public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 10:58:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

【升级go 1.18】

Browse Source
This commit is contained in:
PandaGoAdmin
2022-07-13 11:54:54 +08:00
parent 2e18999587
commit 433ee08634
60 changed files with 253 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/system/api/user.go
View File

@@ -43,7 +43,7 @@ type UserApi struct {
// @Router /system/user/getCaptcha [get]
func (u *UserApi) GenerateCaptcha(c *gin.Context) {
id, image := captcha.Generate()
c.JSON(http.StatusOK, map[string]interface{}{"base64Captcha": image, "captchaId": id})
c.JSON(http.StatusOK, map[string]any{"base64Captcha": image, "captchaId": id})
}
// @Tags Base
@@ -55,7 +55,7 @@ func (u *UserApi) RefreshToken(rc *ctx.ReqCtx) {
tokenStr := rc.GinCtx.Request.Header.Get("X-TOKEN")
token, err := ctx.RefreshToken(tokenStr)
biz.ErrIsNil(err, "刷新token失败")
rc.ResData = map[string]interface{}{"token": token, "expire": time.Now().Unix() + config.Conf.Jwt.ExpireTime}
rc.ResData = map[string]any{"token": token, "expire": time.Now().Unix() + config.Conf.Jwt.ExpireTime}
}
// @Tags Base
@@ -89,7 +89,7 @@ func (u *UserApi) Login(rc *ctx.ReqCtx) {
biz.ErrIsNil(err, "生成Token失败")
rc.ResData = map[string]interface{}{
rc.ResData = map[string]any{
"token": token,
"expire": time.Now().Unix() + config.Conf.Jwt.ExpireTime,
}
@@ -128,7 +128,7 @@ func (u *UserApi) Auth(rc *ctx.ReqCtx) {
permis := u.RoleMenuApp.GetPermis(role.RoleId)
menus := u.MenuApp.SelectMenuRole(role.RoleKey)
rc.ResData = map[string]interface{}{
rc.ResData = map[string]any{
"user": userData,
"role": role,
"permissions": permis,
@@ -183,7 +183,7 @@ func (u *UserApi) GetSysUserList(rc *ctx.ReqCtx) {
user.DeptId = int64(deptId)
list, total := u.UserApp.FindListPage(pageNum, pageSize, user)
rc.ResData = map[string]interface{}{
rc.ResData = map[string]any{
"data": list,
"total": total,
"pageNum": pageNum,
@@ -216,7 +216,7 @@ func (u *UserApi) GetSysUserProfile(rc *ctx.ReqCtx) {
roleIds := make([]int64, 0)
roleIds = append(roleIds, rc.LoginAccount.RoleId)
rc.ResData = map[string]interface{}{
rc.ResData = map[string]any{
"data": user,
"postIds": postIds,
"roleIds": roleIds,
@@ -287,7 +287,7 @@ func (u *UserApi) GetSysUser(rc *ctx.ReqCtx) {
posts := u.PostApp.FindList(entity.SysPost{})
rc.ResData = map[string]interface{}{
rc.ResData = map[string]any{
"data": result,
"postIds": result.PostIds,
"roleIds": result.RoleIds,
@@ -306,7 +306,7 @@ func (u *UserApi) GetSysUserInit(rc *ctx.ReqCtx) {
roles := u.RoleApp.FindList(entity.SysRole{})
posts := u.PostApp.FindList(entity.SysPost{})
mp := make(map[string]interface{}, 2)
mp := make(map[string]any, 2)
mp["roles"] = roles
mp["posts"] = posts
rc.ResData = mp
@@ -334,7 +334,7 @@ func (u *UserApi) GetUserRolePost(rc *ctx.ReqCtx) {
po := u.PostApp.FindOne(kgo.KConv.Str2Int64(postId))
posts = append(posts, *po)
}
mp := make(map[string]interface{}, 2)
mp := make(map[string]any, 2)
mp["roles"] = roles
mp["posts"] = posts
rc.ResData = mp