陆恒 / XIAO_XINGXING

Download as
Browse Code »

Commit 7a88e9835e791885195c516f8808b52afbe41e5f

Authored by 陆恒
1 parent 55c2be39
Exists in master and in 4 other branches test, ver2.2.7, ver2.2.8, ver2.3.0

添加打印

Showing 2 changed files with 65 additions and 86 deletions   Show diff stats
src/HttpServer/logic/function.go
  Diff comments   View file @7a88e98
... ... @@ -322,6 +322,7 @@ func (uinfo *UserData) HandleGetTaskReward(req *GettaskrewardReq, resp *Gettaskr
322 322 }
323 323 }
324 324  
  325 + logger.Info("HandleGetTaskReward index=%v taskdesc=%v", index, taskdesc)
325 326 if isfind && taskdesc != nil && index != -1 {
326 327 if taskdesc.Taskstatus != 2 {
327 328 //状态不是可领取状态 无法领取
... ...
src/HttpServer/logic/logic.go
  Diff comments   View file @7a88e98
... ... @@ -12,14 +12,13 @@ import (
12 12 "time"
13 13 )
14 14  
15   -
16 15 func HandlerQueryguaninfo(w http.ResponseWriter, data string, uuid int) {
17 16 SetHeader(w)
18 17 var resp QueryguaninfoResp
19 18 resp.Code = 0
20 19 for {
21   - uinfo,err := GetUserInfo(uuid)
22   - if err != nil || uinfo == nil{
  20 + uinfo, err := GetUserInfo(uuid)
  21 + if err != nil || uinfo == nil {
23 22 logger.Error("redis failed err=%v", err)
24 23 resp.Message = "服务器错误"
25 24 resp.Code = ERROR_SRV_ERROR
... ... @@ -28,14 +27,13 @@ func HandlerQueryguaninfo(w http.ResponseWriter, data string, uuid int) {
28 27  
29 28 //获取存钱罐等级配置
30 29 mcfg := jsonconf.GetMoneyBoxCfg(uinfo.Lv)
31   - if mcfg==nil {
  30 + if mcfg == nil {
32 31 logger.Error("GetMoneyBoxCfg failed err=%v", err)
33 32 resp.Message = "存钱罐金币不足"
34 33 resp.Code = ERROR_GETCONFIG_FAILED
35 34 break
36 35 }
37 36  
38   -
39 37 resp.Data.Guangold = uinfo.GuanGold
40 38 resp.Data.Loginday = uinfo.ContinueLoginDay
41 39 resp.Data.Totalcnt = uinfo.CalcTotalCnt()
... ... @@ -58,8 +56,8 @@ func HandlerWatchads(w http.ResponseWriter, data string, uuid int) {
58 56 resp.Code = 0
59 57  
60 58 for {
61   - uinfo,err := GetUserInfo(uuid)
62   - if err != nil || uinfo == nil{
  59 + uinfo, err := GetUserInfo(uuid)
  60 + if err != nil || uinfo == nil {
63 61 logger.Error("redis failed err=%v", err)
64 62 resp.Message = "服务器错误"
65 63 resp.Code = ERROR_SRV_ERROR
... ... @@ -73,7 +71,7 @@ func HandlerWatchads(w http.ResponseWriter, data string, uuid int) {
73 71 break
74 72 }
75 73  
76   - uinfo.WatchAddsTime --
  74 + uinfo.WatchAddsTime--
77 75 err = SaveUserInfo(uinfo)
78 76 if err != nil {
79 77 logger.Error("redis failed err=%v", err)
... ... @@ -105,24 +103,24 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
105 103 resp.Code = ERROR_JSONUNMASH_ERROR
106 104 break
107 105 }
108   - uinfo,err := GetUserInfo(uuid)
109   - if err != nil || uinfo == nil{
  106 + uinfo, err := GetUserInfo(uuid)
  107 + if err != nil || uinfo == nil {
110 108 logger.Error("redis failed err=%v", err)
111 109 resp.Message = "服务器错误"
112 110 resp.Code = ERROR_SRV_ERROR
113 111 break
114 112 }
115 113  
116   - drawnum := int(rdata.Money*100)
  114 + drawnum := int(rdata.Money * 100)
117 115 //需要判断一下金币是否足够
118   - if drawnum * 100 > uinfo.RealGold {
  116 + if drawnum*100 > uinfo.RealGold {
119 117 logger.Error("gold nor enough failed err=%v", err)
120 118 resp.Message = "提现金币不足"
121 119 resp.Code = ERROR_GETCASH_GOLDNOTENOUGH_FAILED
122 120 break
123 121 }
124 122  
125   - _,err = GetCashFromSDK(uuid,drawnum,rdata.Gameid,rdata.Channel,rdata.Openid,rdata.Nickname,rdata.Headurl)
  123 + _, err = GetCashFromSDK(uuid, drawnum, rdata.Gameid, rdata.Channel, rdata.Openid, rdata.Nickname, rdata.Headurl)
126 124 if err != nil {
127 125 logger.Error("GetCashFromSDK failed err=%v", err)
128 126 resp.Message = "从后台提现失败了"
... ... @@ -130,7 +128,7 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
130 128 break
131 129 }
132 130  
133   - index,info := uinfo.GetWithDrawData(rdata.Money)
  131 + index, info := uinfo.GetWithDrawData(rdata.Money)
134 132 if index == -1 || info == nil {
135 133 logger.Error("AddWithDrawList failed err=%v", err)
136 134 resp.Message = "网络错误"
... ... @@ -160,10 +158,10 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
160 158 }
161 159  
162 160 //判断一下前置条件的下一档
163   - if index == len(uinfo.WithDraw.Cashdata) - 1 {
  161 + if index == len(uinfo.WithDraw.Cashdata)-1 {
164 162 //最后一档了不用处理
165   - }else {
166   - if index < len(uinfo.WithDraw.Cashdata) - 1{
  163 + } else {
  164 + if index < len(uinfo.WithDraw.Cashdata)-1 {
167 165 uinfo.WithDraw.Cashdata[index+1].Preisfind = 1
168 166 }
169 167 }
... ... @@ -172,7 +170,7 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
172 170 data := new(WithDrawRecord)
173 171 data.Withdrawmoney = rdata.Money
174 172 data.Withdrawtime = int(time.Now().Unix())
175   - err = AddWithDrawList(uuid,data)
  173 + err = AddWithDrawList(uuid, data)
176 174 if err != nil {
177 175 logger.Error("AddWithDrawList failed err=%v", err)
178 176 resp.Message = "网络错误"
... ... @@ -180,8 +178,6 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
180 178 break
181 179 }
182 180  
183   -
184   -
185 181 if info.Isnew == 1 {
186 182 uinfo.WithDraw.Cashdata[index].Isnew = 0
187 183 }
... ... @@ -191,7 +187,6 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
191 187 resp.Data.Walletgold = uinfo.RealGold
192 188 SaveUserInfo(uinfo)
193 189  
194   -
195 190 resp.Code = ERROR_OK
196 191 break
197 192 }
... ... @@ -202,8 +197,6 @@ func HandlerGetcash(w http.ResponseWriter, data string, uuid int) {
202 197  
203 198 }
204 199  
205   -
206   -
207 200 func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) {
208 201 SetHeader(w)
209 202 var resp GetnewlevelrewardResp
... ... @@ -217,8 +210,8 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) {
217 210 resp.Code = ERROR_JSONUNMASH_ERROR
218 211 break
219 212 }
220   - uinfo,err := GetUserInfo(uuid)
221   - if err != nil || uinfo == nil{
  213 + uinfo, err := GetUserInfo(uuid)
  214 + if err != nil || uinfo == nil {
222 215 logger.Error("redis failed err=%v", err)
223 216 resp.Message = "服务器错误"
224 217 resp.Code = ERROR_SRV_ERROR
... ... @@ -241,7 +234,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) {
241 234 break
242 235 }
243 236  
244   - _,err = AddCoinToSdk(uuid,cfg.Cash,rdata.Gameid,rdata.Channel,100)
  237 + _, err = AddCoinToSdk(uuid, cfg.Cash, rdata.Gameid, rdata.Channel, 100)
245 238 if err != nil {
246 239 logger.Error("AddCoinToSdk failed err=%v", err)
247 240 resp.Message = "网络错误"
... ... @@ -251,7 +244,7 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) {
251 244 uinfo.RealGold += cfg.Cash
252 245  
253 246 if rdata.Rewardtype == 2 {
254   - _,err = AddCoinToSdk(uuid,cfg.Extracash,rdata.Gameid,rdata.Channel,100)
  247 + _, err = AddCoinToSdk(uuid, cfg.Extracash, rdata.Gameid, rdata.Channel, 100)
255 248 if err != nil {
256 249 logger.Error("AddCoinToSdk failed err=%v", err)
257 250 resp.Message = "网络错误"
... ... @@ -261,12 +254,11 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) {
261 254 uinfo.RealGold += cfg.Extracash
262 255 }
263 256  
264   - uinfo.LvRewardGet = 1 +rdata.Rewardtype
  257 + uinfo.LvRewardGet = 1 + rdata.Rewardtype
265 258  
266 259 //保存数据
267 260 SaveUserInfo(uinfo)
268 261  
269   -
270 262 resp.Code = ERROR_OK
271 263 break
272 264 }
... ... @@ -277,7 +269,6 @@ func HandlerGetnewlevelreward(w http.ResponseWriter, data string, uuid int) {
277 269  
278 270 }
279 271  
280   -
281 272 func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) {
282 273 SetHeader(w)
283 274 var resp GettaskrewardResp
... ... @@ -291,8 +282,8 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) {
291 282 resp.Code = ERROR_JSONUNMASH_ERROR
292 283 break
293 284 }
294   - uinfo,err := GetUserInfo(uuid)
295   - if err != nil || uinfo == nil{
  285 + uinfo, err := GetUserInfo(uuid)
  286 + if err != nil || uinfo == nil {
296 287 logger.Error("redis failed err=%v", err)
297 288 resp.Message = "服务器错误"
298 289 resp.Code = ERROR_SRV_ERROR
... ... @@ -302,16 +293,16 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) {
302 293 //需要先计算出任务或者成就
303 294 var tasklist *TaskList
304 295 //先查询一下当前的任务数据
305   - tasklist,err = GetTaskInfo(uuid,rdata.Tasktype)
306   - if err != nil || tasklist==nil{
  296 + tasklist, err = GetTaskInfo(uuid, rdata.Tasktype)
  297 + if err != nil || tasklist == nil {
307 298 logger.Error("GetTaskInfo failed err=%v", err)
308 299 resp.Message = "服务器错误"
309 300 resp.Code = ERROR_SRV_ERROR
310 301 break
311 302 }
312 303  
313   -
314   - err = uinfo.HandleGetTaskReward(&rdata,&resp,tasklist)
  304 + err = uinfo.HandleGetTaskReward(&rdata, &resp, tasklist)
  305 + logger.Info("HandlerGettaskreward tasklist=%v", tasklist)
315 306 if err != nil {
316 307 logger.Error("HandleGetTaskReward failed err=%v", err)
317 308 resp.Message = "服务器错误"
... ... @@ -321,7 +312,7 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) {
321 312  
322 313 //保存数据
323 314 SaveUserInfo(uinfo)
324   - SaveTaskInfo(uinfo.Userid,rdata.Tasktype,tasklist)
  315 + SaveTaskInfo(uinfo.Userid, rdata.Tasktype, tasklist)
325 316  
326 317 resp.Code = ERROR_OK
327 318 break
... ... @@ -333,8 +324,6 @@ func HandlerGettaskreward(w http.ResponseWriter, data string, uuid int) {
333 324  
334 325 }
335 326  
336   -
337   -
338 327 func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) {
339 328 SetHeader(w)
340 329 var resp QuerytaskinfoResp
... ... @@ -348,8 +337,8 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) {
348 337 resp.Code = ERROR_JSONUNMASH_ERROR
349 338 break
350 339 }
351   - uinfo,err := GetUserInfo(uuid)
352   - if err != nil || uinfo == nil{
  340 + uinfo, err := GetUserInfo(uuid)
  341 + if err != nil || uinfo == nil {
353 342 logger.Error("redis failed err=%v", err)
354 343 resp.Message = "服务器错误"
355 344 resp.Code = ERROR_SRV_ERROR
... ... @@ -359,21 +348,19 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) {
359 348 //需要先计算出任务或者成就
360 349 var tasklist *TaskList
361 350 //先查询一下当前的任务数据
362   - tasklist,err = GetTaskInfo(uuid,rdata.Tasktype)
363   - if err != nil || tasklist==nil{
  351 + tasklist, err = GetTaskInfo(uuid, rdata.Tasktype)
  352 + if err != nil || tasklist == nil {
364 353 logger.Error("redis failed err=%v", err)
365 354 resp.Message = "服务器错误"
366 355 resp.Code = ERROR_SRV_ERROR
367 356 break
368 357 }
369 358  
370   -
371   -
372 359 if rdata.Tasktype == 1 {
373 360 uinfo.CalcTaskList(tasklist)
374   - }else if rdata.Tasktype == 2 {
  361 + } else if rdata.Tasktype == 2 {
375 362 tasklist = uinfo.CalcAchieveList(tasklist)
376   - }else {
  363 + } else {
377 364 uinfo.CalcTaskList(tasklist)
378 365 }
379 366  
... ... @@ -384,7 +371,7 @@ func HandlerQuerytaskinfo(w http.ResponseWriter, data string, uuid int) {
384 371 break
385 372 }
386 373  
387   - resp.Data.Taskdata = append(resp.Data.Taskdata,tasklist.Taskdata...)
  374 + resp.Data.Taskdata = append(resp.Data.Taskdata, tasklist.Taskdata...)
388 375  
389 376 resp.Code = ERROR_OK
390 377 break
... ... @@ -410,8 +397,8 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
410 397 resp.Code = ERROR_JSONUNMASH_ERROR
411 398 break
412 399 }
413   - uinfo,err := GetUserInfo(uuid)
414   - if err != nil || uinfo == nil{
  400 + uinfo, err := GetUserInfo(uuid)
  401 + if err != nil || uinfo == nil {
415 402 logger.Error("redis failed err=%v", err)
416 403 resp.Message = "服务器错误"
417 404 resp.Code = ERROR_SRV_ERROR
... ... @@ -431,7 +418,7 @@ func HandlerUpdatetaskandachieve(w http.ResponseWriter, data string, uuid int) {
431 418 uinfo.Task.UseItemCnt += rdata.Value
432 419 uinfo.Achieve.SumUseItemCnt += rdata.Value
433 420 }
434   - logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v",uinfo,rdata)
  421 + logger.Info("HandlerUpdatetaskandachieve uinfo=%v rdata=%v", uinfo, rdata)
435 422 SaveUserInfo(uinfo)
436 423 resp.Code = ERROR_OK
437 424 break
... ... @@ -449,15 +436,15 @@ func HandlerOnlinentf(w http.ResponseWriter, data string, uuid int) {
449 436 resp.Code = 0
450 437 for {
451 438  
452   - uinfo,err := GetUserInfo(uuid)
453   - if err != nil || uinfo == nil{
  439 + uinfo, err := GetUserInfo(uuid)
  440 + if err != nil || uinfo == nil {
454 441 logger.Error("redis failed err=%v", err)
455 442 resp.Message = "服务器错误"
456 443 resp.Code = ERROR_SRV_ERROR
457 444 break
458 445 }
459 446  
460   - uinfo.Task.OnlineMin ++
  447 + uinfo.Task.OnlineMin++
461 448  
462 449 SaveUserInfo(uinfo)
463 450  
... ... @@ -476,15 +463,15 @@ func HandlerGetcashrecord(w http.ResponseWriter, data string, uuid int) {
476 463 var resp GetcashrecordResp
477 464 resp.Code = 0
478 465 for {
479   - list,err := GetWithDrawList(uuid)
480   - if err != nil || list == nil{
  466 + list, err := GetWithDrawList(uuid)
  467 + if err != nil || list == nil {
481 468 logger.Error("HandlerGetcashrecord failed err=%v", err)
482 469 resp.Message = "服务器错误"
483 470 resp.Code = ERROR_SRV_ERROR
484 471 break
485 472 }
486 473  
487   - resp.Data.Withdata = append(resp.Data.Withdata,list.Withdata...)
  474 + resp.Data.Withdata = append(resp.Data.Withdata, list.Withdata...)
488 475  
489 476 resp.Code = ERROR_OK
490 477 break
... ... @@ -501,8 +488,8 @@ func HandlerQuerdrawinfo(w http.ResponseWriter, data string, uuid int) {
501 488 var resp QuerdrawinfoResp
502 489 resp.Code = 0
503 490 for {
504   - uinfo,err := GetUserInfo(uuid)
505   - if err != nil || uinfo == nil{
  491 + uinfo, err := GetUserInfo(uuid)
  492 + if err != nil || uinfo == nil {
506 493 logger.Error("redis failed err=%v", err)
507 494 resp.Message = "服务器错误"
508 495 resp.Code = ERROR_SRV_ERROR
... ... @@ -510,7 +497,7 @@ func HandlerQuerdrawinfo(w http.ResponseWriter, data string, uuid int) {
510 497 }
511 498  
512 499 //返回
513   - resp.Data.Cashdata = append(resp.Data.Cashdata,uinfo.WithDraw.Cashdata...)
  500 + resp.Data.Cashdata = append(resp.Data.Cashdata, uinfo.WithDraw.Cashdata...)
514 501  
515 502 resp.Code = ERROR_OK
516 503 break
... ... @@ -522,7 +509,6 @@ func HandlerQuerdrawinfo(w http.ResponseWriter, data string, uuid int) {
522 509  
523 510 }
524 511  
525   -
526 512 func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) {
527 513 SetHeader(w)
528 514 var resp DrawguangoldResp
... ... @@ -537,8 +523,8 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) {
537 523 break
538 524 }
539 525  
540   - uinfo,err := GetUserInfo(uuid)
541   - if err != nil || uinfo == nil{
  526 + uinfo, err := GetUserInfo(uuid)
  527 + if err != nil || uinfo == nil {
542 528 logger.Error("redis failed err=%v", err)
543 529 resp.Message = "服务器错误"
544 530 resp.Code = ERROR_SRV_ERROR
... ... @@ -546,7 +532,7 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) {
546 532 }
547 533 //首先判断一下存钱罐的金币是否足够
548 534 if rdata.Goldnum > uinfo.GuanGold {
549   - logger.Error("guangold not enough rdata.Goldnum=%v uinfo.GuanGold=%v",rdata.Goldnum,uinfo.GuanGold)
  535 + logger.Error("guangold not enough rdata.Goldnum=%v uinfo.GuanGold=%v", rdata.Goldnum, uinfo.GuanGold)
550 536 resp.Message = "存钱罐金币不足"
551 537 resp.Code = ERROR_GUANGOLD_NOTENOUGH
552 538 break
... ... @@ -561,11 +547,11 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) {
561 547 break
562 548 }
563 549  
564   - uinfo.GetFromGuanCnt ++
565   - uinfo.Achieve.SumGetGuan ++
  550 + uinfo.GetFromGuanCnt++
  551 + uinfo.Achieve.SumGetGuan++
566 552 //
567 553 mcfg := jsonconf.GetMoneyBoxCfg(uinfo.Lv)
568   - if mcfg==nil {
  554 + if mcfg == nil {
569 555 logger.Error("GetMoneyBoxCfg failed err=%v", err)
570 556 resp.Message = "获取配置失败"
571 557 resp.Code = ERROR_GETCONFIG_FAILED
... ... @@ -579,10 +565,8 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) {
579 565 break
580 566 }
581 567  
582   -
583   -
584 568 //todo 此处需要调佣SDK接口通知金币变化
585   - _,err = AddCoinToSdk(uuid,rdata.Goldnum,rdata.Gameid,rdata.Channel,100)
  569 + _, err = AddCoinToSdk(uuid, rdata.Goldnum, rdata.Gameid, rdata.Channel, 100)
586 570 if err != nil {
587 571 logger.Error("Drawgold failed err=%v", err)
588 572 resp.Message = "从存钱罐提取金币失败了"
... ... @@ -608,7 +592,6 @@ func HandlerDrawguangold(w http.ResponseWriter, data string, uuid int) {
608 592  
609 593 }
610 594  
611   -
612 595 func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) {
613 596 SetHeader(w)
614 597 var resp GetguangoldResp
... ... @@ -623,17 +606,16 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) {
623 606 break
624 607 }
625 608  
626   - uinfo,err := GetUserInfo(uuid)
627   - if err != nil || uinfo == nil{
  609 + uinfo, err := GetUserInfo(uuid)
  610 + if err != nil || uinfo == nil {
628 611 logger.Error("redis failed err=%v", err)
629 612 resp.Message = "服务器错误"
630 613 resp.Code = ERROR_SRV_ERROR
631 614 break
632 615 }
633 616  
634   -
635 617 mcfg := jsonconf.GetMoneyBoxCfg(uinfo.Lv)
636   - if mcfg==nil {
  618 + if mcfg == nil {
637 619 logger.Error("GetMoneyBoxCfg failed err=%v", err)
638 620 resp.Message = "获取配置失败"
639 621 resp.Code = ERROR_GETCONFIG_FAILED
... ... @@ -647,7 +629,7 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) {
647 629  
648 630 resp.Data.Guangold = uinfo.GuanGold
649 631 //uinfo.Task.GetGuanGold += rdata.Goldnum
650   - uinfo.Task.GetGuanGold ++
  632 + uinfo.Task.GetGuanGold++
651 633  
652 634 SaveUserInfo(uinfo)
653 635  
... ... @@ -661,7 +643,6 @@ func HandlerGetguangold(w http.ResponseWriter, data string, uuid int) {
661 643  
662 644 }
663 645  
664   -
665 646 func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) {
666 647 SetHeader(w)
667 648 var resp GetuserdataResp
... ... @@ -676,17 +657,15 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) {
676 657 break
677 658 }
678 659  
679   -
680   - data,err := GetUserInfo(uuid)
681   - if err != nil || data == nil{
  660 + data, err := GetUserInfo(uuid)
  661 + if err != nil || data == nil {
682 662 resp.Code = ERROR_SRV_ERROR
683 663 resp.Message = "ERROR_SRV_ERROR"
684 664 break
685 665 }
686 666  
687   -
688 667 //此处处理一下从sdk拉取钱包金币数量
689   - gold,err := GetCoinFromSdk(uuid,rdata.Gameid,rdata.Channel)
  668 + gold, err := GetCoinFromSdk(uuid, rdata.Gameid, rdata.Channel)
690 669 if err != nil {
691 670 data.RealGold = gold
692 671 }
... ... @@ -698,7 +677,6 @@ func HandlerGetuserdata(w http.ResponseWriter, data string, uuid int) {
698 677 resp.Data.Userlv = data.Lv
699 678 SaveUserInfo(data)
700 679  
701   -
702 680 resp.Code = ERROR_OK
703 681 break
704 682 }
... ... @@ -725,7 +703,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) {
725 703 }
726 704  
727 705 //先判断一下是否是新用户
728   - isexist,err := redishandler.GetRedisClient().HExists(redis.USER_DATA_KEY, strconv.Itoa(uuid))
  706 + isexist, err := redishandler.GetRedisClient().HExists(redis.USER_DATA_KEY, strconv.Itoa(uuid))
729 707 if err != nil {
730 708 logger.Error("redis failed err=%v", err)
731 709 resp.Message = "服务器错误"
... ... @@ -739,7 +717,7 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) {
739 717 err = InitUserInfo(&rdata, &resp, uuid)
740 718 } else {
741 719 //已经登陆过了 需要获取玩家数据
742   - err = GetUserData(uuid, &rdata,&resp)
  720 + err = GetUserData(uuid, &rdata, &resp)
743 721 }
744 722  
745 723 if err != nil {
... ... @@ -758,4 +736,4 @@ func HandlerLogin(w http.ResponseWriter, data string, uuid int) {
758 736 fmt.Fprint(w, string(respstr))
759 737  
760 738 logger.Info("###HandlerLogin###rdata:%v", string(respstr))
761   -}
762 739 \ No newline at end of file
  740 +}
... ...