Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
梁国权
gin-vue-admin
提交
eda49e94
G
gin-vue-admin
项目概览
梁国权
/
gin-vue-admin
与 Fork 源项目一致
Fork自
FLIPPED-AURORA / gin-vue-admin
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gin-vue-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
eda49e94
编写于
11月 06, 2020
作者:
m0_50812349
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改server/api/v1/sys_user.go的备注错误
上级
5be360f3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
52 addition
and
55 deletion
+52
-55
server/api/v1/sys_user.go
server/api/v1/sys_user.go
+52
-55
未找到文件。
server/api/v1/sys_user.go
浏览文件 @
eda49e94
...
...
@@ -13,43 +13,13 @@ import (
"github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin"
"github.com/go-redis/redis"
"mime/multipart"
"time"
)
// @Tags Base
// @Summary 用户注册账号
// @Produce application/json
// @Param data body model.SysUser true "用户注册接口"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
// @Router /user/register [post]
func
Register
(
c
*
gin
.
Context
)
{
var
R
request
.
RegisterStruct
_
=
c
.
ShouldBindJSON
(
&
R
)
UserVerify
:=
utils
.
Rules
{
"Username"
:
{
utils
.
NotEmpty
()},
"NickName"
:
{
utils
.
NotEmpty
()},
"Password"
:
{
utils
.
NotEmpty
()},
"AuthorityId"
:
{
utils
.
NotEmpty
()},
}
UserVerifyErr
:=
utils
.
Verify
(
R
,
UserVerify
)
if
UserVerifyErr
!=
nil
{
response
.
FailWithMessage
(
UserVerifyErr
.
Error
(),
c
)
return
}
user
:=
&
model
.
SysUser
{
Username
:
R
.
Username
,
NickName
:
R
.
NickName
,
Password
:
R
.
Password
,
HeaderImg
:
R
.
HeaderImg
,
AuthorityId
:
R
.
AuthorityId
}
err
,
userReturn
:=
service
.
Register
(
*
user
)
if
err
!=
nil
{
response
.
FailWithDetailed
(
response
.
ERROR
,
resp
.
SysUserResponse
{
User
:
userReturn
},
fmt
.
Sprintf
(
"%v"
,
err
),
c
)
}
else
{
response
.
OkDetailed
(
resp
.
SysUserResponse
{
User
:
userReturn
},
"注册成功"
,
c
)
}
}
// @Tags Base
// @Summary 用户登录
// @Produce application/json
// @Param data body request.RegisterAndLoginStruct true "用户
登录接口
"
// @Param data body request.RegisterAndLoginStruct true "用户
名, 密码, 验证码
"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}"
// @Router /base/login [post]
func
Login
(
c
*
gin
.
Context
)
{
...
...
@@ -61,8 +31,7 @@ func Login(c *gin.Context) {
"Username"
:
{
utils
.
NotEmpty
()},
"Password"
:
{
utils
.
NotEmpty
()},
}
UserVerifyErr
:=
utils
.
Verify
(
L
,
UserVerify
)
if
UserVerifyErr
!=
nil
{
if
UserVerifyErr
:=
utils
.
Verify
(
L
,
UserVerify
);
UserVerifyErr
!=
nil
{
response
.
FailWithMessage
(
UserVerifyErr
.
Error
(),
c
)
return
}
...
...
@@ -81,9 +50,7 @@ func Login(c *gin.Context) {
// 登录以后签发jwt
func
tokenNext
(
c
*
gin
.
Context
,
user
model
.
SysUser
)
{
j
:=
&
middleware
.
JWT
{
SigningKey
:
[]
byte
(
global
.
GVA_CONFIG
.
JWT
.
SigningKey
),
// 唯一签名
}
j
:=
&
middleware
.
JWT
{
SigningKey
:
[]
byte
(
global
.
GVA_CONFIG
.
JWT
.
SigningKey
)}
// 唯一签名
clams
:=
request
.
CustomClaims
{
UUID
:
user
.
UUID
,
ID
:
user
.
ID
,
...
...
@@ -142,11 +109,39 @@ func tokenNext(c *gin.Context, user model.SysUser) {
}
}
// @Tags SysUser
// @Summary 用户注册账号
// @Produce application/json
// @Param data body model.SysUser true "用户名, 昵称, 密码, 角色ID"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
// @Router /user/register [post]
func
Register
(
c
*
gin
.
Context
)
{
var
R
request
.
RegisterStruct
_
=
c
.
ShouldBindJSON
(
&
R
)
UserVerify
:=
utils
.
Rules
{
"Username"
:
{
utils
.
NotEmpty
()},
"NickName"
:
{
utils
.
NotEmpty
()},
"Password"
:
{
utils
.
NotEmpty
()},
"AuthorityId"
:
{
utils
.
NotEmpty
()},
}
if
UserVerifyErr
:=
utils
.
Verify
(
R
,
UserVerify
);
UserVerifyErr
!=
nil
{
response
.
FailWithMessage
(
UserVerifyErr
.
Error
(),
c
)
return
}
user
:=
&
model
.
SysUser
{
Username
:
R
.
Username
,
NickName
:
R
.
NickName
,
Password
:
R
.
Password
,
HeaderImg
:
R
.
HeaderImg
,
AuthorityId
:
R
.
AuthorityId
}
err
,
userReturn
:=
service
.
Register
(
*
user
)
if
err
!=
nil
{
response
.
FailWithDetailed
(
response
.
ERROR
,
resp
.
SysUserResponse
{
User
:
userReturn
},
fmt
.
Sprintf
(
"%v"
,
err
),
c
)
}
else
{
response
.
OkDetailed
(
resp
.
SysUserResponse
{
User
:
userReturn
},
"注册成功"
,
c
)
}
}
// @Tags SysUser
// @Summary 用户修改密码
// @Security ApiKeyAuth
// @Produce application/json
// @Param data body request.ChangePasswordStruct true "用户
修改
密码"
// @Param data body request.ChangePasswordStruct true "用户
名, 原密码, 新
密码"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/changePassword [put]
func
ChangePassword
(
c
*
gin
.
Context
)
{
...
...
@@ -157,8 +152,7 @@ func ChangePassword(c *gin.Context) {
"Password"
:
{
utils
.
NotEmpty
()},
"NewPassword"
:
{
utils
.
NotEmpty
()},
}
UserVerifyErr
:=
utils
.
Verify
(
params
,
UserVerify
)
if
UserVerifyErr
!=
nil
{
if
UserVerifyErr
:=
utils
.
Verify
(
params
,
UserVerify
);
UserVerifyErr
!=
nil
{
response
.
FailWithMessage
(
UserVerifyErr
.
Error
(),
c
)
return
}
...
...
@@ -170,23 +164,18 @@ func ChangePassword(c *gin.Context) {
}
}
type
UserHeaderImg
struct
{
HeaderImg
multipart
.
File
`json:"headerImg"`
}
// @Tags SysUser
// @Summary 分页获取用户列表
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.PageInfo true "
分页获取用户列表
"
// @Param data body request.PageInfo true "
页码, 页大小
"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
// @Router /user/getUserList [post]
func
GetUserList
(
c
*
gin
.
Context
)
{
var
pageInfo
request
.
PageInfo
_
=
c
.
ShouldBindJSON
(
&
pageInfo
)
PageVerifyErr
:=
utils
.
Verify
(
pageInfo
,
utils
.
CustomizeMap
[
"PageVerify"
])
if
PageVerifyErr
!=
nil
{
if
PageVerifyErr
:=
utils
.
Verify
(
pageInfo
,
utils
.
CustomizeMap
[
"PageVerify"
]);
PageVerifyErr
!=
nil
{
response
.
FailWithMessage
(
PageVerifyErr
.
Error
(),
c
)
return
}
...
...
@@ -208,7 +197,7 @@ func GetUserList(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.SetUserAuth true "
设置用户权限
"
// @Param data body request.SetUserAuth true "
用户UUID, 角色ID
"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/setUserAuthority [post]
func
SetUserAuthority
(
c
*
gin
.
Context
)
{
...
...
@@ -218,8 +207,7 @@ func SetUserAuthority(c *gin.Context) {
"UUID"
:
{
utils
.
NotEmpty
()},
"AuthorityId"
:
{
utils
.
NotEmpty
()},
}
UserVerifyErr
:=
utils
.
Verify
(
sua
,
UserVerify
)
if
UserVerifyErr
!=
nil
{
if
UserVerifyErr
:=
utils
.
Verify
(
sua
,
UserVerify
);
UserVerifyErr
!=
nil
{
response
.
FailWithMessage
(
UserVerifyErr
.
Error
(),
c
)
return
}
...
...
@@ -236,14 +224,13 @@ func SetUserAuthority(c *gin.Context) {
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body request.GetById true "
删除用户
"
// @Param data body request.GetById true "
用户ID
"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/deleteUser [delete]
func
DeleteUser
(
c
*
gin
.
Context
)
{
var
reqId
request
.
GetById
_
=
c
.
ShouldBindJSON
(
&
reqId
)
IdVerifyErr
:=
utils
.
Verify
(
reqId
,
utils
.
CustomizeMap
[
"IdVerify"
])
if
IdVerifyErr
!=
nil
{
if
IdVerifyErr
:=
utils
.
Verify
(
reqId
,
utils
.
CustomizeMap
[
"IdVerify"
]);
IdVerifyErr
!=
nil
{
response
.
FailWithMessage
(
IdVerifyErr
.
Error
(),
c
)
return
}
...
...
@@ -256,16 +243,26 @@ func DeleteUser(c *gin.Context) {
}
// @Tags SysUser
// @Summary
删除用户
// @Summary
设置用户信息
// @Security ApiKeyAuth
// @accept application/json
// @Produce application/json
// @Param data body model.SysUser true "
删除用户
"
// @Param data body model.SysUser true "
ID, 用户名, 昵称, 头像链接
"
// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
// @Router /user/setUserInfo [put]
func
SetUserInfo
(
c
*
gin
.
Context
)
{
var
user
model
.
SysUser
c
.
ShouldBindJSON
(
&
user
)
UserVerify
:=
utils
.
Rules
{
"ID"
:
{
utils
.
NotEmpty
()},
"Username"
:
{
utils
.
NotEmpty
()},
"NickName"
:
{
utils
.
NotEmpty
()},
"HeaderImg"
:
{
utils
.
NotEmpty
()},
}
if
UserVerifyErr
:=
utils
.
Verify
(
user
,
UserVerify
);
UserVerifyErr
!=
nil
{
response
.
FailWithMessage
(
UserVerifyErr
.
Error
(),
c
)
return
}
_
=
c
.
ShouldBindJSON
(
&
user
)
err
,
ReqUser
:=
service
.
SetUserInfo
(
user
)
if
err
!=
nil
{
response
.
FailWithMessage
(
fmt
.
Sprintf
(
"更新失败,%v"
,
err
),
c
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录