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

Merge pull request #418 from RoseKissYou/develop

Browse Source 
api/v1/sys_api.go api/v1/sys_menu.go api/v1/sys_user.go model/request…
This commit is contained in:
奇淼（piexlmax
2021-04-20 04:16:49 -05:00
committed by GitHub
parent 0fe70c5e1c 4e9ce0de7e
commit e49bd514f7
6 changed files with 103 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/api/v1/sys_api.go
View File

@@ -7,6 +7,7 @@ import (
"gin-vue-admin/model/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
)
@@ -100,7 +101,7 @@ func GetApiById(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
err, api := service.GetApiById(idInfo.Id)
err, api := service.GetApiById(idInfo.ID)
if err != nil {
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage("获取失败", c)

5
server/api/v1/sys_menu.go
View File

@@ -7,6 +7,7 @@ import (
"gin-vue-admin/model/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"github.com/gin-gonic/gin"
"go.uber.org/zap"
)
@@ -132,7 +133,7 @@ func DeleteBaseMenu(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
if err := service.DeleteBaseMenu(menu.Id); err != nil {
if err := service.DeleteBaseMenu(menu.ID); err != nil {
global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
response.FailWithMessage("删除失败", c)
} else {
@@ -182,7 +183,7 @@ func GetBaseMenuById(c *gin.Context) {
response.FailWithMessage(err.Error(), c)
return
}
if err, menu := service.GetBaseMenuById(idInfo.Id); err != nil {
if err, menu := service.GetBaseMenuById(idInfo.ID); err != nil {
global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
response.FailWithMessage("获取失败", c)
} else {

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

@@ -8,11 +8,12 @@ import (
"gin-vue-admin/model/response"
"gin-vue-admin/service"
"gin-vue-admin/utils"
"time"
"github.com/dgrijalva/jwt-go"
"github.com/gin-gonic/gin"
"github.com/go-redis/redis"
"go.uber.org/zap"
"time"
)
// @Tags Base
@@ -217,11 +218,11 @@ func DeleteUser(c *gin.Context) {
return
}
jwtId := getUserID(c)
if jwtId == uint(reqId.Id) {
if jwtId == uint(reqId.ID) {
response.FailWithMessage("删除失败, 自杀失败", c)
return
}
if err := service.DeleteUser(reqId.Id); err != nil {
if err := service.DeleteUser(reqId.ID); err != nil {
global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
response.FailWithMessage("删除失败", c)
} else {