Browse Source

re-use responseLoginSuccess

Tao Chen 1 year ago
parent
commit
18d59d7047
1 changed files with 2 additions and 13 deletions
  1. 2 13
      http/controller/admin/user.go

+ 2 - 13
http/controller/admin/user.go

@@ -217,12 +217,7 @@ func (ct *User) Current(c *gin.Context) {
217
 	u := service.AllService.UserService.CurUser(c)
217
 	u := service.AllService.UserService.CurUser(c)
218
 	token, _ := c.Get("token")
218
 	token, _ := c.Get("token")
219
 	t := token.(string)
219
 	t := token.(string)
220
-	response.Success(c, &adResp.LoginPayload{
221
-		Token:      t,
222
-		Username:   u.Username,
223
-		RouteNames: service.AllService.UserService.RouteNames(u),
224
-		Nickname:   u.Nickname,
225
-	})
220
+	responseLoginSuccess(c, u, t)
226
 }
221
 }
227
 
222
 
228
 // ChangeCurPwd 修改当前用户密码
223
 // ChangeCurPwd 修改当前用户密码
@@ -404,11 +399,5 @@ func (ct *User) Register(c *gin.Context) {
404
 		Ip:     c.ClientIP(),
399
 		Ip:     c.ClientIP(),
405
 		Type:   model.LoginLogTypeAccount,
400
 		Type:   model.LoginLogTypeAccount,
406
 	})
401
 	})
407
-	response.Success(c, &adResp.LoginPayload{
408
-		Token:      ut.Token,
409
-		Username:   u.Username,
410
-		Email:	  	u.Email,
411
-		RouteNames: service.AllService.UserService.RouteNames(u),
412
-		Nickname:   u.Nickname,
413
-	})
402
+	responseLoginSuccess(c, u, ut.Token)
414
 }
403
 }