estel/gva
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "pointChange"

Browse Source 
This reverts commit fb4dba161619c043b8acd4971eac5433eb6630ab.
This commit is contained in:
songzhibin97
2020-11-23 12:02:18 +08:00
parent 1ddd6dac4f
commit 8e87ae55a9
31 changed files with 114 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/api/v1/sys_user.go
View File

@@ -88,7 +88,7 @@ func tokenNext(c *gin.Context, user model.SysUser) {
} else {
var blackJWT model.JwtBlacklist
blackJWT.Jwt = jwtStr
if err := service.JsonInBlacklist(&blackJWT); err != nil {
if err := service.JsonInBlacklist(blackJWT); err != nil {
response.FailWithMessage("jwt作废失败", c)
return
}
@@ -118,12 +118,12 @@ func Register(c *gin.Context) {
return
}
user := &model.SysUser{Username: R.Username, NickName: R.NickName, Password: R.Password, HeaderImg: R.HeaderImg, AuthorityId: R.AuthorityId}
err, userReturn := service.Register(user)
err, userReturn := service.Register(*user)
if err != nil {
global.GVA_LOG.Error("注册失败", zap.Any("err", err))
response.FailWithDetailed(response.SysUserResponse{User: *userReturn}, "注册失败", c)
response.FailWithDetailed(response.SysUserResponse{User: userReturn}, "注册失败", c)
} else {
response.OkWithDetailed(response.SysUserResponse{User: *userReturn}, "注册成功", c)
response.OkWithDetailed(response.SysUserResponse{User: userReturn}, "注册成功", c)
}
}
@@ -165,7 +165,7 @@ func GetUserList(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
if err, list, total := service.GetUserInfoList(&pageInfo); err != nil {
if err, list, total := service.GetUserInfoList(pageInfo); err != nil {
global.GVA_LOG.Error("获取失败", zap.Any("err", err))
response.FailWithMessage("获取失败", c)
} else {
@@ -244,7 +244,7 @@ func SetUserInfo(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
if err, ReqUser := service.SetUserInfo(&user); err != nil {
if err, ReqUser := service.SetUserInfo(user); err != nil {
global.GVA_LOG.Error("设置失败", zap.Any("err", err))
response.FailWithMessage("设置失败", c)
} else {