Merge pull request #368 from go-admin-team/dev

Dev

app/admin/apis/monitor/server.go

@@ -4,12 +4,11 @@ import (
 	"runtime"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/shirou/gopsutil/mem"
-
-	"go-admin/tools"
-	"go-admin/tools/app"
 )
 
 const (
@@ -33,8 +32,8 @@ func ServerInfo(c *gin.Context) {
 	osDic["compiler"] = runtime.Compiler
 	osDic["version"] = runtime.Version()
 	osDic["numGoroutine"] = runtime.NumGoroutine()
-	osDic["ip"] = tools.GetLocaHonst()
-	osDic["projectDir"] = tools.GetCurrentPath()
+	osDic["ip"] = pkg.GetLocaHonst()
+	osDic["projectDir"] = pkg.GetCurrentPath()
 
 	dis, _ := disk.Usage("/")
 	diskTotalGB := int(dis.Total) / GB
@@ -57,7 +56,7 @@ func ServerInfo(c *gin.Context) {
 	cpuDic := make(map[string]interface{}, 0)
 	cpuDic["cpuInfo"], _ = cpu.Info()
 	percent, _ := cpu.Percent(0, false)
-	cpuDic["Percent"] = tools.Round(percent[0], 2)
+	cpuDic["Percent"] = pkg.Round(percent[0], 2)
 	cpuDic["cpuNum"], _ = cpu.Counts(false)
 
 	app.Custum(c, gin.H{

app/admin/apis/process/wf_classify.go

@@ -1,15 +1,16 @@
 package process
 
 import (
-	"github.com/gin-gonic/gin"
-	"go-admin/app/admin/service"
 	"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/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	"go-admin/common/apis"
-	"go-admin/tools"
 )
 
 type WfProcessClassify struct {
@@ -104,7 +105,7 @@ func (e *WfProcessClassify) InsertWfProcessClassify(c *gin.Context) {
 		return
 	}
 	// 设置创建人
-	object.SetCreateBy(tools.GetUserId(c))
+	object.SetCreateBy(user.GetUserId(c))
 
 	serviceWfProcessClassify := service.WfProcessClassify{}
 	serviceWfProcessClassify.Orm = db
@@ -139,7 +140,7 @@ func (e *WfProcessClassify) UpdateWfProcessClassify(c *gin.Context) {
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 		return
 	}
-	object.SetUpdateBy(tools.GetUserId(c))
+	object.SetUpdateBy(user.GetUserId(c))
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -174,7 +175,7 @@ func (e *WfProcessClassify) DeleteWfProcessClassify(c *gin.Context) {
 	}
 
 	// 设置编辑人
-	control.SetUpdateBy(tools.GetUserId(c))
+	control.SetUpdateBy(user.GetUserId(c))
 
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)

app/admin/apis/public/file.go

@@ -4,17 +4,16 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"go-admin/common/file_store"
 	"io/ioutil"
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/utils"
 	"github.com/google/uuid"
-	//imgType "github.com/shamsher31/goimgtype"
 
-	"go-admin/pkg/utils"
-	"go-admin/tools"
-	"go-admin/tools/app"
+	"go-admin/common/file_store"
 )
 
 type FileResponse struct {
@@ -72,7 +71,7 @@ func baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileRe
 	_ = ioutil.WriteFile(base64File, ddd, 0666)
 	typeStr := strings.Replace(strings.Replace(file2list[0], "data:", "", -1), ";base64", "", -1)
 	fileResponse = FileResponse{
-		Size:     tools.GetFileSize(base64File),
+		Size:     pkg.GetFileSize(base64File),
 		Path:     base64File,
 		FullPath: urlPerfix + base64File,
 		Name:     "",
@@ -107,7 +106,7 @@ func multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
 				app.Error(c, 200, errors.New(""), "上传第三方失败")
 			} else {
 				fileResponse := FileResponse{
-					Size:     tools.GetFileSize(multipartFileName),
+					Size:     pkg.GetFileSize(multipartFileName),
 					Path:     multipartFileName,
 					FullPath: urlPerfix + multipartFileName,
 					Name:     f.Filename,
@@ -139,7 +138,7 @@ func singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix string) (Fi
 	_ = c.SaveUploadedFile(files, singleFile)
 	fileType, _ := utils.GetType(singleFile)
 	fileResponse = FileResponse{
-		Size:     tools.GetFileSize(singleFile),
+		Size:     pkg.GetFileSize(singleFile),
 		Path:     singleFile,
 		FullPath: urlPerfix + singleFile,
 		Name:     files.Filename,

app/admin/apis/sys_china_area_data/sys_china_area_data.go

@@ -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/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	"go-admin/common/apis"
-	"go-admin/tools"
 )
 
 type SysChinaAreaData struct {
@@ -103,7 +103,7 @@ func (e *SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
 		return
 	}
 	// 设置创建人
-	object.SetCreateBy(tools.GetUserId(c))
+	object.SetCreateBy(user.GetUserId(c))
 
 	serviceSysChinaAreaData := service.SysChinaAreaData{}
 	serviceSysChinaAreaData.Orm = db
@@ -138,7 +138,7 @@ func (e *SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 		return
 	}
-	object.SetUpdateBy(tools.GetUserId(c))
+	object.SetUpdateBy(user.GetUserId(c))
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -172,7 +172,7 @@ func (e *SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
 	}
 
 	// 设置编辑人
-	control.SetUpdateBy(tools.GetUserId(c))
+	control.SetUpdateBy(user.GetUserId(c))
 
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)

app/admin/apis/sys_content/sys_content.go

@@ -6,8 +6,8 @@ package sys_content
 //
 //	"go-admin/app/admin/models"
 //	"go-admin/tools"
-//	"go-admin/tools/app"
-//	"go-admin/tools/app/msg"
+//	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+//	"github.com/go-admin-team/go-admin-core/sdk/pkg/response/msg"
 //)
 //
 //func GetSysContentList(c *gin.Context) {

app/admin/apis/sys_file/sys_file_dir.go

@@ -4,13 +4,14 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	"go-admin/common/apis"
-	"go-admin/tools"
 )
 
 type SysFileDir struct {
@@ -99,7 +100,7 @@ func (e *SysFileDir) InsertSysFileDir(c *gin.Context) {
 		return
 	}
 	// 设置创建人
-	control.CreateBy = tools.GetUserId(c)
+	control.CreateBy = user.GetUserId(c)
 
 	serviceSysFileDir := service.SysFileDir{}
 	serviceSysFileDir.Orm = db
@@ -134,7 +135,7 @@ func (e *SysFileDir) UpdateSysFileDir(c *gin.Context) {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 	}
 	// 设置创建人
-	control.UpdateBy = tools.GetUserId(c)
+	control.UpdateBy = user.GetUserId(c)
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -160,7 +161,7 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
 		return
 	}
 
-	msgID := tools.GenerateMsgIDFromContext(c)
+	msgID := pkg.GenerateMsgIDFromContext(c)
 	//删除操作
 	err = c.ShouldBindUri(control)
 	if err != nil {
@@ -174,7 +175,7 @@ func (e *SysFileDir) DeleteSysFileDir(c *gin.Context) {
 	}
 
 	// 设置编辑人
-	control.UpdateBy = tools.GetUserId(c)
+	control.UpdateBy = user.GetUserId(c)
 
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)

app/admin/apis/sys_file/sys_file_info.go

@@ -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/service"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	"go-admin/common/apis"
-	"go-admin/tools"
 )
 
 type SysFileInfo struct {
@@ -108,7 +108,7 @@ func (e *SysFileInfo) InsertSysFileInfo(c *gin.Context) {
 		return
 	}
 	// 设置创建人
-	control.CreateBy = tools.GetUserId(c)
+	control.CreateBy = user.GetUserId(c)
 
 	serviceSysFileInfo := service.SysFileInfo{}
 	serviceSysFileInfo.Orm = db
@@ -145,7 +145,7 @@ func (e *SysFileInfo) UpdateSysFileInfo(c *gin.Context) {
 		return
 	}
 	// 设置创建人
-	control.UpdateBy = tools.GetUserId(c)
+	control.UpdateBy = user.GetUserId(c)
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -186,7 +186,7 @@ func (e *SysFileInfo) DeleteSysFileInfo(c *gin.Context) {
 	}
 
 	// 设置编辑人
-	control.UpdateBy = tools.GetUserId(c)
+	control.UpdateBy = user.GetUserId(c)
 
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)

app/admin/apis/sys_job/sys_job.go

@@ -1,13 +1,15 @@
 package sys_job
 
 import (
-	"github.com/gin-gonic/gin"
 	"net/http"
 
+	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+
 	"go-admin/app/admin/service"
 	"go-admin/common/apis"
 	"go-admin/common/dto"
-	"go-admin/tools/app"
 )
 
 type SysJob struct {
@@ -32,7 +34,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) {
 	s := service.SysJob{}
 	s.Log = log
 	s.Orm = db
-	s.Cron = app.Runtime.GetCrontabKey(c.Request.Host)
+	s.Cron = sdk.Runtime.GetCrontabKey(c.Request.Host)
 	err = s.RemoveJob(&v)
 	if err != nil {
 		log.Errorf("RemoveJob error, %s", err.Error())
@@ -60,7 +62,7 @@ func (e *SysJob) StartJobForService(c *gin.Context) {
 	s := service.SysJob{}
 	s.Orm = db
 	s.Log = log
-	s.Cron = app.Runtime.GetCrontabKey(c.Request.Host)
+	s.Cron = sdk.Runtime.GetCrontabKey(c.Request.Host)
 	err = s.StartJob(&v)
 	if err != nil {
 		log.Errorf("GetCrontabKey error, %s", err.Error())

app/admin/apis/sys_user/sys_user.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	"github.com/google/uuid"
 
 	"go-admin/app/admin/models"
@@ -13,7 +14,6 @@ import (
 	"go-admin/common/actions"
 	"go-admin/common/apis"
 	common "go-admin/common/models"
-	"go-admin/tools"
 )
 
 type SysUser struct {
@@ -136,7 +136,7 @@ func (e *SysUser) InsertSysUser(c *gin.Context) {
 		return
 	}
 	// 设置创建人
-	object.SetCreateBy(tools.GetUserId(c))
+	object.SetCreateBy(user.GetUserId(c))
 
 	serviceSysUser := service.SysUser{}
 	serviceSysUser.Orm = db
@@ -183,7 +183,7 @@ func (e *SysUser) UpdateSysUser(c *gin.Context) {
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 		return
 	}
-	object.SetUpdateBy(tools.GetUserId(c))
+	object.SetUpdateBy(user.GetUserId(c))
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -232,7 +232,7 @@ func (e *SysUser) DeleteSysUser(c *gin.Context) {
 	}
 
 	// 设置编辑人
-	object.SetUpdateBy(tools.GetUserId(c))
+	object.SetUpdateBy(user.GetUserId(c))
 
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)
@@ -354,7 +354,7 @@ func (e *SysUser) GetSysUserProfile(c *gin.Context) {
 		return
 	}
 
-	id := tools.GetUserId(c)
+	id := user.GetUserId(c)
 	serviceSysUser := service.SysUser{}
 	serviceSysUser.Log = log
 	serviceSysUser.Orm = db
@@ -418,7 +418,7 @@ func (e *SysUser) GetInfo(c *gin.Context) {
 	p := actions.GetPermissionFromContext(c)
 
 	var roles = make([]string, 1)
-	roles[0] = tools.GetRoleName(c)
+	roles[0] = user.GetRoleName(c)
 
 	var permissions = make([]string, 1)
 	permissions[0] = "*:*:*"
@@ -427,11 +427,11 @@ func (e *SysUser) GetInfo(c *gin.Context) {
 	buttons[0] = "*:*:*"
 
 	RoleMenu := models.RoleMenu{}
-	RoleMenu.RoleId = tools.GetRoleId(c)
+	RoleMenu.RoleId = user.GetRoleId(c)
 
 	var mp = make(map[string]interface{})
 	mp["roles"] = roles
-	if tools.GetRoleName(c) == "admin" || tools.GetRoleName(c) == "系统管理员" {
+	if user.GetRoleName(c) == "admin" || user.GetRoleName(c) == "系统管理员" {
 		mp["permissions"] = permissions
 		mp["buttons"] = buttons
 	} else {
@@ -440,13 +440,13 @@ func (e *SysUser) GetInfo(c *gin.Context) {
 		mp["buttons"] = list
 	}
 
-	var user system.SysUser
+	var sysUser system.SysUser
 	req := new(dto.SysUserById)
-	req.Id = tools.GetUserId(c)
+	req.Id = user.GetUserId(c)
 	serviceSysUser := service.SysUser{}
 	serviceSysUser.Log = log
 	serviceSysUser.Orm = db
-	err = serviceSysUser.GetSysUser(req, p, &user)
+	err = serviceSysUser.GetSysUser(req, p, &sysUser)
 	if err != nil {
 		e.Error(c, http.StatusUnauthorized, err, "登录失败")
 		return
@@ -455,12 +455,12 @@ func (e *SysUser) GetInfo(c *gin.Context) {
 	mp["introduction"] = " am a super administrator"
 
 	mp["avatar"] = "https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif"
-	if user.Avatar != "" {
-		mp["avatar"] = user.Avatar
+	if sysUser.Avatar != "" {
+		mp["avatar"] = sysUser.Avatar
 	}
-	mp["userName"] = user.NickName
-	mp["userId"] = user.UserId
-	mp["deptId"] = user.DeptId
-	mp["name"] = user.NickName
+	mp["userName"] = sysUser.NickName
+	mp["userId"] = sysUser.UserId
+	mp["deptId"] = sysUser.DeptId
+	mp["name"] = sysUser.NickName
 	e.OK(c, mp, "")
 }

app/admin/apis/system/captcha.go

@@ -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,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,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

@@ -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

@@ -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,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

@@ -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

@@ -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

@@ -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,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

app/admin/apis/tools/dbcolumns.go

@@ -1,14 +1,14 @@
 package tools
 
 import (
-	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
 	"go-admin/app/admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
+	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据 / page list data
@@ -27,14 +27,14 @@ func GetDBColumnList(c *gin.Context) {
 	var pageIndex = 1
 
 	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize, err = tools2.StringToInt(size)
+		pageSize, err = pkg.StringToInt(size)
 	}
 
 	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex, err = tools2.StringToInt(index)
+		pageIndex, err = pkg.StringToInt(index)
 	}
 
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -42,9 +42,9 @@ func GetDBColumnList(c *gin.Context) {
 	}
 
 	data.TableName = c.Request.FormValue("tableName")
-	tools2.Assert(data.TableName == "", "table name cannot be empty！", 500)
+	pkg.Assert(data.TableName == "", "table name cannot be empty！", 500)
 	result, count, err := data.GetPage(db, pageSize, pageIndex)
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
 	var mp = make(map[string]interface{}, 3)
 	mp["list"] = result

app/admin/apis/tools/dbtables.go

@@ -1,15 +1,15 @@
 package tools
 
 import (
-	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
 	"go-admin/app/admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
+	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据 / page list data
@@ -34,14 +34,14 @@ func GetDBTableList(c *gin.Context) {
 	}
 
 	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize, err = tools2.StringToInt(size)
+		pageSize, err = pkg.StringToInt(size)
 	}
 
 	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex, err = tools2.StringToInt(index)
+		pageIndex, err = pkg.StringToInt(index)
 	}
 
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -50,7 +50,7 @@ func GetDBTableList(c *gin.Context) {
 
 	data.TableName = c.Request.FormValue("tableName")
 	result, count, err := data.GetPage(db, pageSize, pageIndex)
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
 	var mp = make(map[string]interface{}, 3)
 	mp["list"] = result

app/admin/apis/tools/gen.go

@@ -2,39 +2,39 @@ package tools
 
 import (
 	"bytes"
-	"go-admin/common/apis"
 	"net/http"
 	"text/template"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
+	"go-admin/common/apis"
 )
 
 func Preview(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
 	table := tools.SysTables{}
-	id, err := tools2.StringToInt(c.Param("tableId"))
-	tools2.HasError(err, "", -1)
+	id, err := pkg.StringToInt(c.Param("tableId"))
+	pkg.HasError(err, "", -1)
 	table.TableId = id
 	t1, err := template.ParseFiles("template/v4/model.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t3, err := template.ParseFiles("template/v4/js.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t4, err := template.ParseFiles("template/v4/vue.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t6, err := template.ParseFiles("template/v4/dto.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -71,10 +71,10 @@ func Preview(c *gin.Context) {
 func GenCodeV3(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
 	table := tools.SysTables{}
-	id, err := tools2.StringToInt(c.Param("tableId"))
-	tools2.HasError(err, "", -1)
+	id, err := pkg.StringToInt(c.Param("tableId"))
+	pkg.HasError(err, "", -1)
 
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -103,26 +103,26 @@ func NOActionsGenV3(tab tools.SysTables) {
 	}
 
 	t1, err := template.ParseFiles(basePath + "model.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t3, err := template.ParseFiles(routerFile)
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t4, err := template.ParseFiles(basePath + "js.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/apis/" + tab.ModuleName)
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/models/")
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/router/")
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/service/dto/")
-	_ = tools2.PathCreate(config.GenConfig.FrontPath + "/api/")
-	_ = tools2.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName)
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/apis/" + tab.ModuleName)
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName)
 
 	var b1 bytes.Buffer
 	err = t1.Execute(&b1, tab)
@@ -138,13 +138,13 @@ func NOActionsGenV3(tab tools.SysTables) {
 	err = t6.Execute(&b6, tab)
 	var b7 bytes.Buffer
 	err = t7.Execute(&b7, tab)
-	tools2.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go")
-	tools2.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+"/"+tab.BusinessName+".go")
-	tools2.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go")
-	tools2.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js")
-	tools2.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue")
-	tools2.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
-	tools2.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.BusinessName+".go")
+	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go")
+	pkg.FileCreate(b2, "./app/"+tab.PackageName+"/apis/"+tab.ModuleName+"/"+tab.BusinessName+".go")
+	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go")
+	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js")
+	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue")
+	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
+	pkg.FileCreate(b7, "./app/"+tab.PackageName+"/service/"+tab.BusinessName+".go")
 
 }
 
@@ -157,21 +157,21 @@ func ActionsGenV3(tab tools.SysTables) {
 	}
 
 	t1, err := template.ParseFiles(basePath + "model.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t3, err := template.ParseFiles(routerFile)
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t4, err := template.ParseFiles(basePath + "js.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/models/")
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/router/")
-	_ = tools2.PathCreate("./app/" + tab.PackageName + "/service/dto/")
-	_ = tools2.PathCreate(config.GenConfig.FrontPath + "/api/")
-	_ = tools2.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName)
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
+	_ = pkg.PathCreate("./app/" + tab.PackageName + "/service/dto/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/api/")
+	_ = pkg.PathCreate(config.GenConfig.FrontPath + "/views/" + tab.BusinessName)
 
 	var b1 bytes.Buffer
 	err = t1.Execute(&b1, tab)
@@ -184,22 +184,22 @@ func ActionsGenV3(tab tools.SysTables) {
 	var b6 bytes.Buffer
 	err = t6.Execute(&b6, tab)
 
-	tools2.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go")
-	tools2.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go")
-	tools2.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js")
-	tools2.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue")
-	tools2.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
+	pkg.FileCreate(b1, "./app/"+tab.PackageName+"/models/"+tab.BusinessName+".go")
+	pkg.FileCreate(b3, "./app/"+tab.PackageName+"/router/"+tab.BusinessName+".go")
+	pkg.FileCreate(b4, config.GenConfig.FrontPath+"/api/"+tab.BusinessName+".js")
+	pkg.FileCreate(b5, config.GenConfig.FrontPath+"/views/"+tab.BusinessName+"/index.vue")
+	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
 }
 
 func GenMenuAndApi(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
 
 	table := tools.SysTables{}
-	timeNow := tools2.GetCurrentTime()
-	id, err := tools2.StringToInt(c.Param("tableId"))
-	tools2.HasError(err, "", -1)
+	timeNow := pkg.GetCurrentTime()
+	id, err := pkg.StringToInt(c.Param("tableId"))
+	pkg.HasError(err, "", -1)
 
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")

app/admin/apis/tools/systables.go

@@ -1,16 +1,17 @@
 package tools
 
 import (
-	"go-admin/common/apis"
-	"gorm.io/gorm"
 	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"gorm.io/gorm"
 
 	"go-admin/app/admin/models/tools"
-	tools2 "go-admin/tools"
-	"go-admin/tools/app"
+	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据
@@ -29,14 +30,14 @@ func GetSysTableList(c *gin.Context) {
 	var pageIndex = 1
 
 	if size := c.Request.FormValue("pageSize"); size != "" {
-		pageSize, err = tools2.StringToInt(size)
+		pageSize, err = pkg.StringToInt(size)
 	}
 
 	if index := c.Request.FormValue("pageIndex"); index != "" {
-		pageIndex, err = tools2.StringToInt(index)
+		pageIndex, err = pkg.StringToInt(index)
 	}
 
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -46,7 +47,7 @@ func GetSysTableList(c *gin.Context) {
 	data.TBName = c.Request.FormValue("tableName")
 	data.TableComment = c.Request.FormValue("tableComment")
 	result, count, err := data.GetPage(db, pageSize, pageIndex)
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
 	var mp = make(map[string]interface{}, 3)
 	mp["list"] = result
@@ -69,7 +70,7 @@ func GetSysTableList(c *gin.Context) {
 // @Security Bearer
 func GetSysTables(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -77,9 +78,9 @@ func GetSysTables(c *gin.Context) {
 	}
 
 	var data tools.SysTables
-	data.TableId, _ = tools2.StringToInt(c.Param("tableId"))
+	data.TableId, _ = pkg.StringToInt(c.Param("tableId"))
 	result, err := data.Get(db)
-	tools2.HasError(err, "抱歉未找到相关信息", -1)
+	pkg.HasError(err, "抱歉未找到相关信息", -1)
 
 	var res app.Response
 	res.Data = result
@@ -92,7 +93,7 @@ func GetSysTables(c *gin.Context) {
 
 func GetSysTablesInfo(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -104,7 +105,7 @@ func GetSysTablesInfo(c *gin.Context) {
 		data.TBName = c.Request.FormValue("tableName")
 	}
 	result, err := data.Get(db)
-	tools2.HasError(err, "抱歉未找到相关信息", -1)
+	pkg.HasError(err, "抱歉未找到相关信息", -1)
 
 	var res app.Response
 	res.Data = result
@@ -117,7 +118,7 @@ func GetSysTablesInfo(c *gin.Context) {
 
 func GetSysTablesTree(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -126,7 +127,7 @@ func GetSysTablesTree(c *gin.Context) {
 
 	var data tools.SysTables
 	result, err := data.GetTree(db)
-	tools2.HasError(err, "抱歉未找到相关信息", -1)
+	pkg.HasError(err, "抱歉未找到相关信息", -1)
 
 	var res app.Response
 	res.Data = result
@@ -145,7 +146,7 @@ func GetSysTablesTree(c *gin.Context) {
 // @Security Bearer
 func InsertSysTable(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -158,7 +159,7 @@ func InsertSysTable(c *gin.Context) {
 		data, err := genTableInit(db, tablesList, i, c)
 
 		_, err = data.Create(db)
-		tools2.HasError(err, "", -1)
+		pkg.HasError(err, "", -1)
 	}
 	var res app.Response
 	res.Msg = "添加成功！"
@@ -171,7 +172,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	var dbTable tools.DBTables
 	var dbColumn tools.DBColumns
 	data.TBName = tablesList[i]
-	data.CreateBy = tools2.GetUserIdStr(c)
+	data.CreateBy = user.GetUserIdStr(c)
 
 	dbTable.TableName = data.TBName
 	dbtable, err := dbTable.Get(tx)
@@ -190,7 +191,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	data.Crud = true
 
 	dbcolumn, err := dbColumn.GetList(tx)
-	data.CreateBy = tools2.GetUserIdStr(c)
+	data.CreateBy = user.GetUserIdStr(c)
 	data.TableComment = dbtable.TableComment
 	if dbtable.TableComment == "" {
 		data.TableComment = data.ClassName
@@ -279,19 +280,19 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 func UpdateSysTable(c *gin.Context) {
 	var data tools.SysTables
 	err := c.Bind(&data)
-	tools2.HasError(err, "数据解析失败", 500)
+	pkg.HasError(err, "数据解析失败", 500)
 
 	log := apis.GetRequestLogger(c)
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
-	data.UpdateBy = tools2.GetUserIdStr(c)
+	data.UpdateBy = user.GetUserIdStr(c)
 	result, err := data.Update(db)
-	tools2.HasError(err, "", -1)
+	pkg.HasError(err, "", -1)
 
 	var res app.Response
 	res.Data = result
@@ -308,7 +309,7 @@ func UpdateSysTable(c *gin.Context) {
 // @Router /api/v1/sys/tables/info/{tableId} [delete]
 func DeleteSysTables(c *gin.Context) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools2.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -316,9 +317,9 @@ func DeleteSysTables(c *gin.Context) {
 	}
 
 	var data tools.SysTables
-	IDS := tools2.IdsStrToIdsIntGroup("tableId", c)
+	IDS := pkg.IdsStrToIdsIntGroup("tableId", c)
 	_, err = data.BatchDelete(db, IDS)
-	tools2.HasError(err, "删除失败", 500)
+	pkg.HasError(err, "删除失败", 500)
 	var res app.Response
 	res.Msg = "删除成功"
 	c.JSON(http.StatusOK, res.ReturnOK())

app/admin/middleware/auth.go

@@ -3,9 +3,9 @@ package middleware
 import (
 	"time"
 
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/middleware/handler"
-	jwt "go-admin/pkg/jwtauth"
-	"go-admin/tools/config"
 )
 
 // AuthInit jwt验证new

app/admin/middleware/handler/auth.go

@@ -1,19 +1,20 @@
 package handler
 
 import (
-	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"github.com/mojocn/base64Captcha"
 	"github.com/mssola/user_agent"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
-	jwt "go-admin/pkg/jwtauth"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
+	"go-admin/common/apis"
 )
 
 var store = base64Captcha.DefaultMemStore
@@ -60,7 +61,7 @@ func IdentityHandler(c *gin.Context) interface{} {
 // @Router /login [post]
 func Authenticator(c *gin.Context) (interface{}, error) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -109,16 +110,16 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
 	log := apis.GetRequestLogger(c)
 	if config.LoggerConfig.EnabledDB {
 		var loginLog system.SysLoginLog
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Errorf("获取Orm失败, error:%s", err)
 		}
 		ua := user_agent.New(c.Request.UserAgent())
 		loginLog.Ipaddr = c.ClientIP()
 		loginLog.Username = username
-		location := tools.GetLocation(c.ClientIP())
+		location := pkg.GetLocation(c.ClientIP())
 		loginLog.LoginLocation = location
-		loginLog.LoginTime = tools.GetCurrentTime()
+		loginLog.LoginTime = pkg.GetCurrentTime()
 		loginLog.Status = status
 		loginLog.Remark = c.Request.UserAgent()
 		browserName, browserVersion := ua.Browser()
@@ -146,18 +147,18 @@ func LogOut(c *gin.Context) {
 	var loginLog system.SysLoginLog
 	ua := user_agent.New(c.Request.UserAgent())
 	loginLog.Ipaddr = c.ClientIP()
-	location := tools.GetLocation(c.ClientIP())
+	location := pkg.GetLocation(c.ClientIP())
 	loginLog.LoginLocation = location
-	loginLog.LoginTime = tools.GetCurrentTime()
+	loginLog.LoginTime = pkg.GetCurrentTime()
 	loginLog.Status = "2"
 	loginLog.Remark = c.Request.UserAgent()
 	browserName, browserVersion := ua.Browser()
 	loginLog.Browser = browserName + " " + browserVersion
 	loginLog.Os = ua.OS()
 	loginLog.Platform = ua.Platform()
-	loginLog.Username = tools.GetUserName(c)
+	loginLog.Username = user.GetUserName(c)
 	loginLog.Msg = "退出成功"
-	db, err := tools.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("获取Orm失败, error:%s", err)
 	}

app/admin/middleware/handler/httpshandler.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/unrolled/secure"
 
-	"go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 func TlsHandler() gin.HandlerFunc {

app/admin/middleware/logger.go

@@ -2,19 +2,20 @@ package middleware
 
 import (
 	"fmt"
-	"go-admin/common/apis"
 	"net/http"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"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"
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
+	"go-admin/common/apis"
 )
 
 // LoggerToFile 日志记录到文件
@@ -79,7 +80,7 @@ func LoggerToFile() gin.HandlerFunc {
 // SetDBOperLog 写入操作日志表 fixme 该方法后续即将弃用
 func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string, reqMethod string, latencyTime time.Duration, body string, result string, status int) {
 	log := apis.GetRequestLogger(c)
-	db, err := tools.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
 		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
@@ -92,9 +93,9 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
 	menuList, _ := menu.Get(db)
 	sysOperaLog := system.SysOperaLog{}
 	sysOperaLog.OperIp = clientIP
-	sysOperaLog.OperLocation = tools.GetLocation(clientIP)
-	sysOperaLog.Status = tools.IntToString(statusCode)
-	sysOperaLog.OperName = tools.GetUserName(c)
+	sysOperaLog.OperLocation = pkg.GetLocation(clientIP)
+	sysOperaLog.Status = pkg.IntToString(statusCode)
+	sysOperaLog.OperName = user.GetUserName(c)
 	sysOperaLog.RequestMethod = c.Request.Method
 	sysOperaLog.OperUrl = reqUri
 	sysOperaLog.OperParam = body
@@ -120,8 +121,8 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
 	if len(menuList) > 0 {
 		sysOperaLog.Title = menuList[0].Title
 	}
-	sysOperaLog.CreateBy = tools.GetUserId(c)
-	sysOperaLog.OperTime = tools.GetCurrentTime()
+	sysOperaLog.CreateBy = user.GetUserId(c)
+	sysOperaLog.OperTime = pkg.GetCurrentTime()
 	sysOperaLog.LatencyTime = fmt.Sprintf("%v", latencyTime)
 
 	sysOperaLog.JsonResult = result

app/admin/models/initdb.go

@@ -2,7 +2,7 @@ package models
 
 import (
 	"fmt"
-	"go-admin/tools/app"
+	"go-admin/common/global"
 	"gorm.io/gorm"
 	"io/ioutil"
 	"log"
@@ -12,7 +12,7 @@ import (
 func InitDb(db *gorm.DB) (err error) {
 	filePath := "config/db.sql"
 	err = ExecSql(db, filePath)
-	if app.Driver == "postgres" {
+	if global.Driver == "postgres" {
 		filePath = "config/pg.sql"
 		err = ExecSql(db, filePath)
 	}

app/admin/models/menu.go

@@ -2,11 +2,11 @@ package models
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
 	"gorm.io/gorm"
 
 	"go-admin/app/admin/models/system"
-	"go-admin/tools"
 )
 
 type Menu struct {
@@ -274,7 +274,7 @@ func (e *Menu) GetPage(tx *gorm.DB) (Menus []Menu, err error) {
 
 	// 数据权限控制
 	dataPermission := new(system.DataPermission)
-	dataPermission.UserId, _ = tools.StringToInt(e.DataScope)
+	dataPermission.UserId, _ = pkg.StringToInt(e.DataScope)
 	table, err = dataPermission.GetDataScope("sys_menu", table)
 	if err != nil {
 		return nil, err
@@ -307,9 +307,9 @@ func InitPaths(tx *gorm.DB, menu *Menu) (err error) {
 			err = errors.New("父级paths异常，请尝试对当前节点父级菜单进行更新操作！")
 			return
 		}
-		menu.Paths = parentMenu.Paths + "/" + tools.IntToString(menu.MenuId)
+		menu.Paths = parentMenu.Paths + "/" + pkg.IntToString(menu.MenuId)
 	} else {
-		menu.Paths = "/0/" + tools.IntToString(menu.MenuId)
+		menu.Paths = "/0/" + pkg.IntToString(menu.MenuId)
 	}
 	tx.Table("sys_menu").Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths)
 	return

app/admin/models/sys_file_dir.go

@@ -37,4 +37,4 @@ func (e *SysFileDir) Generate() models.ActiveRecord {
 
 func (e *SysFileDir) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/sys_file_info.go

@@ -9,7 +9,7 @@ type SysFileInfo struct {
 	Type    string `json:"type" gorm:"type:varchar(255);comment:类型"`     //
 	Name    string `json:"name" gorm:"type:varchar(255);comment:名称"`     //
 	Size    string `json:"size" gorm:"type:int(11);comment:大小"`          //
-	PId     int   `json:"pId" gorm:"type:int(11);comment:目录"`           //
+	PId     int    `json:"pId" gorm:"type:int(11);comment:目录"`           //
 	Source  string `json:"source" gorm:"type:varchar(255);comment:来源"`   //
 	Url     string `json:"url" gorm:"type:varchar(255);comment:地址"`      //
 	FullUrl string `json:"fullUrl" gorm:"type:varchar(255);comment:全地址"` //
@@ -28,4 +28,4 @@ func (e *SysFileInfo) Generate() models.ActiveRecord {
 
 func (e *SysFileInfo) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/syscategory.go

@@ -26,4 +26,4 @@ func (e *SysCategory) Generate() models.ActiveRecord {
 
 func (e *SysCategory) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/syschinaareadata.go

@@ -6,18 +6,18 @@ import (
 )
 
 type SysChinaAreaData struct {
-    models.Model
-    models.ControlBy
-    
-    PId string `json:"pId" gorm:"type:int(11);comment:上级编码"` 
-    Name string `json:"name" gorm:"type:varchar(128);comment:名称"` 
-    CreateTime time.Time `json:"createTime" gorm:"type:timestamp;comment:CreateTime"` 
-    UpdateTime time.Time `json:"updateTime" gorm:"type:timestamp;comment:UpdateTime"` 
-    DeleteTime time.Time `json:"deleteTime" gorm:"type:timestamp;comment:DeleteTime"` 
+	models.Model
+	models.ControlBy
+
+	PId        string    `json:"pId" gorm:"type:int(11);comment:上级编码"`
+	Name       string    `json:"name" gorm:"type:varchar(128);comment:名称"`
+	CreateTime time.Time `json:"createTime" gorm:"type:timestamp;comment:CreateTime"`
+	UpdateTime time.Time `json:"updateTime" gorm:"type:timestamp;comment:UpdateTime"`
+	DeleteTime time.Time `json:"deleteTime" gorm:"type:timestamp;comment:DeleteTime"`
 }
 
 func (SysChinaAreaData) TableName() string {
-    return "sys_china_area_data"
+	return "sys_china_area_data"
 }
 
 func (e *SysChinaAreaData) Generate() models.ActiveRecord {
@@ -27,4 +27,4 @@ func (e *SysChinaAreaData) Generate() models.ActiveRecord {
 
 func (e *SysChinaAreaData) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/system/datascope.go

@@ -2,11 +2,11 @@ package system
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"gorm.io/gorm"
 
 	log "github.com/go-admin-team/go-admin-core/logger"
-	"go-admin/tools"
-	"go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 type DataPermission struct {
@@ -19,7 +19,7 @@ type DataPermission struct {
 func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB, error) {
 
 	if !config.ApplicationConfig.EnableDP {
-		usageStr := `数据权限已经为您` + tools.Green(`关闭`) + `，如需开启请参考配置文件字段说明`
+		usageStr := `数据权限已经为您` + pkg.Green(`关闭`) + `，如需开启请参考配置文件字段说明`
 		log.Debug("%s\n", usageStr)
 		return db, nil
 	}
@@ -40,7 +40,7 @@ func (e *DataPermission) GetDataScope(tableName string, db *gorm.DB) (*gorm.DB,
 		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
 	}
 	if role.DataScope == "4" {
-		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(user.DeptId)+"%")
+		db = db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
 	}
 	if role.DataScope == "5" || role.DataScope == "" {
 		db = db.Where(tableName+".create_by = ?", e.UserId)
@@ -71,7 +71,7 @@ func DataScopes(tableName string, userId int) func(db *gorm.DB) *gorm.DB {
 			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", user.DeptId)
 		}
 		if role.DataScope == "4" {
-			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(user.DeptId)+"%")
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(user.DeptId)+"%")
 		}
 		if role.DataScope == "5" || role.DataScope == "" {
 			return db.Where(tableName+".create_by = ?", userId)

app/admin/models/system/login.go

@@ -3,7 +3,7 @@ package system
 import (
 	"fmt"
 	log "github.com/go-admin-team/go-admin-core/logger"
-	"go-admin/tools"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"gorm.io/gorm"
 )
 
@@ -21,7 +21,7 @@ func (u *Login) GetUser(tx *gorm.DB) (user SysUser, role SysRole, err error) {
 		return
 	}
 	fmt.Println(user.Password, u.Password)
-	_, err = tools.CompareHashAndPassword(user.Password, u.Password)
+	_, err = pkg.CompareHashAndPassword(user.Password, u.Password)
 	if err != nil {
 		log.Errorf("user login error, %s", err.Error())
 		return

app/admin/models/system/role_menu.go

@@ -2,11 +2,10 @@ package system
 
 import (
 	"fmt"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
 	"github.com/casbin/casbin/v2"
 	"gorm.io/gorm"
-
-	"go-admin/tools"
 )
 
 type RoleMenu struct {
@@ -159,7 +158,7 @@ func (rm *RoleMenu) Insert(tx *gorm.DB, enforcer *casbin.SyncedEnforcer, roleId
 }
 
 func (rm *RoleMenu) Delete(tx *gorm.DB, RoleId string, MenuID string) (bool, error) {
-	rm.RoleId, _ = tools.StringToInt(RoleId)
+	rm.RoleId, _ = pkg.StringToInt(RoleId)
 	table := tx.Table("sys_role_menu").Where("role_id = ?", RoleId)
 	if MenuID != "" {
 		table = table.Where("menu_id = ?", MenuID)

app/admin/models/system/sys_config.go

@@ -26,4 +26,4 @@ func (e *SysConfig) Generate() models.ActiveRecord {
 
 func (e *SysConfig) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/system/sys_login_log.go

@@ -34,4 +34,4 @@ func (e *SysLoginLog) Generate() models.ActiveRecord {
 
 func (e *SysLoginLog) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/system/sys_opera_log.go

@@ -42,4 +42,4 @@ func (e *SysOperaLog) Generate() models.ActiveRecord {
 
 func (e *SysOperaLog) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/models/system/sys_post.go

@@ -4,11 +4,11 @@ import "go-admin/common/models"
 
 type SysPost struct {
 	PostId   int    `gorm:"primaryKey;autoIncrement" json:"postId"` //岗位编号
-	PostName string `gorm:"size:128;" json:"postName"`                //岗位名称
-	PostCode string `gorm:"size:128;" json:"postCode"`                //岗位代码
-	Sort     int    `gorm:"" json:"sort"`                             //岗位排序
-	Status   int    `gorm:"size:4;" json:"status"`                    //状态
-	Remark   string `gorm:"size:255;" json:"remark"`                  //描述
+	PostName string `gorm:"size:128;" json:"postName"`              //岗位名称
+	PostCode string `gorm:"size:128;" json:"postCode"`              //岗位代码
+	Sort     int    `gorm:"" json:"sort"`                           //岗位排序
+	Status   int    `gorm:"size:4;" json:"status"`                  //状态
+	Remark   string `gorm:"size:255;" json:"remark"`                //描述
 	models.ControlBy
 	models.ModelTime
 

app/admin/models/system/sys_role.go

@@ -4,12 +4,12 @@ import "go-admin/common/models"
 
 type SysRole struct {
 	RoleId    int    `json:"roleId" gorm:"primaryKey;autoIncrement"` // 角色编码
-	RoleName  string `json:"roleName" gorm:"size:128;"`                // 角色名称
-	Status    string `json:"status" gorm:"size:4;"`                    //
-	RoleKey   string `json:"roleKey" gorm:"size:128;"`                 //角色代码
-	RoleSort  int    `json:"roleSort" gorm:""`                         //角色排序
-	Flag      string `json:"flag" gorm:"size:128;"`                    //
-	Remark    string `json:"remark" gorm:"size:255;"`                  //备注
+	RoleName  string `json:"roleName" gorm:"size:128;"`              // 角色名称
+	Status    string `json:"status" gorm:"size:4;"`                  //
+	RoleKey   string `json:"roleKey" gorm:"size:128;"`               //角色代码
+	RoleSort  int    `json:"roleSort" gorm:""`                       //角色排序
+	Flag      string `json:"flag" gorm:"size:128;"`                  //
+	Remark    string `json:"remark" gorm:"size:255;"`                //备注
 	Admin     bool   `json:"admin" gorm:"size:4;"`
 	DataScope string `json:"dataScope" gorm:"size:128;"`
 	Params    string `json:"params" gorm:"-"`

app/admin/models/system/sys_user.go

@@ -11,11 +11,11 @@ type SysUser struct {
 	models.ModelTime
 	UserId   int      `gorm:"primaryKey;autoIncrement;comment:编码"  json:"userId"`
 	Username string   `json:"username" gorm:"type:varchar(64);comment:用户名"`
-	Password string   `json:"password" gorm:"type:varchar(128);comment:密码"`
+	Password string   `json:"-" gorm:"type:varchar(128);comment:密码"`
 	NickName string   `json:"nickName" gorm:"type:varchar(128);comment:昵称"`
 	Phone    string   `json:"phone" gorm:"type:varchar(11);comment:手机号"`
 	RoleId   int      `json:"roleId" gorm:"type:bigint(20);comment:角色ID"`
-	Salt     string   `json:"salt" gorm:"type:varchar(255);comment:加盐"`
+	Salt     string   `json:"-" gorm:"type:varchar(255);comment:加盐"`
 	Avatar   string   `json:"avatar" gorm:"type:varchar(255);comment:头像"`
 	Sex      string   `json:"sex" gorm:"type:varchar(255);comment:性别"`
 	Email    string   `json:"email" gorm:"type:varchar(128);comment:邮箱"`

app/admin/models/tools/dbcolumns.go

@@ -2,11 +2,11 @@ package tools
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
 	"gorm.io/gorm"
 
-	"go-admin/tools"
-	"go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 type DBColumns struct {
@@ -62,7 +62,7 @@ func (e *DBColumns) GetList(tx *gorm.DB) ([]DBColumns, error) {
 
 		table = table.Where("TABLE_NAME = ?", e.TableName).Order("ORDINAL_POSITION asc")
 	} else {
-		tools.Assert(true, "目前只支持mysql数据库", 500)
+		pkg.Assert(true, "目前只支持mysql数据库", 500)
 	}
 	if err := table.Find(&doc).Error; err != nil {
 		return doc, err

app/admin/models/tools/dbtables.go

@@ -2,11 +2,11 @@ package tools
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
 	"gorm.io/gorm"
 
-	"go-admin/tools"
-	config2 "go-admin/tools/config"
+	config2 "github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 type DBTables struct {
@@ -36,7 +36,7 @@ func (e *DBTables) GetPage(tx *gorm.DB, pageSize int, pageIndex int) ([]DBTables
 			return nil, 0, err
 		}
 	} else {
-		tools.Assert(true, "目前只支持mysql数据库", 500)
+		pkg.Assert(true, "目前只支持mysql数据库", 500)
 	}
 
 	//table.Count(&count)
@@ -56,7 +56,7 @@ func (e *DBTables) Get(tx *gorm.DB) (DBTables, error) {
 			return doc, err
 		}
 	} else {
-		tools.Assert(true, "目前只支持mysql数据库", 500)
+		pkg.Assert(true, "目前只支持mysql数据库", 500)
 	}
 	return doc, nil
 }

app/admin/models/wf_classify.go

@@ -1,20 +1,20 @@
 package models
 
 import (
-   // "gorm.io/gorm"
+	// "gorm.io/gorm"
 
 	"go-admin/common/models"
 )
 
 type WfProcessClassify struct {
-    models.Model
-    models.ControlBy
-    
-    Name string `json:"name" gorm:"type:varchar(255);comment:名称"` 
+	models.Model
+	models.ControlBy
+
+	Name string `json:"name" gorm:"type:varchar(255);comment:名称"`
 }
 
 func (WfProcessClassify) TableName() string {
-    return "wf_process_classify"
+	return "wf_process_classify"
 }
 
 func (e *WfProcessClassify) Generate() models.ActiveRecord {
@@ -24,4 +24,4 @@ func (e *WfProcessClassify) Generate() models.ActiveRecord {
 
 func (e *WfProcessClassify) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/router/init_router.go

@@ -1,7 +1,8 @@
 package router
 
 import (
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"os"
 
 	"github.com/gin-gonic/gin"
@@ -10,18 +11,17 @@ import (
 	"go-admin/app/admin/middleware"
 	"go-admin/app/admin/middleware/handler"
 	common "go-admin/common/middleware"
-	//_ "go-admin/pkg/jwtauth"
-	"go-admin/tools"
-	"go-admin/tools/config"
+
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 // InitRouter 路由初始化，不要怀疑，这里用到了
 func InitRouter() {
 	var r *gin.Engine
-	h := app.Runtime.GetEngine()
+	h := sdk.Runtime.GetEngine()
 	if h == nil {
 		h = gin.New()
-		app.Runtime.SetEngine(h)
+		sdk.Runtime.SetEngine(h)
 	}
 	switch h.(type) {
 	case *gin.Engine:
@@ -35,7 +35,7 @@ func InitRouter() {
 	}
 
 	r.Use(common.Sentinel()).
-		Use(common.RequestId(tools.TrafficKey))
+		Use(common.RequestId(pkg.TrafficKey))
 	middleware.InitMiddleware(r)
 	// the jwt middleware
 	authMiddleware, err := middleware.AuthInit()

app/admin/router/monitor.go

@@ -1,7 +1,7 @@
 package router
 
 import (
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -12,10 +12,10 @@ import (
 
 func Monitor() {
 	var r *gin.Engine
-	h := app.Runtime.GetEngine()
+	h := sdk.Runtime.GetEngine()
 	if h == nil {
 		h = gin.New()
-		app.Runtime.SetEngine(h)
+		sdk.Runtime.SetEngine(h)
 	}
 	switch h.(type) {
 	case *gin.Engine:

app/admin/router/router.go

@@ -3,8 +3,8 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 	_ "github.com/gin-gonic/gin"
-	"go-admin/pkg/jwtauth"
-	jwt "go-admin/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 )
 
 var (

app/admin/router/sys_category.go

@@ -1,31 +1,31 @@
 package router
 
 import (
-    "github.com/gin-gonic/gin"
+	"github.com/gin-gonic/gin"
+	middleware2 "go-admin/common/middleware"
 
-    "go-admin/app/admin/middleware"
-    "go-admin/app/admin/models"
-    "go-admin/app/admin/service/dto"
-    "go-admin/common/actions"
-    jwt "go-admin/pkg/jwtauth"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"go-admin/app/admin/models"
+	"go-admin/app/admin/service/dto"
+	"go-admin/common/actions"
 )
 
-func init()  {
+func init() {
 	routerCheckRole = append(routerCheckRole, registerSysCategoryRouter)
 }
 
 // 需认证的路由代码
 func registerSysCategoryRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-    r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
-    {
-        model := &models.SysCategory{}
-        r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysCategorySearch), func() interface{} {
-            list := make([]models.SysCategory, 0)
-            return &list
-        }))
-        r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysCategoryById), nil))
-        r.POST("", actions.CreateAction(new(dto.SysCategoryControl)))
-        r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysCategoryControl)))
-        r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysCategoryById)))
-    }
+	r := v1.Group("/syscategory").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
+	{
+		model := &models.SysCategory{}
+		r.GET("", actions.PermissionAction(), actions.IndexAction(model, new(dto.SysCategorySearch), func() interface{} {
+			list := make([]models.SysCategory, 0)
+			return &list
+		}))
+		r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.SysCategoryById), nil))
+		r.POST("", actions.CreateAction(new(dto.SysCategoryControl)))
+		r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.SysCategoryControl)))
+		r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.SysCategoryById)))
+	}
 }

app/admin/router/sys_config.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_config"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -13,7 +13,7 @@ func init() {
 
 // 需认证的路由代码
 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
-	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		api := &sys_config.SysConfig{}
 		r.GET("", api.GetSysConfigList)

app/admin/router/sys_content.go

@@ -2,11 +2,11 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/app/admin/middleware"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -16,7 +16,7 @@ func init() {
 // 需认证的路由代码
 func registerSysContentRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 
-	r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/syscontent").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		//r.GET("", sys_content.GetSysContentList)
 		//r.GET("/:id", sys_content.GetSysContent)

app/admin/router/sys_dept.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_dept"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysDeptRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_dept.SysDept{}
-	r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/dept").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysDeptList)
 		r.GET("/:id", api.GetSysDept)

app/admin/router/sys_file_dir.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/sys_file"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysFileDirRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_file.SysFileDir{}
-	r := v1.Group("/sysfiledir").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/sysfiledir").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysFileDirList)
 		r.GET("/:id", api.GetSysFileDir)

app/admin/router/sys_file_info.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/sys_file"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysFileInfoRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_file.SysFileInfo{}
-	r := v1.Group("/sysfileinfo").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/sysfileinfo").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysFileInfoList)
 		r.GET("/:id", api.GetSysFileInfo)

app/admin/router/sys_job.go

@@ -2,12 +2,12 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/sys_job"
-	"go-admin/app/admin/middleware"
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -17,7 +17,7 @@ func init() {
 // 需认证的路由代码
 func registerSysJobRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 
-	r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/sysjob").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		sysJob := &models.SysJob{}
 		r.GET("", actions.PermissionAction(), actions.IndexAction(sysJob, new(dto.SysJobSearch), func() interface{} {

app/admin/router/sys_login_log.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_login_log"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysLoginLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_login_log.SysLoginLog{}
-	r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/sys-login-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysLoginLogList)
 		r.GET("/:id", api.GetSysLoginLog)

app/admin/router/sys_menu.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_menu"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -21,7 +21,7 @@ func registerSysMenuRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 	//	menu.PUT("", system.UpdateMenu)
 	//	menu.DELETE("/:id", system.DeleteMenu)
 	//}
-	r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/menu").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysMenuList)
 		r.GET("/:id", api.GetSysMenu)

app/admin/router/sys_opera_log.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_opera_log"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysOperaLogRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_opera_log.SysOperaLog{}
-	r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/sys-opera-log").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysOperaLogList)
 		r.GET("/:id", api.GetSysOperaLog)

app/admin/router/sys_post.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_post"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_post.SysPost{}
-	r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/post").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysPostList)
 		r.GET("/:id", api.GetSysPost)
@@ -23,4 +23,3 @@ func registerSyPostRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlew
 		r.DELETE("/:id", api.DeleteSysPost)
 	}
 }
-

app/admin/router/sys_role.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/system/sys_role"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysRoleRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_role.SysRole{}
-	r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/role").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysRoleList)
 		r.GET("/:id", api.GetSysRole)

app/admin/router/sys_router.go

@@ -2,18 +2,18 @@ package router
 
 import (
 	"go-admin/app/admin/apis/system/sys_menu"
+	middleware2 "go-admin/common/middleware"
 	"mime"
 
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/ws"
 	"go-admin/app/admin/apis/monitor"
 	"go-admin/app/admin/apis/public"
 	"go-admin/app/admin/apis/system"
 	"go-admin/app/admin/apis/system/dict"
 	. "go-admin/app/admin/apis/tools"
-	"go-admin/app/admin/middleware"
 	"go-admin/app/admin/middleware/handler"
 	_ "go-admin/docs"
-	jwt "go-admin/pkg/jwtauth"
-	"go-admin/pkg/ws"
 
 	"github.com/gin-gonic/gin"
 	ginSwagger "github.com/swaggo/gin-swagger"
@@ -110,7 +110,7 @@ func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 
 func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := sys_menu.SysMenu{}
-	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	v1auth := v1.Group("").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		//v1auth.GET("/getinfo", system.GetInfo)
 		v1auth.GET("/roleMenuTreeselect/:roleId", api.GetMenuTreeSelect)
@@ -160,7 +160,7 @@ func registerBaseRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	dictApi := &dict.SysDictType{}
 	dataApi := &dict.SysDictData{}
-	dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	dicts := v1.Group("/dict").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 
 		dicts.GET("/data", dataApi.GetSysDictDataList)

app/admin/router/sys_user.go

@@ -2,10 +2,10 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/sys_user"
-	"go-admin/app/admin/middleware"
 	"go-admin/common/actions"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -15,7 +15,7 @@ func init() {
 // 需认证的路由代码
 func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_user.SysUser{}
-	r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction())
+	r := v1.Group("/sysUser").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction())
 	{
 		r.GET("", api.GetSysUserList)
 		r.GET("/:id", api.GetSysUser)
@@ -24,7 +24,7 @@ func registerSysUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 		r.DELETE("", api.DeleteSysUser)
 	}
 
-	user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction())
+	user := v1.Group("/user").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()).Use(actions.PermissionAction())
 	{
 		user.GET("/profile", api.GetSysUserProfile)
 		user.POST("/avatar", api.InsetSysUserAvatar)

app/admin/router/syschinaareadata.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/sys_china_area_data"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &sys_china_area_data.SysChinaAreaData{}
-	r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/sys_china_area_data").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetSysChinaAreaDataList)
 		r.GET("/:id", api.GetSysChinaAreaData)
@@ -22,4 +22,4 @@ func registerSysChinaAreaDataRouter(v1 *gin.RouterGroup, authMiddleware *jwt.Gin
 		r.PUT("/:id", api.UpdateSysChinaAreaData)
 		r.DELETE("", api.DeleteSysChinaAreaData)
 	}
-}
+}

app/admin/router/wf_classify.go

@@ -2,9 +2,9 @@ package router
 
 import (
 	"github.com/gin-gonic/gin"
+	jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"go-admin/app/admin/apis/process"
-	"go-admin/app/admin/middleware"
-	jwt "go-admin/pkg/jwtauth"
+	middleware2 "go-admin/common/middleware"
 )
 
 func init() {
@@ -14,7 +14,7 @@ func init() {
 // 需认证的路由代码
 func registerWfProcessClassifyRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
 	api := &process.WfProcessClassify{}
-	r := v1.Group("/process").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
+	r := v1.Group("/process").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
 		r.GET("", api.GetWfProcessClassifyList)
 		r.GET("/:id", api.GetWfProcessClassify)

app/admin/service/dto/sys_file_info.go

@@ -49,4 +49,4 @@ func (s *SysFileInfoControl) Generate() (*models.SysFileInfo, error) {
 type SysFileInfoById struct {
 	dto.ObjectById
 	UpdateBy int `json:"-"`
-}
+}

app/admin/service/sys_dept.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 
 	"gorm.io/gorm"
 
@@ -9,7 +10,6 @@ import (
 	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 	"go-admin/common/service"
-	"go-admin/tools"
 )
 
 type SysDept struct {
@@ -64,7 +64,7 @@ func (e *SysDept) InsertSysDept(model *system.SysDept) error {
 		e.Log.Errorf("db error:%s", err)
 		return err
 	}
-	deptPath := "/" + tools.IntToString(model.DeptId)
+	deptPath := "/" + pkg.IntToString(model.DeptId)
 	if model.ParentId != 0 {
 		var deptP system.SysDept
 		e.Orm.Model(&data).First(&deptP, model.ParentId)

app/admin/service/sys_file_dir.go

@@ -165,4 +165,4 @@ func SysFileDirCall(list *[]models.SysFileDirL, m models.SysFileDirL) models.Sys
 	}
 
 	return m
-}
+}

app/admin/service/sys_job.go

@@ -8,7 +8,6 @@ import (
 	"go-admin/app/jobs"
 	"go-admin/common/dto"
 	"go-admin/common/service"
-	"go-admin/tools/app/msg"
 )
 
 type SysJob struct {
@@ -38,7 +37,7 @@ func (e *SysJob) RemoveJob(c *dto.GeneralDelDto) error {
 			return err
 		}
 	case <-time.After(time.Second * 1):
-		e.Msg = msg.TimeOut
+		e.Msg = "操作超时！"
 		return nil
 	}
 	return nil

app/admin/service/sys_menu.go

@@ -2,11 +2,11 @@ package service
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service/dto"
 	cDto "go-admin/common/dto"
 	"go-admin/common/service"
-	"go-admin/tools"
 	"gorm.io/gorm"
 )
 
@@ -93,9 +93,9 @@ func (e *SysMenu) initPaths(menu *system.SysMenu) error {
 			err = errors.New("父级paths异常，请尝试对当前节点父级菜单进行更新操作！")
 			return err
 		}
-		menu.Paths = parentMenu.Paths + "/" + tools.IntToString(menu.MenuId)
+		menu.Paths = parentMenu.Paths + "/" + pkg.IntToString(menu.MenuId)
 	} else {
-		menu.Paths = "/0/" + tools.IntToString(menu.MenuId)
+		menu.Paths = "/0/" + pkg.IntToString(menu.MenuId)
 	}
 	e.Orm.Model(&data).Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths)
 	return err

app/admin/service/sys_user.go

@@ -27,6 +27,7 @@ func (e *SysUser) GetSysUserPage(c cDto.Index, p *actions.DataPermission, list *
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
 		).
+		Preload("Dept").
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
 	if err != nil {

app/jobs/jobbase.go

@@ -3,16 +3,16 @@ package jobs
 import (
 	"fmt"
 	log "github.com/go-admin-team/go-admin-core/logger"
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"gorm.io/gorm"
 	"sync"
 	"time"
 
 	"github.com/robfig/cron/v3"
 
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/cronjob"
 	"go-admin/app/admin/models"
-	"go-admin/pkg"
-	"go-admin/pkg/cronjob"
 )
 
 var timeFormat = "2006-01-02 15:04:05"
@@ -101,13 +101,13 @@ func Setup(dbs map[string]*gorm.DB) {
 	fmt.Println(time.Now().Format(timeFormat), " [INFO] JobCore Starting...")
 
 	for k, db := range dbs {
-		app.Runtime.SetCrontab(k, cronjob.NewWithSeconds())
+		sdk.Runtime.SetCrontab(k, cronjob.NewWithSeconds())
 		setup(k, db)
 	}
 }
 
 func setup(key string, db *gorm.DB) {
-	crontab := app.Runtime.GetCrontabKey(key)
+	crontab := sdk.Runtime.GetCrontabKey(key)
 	sysJob := models.SysJob{}
 	jobList := make([]models.SysJob, 0)
 	err := sysJob.GetList(db, &jobList)

cmd/api/server.go

@@ -3,7 +3,8 @@ package api
 import (
 	"context"
 	"fmt"
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"log"
 	"net/http"
 	"os"
@@ -14,13 +15,12 @@ import (
 	"github.com/go-admin-team/go-admin-core/config/source/file"
 	"github.com/spf13/cobra"
 
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
 	"go-admin/app/admin/router"
 	"go-admin/app/jobs"
 	"go-admin/common/database"
 	"go-admin/common/global"
-	"go-admin/pkg/logger"
-	"go-admin/tools"
-	"go-admin/tools/config"
 )
 
 var (
@@ -54,7 +54,7 @@ func setup() {
 	config.Setup(file.NewSource, file.WithPath(configYml))
 	go config.Watch()
 	//2. 设置日志
-	app.Runtime.SetLogger(
+	sdk.Runtime.SetLogger(
 		logger.SetupLogger(
 			config.LoggerConfig.Type,
 			config.LoggerConfig.Path,
@@ -70,10 +70,10 @@ func setup() {
 func run() error {
 	defer config.Stop()
 
-	if config.ApplicationConfig.Mode == tools.ModeProd.String() {
+	if config.ApplicationConfig.Mode == pkg.ModeProd.String() {
 		gin.SetMode(gin.ReleaseMode)
 	}
-	engine := app.Runtime.GetEngine()
+	engine := sdk.Runtime.GetEngine()
 	if engine == nil {
 		engine = gin.New()
 	}
@@ -89,11 +89,11 @@ func run() error {
 
 	srv := &http.Server{
 		Addr:    fmt.Sprintf("%s:%d", config.ApplicationConfig.Host, config.ApplicationConfig.Port),
-		Handler: app.Runtime.GetEngine(),
+		Handler: sdk.Runtime.GetEngine(),
 	}
 	go func() {
 		jobs.InitJob()
-		jobs.Setup(app.Runtime.GetDb())
+		jobs.Setup(sdk.Runtime.GetDb())
 
 	}()
 
@@ -112,20 +112,20 @@ func run() error {
 			}
 		}
 	}()
-	fmt.Println(tools.Red(string(global.LogoContent)))
+	fmt.Println(pkg.Red(string(global.LogoContent)))
 	tip()
-	fmt.Println(tools.Green("Server run at:"))
+	fmt.Println(pkg.Green("Server run at:"))
 	fmt.Printf("-  Local:   http://localhost:%d/ \r\n", config.ApplicationConfig.Port)
-	fmt.Printf("-  Network: http://%s:%d/ \r\n", tools.GetLocaHonst(), config.ApplicationConfig.Port)
-	fmt.Println(tools.Green("Swagger run at:"))
+	fmt.Printf("-  Network: http://%s:%d/ \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
+	fmt.Println(pkg.Green("Swagger run at:"))
 	fmt.Printf("-  Local:   http://localhost:%d/swagger/index.html \r\n", config.ApplicationConfig.Port)
-	fmt.Printf("-  Network: http://%s:%d/swagger/index.html \r\n", tools.GetLocaHonst(), config.ApplicationConfig.Port)
-	fmt.Printf("%s Enter Control + C Shutdown Server \r\n", tools.GetCurrentTimeStr())
+	fmt.Printf("-  Network: http://%s:%d/swagger/index.html \r\n", pkg.GetLocaHonst(), config.ApplicationConfig.Port)
+	fmt.Printf("%s Enter Control + C Shutdown Server \r\n", pkg.GetCurrentTimeStr())
 	// 等待中断信号以优雅地关闭服务器（设置 5 秒的超时时间）
 	quit := make(chan os.Signal)
 	signal.Notify(quit, os.Interrupt)
 	<-quit
-	fmt.Printf("%s Shutdown Server ... \r\n", tools.GetCurrentTimeStr())
+	fmt.Printf("%s Shutdown Server ... \r\n", pkg.GetCurrentTimeStr())
 
 	if err := srv.Shutdown(ctx); err != nil {
 		log.Fatal("Server Shutdown:", err)
@@ -136,6 +136,6 @@ func run() error {
 }
 
 func tip() {
-	usageStr := `欢迎使用 ` + tools.Green(`go-admin `+app.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
+	usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令`
 	fmt.Printf("%s \n\n", usageStr)
 }

cmd/cobra.go

@@ -3,7 +3,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"go-admin/common/global"
 	"os"
 
 	"github.com/spf13/cobra"
@@ -12,7 +13,6 @@ import (
 	"go-admin/cmd/config"
 	"go-admin/cmd/migrate"
 	"go-admin/cmd/version"
-	"go-admin/tools"
 )
 
 var rootCmd = &cobra.Command{
@@ -23,7 +23,7 @@ var rootCmd = &cobra.Command{
 	Args: func(cmd *cobra.Command, args []string) error {
 		if len(args) < 1 {
 			tip()
-			return errors.New(tools.Red("requires at least one arg"))
+			return errors.New(pkg.Red("requires at least one arg"))
 		}
 		return nil
 	},
@@ -34,7 +34,7 @@ var rootCmd = &cobra.Command{
 }
 
 func tip() {
-	usageStr := `欢迎使用 ` + tools.Green(`go-admin `+app.Version) + ` 可以使用 ` + tools.Red(`-h`) + ` 查看命令`
+	usageStr := `欢迎使用 ` + pkg.Green(`go-admin `+global.Version) + ` 可以使用 ` + pkg.Red(`-h`) + ` 查看命令`
 	usageStr1 := `也可以参考 http://doc.zhangwj.com/go-admin-site/guide/ksks.html 里边的【启动】章节`
 	fmt.Printf("%s\n", usageStr)
 	fmt.Printf("%s\n", usageStr1)

cmd/config/server.go

@@ -7,7 +7,7 @@ import (
 	"github.com/go-admin-team/go-admin-core/config/source/file"
 	"github.com/spf13/cobra"
 
-	"go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
 )
 
 var (

cmd/migrate/migration/version/dictdata.go

@@ -6,18 +6,18 @@ import (
 
 type DictData struct {
 	DictCode  int    `gorm:"primaryKey;autoIncrement;" json:"dictCode" example:"1"` //字典编码
-	DictSort  int    `gorm:"" json:"dictSort"`                                        //显示顺序
-	DictLabel string `gorm:"size:128;" json:"dictLabel"`                              //数据标签
-	DictValue string `gorm:"size:255;" json:"dictValue"`                              //数据键值
-	DictType  string `gorm:"size:64;" json:"dictType"`                                //字典类型
-	CssClass  string `gorm:"size:128;" json:"cssClass"`                               //
-	ListClass string `gorm:"size:128;" json:"listClass"`                              //
-	IsDefault string `gorm:"size:8;" json:"isDefault"`                                //
-	Status    string `gorm:"size:4;" json:"status"`                                   //状态
-	Default   string `gorm:"size:8;" json:"default"`                                  //
-	CreateBy  string `gorm:"size:64;" json:"createBy"`                                //
-	UpdateBy  string `gorm:"size:64;" json:"updateBy"`                                //
-	Remark    string `gorm:"size:255;" json:"remark"`                                 //备注
+	DictSort  int    `gorm:"" json:"dictSort"`                                      //显示顺序
+	DictLabel string `gorm:"size:128;" json:"dictLabel"`                            //数据标签
+	DictValue string `gorm:"size:255;" json:"dictValue"`                            //数据键值
+	DictType  string `gorm:"size:64;" json:"dictType"`                              //字典类型
+	CssClass  string `gorm:"size:128;" json:"cssClass"`                             //
+	ListClass string `gorm:"size:128;" json:"listClass"`                            //
+	IsDefault string `gorm:"size:8;" json:"isDefault"`                              //
+	Status    string `gorm:"size:4;" json:"status"`                                 //状态
+	Default   string `gorm:"size:8;" json:"default"`                                //
+	CreateBy  string `gorm:"size:64;" json:"createBy"`                              //
+	UpdateBy  string `gorm:"size:64;" json:"updateBy"`                              //
+	Remark    string `gorm:"size:255;" json:"remark"`                               //备注
 	models.BaseModel
 }
 

cmd/migrate/server.go

@@ -3,7 +3,8 @@ package migrate
 import (
 	"bytes"
 	"fmt"
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"strconv"
 	"text/template"
 	"time"
@@ -11,14 +12,13 @@ import (
 	"github.com/go-admin-team/go-admin-core/config/source/file"
 	"github.com/spf13/cobra"
 
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
 	"go-admin/cmd/migrate/migration"
 	_ "go-admin/cmd/migrate/migration/version"
 	_ "go-admin/cmd/migrate/migration/version-local"
 	"go-admin/common/database"
 	"go-admin/common/models"
-	"go-admin/pkg/logger"
-	"go-admin/tools"
-	"go-admin/tools/config"
 )
 
 var (
@@ -51,7 +51,7 @@ func run() {
 		//1. 读取配置
 		config.Setup(file.NewSource, file.WithPath(configYml))
 		//2. 设置日志
-		app.Runtime.SetLogger(
+		sdk.Runtime.SetLogger(
 			logger.SetupLogger(
 				config.LoggerConfig.Type,
 				config.LoggerConfig.Path,
@@ -68,7 +68,7 @@ func migrateModel() error {
 	if host == "" {
 		host = "*"
 	}
-	db := app.Runtime.GetDbByKey(host)
+	db := sdk.Runtime.GetDbByKey(host)
 	if config.DatabasesConfig[host].Driver == "mysql" {
 		//初始化数据库时候用
 		db.Set("gorm:table_options", "ENGINE=InnoDB CHARSET=utf8mb4")
@@ -105,9 +105,9 @@ func genFile() error {
 	var b1 bytes.Buffer
 	err = t1.Execute(&b1, m)
 	if goAdmin {
-		tools.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
+		pkg.FileCreate(b1, "./cmd/migrate/migration/version/"+m["GenerateTime"]+"_migrate.go")
 	} else {
-		tools.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go")
+		pkg.FileCreate(b1, "./cmd/migrate/migration/version-local/"+m["GenerateTime"]+"_migrate.go")
 	}
 	return nil
 }

cmd/version/server.go

@@ -2,9 +2,8 @@ package version
 
 import (
 	"fmt"
-	"go-admin/tools/app"
-
 	"github.com/spf13/cobra"
+	"go-admin/common/global"
 )
 
 var (
@@ -22,6 +21,6 @@ var (
 )
 
 func run() error {
-	fmt.Println(app.Version)
+	fmt.Println(global.Version)
 	return nil
 }

common/actions/create.go

@@ -1,22 +1,23 @@
 package actions
 
 import (
-	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"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/common/apis"
 	"go-admin/common/dto"
 	"go-admin/common/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
 )
 
 // CreateAction 通用新增动作
 func CreateAction(control dto.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		log := apis.GetRequestLogger(c)
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
 			return
@@ -35,7 +36,7 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
 			app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 			return
 		}
-		object.SetCreateBy(tools.GetUserId(c))
+		object.SetCreateBy(user.GetUserId(c))
 		err = db.WithContext(c).Create(object).Error
 		if err != nil {
 			log.Errorf("Create error: %s", err)

common/actions/delete.go

@@ -4,24 +4,25 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-
 	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"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/common/dto"
 	"go-admin/common/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
 )
 
 // DeleteAction 通用删除动作
 func DeleteAction(control dto.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
 			return
 		}
 
-		msgID := tools.GenerateMsgIDFromContext(c)
+		msgID := pkg.GenerateMsgIDFromContext(c)
 		//删除操作
 		req := control.Generate()
 		err = req.Bind(c)
@@ -37,7 +38,7 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 			return
 		}
 
-		object.SetUpdateBy(tools.GetUserId(c))
+		object.SetUpdateBy(user.GetUserId(c))
 
 		//数据权限检查
 		p := GetPermissionFromContext(c)

common/actions/index.go

@@ -5,25 +5,25 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"gorm.io/gorm"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
 	"go-admin/common/dto"
 	"go-admin/common/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
 )
 
 // IndexAction 通用查询动作
 func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
 			return
 		}
 
-		msgID := tools.GenerateMsgIDFromContext(c)
+		msgID := pkg.GenerateMsgIDFromContext(c)
 		list := f()
 		object := m.Generate()
 		req := d.Generate()

common/actions/permission.go

@@ -5,12 +5,12 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gorm.io/gorm"
-
 	log "github.com/go-admin-team/go-admin-core/logger"
-	"go-admin/tools"
-	"go-admin/tools/app"
-	"go-admin/tools/config"
+	"github.com/go-admin-team/go-admin-core/sdk/config"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"gorm.io/gorm"
 )
 
 type DataPermission struct {
@@ -22,15 +22,15 @@ type DataPermission struct {
 
 func PermissionAction() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
 			return
 		}
 
-		msgID := tools.GenerateMsgIDFromContext(c)
+		msgID := pkg.GenerateMsgIDFromContext(c)
 		var p = new(DataPermission)
-		if userId := tools.GetUserIdStr(c); userId != "" {
+		if userId := user.GetUserIdStr(c); userId != "" {
 			p, err = newDataPermission(db, userId)
 			if err != nil {
 				log.Errorf("MsgID[%s] PermissionAction error: %s", msgID, err)
@@ -71,7 +71,7 @@ func Permission(tableName string, p *DataPermission) func(db *gorm.DB) *gorm.DB
 		case "3":
 			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", p.DeptId)
 		case "4":
-			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+tools.IntToString(p.DeptId)+"%")
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(p.DeptId)+"%")
 		case "5":
 			return db.Where(tableName+".create_by = ?", p.UserId)
 		default:

common/actions/update.go

@@ -4,24 +4,25 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-
 	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"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/common/dto"
 	"go-admin/common/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
 )
 
 // UpdateAction 通用更新动作
 func UpdateAction(control dto.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
 			return
 		}
 
-		msgID := tools.GenerateMsgIDFromContext(c)
+		msgID := pkg.GenerateMsgIDFromContext(c)
 		req := control.Generate()
 		//更新操作
 		err = req.Bind(c)
@@ -35,7 +36,7 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 			app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 			return
 		}
-		object.SetUpdateBy(tools.GetUserId(c))
+		object.SetUpdateBy(user.GetUserId(c))
 
 		//数据权限检查
 		p := GetPermissionFromContext(c)

common/actions/view.go

@@ -5,25 +5,25 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"gorm.io/gorm"
 
-	log "github.com/go-admin-team/go-admin-core/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"go-admin/common/dto"
 	"go-admin/common/models"
-	"go-admin/tools"
-	"go-admin/tools/app"
 )
 
 // ViewAction 通用详情动作
 func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		db, err := tools.GetOrm(c)
+		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
 			return
 		}
 
-		msgID := tools.GenerateMsgIDFromContext(c)
+		msgID := pkg.GenerateMsgIDFromContext(c)
 		//查看详情
 		req := control.Generate()
 		err = req.Bind(c)

common/apis/api.go

@@ -2,14 +2,14 @@ package apis
 
 import (
 	"encoding/json"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"go-admin/pkg/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
 	"gorm.io/gorm"
 
 	"go-admin/common/models"
-	"go-admin/tools"
 )
 
 type Api struct {
@@ -22,7 +22,7 @@ func (e *Api) GetLogger(c *gin.Context) *logger.Logger {
 
 // GetOrm 获取Orm DB
 func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
-	db, err := tools.GetOrm(c)
+	db, err := pkg.GetOrm(c)
 	if err != nil {
 		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return nil, err
@@ -39,7 +39,7 @@ func (e *Api) Error(c *gin.Context, code int, err error, msg string) {
 	if msg != "" {
 		res.Msg = msg
 	}
-	res.RequestId = tools.GenerateMsgIDFromContext(c)
+	res.RequestId = pkg.GenerateMsgIDFromContext(c)
 	Return := res.ReturnError(code)
 	e.setResult(c, Return, res.RequestId, code)
 	c.AbortWithStatusJSON(http.StatusOK, Return)
@@ -52,7 +52,7 @@ func (e *Api) OK(c *gin.Context, data interface{}, msg string) {
 	if msg != "" {
 		res.Msg = msg
 	}
-	res.RequestId = tools.GenerateMsgIDFromContext(c)
+	res.RequestId = pkg.GenerateMsgIDFromContext(c)
 	Return := res.ReturnOK()
 	e.setResult(c, Return, res.RequestId, 200)
 	c.AbortWithStatusJSON(http.StatusOK, Return)
@@ -70,7 +70,7 @@ func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex in
 
 // Custom 兼容函数
 func (e *Api) Custom(c *gin.Context, data gin.H) {
-	msgID := tools.GenerateMsgIDFromContext(c)
+	msgID := pkg.GenerateMsgIDFromContext(c)
 	Return := data
 	e.setResult(c, Return, msgID, 200)
 	c.AbortWithStatusJSON(http.StatusOK, Return)

common/apis/request_logger.go

@@ -2,17 +2,17 @@ package apis
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/pkg/logger"
-	"go-admin/tools"
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
 	"strings"
 )
 
 // GetRequestLogger 获取上下文提供的日志
 func GetRequestLogger(c *gin.Context) *logger.Logger {
-	requestId := tools.GenerateMsgIDFromContext(c)
-	log := app.Runtime.GetLogger().Fields(map[string]interface{}{
-		strings.ToLower(tools.TrafficKey): requestId,
+	requestId := pkg.GenerateMsgIDFromContext(c)
+	log := sdk.Runtime.GetLogger().Fields(map[string]interface{}{
+		strings.ToLower(pkg.TrafficKey): requestId,
 	})
 	return &logger.Logger{Logger: log}
 }

common/database/initialize.go

@@ -1,7 +1,9 @@
 package database
 
 import (
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
+	"go-admin/common/global"
 	. "log"
 	"time"
 
@@ -12,9 +14,8 @@ import (
 	"gorm.io/gorm/schema"
 
 	log "github.com/go-admin-team/go-admin-core/logger"
-	mycasbin "go-admin/pkg/casbin"
-	"go-admin/tools"
-	toolsConfig "go-admin/tools/config"
+	toolsConfig "github.com/go-admin-team/go-admin-core/sdk/config"
+	mycasbin "github.com/go-admin-team/go-admin-core/sdk/pkg/casbin"
 )
 
 // Setup 配置数据库
@@ -25,10 +26,10 @@ func Setup() {
 }
 
 func setupSimpleDatabase(host string, c *toolsConfig.Database) {
-	if app.Driver == "" {
-		app.Driver = c.Driver
+	if global.Driver == "" {
+		global.Driver = c.Driver
 	}
-	log.Infof("%s => %s", host, tools.Green(c.Source))
+	log.Infof("%s => %s", host, pkg.Green(c.Source))
 	registers := make([]toolsDB.ResolverConfigure, len(c.Registers))
 	for i := range c.Registers {
 		registers[i] = toolsDB.NewResolverConfigure(
@@ -54,9 +55,9 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
 	}, opens[c.Driver])
 
 	if err != nil {
-		log.Fatal(tools.Red(c.Driver+" connect error :"), err)
+		log.Fatal(pkg.Red(c.Driver+" connect error :"), err)
 	} else {
-		log.Info(tools.Green(c.Driver + " connect success !"))
+		log.Info(pkg.Green(c.Driver + " connect success !"))
 	}
 
 	e := mycasbin.Setup(db, "sys_")
@@ -65,6 +66,6 @@ func setupSimpleDatabase(host string, c *toolsConfig.Database) {
 	//	global.Eloquent = db
 	//}
 
-	app.Runtime.SetDb(host, db)
-	app.Runtime.SetCasbin(host, e)
+	sdk.Runtime.SetDb(host, db)
+	sdk.Runtime.SetCasbin(host, e)
 }

common/dto/search.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/go-admin-team/go-admin-core/tools/search"
-	"go-admin/tools/app"
+	"go-admin/common/global"
 	"gorm.io/gorm"
 )
 
@@ -44,7 +44,7 @@ func MakeCondition(q interface{}) func(db *gorm.DB) *gorm.DB {
 			GormPublic: search.GormPublic{},
 			Join:       make([]*search.GormJoin, 0),
 		}
-		search.ResolveSearchQuery(app.Driver, q, condition)
+		search.ResolveSearchQuery(global.Driver, q, condition)
 		for _, join := range condition.Join {
 			if join == nil {
 				continue

common/file_store/initialize.go

@@ -1,7 +1,6 @@
 package file_store
 
 type FileStore struct {
-
 }
 
 // Setup 配置数据库

common/file_store/interface.go

@@ -3,4 +3,4 @@ package file_store
 type FileStoreType interface {
 	Setup() error
 	UpLoad(yourObjectName string, localFile string) error
-}
+}

common/global/adm.go

@@ -0,0 +1,12 @@
+package global
+
+const (
+	// go-admin Version Info
+	Version = "1.3.0-rc.0"
+)
+
+var (
+	Source string
+	Driver string
+	DBName string
+)

common/global/casbin.go

@@ -3,14 +3,14 @@ package global
 import (
 	"github.com/casbin/casbin/v2"
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"go-admin/common/apis"
-	"go-admin/tools/app"
 )
 
 func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
 	log := apis.GetRequestLogger(c)
-	if err := app.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
-		return app.Runtime.GetCasbinKey(c.Request.Host), err
+	if err := sdk.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
+		return sdk.Runtime.GetCasbinKey(c.Request.Host), err
 	} else {
 		log.Errorf("casbin rbac_model or policy init error, %s ", err.Error())
 		return nil, err

common/middleware/db.go

@@ -2,10 +2,10 @@ package middleware
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
 )
 
 func WithContextDb(c *gin.Context) {
-	c.Set("db", app.Runtime.GetDbByKey(c.Request.Host))
+	c.Set("db", sdk.Runtime.GetDbByKey(c.Request.Host))
 	c.Next()
 }

common/middleware/log.go

@@ -1,9 +0,0 @@
-package middleware
-
-import "github.com/gin-gonic/gin"
-
-func SetLogger() gin.HandlerFunc {
-	return func(ctx *gin.Context) {
-
-	}
-}

common/middleware/permission.go

@@ -1,13 +1,14 @@
 package middleware
 
 import (
-	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 
-	"go-admin/pkg/jwtauth"
-	"go-admin/tools/app"
+	"go-admin/common/apis"
 )
 
 //权限检查中间件
@@ -16,7 +17,7 @@ func AuthCheckRole() gin.HandlerFunc {
 		log := apis.GetRequestLogger(c)
 		data, _ := c.Get(jwtauth.JwtPayloadKey)
 		v := data.(jwtauth.MapClaims)
-		e := app.Runtime.GetCasbinKey(c.Request.Host)
+		e := sdk.Runtime.GetCasbinKey(c.Request.Host)
 		var res bool
 		var err error
 		//检查权限

common/models/by.go

@@ -27,4 +27,4 @@ type ModelTime struct {
 	CreatedAt time.Time      `json:"createdAt" gorm:"comment:创建时间"`
 	UpdatedAt time.Time      `json:"updatedAt" gorm:"comment:最后更新时间"`
 	DeletedAt gorm.DeletedAt `json:"-" gorm:"index;comment:删除时间"`
-}
+}

common/models/response.go

@@ -27,4 +27,4 @@ func (res *Response) ReturnOK() *Response {
 func (res *Response) ReturnError(code int) *Response {
 	res.Code = code
 	return res
-}
+}

common/models/user.go

@@ -3,7 +3,7 @@ package models
 import (
 	"gorm.io/gorm"
 
-	"go-admin/pkg"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 )
 
 // BaseUser 密码登录基础用户

common/service/service.go

@@ -1,7 +1,7 @@
 package service
 
 import (
-	"go-admin/pkg/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
 	"gorm.io/gorm"
 )
 

examples/run.go

@@ -3,13 +3,13 @@
 package main
 
 import (
-	"go-admin/tools/app"
+	"github.com/go-admin-team/go-admin-core/sdk"
 	"log"
 
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 
-	myCasbin "go-admin/pkg/casbin"
+	myCasbin "github.com/go-admin-team/go-admin-core/sdk/pkg/casbin"
 	"gorm.io/driver/mysql"
 )
 
@@ -19,10 +19,10 @@ func main() {
 		panic(err)
 	}
 	syncEnforce := myCasbin.Setup(db, "sys_")
-	app.Runtime.SetDb("*", db)
-	app.Runtime.SetCasbin("*", syncEnforce)
+	sdk.Runtime.SetDb("*", db)
+	sdk.Runtime.SetCasbin("*", syncEnforce)
 
 	e := gin.Default()
-	app.Runtime.SetEngine(e)
+	sdk.Runtime.SetEngine(e)
 	log.Fatal(e.Run(":8000"))
 }

go.mod

@@ -6,37 +6,27 @@ require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/alibaba/sentinel-golang v0.6.1
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
-	github.com/casbin/casbin/v2 v2.24.0
-	github.com/casbin/gorm-adapter/v3 v3.0.2
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/casbin/casbin/v2 v2.25.1
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-admin-team/go-admin-core v1.2.3-0.20210305064904-6d101c8bc904
-	github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210305064904-6d101c8bc904
-	github.com/go-redis/redis/v7 v7.4.0
-	github.com/google/uuid v1.1.2
-	github.com/gorilla/websocket v1.4.2
+	github.com/go-admin-team/go-admin-core v1.3.0-rc.0.0.20210309094332-92435b42cec0
+	github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210309094332-92435b42cec0 // indirect
+	github.com/go-admin-team/go-admin-core/sdk v0.0.0-20210310033039-117243556307
+	github.com/google/uuid v1.2.0
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/mssola/user_agent v0.5.2
-	github.com/opentracing/basictracer-go v1.1.0 // indirect
 	github.com/opentracing/opentracing-go v1.1.0
 	github.com/prometheus/client_golang v1.1.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/robinjoseph08/redisqueue/v2 v2.1.0
-	github.com/satori/go.uuid v1.2.0
-	github.com/shamsher31/goimgext v1.0.0
 	github.com/shirou/gopsutil v2.20.7+incompatible
-	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
-	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
 	github.com/spf13/cast v1.3.1
 	github.com/spf13/cobra v1.0.0
 	github.com/swaggo/gin-swagger v1.2.0
 	github.com/swaggo/swag v1.6.7
 	github.com/unrolled/secure v1.0.8
-	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
+	golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
 	gorm.io/driver/mysql v1.0.4-0.20201206014609-ae5fd10184f6
 	gorm.io/driver/postgres v1.0.6-0.20201208020313-1ed927cfab53
 	gorm.io/driver/sqlite v1.1.5-0.20201206014648-c84401fbe3ba
-	gorm.io/gorm v1.20.12
-	sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0
-	sourcegraph.com/sourcegraph/appdash-data v0.0.0-20151005221446-73f23eafcf67 // indirect
+	gorm.io/gorm v1.21.3
 )