public/go-admin
1
0
Fork 0
mirror of https://github.com/go-admin-team/go-admin.git synced 2026-09-21 18:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改，兼容go-admin sdk方案

Browse Source
This commit is contained in:
linwenxiang
2021-03-09 19:12:49 +08:00
parent c541d09076
commit 25d8364bf4
151 changed files with 578 additions and 3525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/admin/apis/system/captcha.go
+4 -5
View File
@@ -2,15 +2,14 @@ package system
import (
"github.com/gin-gonic/gin"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/captcha"
"github.com/go-admin-team/go-admin-core/sdk/pkg"
"github.com/go-admin-team/go-admin-core/sdk/pkg/captcha"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
)
func GenerateCaptchaHandler(c *gin.Context) {
id, b64s, err := captcha.DriverDigitFunc()
tools.HasError(err, "验证码获取失败", 500)
pkg.HasError(err, "验证码获取失败", 500)
app.Custum(c, gin.H{
"code": 200,
"data": b64s,
app/admin/apis/system/dict/sys_dict_data.go
+4 -4
View File
@@ -4,13 +4,13 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
common "go-admin/common/models"
"go-admin/tools"
)
type SysDictData struct {
@@ -127,7 +127,7 @@ func (e *SysDictData) InsertSysDictData(c *gin.Context) {
}
object, _ := req.GenerateM()
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
s := service.SysDictData{}
s.Orm = db
@@ -169,7 +169,7 @@ func (e *SysDictData) UpdateSysDictData(c *gin.Context) {
return
}
object, _ := req.GenerateM()
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictData{}
s.Orm = db
@@ -215,7 +215,7 @@ func (e *SysDictData) DeleteSysDictData(c *gin.Context) {
}
// 设置编辑人
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictData{}
s.Orm = db
app/admin/apis/system/dict/sys_dict_type.go
+4 -4
View File
@@ -4,13 +4,13 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
common "go-admin/common/models"
"go-admin/tools"
)
type SysDictType struct {
@@ -122,7 +122,7 @@ func (e *SysDictType) InsertSysDictType(c *gin.Context) {
}
object, _ := req.GenerateM()
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
s := service.SysDictType{}
s.Orm = db
@@ -163,7 +163,7 @@ func (e *SysDictType) UpdateSysDictType(c *gin.Context) {
return
}
object, _ := req.GenerateM()
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictType{}
s.Orm = db
@@ -207,7 +207,7 @@ func (e *SysDictType) DeleteSysDictType(c *gin.Context) {
}
// 设置编辑人
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
s := service.SysDictType{}
s.Orm = db
app/admin/apis/system/sys_config/sys_config.go
+7 -6
View File
@@ -1,15 +1,16 @@
package sys_config
import (
"github.com/gin-gonic/gin"
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
"go-admin/tools/app"
)
type SysConfig struct {
@@ -104,7 +105,7 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
@@ -146,7 +147,7 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
app.Error(c, 500, err, "Orm获取失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
@@ -188,7 +189,7 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
}
// 设置编辑人
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysConfig{}
serviceSysLoginLog.Orm = db
app/admin/apis/system/sys_dept/sys_dept.go
+3 -3
View File
@@ -4,12 +4,12 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
)
type SysDept struct {
@@ -122,7 +122,7 @@ func (e *SysDept) InsertSysDept(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
serviceSysDept := service.SysDept{}
serviceSysDept.Orm = db
@@ -168,7 +168,7 @@ func (e *SysDept) UpdateSysDept(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysDept := service.SysDept{}
serviceSysDept.Orm = db
app/admin/apis/system/sys_login_log/sys_login_log.go
+4 -4
View File
@@ -4,12 +4,12 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
)
type SysLoginLog struct {
@@ -96,7 +96,7 @@ func (e *SysLoginLog) InsertSysLoginLog(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysLoginLog{}
serviceSysLoginLog.Orm = db
@@ -131,7 +131,7 @@ func (e *SysLoginLog) UpdateSysLoginLog(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysLoginLog{}
serviceSysLoginLog.Orm = db
@@ -168,7 +168,7 @@ func (e *SysLoginLog) DeleteSysLoginLog(c *gin.Context) {
}
// 设置编辑人
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysLoginLog := service.SysLoginLog{}
serviceSysLoginLog.Orm = db
app/admin/apis/system/sys_menu/sys_menu.go
+5 -5
View File
@@ -4,13 +4,13 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
)
type SysMenu struct {
@@ -131,7 +131,7 @@ func (e *SysMenu) InsertSysMenu(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
serviceSysMenu := service.SysMenu{}
serviceSysMenu.Orm = db
@@ -179,7 +179,7 @@ func (e *SysMenu) UpdateSysMenu(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysMenu := service.SysMenu{}
serviceSysMenu.Orm = db
@@ -249,7 +249,7 @@ func (e *SysMenu) GetMenuRole(c *gin.Context) {
serviceSysMenu := service.SysMenu{}
serviceSysMenu.Log = log
serviceSysMenu.Orm = db
result, err := serviceSysMenu.SetMenuRole(tools.GetRoleName(c))
result, err := serviceSysMenu.SetMenuRole(user.GetRoleName(c))
if err != nil {
e.Error(c, http.StatusInternalServerError, err, "查询失败")
@@ -276,7 +276,7 @@ func (e *SysMenu) GetMenuIDS(c *gin.Context) {
}
var data models.RoleMenu
data.RoleName = c.GetString("role")
data.UpdateBy = tools.GetUserIdStr(c)
data.UpdateBy = user.GetUserIdStr(c)
result, err := data.GetIDS(db)
if err != nil {
log.Errorf("GetIDS error, %s", err.Error())
app/admin/apis/system/sys_opera_log/sys_opera_log.go
+3 -3
View File
@@ -4,12 +4,12 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
)
type SysOperaLog struct {
@@ -96,7 +96,7 @@ func (e *SysOperaLog) InsertSysOperaLog(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
serviceSysOperaLog := service.SysOperaLog{}
serviceSysOperaLog.Orm = db
@@ -131,7 +131,7 @@ func (e *SysOperaLog) UpdateSysOperaLog(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysOperaLog := service.SysOperaLog{}
serviceSysOperaLog.Orm = db
app/admin/apis/system/sys_post/sys_post.go
+3 -3
View File
@@ -4,12 +4,12 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/tools"
)
type SysPost struct {
@@ -123,7 +123,7 @@ func (e *SysPost) InsertSysPost(c *gin.Context) {
return
}
// 设置创建人
object.SetCreateBy(tools.GetUserId(c))
object.SetCreateBy(user.GetUserId(c))
serviceSysPost := service.SysPost{}
serviceSysPost.Orm = db
@@ -168,7 +168,7 @@ func (e *SysPost) UpdateSysPost(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.SetUpdateBy(tools.GetUserId(c))
object.SetUpdateBy(user.GetUserId(c))
serviceSysPost := service.SysPost{}
serviceSysPost.Orm = db
app/admin/apis/system/sys_role/sys_role.go
+4 -4
View File
@@ -4,13 +4,13 @@ import (
"net/http"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
"go-admin/app/admin/models/system"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
"go-admin/common/global"
"go-admin/tools"
)
type SysRole struct {
@@ -126,7 +126,7 @@ func (e *SysRole) InsertSysRole(c *gin.Context) {
return
}
// 设置创建人
object.CreateBy = tools.GetUserId(c)
object.CreateBy = user.GetUserId(c)
if object.Status == "" {
object.Status = "2"
}
@@ -178,7 +178,7 @@ func (e *SysRole) UpdateSysRole(c *gin.Context) {
e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
return
}
object.UpdateBy = tools.GetUserId(c)
object.UpdateBy = user.GetUserId(c)
s := service.SysRole{}
s.Orm = db
@@ -259,7 +259,7 @@ func (e *SysRole) UpdateRoleDataScope(c *gin.Context) {
DataScope: control.DataScope,
DeptIds: control.DeptIds,
}
data.UpdateBy = tools.GetUserId(c)
data.UpdateBy = user.GetUserId(c)
s := &service.SysRole{}
s.Orm = db
s.Log = log