Skip to content

Commit 68fafad

Browse files
cxykevincxykevin
committed
设置错误码始终为200
1 parent 897f03e commit 68fafad

5 files changed

Lines changed: 80 additions & 80 deletions

File tree

‎service/file/file.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ func getInfo(c *gin.Context) {
271271

272272
cli, err := call()
273273
if err != nil {
274-
c.JSON(http.StatusBadRequest, gin.H{
274+
c.JSON(http.StatusOK, gin.H{
275275
"result": gin.H{
276276
"code": errorcode.ServerInternalNetworkError,
277277
"msg": err.Error(),
@@ -285,7 +285,7 @@ func getInfo(c *gin.Context) {
285285
Hash: fileHash,
286286
})
287287
if err != nil {
288-
c.JSON(http.StatusBadRequest, gin.H{
288+
c.JSON(http.StatusOK, gin.H{
289289
"result": gin.H{
290290
"code": errorcode.ServerInternalNetworkError,
291291
"msg": "Network error",
@@ -294,7 +294,7 @@ func getInfo(c *gin.Context) {
294294
return
295295
}
296296
if ret.Result.Code != errorcode.Success {
297-
c.JSON(http.StatusBadRequest, gin.H{
297+
c.JSON(http.StatusOK, gin.H{
298298
"result": gin.H{
299299
"code": ret.Result.Code,
300300
"msg": ret.Result.Msg,
@@ -349,7 +349,7 @@ func download(c *gin.Context) {
349349

350350
cli, err := call()
351351
if err != nil {
352-
c.JSON(http.StatusBadRequest, gin.H{
352+
c.JSON(http.StatusOK, gin.H{
353353
"result": gin.H{
354354
"code": errorcode.ServerInternalNetworkError,
355355
"msg": err.Error(),
@@ -363,7 +363,7 @@ func download(c *gin.Context) {
363363
Hash: fileHash,
364364
})
365365
if err != nil {
366-
c.JSON(http.StatusBadRequest, gin.H{
366+
c.JSON(http.StatusOK, gin.H{
367367
"result": gin.H{
368368
"code": errorcode.ServerInternalNetworkError,
369369
"msg": "Network error",
@@ -372,7 +372,7 @@ func download(c *gin.Context) {
372372
return
373373
}
374374
if fileInfoRet.Result.Code != errorcode.Success {
375-
c.JSON(http.StatusBadRequest, gin.H{
375+
c.JSON(http.StatusOK, gin.H{
376376
"result": gin.H{
377377
"code": fileInfoRet.Result.Code,
378378
"msg": fileInfoRet.Result.Msg,
@@ -414,7 +414,7 @@ func download(c *gin.Context) {
414414
End: (end + 1), // 原API是包含头不包含尾的，所以这里需要加1
415415
})
416416
if err != nil {
417-
c.JSON(http.StatusBadRequest, gin.H{
417+
c.JSON(http.StatusOK, gin.H{
418418
"result": gin.H{
419419
"code": errorcode.ServerInternalNetworkError,
420420
"msg": "Network error",

‎service/group/group.go‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func getByUID(c *gin.Context) {
2828
var uid int32 = int32(c.GetInt("uid"))
2929
cli, err := call()
3030
if err != nil {
31-
c.JSON(http.StatusBadRequest, gin.H{
31+
c.JSON(http.StatusOK, gin.H{
3232
"result": gin.H{
3333
"code": errorcode.ServerInternalNetworkError,
3434
"msg": err.Error(),
@@ -42,7 +42,7 @@ func getByUID(c *gin.Context) {
4242
Uid: uid,
4343
})
4444
if ret.Result.Code != errorcode.Success {
45-
c.JSON(http.StatusBadRequest, gin.H{
45+
c.JSON(http.StatusOK, gin.H{
4646
"result": gin.H{
4747
"code": ret.Result.Code,
4848
"msg": ret.Result.Msg,
@@ -65,7 +65,7 @@ func getPublicInfo(c *gin.Context) {
6565
var groupidStr string = c.Param("groupid")
6666
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
6767
if err != nil {
68-
c.JSON(http.StatusBadRequest, gin.H{
68+
c.JSON(http.StatusOK, gin.H{
6969
"result": gin.H{
7070
"code": errorcode.ProxyBadRequest,
7171
"msg": err.Error(),
@@ -74,7 +74,7 @@ func getPublicInfo(c *gin.Context) {
7474
}
7575
cli, err := call()
7676
if err != nil {
77-
c.JSON(http.StatusBadRequest, gin.H{
77+
c.JSON(http.StatusOK, gin.H{
7878
"result": gin.H{
7979
"code": errorcode.ServerInternalNetworkError,
8080
"msg": err.Error(),
@@ -88,7 +88,7 @@ func getPublicInfo(c *gin.Context) {
8888
GroupId: int32(groupid),
8989
})
9090
if ret.Result.Code != errorcode.Success {
91-
c.JSON(http.StatusBadRequest, gin.H{
91+
c.JSON(http.StatusOK, gin.H{
9292
"result": gin.H{
9393
"code": ret.Result.Code,
9494
"msg": ret.Result.Msg,
@@ -111,7 +111,7 @@ func getInfo(c *gin.Context) {
111111
var groupidStr string = c.Param("groupid")
112112
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
113113
if err != nil {
114-
c.JSON(http.StatusBadRequest, gin.H{
114+
c.JSON(http.StatusOK, gin.H{
115115
"result": gin.H{
116116
"code": errorcode.ProxyBadRequest,
117117
"msg": err.Error(),
@@ -120,7 +120,7 @@ func getInfo(c *gin.Context) {
120120
}
121121
cli, err := call()
122122
if err != nil {
123-
c.JSON(http.StatusBadRequest, gin.H{
123+
c.JSON(http.StatusOK, gin.H{
124124
"result": gin.H{
125125
"code": errorcode.ServerInternalNetworkError,
126126
"msg": err.Error(),
@@ -135,7 +135,7 @@ func getInfo(c *gin.Context) {
135135
GroupId: int32(groupid),
136136
})
137137
if ret.Result.Code != errorcode.Success {
138-
c.JSON(http.StatusBadRequest, gin.H{
138+
c.JSON(http.StatusOK, gin.H{
139139
"result": gin.H{
140140
"code": ret.Result.Code,
141141
"msg": ret.Result.Msg,
@@ -162,7 +162,7 @@ func getInfo(c *gin.Context) {
162162
func create(c *gin.Context) {
163163
var obj createGroupRequest
164164
if err := c.ShouldBindJSON(&obj); err != nil {
165-
c.JSON(http.StatusBadRequest, gin.H{
165+
c.JSON(http.StatusOK, gin.H{
166166
"result": gin.H{
167167
"code": errorcode.ProxyBadRequest,
168168
"msg": err.Error(),
@@ -173,7 +173,7 @@ func create(c *gin.Context) {
173173
var uid int32 = int32(c.GetInt("uid"))
174174
cli, err := call()
175175
if err != nil {
176-
c.JSON(http.StatusBadRequest, gin.H{
176+
c.JSON(http.StatusOK, gin.H{
177177
"result": gin.H{
178178
"code": errorcode.ServerInternalNetworkError,
179179
"msg": err.Error(),
@@ -188,7 +188,7 @@ func create(c *gin.Context) {
188188
Name: obj.Name,
189189
})
190190
if ret.Result.Code != errorcode.Success {
191-
c.JSON(http.StatusBadRequest, gin.H{
191+
c.JSON(http.StatusOK, gin.H{
192192
"result": gin.H{
193193
"code": ret.Result.Code,
194194
"msg": ret.Result.Msg,
@@ -210,7 +210,7 @@ func join(c *gin.Context) {
210210
var groupidStr string = c.Param("groupid")
211211
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
212212
if err != nil {
213-
c.JSON(http.StatusBadRequest, gin.H{
213+
c.JSON(http.StatusOK, gin.H{
214214
"result": gin.H{
215215
"code": errorcode.ProxyBadRequest,
216216
"msg": err.Error(),
@@ -219,7 +219,7 @@ func join(c *gin.Context) {
219219
}
220220
var obj joinRequest
221221
if err := c.ShouldBindJSON(&obj); err != nil {
222-
c.JSON(http.StatusBadRequest, gin.H{
222+
c.JSON(http.StatusOK, gin.H{
223223
"result": gin.H{
224224
"code": errorcode.ProxyBadRequest,
225225
"msg": err.Error(),
@@ -229,7 +229,7 @@ func join(c *gin.Context) {
229229
}
230230
cli, err := call()
231231
if err != nil {
232-
c.JSON(http.StatusBadRequest, gin.H{
232+
c.JSON(http.StatusOK, gin.H{
233233
"result": gin.H{
234234
"code": errorcode.ServerInternalNetworkError,
235235
"msg": err.Error(),
@@ -245,7 +245,7 @@ func join(c *gin.Context) {
245245
GroupId: int32(groupid),
246246
})
247247
if ret.Result.Code != errorcode.Success {
248-
c.JSON(http.StatusBadRequest, gin.H{
248+
c.JSON(http.StatusOK, gin.H{
249249
"result": gin.H{
250250
"code": ret.Result.Code,
251251
"msg": ret.Result.Msg,
@@ -266,7 +266,7 @@ func invite(c *gin.Context) {
266266
var groupidStr string = c.Param("groupid")
267267
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
268268
if err != nil {
269-
c.JSON(http.StatusBadRequest, gin.H{
269+
c.JSON(http.StatusOK, gin.H{
270270
"result": gin.H{
271271
"code": errorcode.ProxyBadRequest,
272272
"msg": err.Error(),
@@ -275,7 +275,7 @@ func invite(c *gin.Context) {
275275
}
276276
var obj inviteRequest
277277
if err := c.ShouldBindJSON(&obj); err != nil {
278-
c.JSON(http.StatusBadRequest, gin.H{
278+
c.JSON(http.StatusOK, gin.H{
279279
"result": gin.H{
280280
"code": errorcode.ProxyBadRequest,
281281
"msg": err.Error(),
@@ -285,7 +285,7 @@ func invite(c *gin.Context) {
285285
}
286286
cli, err := call()
287287
if err != nil {
288-
c.JSON(http.StatusBadRequest, gin.H{
288+
c.JSON(http.StatusOK, gin.H{
289289
"result": gin.H{
290290
"code": errorcode.ServerInternalNetworkError,
291291
"msg": err.Error(),
@@ -301,7 +301,7 @@ func invite(c *gin.Context) {
301301
Username: obj.Username,
302302
})
303303
if ret.Result.Code != errorcode.Success {
304-
c.JSON(http.StatusBadRequest, gin.H{
304+
c.JSON(http.StatusOK, gin.H{
305305
"result": gin.H{
306306
"code": ret.Result.Code,
307307
"msg": ret.Result.Msg,
@@ -323,7 +323,7 @@ func setUserType(c *gin.Context) {
323323
var username string = c.Param("username")
324324
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
325325
if err != nil {
326-
c.JSON(http.StatusBadRequest, gin.H{
326+
c.JSON(http.StatusOK, gin.H{
327327
"result": gin.H{
328328
"code": errorcode.ProxyBadRequest,
329329
"msg": err.Error(),
@@ -332,7 +332,7 @@ func setUserType(c *gin.Context) {
332332
}
333333
var obj setUserTypeRequest
334334
if err := c.ShouldBindJSON(&obj); err != nil {
335-
c.JSON(http.StatusBadRequest, gin.H{
335+
c.JSON(http.StatusOK, gin.H{
336336
"result": gin.H{
337337
"code": errorcode.ProxyBadRequest,
338338
"msg": err.Error(),
@@ -341,7 +341,7 @@ func setUserType(c *gin.Context) {
341341
return
342342
}
343343
if obj.Type != int32(pb.MemberType_owner) && obj.Type != int32(pb.MemberType_member) && obj.Type != int32(pb.MemberType_manager) {
344-
c.JSON(http.StatusBadRequest, gin.H{
344+
c.JSON(http.StatusOK, gin.H{
345345
"result": gin.H{
346346
"code": errorcode.ProxyBadRequest,
347347
"msg": "Type is invalid",
@@ -351,7 +351,7 @@ func setUserType(c *gin.Context) {
351351
}
352352
cli, err := call()
353353
if err != nil {
354-
c.JSON(http.StatusBadRequest, gin.H{
354+
c.JSON(http.StatusOK, gin.H{
355355
"result": gin.H{
356356
"code": errorcode.ServerInternalNetworkError,
357357
"msg": err.Error(),
@@ -368,7 +368,7 @@ func setUserType(c *gin.Context) {
368368
Type: pb.MemberType(obj.Type),
369369
})
370370
if ret.Result.Code != errorcode.Success {
371-
c.JSON(http.StatusBadRequest, gin.H{
371+
c.JSON(http.StatusOK, gin.H{
372372
"result": gin.H{
373373
"code": ret.Result.Code,
374374
"msg": ret.Result.Msg,
@@ -390,7 +390,7 @@ func kickUser(c *gin.Context) {
390390
var groupidStr string = c.Param("groupid")
391391
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
392392
if err != nil {
393-
c.JSON(http.StatusBadRequest, gin.H{
393+
c.JSON(http.StatusOK, gin.H{
394394
"result": gin.H{
395395
"code": errorcode.ProxyBadRequest,
396396
"msg": err.Error(),
@@ -399,7 +399,7 @@ func kickUser(c *gin.Context) {
399399
}
400400
cli, err := call()
401401
if err != nil {
402-
c.JSON(http.StatusBadRequest, gin.H{
402+
c.JSON(http.StatusOK, gin.H{
403403
"result": gin.H{
404404
"code": errorcode.ServerInternalNetworkError,
405405
"msg": err.Error(),
@@ -415,7 +415,7 @@ func kickUser(c *gin.Context) {
415415
Username: username,
416416
})
417417
if ret.Result.Code != errorcode.Success {
418-
c.JSON(http.StatusBadRequest, gin.H{
418+
c.JSON(http.StatusOK, gin.H{
419419
"result": gin.H{
420420
"code": ret.Result.Code,
421421
"msg": ret.Result.Msg,
@@ -436,7 +436,7 @@ func changePassword(c *gin.Context) {
436436
var groupidStr string = c.Param("groupid")
437437
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
438438
if err != nil {
439-
c.JSON(http.StatusBadRequest, gin.H{
439+
c.JSON(http.StatusOK, gin.H{
440440
"result": gin.H{
441441
"code": errorcode.ProxyBadRequest,
442442
"msg": err.Error(),
@@ -445,7 +445,7 @@ func changePassword(c *gin.Context) {
445445
}
446446
var obj changePasswordRequest
447447
if err := c.ShouldBindJSON(&obj); err != nil {
448-
c.JSON(http.StatusBadRequest, gin.H{
448+
c.JSON(http.StatusOK, gin.H{
449449
"result": gin.H{
450450
"code": errorcode.ProxyBadRequest,
451451
"msg": err.Error(),
@@ -455,7 +455,7 @@ func changePassword(c *gin.Context) {
455455
}
456456
cli, err := call()
457457
if err != nil {
458-
c.JSON(http.StatusBadRequest, gin.H{
458+
c.JSON(http.StatusOK, gin.H{
459459
"result": gin.H{
460460
"code": errorcode.ServerInternalNetworkError,
461461
"msg": err.Error(),
@@ -471,7 +471,7 @@ func changePassword(c *gin.Context) {
471471
Uid: uid,
472472
})
473473
if ret.Result.Code != errorcode.Success {
474-
c.JSON(http.StatusBadRequest, gin.H{
474+
c.JSON(http.StatusOK, gin.H{
475475
"result": gin.H{
476476
"code": ret.Result.Code,
477477
"msg": ret.Result.Msg,
@@ -492,7 +492,7 @@ func changeName(c *gin.Context) {
492492
var groupidStr string = c.Param("groupid")
493493
groupid, err := strconv.ParseInt(groupidStr, 10, 64)
494494
if err != nil {
495-
c.JSON(http.StatusBadRequest, gin.H{
495+
c.JSON(http.StatusOK, gin.H{
496496
"result": gin.H{
497497
"code": errorcode.ProxyBadRequest,
498498
"msg": err.Error(),
@@ -501,7 +501,7 @@ func changeName(c *gin.Context) {
501501
}
502502
var obj changeNameRequest
503503
if err := c.ShouldBindJSON(&obj); err != nil {
504-
c.JSON(http.StatusBadRequest, gin.H{
504+
c.JSON(http.StatusOK, gin.H{
505505
"result": gin.H{
506506
"code": errorcode.ProxyBadRequest,
507507
"msg": err.Error(),
@@ -511,7 +511,7 @@ func changeName(c *gin.Context) {
511511
}
512512
cli, err := call()
513513
if err != nil {
514-
c.JSON(http.StatusBadRequest, gin.H{
514+
c.JSON(http.StatusOK, gin.H{
515515
"result": gin.H{
516516
"code": errorcode.ServerInternalNetworkError,
517517
"msg": err.Error(),
@@ -527,7 +527,7 @@ func changeName(c *gin.Context) {
527527
Uid: uid,
528528
})
529529
if ret.Result.Code != errorcode.Success {
530-
c.JSON(http.StatusBadRequest, gin.H{
530+
c.JSON(http.StatusOK, gin.H{
531531
"result": gin.H{
532532
"code": ret.Result.Code,
533533
"msg": ret.Result.Msg,

0 commit comments

Comments
 (0)