陆恒 / new_catcafe

Download as
Browse Code »

Commit 329c3205c413fba31a4533c8c2fbe98bee1389b0

Authored by 陆恒
1 parent 5ae5e5b1
Exists in master

修改猫咖的接口

Showing 2 changed files with 64 additions and 48 deletions   Show diff stats
src/HttpServer/logic/datadef.go
  Diff comments   View file @329c320
... ... @@ -95,13 +95,22 @@ type QueryInviteReq struct{
95 95 type QueryInviteData struct {
96 96 Uuid int `json:"uuid"`
97 97 Nickname string `json:"nickname"`
  98 + Headurl string `json:"headurl"`
98 99 Isfetched int `json:"isfetched"`
99 100 }
100 101  
  102 +type QueryInviteDesc struct {
  103 + Invite_data []QueryInviteData `json:"invite_data"`
  104 +}
  105 +
  106 +type QueryInviteResult struct {
  107 + Code int `json:"code"`
  108 + Data QueryInviteDesc `json:"data"`
  109 +}
  110 +
101 111 type QueryInviteResp struct {
102   - Code int `json:"code"`
103   - Message string `json:"message"`
104   - Data []QueryInviteData `json:"data"`
  112 + Status string `json:"status"`
  113 + Result QueryInviteResult `json:"result"`
105 114 }
106 115  
107 116  
... ... @@ -119,10 +128,18 @@ type InviteWorkDesc struct {
119 128 }
120 129  
121 130  
  131 +type InviteWorksDesc struct {
  132 + Invite_data []InviteWorkDesc `json:"invite_data"`
  133 +}
  134 +
  135 +type InviteWorkResult struct {
  136 + Code int `json:"code"`
  137 + Data InviteWorksDesc `json:"data"`
  138 +}
  139 +
122 140 type InviteWorkResp struct {
123   - Code int `json:"code"`
124   - Message string `json:"message"`
125   - Data []InviteWorkDesc `json:"data"`
  141 + Status string `json:"status"`
  142 + Result InviteWorkResult `json:"result"`
126 143 }
127 144  
128 145  
... ... @@ -145,8 +162,8 @@ type FetchInviteReq struct{
145 162  
146 163  
147 164 type FetchInviteResp struct {
148   - Code int `json:"code"`
149   - Message string `json:"message"`
  165 + Status string `json:"status"`
  166 + Result CommonResult `json:"result"`
150 167 }
151 168  
152 169 type EnterInviteReq struct{
... ... @@ -157,8 +174,8 @@ type EnterInviteReq struct{
157 174  
158 175  
159 176 type EnterInviteResp struct {
160   - Code int `json:"code"`
161   - Message string `json:"message"`
  177 + Status string `json:"status"`
  178 + Result CommonResult `json:"result"`
162 179 }
163 180  
164 181  
... ...
src/HttpServer/logic/logic.go
  Diff comments   View file @329c320
... ... @@ -237,22 +237,21 @@ func HandleQueryInvite(w http.ResponseWriter, data string) {
237 237  
238 238 SetHeader(w)
239 239 var resp QueryInviteResp
240   - resp.Code = 0
  240 + resp.Status = "true"
241 241 var rdata QueryInviteReq
242 242 err := json.Unmarshal([]byte(data), &rdata)
243 243 for {
244 244 if err != nil {
245 245 logger.Error("HandleQueryInvite json unmarshal failed=%v", err)
246   - resp.Code = ERROR_JSONUNMASHFAILED
247   - resp.Message = "json unmarshal failed"
  246 + resp.Result.Code = ERROR_JSONUNMASHFAILED
248 247 break
249 248 }
250 249  
251 250 inlist,err := mysql.QueryInvite(rdata.Uuid)
252 251 if err != nil {
253 252 logger.Error("HandleQueryInvite QueryInvite failed=%v", err)
254   - resp.Code = ERROR_JSONUNMASHFAILED
255   - resp.Message = "QueryInvite failed"
  253 + resp.Result.Code = ERROR_JSONUNMASHFAILED
  254 + //resp.Message = "QueryInvite failed"
256 255 break
257 256 }
258 257  
... ... @@ -261,10 +260,10 @@ func HandleQueryInvite(w http.ResponseWriter, data string) {
261 260 tmp.Uuid = val.Uuid
262 261 tmp.Nickname = val.NickName
263 262 tmp.Isfetched = val.IsFecthed
264   - resp.Data = append(resp.Data,tmp)
  263 + resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,tmp)
265 264 }
266 265  
267   - resp.Code = ERROR_OK
  266 + resp.Result.Code = ERROR_OK
268 267 break
269 268 }
270 269  
... ... @@ -309,30 +308,30 @@ func HandleQueryInviteWork(w http.ResponseWriter, data string) {
309 308  
310 309 SetHeader(w)
311 310 var resp InviteWorkResp
312   - resp.Code = 0
  311 + resp.Status = "true"
313 312 var rdata InviteWorkReq
314 313 err := json.Unmarshal([]byte(data), &rdata)
315 314 for {
316 315 if err != nil {
317 316 logger.Error("HandleQueryInviteWork json unmarshal failed=%v", err)
318   - resp.Code = ERROR_JSONUNMASHFAILED
319   - resp.Message = "json unmarshal failed"
  317 + resp.Result.Code = ERROR_JSONUNMASHFAILED
  318 + //resp.Message = "json unmarshal failed"
320 319 break
321 320 }
322 321  
323 322 dalist,err := GetdagongList(rdata.Uuid)
324 323 if err != nil {
325 324 logger.Error("HandleQueryInviteWork GetdagongList failed")
326   - resp.Code = ERROR_SRVDB_FAILED
327   - resp.Message = fmt.Sprintf("%s",err)
  325 + resp.Result.Code = ERROR_SRVDB_FAILED
  326 + //resp.Message = fmt.Sprintf("%s",err)
328 327 break
329 328 }
330 329  
331 330 for _,val := range *dalist {
332   - resp.Data = append(resp.Data,val)
  331 + resp.Result.Data.Invite_data = append(resp.Result.Data.Invite_data,val)
333 332 }
334 333  
335   - resp.Code = ERROR_OK
  334 + resp.Result.Code = ERROR_OK
336 335 break
337 336 }
338 337  
... ... @@ -347,14 +346,14 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
347 346  
348 347 SetHeader(w)
349 348 var resp EnterInviteResp
350   - resp.Code = 0
  349 + resp.Status = "true"
351 350 var rdata EnterInviteReq
352 351 err := json.Unmarshal([]byte(data), &rdata)
353 352 for {
354 353 if err != nil {
355 354 logger.Error("HandleEnterInvite json unmarshal failed=%v", err)
356   - resp.Code = ERROR_JSONUNMASHFAILED
357   - resp.Message = "json unmarshal failed"
  355 + resp.Result.Code = ERROR_JSONUNMASHFAILED
  356 + //resp.Message = "json unmarshal failed"
358 357 break
359 358 }
360 359  
... ... @@ -364,15 +363,15 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
364 363 exist,err := redishandler.GetRedisClient().HExists(redis.USER_BEINVITE_UUIDRELATION,strconv.Itoa(rdata.Selfuuid))
365 364 if err != nil {
366 365 logger.Error("HandleEnterInvite redis failed=%v", err)
367   - resp.Code = ERROR_JSONUNMASHFAILED
368   - resp.Message = fmt.Sprintf("%s",err)
  366 + resp.Result.Code = ERROR_JSONUNMASHFAILED
  367 + //resp.Message = fmt.Sprintf("%s",err)
369 368 break
370 369 }
371 370  
372 371 if exist {
373 372 logger.Error("HandleEnterInvite already invited")
374   - resp.Code = ERROR_ALREADY_INVITED
375   - resp.Message = fmt.Sprintf("%s",err)
  373 + resp.Result.Code = ERROR_ALREADY_INVITED
  374 + //resp.Message = fmt.Sprintf("%s",err)
376 375 break
377 376 }
378 377  
... ... @@ -388,23 +387,23 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
388 387 invitelist,err := GetdagongList(rdata.Inviteuuid)
389 388 if err != nil {
390 389 logger.Error("HandleEnterInvite GetdagongList failed")
391   - resp.Code = ERROR_SRVDB_FAILED
392   - resp.Message = fmt.Sprintf("%s",err)
  390 + resp.Result.Code = ERROR_SRVDB_FAILED
  391 + //resp.Message = fmt.Sprintf("%s",err)
393 392 break
394 393 }
395 394  
396 395 if len(*invitelist) > 2 {
397 396 logger.Error("HandleEnterInvite dagong num is full")
398   - resp.Code = ERROR_DAGONG_FULL
399   - resp.Message = "dagong full"
  397 + resp.Result.Code = ERROR_DAGONG_FULL
  398 + //resp.Message = "dagong full"
400 399 break
401 400 }
402 401  
403 402 //需要判断是否已经处于打工中
404 403 if invitelist.IsInWork(rdata.Selfuuid) {
405 404 logger.Error("HandleEnterInvite IsInWork")
406   - resp.Code = ERROR_DAGONG_FULL
407   - resp.Message = "ERROR_ALREADY_INWORK"
  405 + resp.Result.Code = ERROR_DAGONG_FULL
  406 + //resp.Message = "ERROR_ALREADY_INWORK"
408 407 break
409 408 }
410 409  
... ... @@ -412,14 +411,14 @@ func HandleEnterInvite(w http.ResponseWriter, data string) {
412 411  
413 412 if err != nil {
414 413 logger.Error("HandleEnterInvite ERROR_SRVDB_FAILED")
415   - resp.Code = ERROR_SRVDB_FAILED
416   - resp.Message = fmt.Sprintf("%s",err)
  414 + resp.Result.Code = ERROR_SRVDB_FAILED
  415 + //resp.Message = fmt.Sprintf("%s",err)
417 416 break
418 417 }
419 418 }
420 419  
421 420  
422   - resp.Code = ERROR_OK
  421 + resp.Result.Code = ERROR_OK
423 422 break
424 423 }
425 424  
... ... @@ -433,14 +432,14 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) {
433 432  
434 433 SetHeader(w)
435 434 var resp FetchInviteResp
436   - resp.Code = 0
  435 + resp.Status = "true"
437 436 var rdata FetchInviteReq
438 437 err := json.Unmarshal([]byte(data), &rdata)
439 438 for {
440 439 if err != nil {
441 440 logger.Error("HandleFetchInviteReward json unmarshal failed=%v", err)
442   - resp.Code = ERROR_JSONUNMASHFAILED
443   - resp.Message = "json unmarshal failed"
  441 + resp.Result.Code = ERROR_JSONUNMASHFAILED
  442 + //resp.Message = "json unmarshal failed"
444 443 break
445 444 }
446 445  
... ... @@ -448,22 +447,22 @@ func HandleFetchInviteReward(w http.ResponseWriter, data string) {
448 447 fetch,err := redishandler.GetRedisClient().HGet(rkey,strconv.Itoa(rdata.Fuuid))
449 448 if err != nil {
450 449 logger.Error("HandleFetchInviteReward redis failed=%v", err)
451   - resp.Code = ERROR_JSONUNMASHFAILED
452   - resp.Message = fmt.Sprintf("%s",err)
  450 + resp.Result.Code = ERROR_JSONUNMASHFAILED
  451 + //resp.Message = fmt.Sprintf("%s",err)
453 452 break
454 453 }
455 454  
456 455 if fetch == "1" {
457 456 logger.Error("HandleFetchInviteReward alreadyfetched failed=%v", err)
458   - resp.Code = ERROR_INVITEREAWARD_FETCHED
459   - resp.Message = "already fetched"
  457 + resp.Result.Code = ERROR_INVITEREAWARD_FETCHED
  458 + //resp.Message = "already fetched"
460 459 break
461 460 }
462 461  
463 462 //将领取记录记录
464 463 redishandler.GetRedisClient().HSet(rkey,strconv.Itoa(rdata.Fuuid),"1")
465 464  
466   - resp.Code = ERROR_OK
  465 + resp.Result.Code = ERROR_OK
467 466 break
468 467 }
469 468  
... ...