publish🚀 v1.3.0

注意：系统配置表将设置为过时功能

app/admin/apis/monitor/server.go

@@ -1,11 +1,11 @@
 package monitor
 
 import (
+	"go-admin/common/apis"
 	"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"
@@ -18,12 +18,16 @@ const (
 	GB = 1024 * MB
 )
 
+type Monitor struct {
+	apis.Api
+}
+
 // @Summary 系统信息
 // @Description 获取JSON
 // @Tags 系统信息
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/settings/serverInfo [get]
-func ServerInfo(c *gin.Context) {
+func (e *Monitor) ServerInfo(c *gin.Context) {
 
 	osDic := make(map[string]interface{}, 0)
 	osDic["goOs"] = runtime.GOOS
@@ -59,7 +63,7 @@ func ServerInfo(c *gin.Context) {
 	cpuDic["Percent"] = pkg.Round(percent[0], 2)
 	cpuDic["cpuNum"], _ = cpu.Counts(false)
 
-	app.Custum(c, gin.H{
+	e.Custom(c, gin.H{
 		"code": 200,
 		"os":   osDic,
 		"mem":  memDic,

app/admin/apis/public/file.go

@@ -9,10 +9,10 @@ import (
 
 	"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"
 
+	"go-admin/common/apis"
 	"go-admin/common/file_store"
 )
 
@@ -24,6 +24,10 @@ type FileResponse struct {
 	Type     string `json:"type"`
 }
 
+type File struct {
+	apis.Api
+}
+
 // @Summary 上传图片
 // @Description 获取JSON
 // @Tags 公共接口
@@ -33,35 +37,36 @@ type FileResponse struct {
 // @Success 200 {string} string	"{"code": 200, "message": "添加成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/public/uploadFile [post]
-func UploadFile(c *gin.Context) {
+func (e *File) UploadFile(c *gin.Context) {
 	tag, _ := c.GetPostForm("type")
 	urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host)
 	var fileResponse FileResponse
 	if tag == "" {
-		app.Error(c, 200, errors.New(""), "缺少标识")
+		e.Error(c, 500, nil, "缺少标识")
+		//app.Error(c, 200, errors.New(""), "缺少标识")
 		return
 	} else {
 		switch tag {
 		case "1": // 单图
 			var done bool
-			fileResponse, done = singleFile(c, fileResponse, urlPerfix)
+			fileResponse, done = e.singleFile(c, fileResponse, urlPerfix)
 			if done {
 				return
 			}
-			app.OK(c, fileResponse, "上传成功")
+			e.OK(c, fileResponse, "上传成功")
 			return
 		case "2": // 多图
-			multipartFile := multipleFile(c, urlPerfix)
-			app.OK(c, multipartFile, "上传成功")
+			multipartFile := e.multipleFile(c, urlPerfix)
+			e.OK(c, multipartFile, "上传成功")
 			return
 		case "3": // base64
-			fileResponse = baseImg(c, fileResponse, urlPerfix)
-			app.OK(c, fileResponse, "上传成功")
+			fileResponse = e.baseImg(c, fileResponse, urlPerfix)
+			e.OK(c, fileResponse, "上传成功")
 		}
 	}
 }
 
-func baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileResponse {
+func (e *File) baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileResponse {
 	files, _ := c.GetPostForm("file")
 	file2list := strings.Split(files, ",")
 	ddd, _ := base64.StdEncoding.DecodeString(file2list[1])
@@ -80,7 +85,7 @@ func baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileRe
 	source, _ := c.GetPostForm("source")
 	err := thirdUpload(source, fileName, base64File)
 	if err != nil {
-		app.Error(c, 200, errors.New(""), "上传第三方失败")
+		e.Error(c, 200, errors.New(""), "上传第三方失败")
 		return fileResponse
 	}
 	if source != "1" {
@@ -90,7 +95,7 @@ func baseImg(c *gin.Context, fileResponse FileResponse, urlPerfix string) FileRe
 	return fileResponse
 }
 
-func multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
+func (e *File) multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
 	files := c.Request.MultipartForm.File["file"]
 	source, _ := c.GetPostForm("source")
 	var multipartFile []FileResponse
@@ -98,12 +103,12 @@ func multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
 		guid := uuid.New().String()
 		fileName := guid + utils.GetExt(f.Filename)
 		multipartFileName := "static/uploadfile/" + fileName
-		e := c.SaveUploadedFile(f, multipartFileName)
+		err1 := c.SaveUploadedFile(f, multipartFileName)
 		fileType, _ := utils.GetType(multipartFileName)
-		if e == nil {
+		if err1 == nil {
 			err := thirdUpload(source, fileName, multipartFileName)
 			if err != nil {
-				app.Error(c, 200, errors.New(""), "上传第三方失败")
+				e.Error(c, 500, errors.New(""), "上传第三方失败")
 			} else {
 				fileResponse := FileResponse{
 					Size:     pkg.GetFileSize(multipartFileName),
@@ -123,11 +128,11 @@ func multipleFile(c *gin.Context, urlPerfix string) []FileResponse {
 	return multipartFile
 }
 
-func singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix string) (FileResponse, bool) {
+func (e *File) singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix string) (FileResponse, bool) {
 	files, err := c.FormFile("file")
 
 	if err != nil {
-		app.Error(c, 200, errors.New(""), "图片不能为空")
+		e.Error(c, 200, errors.New(""), "图片不能为空")
 		return FileResponse{}, true
 	}
 	// 上传文件至指定目录
@@ -147,7 +152,7 @@ func singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix string) (Fi
 	source, _ := c.GetPostForm("source")
 	err = thirdUpload(source, fileName, singleFile)
 	if err != nil {
-		app.Error(c, 200, errors.New(""), "上传第三方失败")
+		e.Error(c, 200, errors.New(""), "上传第三方失败")
 		return FileResponse{}, true
 	}
 	fileResponse.Path = "https://youshikeji.oss-cn-shanghai.aliyuncs.com/img/" + fileName

app/admin/apis/sys_job/sys_job.go

@@ -5,8 +5,6 @@ import (
 
 	"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"
@@ -41,7 +39,7 @@ func (e *SysJob) RemoveJobForService(c *gin.Context) {
 		e.Error(c, http.StatusInternalServerError, err, "")
 		return
 	}
-	app.OK(c, nil, s.Msg)
+	e.OK(c, nil, s.Msg)
 }
 
 // StartJobForService 启动job service实现
@@ -69,5 +67,5 @@ func (e *SysJob) StartJobForService(c *gin.Context) {
 		e.Error(c, http.StatusInternalServerError, err, "")
 		return
 	}
-	app.OK(c, nil, s.Msg)
+	e.OK(c, nil, s.Msg)
 }

app/admin/apis/system/captcha.go

@@ -2,15 +2,23 @@ package system
 
 import (
 	"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/captcha"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
+	"go-admin/common/apis"
 )
 
-func GenerateCaptchaHandler(c *gin.Context) {
+type System struct {
+	apis.Api
+}
+
+func (e *System) GenerateCaptchaHandler(c *gin.Context) {
+	log := e.GetLogger(c)
 	id, b64s, err := captcha.DriverDigitFunc()
-	pkg.HasError(err, "验证码获取失败", 500)
-	app.Custum(c, gin.H{
+	if err != nil {
+		log.Errorf("DriverDigitFunc error, %s", err.Error())
+		e.Error(c, 500, err, "验证码获取失败")
+		return
+	}
+	e.Custom(c, gin.H{
 		"code": 200,
 		"data": b64s,
 		"id":   id,

app/admin/apis/system/index.go

@@ -28,7 +28,7 @@ $(function(){
 </script>
 </head>
 <body>
-<iframe id="iframe" frameborder="0" src="http://doc.zhangwj.com/go-admin-site/" style="width:100%;"></iframe>
+<iframe id="iframe" frameborder="0" src="https://doc.go-admin.dev" style="width:100%;"></iframe>
 </body>
 </html>
 `
@@ -36,4 +36,4 @@ $(function(){
 func HelloWorld(c *gin.Context) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	c.String(200, INDEX)
-}
+}

app/admin/apis/system/sys_config/sys_config.go

@@ -5,7 +5,6 @@ import (
 
 	"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"
@@ -30,7 +29,7 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) {
 	err = d.Bind(c)
 	if err != nil {
 		log.Errorf("参数验证失败, error:%s", err)
-		app.Error(c, 500, err, "参数验证失败")
+		e.Error(c, 500, err, "参数验证失败")
 		return
 	}
 
@@ -42,12 +41,52 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) {
 	err = s.GetSysConfigPage(d, &list, &count)
 	if err != nil {
 		log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
-		app.Error(c, 500, err, "查询失败")
+		e.Error(c, 500, err, "查询失败")
 		return
 	}
 	e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
 }
 
+// GetSysConfigBySysApp 获取系统配置信息，主要注意这里不在验证数据权限
+func (e *SysConfig) GetSysConfigBySysApp(c *gin.Context) {
+	log := e.GetLogger(c)
+	d := new(dto.SysConfigSearch)
+	db, err := e.GetOrm(c)
+	if err != nil {
+		log.Error(err)
+		return
+	}
+	err = d.Bind(c)
+	if err != nil {
+		log.Errorf("参数验证失败, error:%s", err)
+		e.Error(c, 500, err, "参数验证失败")
+		return
+	}
+	
+	// 控制只读前台的数据
+	d.IsFrontend = 1
+
+
+	list := make([]system.SysConfig, 0)
+	s := service.SysConfig{}
+	s.Log = log
+	s.Orm = db
+	err = s.GetSysConfigByKey(d, &list)
+	if err != nil {
+		log.Errorf("GetSysConfigPage 查询失败, error:%s", err)
+		e.Error(c, 500, err, "查询失败")
+		return
+	}
+	mp := make(map[string]string)
+	for i := 0; i < len(list); i++ {
+		key := list[i].ConfigKey
+		if key != "" {
+			mp[key] = list[i].ConfigValue
+		}
+	}
+	e.OK(c, mp, "查询成功")
+}
+
 func (e *SysConfig) GetSysConfig(c *gin.Context) {
 	log := e.GetLogger(c)
 	control := new(dto.SysConfigById)
@@ -61,7 +100,7 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) {
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	var object system.SysConfig
@@ -73,7 +112,7 @@ func (e *SysConfig) GetSysConfig(c *gin.Context) {
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 
@@ -94,14 +133,14 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) {
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	object, err := control.Generate()
 	if err != nil {
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	// 设置创建人
@@ -115,7 +154,7 @@ func (e *SysConfig) InsertSysConfig(c *gin.Context) {
 		log.Error(err)
 		e.Error(c, http.StatusInternalServerError, err, "创建失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 
@@ -137,14 +176,14 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	object, err := control.Generate()
 	if err != nil {
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	object.SetUpdateBy(user.GetUserId(c))
@@ -156,7 +195,7 @@ func (e *SysConfig) UpdateSysConfig(c *gin.Context) {
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "更新失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	e.OK(c, object.GetId(), "更新成功")
@@ -177,14 +216,14 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
 		log.Errorf("Bind error: %s", err)
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	object, err := control.GenerateM()
 	if err != nil {
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 
@@ -198,7 +237,7 @@ func (e *SysConfig) DeleteSysConfig(c *gin.Context) {
 	if err != nil {
 		e.Error(c, http.StatusUnprocessableEntity, err, "删除失败")
 		log.Errorf("Orm获取失败, error:%s", err)
-		app.Error(c, 500, err, "Orm获取失败")
+		e.Error(c, 500, err, "Orm获取失败")
 		return
 	}
 	e.OK(c, object.GetId(), "删除成功")
@@ -216,7 +255,7 @@ func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
 	err = v.Bind(c)
 	if err != nil {
 		log.Errorf("参数验证错误, error:%s", err)
-		app.Error(c, 422, err, "参数验证失败")
+		e.Error(c, 422, err, "参数验证失败")
 		return
 	}
 	s := service.SysConfig{}
@@ -225,8 +264,8 @@ func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
 	err = s.GetSysConfigByKEY(&v)
 	if err != nil {
 		log.Errorf("通过Key获取配置失败, error:%s", err)
-		app.Error(c, 500, err, "")
+		e.Error(c, 500, err, "")
 		return
 	}
-	app.OK(c, v, s.Msg)
-}
+	e.OK(c, v, s.Msg)
+}

app/admin/apis/tools/dbcolumns.go

@@ -5,10 +5,8 @@ import (
 
 	"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"
-	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据 / page list data
@@ -19,8 +17,8 @@ import (
 // @Param pageIndex query int false "pageIndex / 页码"
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/db/columns/page [get]
-func GetDBColumnList(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
+func (e *Gen) GetDBColumnList(c *gin.Context) {
+	log := e.GetLogger(c)
 	var data tools.DBColumns
 	var err error
 	var pageSize = 10
@@ -37,23 +35,17 @@ func GetDBColumnList(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	data.TableName = c.Request.FormValue("tableName")
 	pkg.Assert(data.TableName == "", "table name cannot be empty！", 500)
 	result, count, err := data.GetPage(db, pageSize, pageIndex)
-	pkg.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
+	if err != nil {
+		log.Errorf("GetPage error, %s", err.Error())
+		e.Error(c, 500, err, "")
+		return
+	}
+	e.PageOK(c, result, count, pageIndex, pageSize, "查询成功")
 }

app/admin/apis/tools/dbtables.go

@@ -1,15 +1,14 @@
 package tools
 
 import (
+	"errors"
 	"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"
-	"go-admin/common/apis"
 )
 
 // @Summary 分页列表数据 / page list data
@@ -20,16 +19,18 @@ import (
 // @Param pageIndex query int false "pageIndex / 页码"
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/db/tables/page [get]
-func GetDBTableList(c *gin.Context) {
-	var res app.Response
+func (e *Gen) GetDBTableList(c *gin.Context) {
+	//var res app.Response
 	var data tools.DBTables
 	var err error
 	var pageSize = 10
 	var pageIndex = 1
-	log := apis.GetRequestLogger(c)
+	log := e.GetLogger(c)
 	if config.DatabaseConfig.Driver == "sqlite3" || config.DatabaseConfig.Driver == "postgres" {
-		res.Msg = "对不起，sqlite3 或 postgres 不支持代码生成！"
-		c.JSON(http.StatusOK, res.ReturnError(500))
+		err = errors.New("对不起，sqlite3 或 postgres 不支持代码生成！")
+		log.Warn(err)
+		e.Error(c, 403, err, "")
+		//c.JSON(http.StatusOK, res.ReturnError(500))
 		return
 	}
 
@@ -44,21 +45,16 @@ func GetDBTableList(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	data.TableName = c.Request.FormValue("tableName")
 	result, count, err := data.GetPage(db, pageSize, pageIndex)
-	pkg.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
+	if err != nil {
+		log.Errorf("GetPage error, %s", err.Error())
+		e.Error(c, 500, err, "")
+		return
+	}
+	e.PageOK(c, result, count, pageIndex, pageSize, "查询成功")
 }

app/admin/apis/tools/gen.go

@@ -6,40 +6,76 @@ import (
 	"text/template"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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"
 	"go-admin/common/apis"
 )
 
-func Preview(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
+type Gen struct {
+	apis.Api
+}
+
+func (e *Gen) Preview(c *gin.Context) {
+	log := e.GetLogger(c)
 	table := tools.SysTables{}
 	id, err := pkg.StringToInt(c.Param("tableId"))
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	table.TableId = id
 	t1, err := template.ParseFiles("template/v4/model.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t2, err := template.ParseFiles("template/v4/no_actions/apis.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t3, err := template.ParseFiles("template/v4/js.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t4, err := template.ParseFiles("template/v4/vue.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t5, err := template.ParseFiles("template/v4/no_actions/router_check_role.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t6, err := template.ParseFiles("template/v4/dto.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t7, err := template.ParseFiles("template/v4/no_actions/service.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -67,22 +103,23 @@ func Preview(c *gin.Context) {
 	mp["template/router.go.template"] = b5.String()
 	mp["template/dto.go.template"] = b6.String()
 	mp["template/service.go.template"] = b7.String()
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
+	e.OK(c, mp, "")
 }
 
-func GenCodeV3(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
+func (e *Gen) GenCodeV3(c *gin.Context) {
+	log := e.GetLogger(c)
 	table := tools.SysTables{}
 	id, err := pkg.StringToInt(c.Param("tableId"))
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -90,15 +127,16 @@ func GenCodeV3(c *gin.Context) {
 	tab, _ := table.Get(db)
 
 	if tab.IsActions == 1 {
-		ActionsGenV3(tab)
+		e.ActionsGenV3(c, tab)
 	} else {
-		NOActionsGenV3(tab)
+		e.NOActionsGenV3(c, tab)
 	}
 
-	app.OK(c, "", "Code generated successfully！")
+	e.OK(c, "", "Code generated successfully！")
 }
 
-func NOActionsGenV3(tab tools.SysTables) {
+func (e *Gen) NOActionsGenV3(c *gin.Context, tab tools.SysTables) {
+	log := e.GetLogger(c)
 
 	basePath := "template/v4/"
 	routerFile := basePath + "no_actions/router_check_role.go.template"
@@ -108,19 +146,47 @@ func NOActionsGenV3(tab tools.SysTables) {
 	}
 
 	t1, err := template.ParseFiles(basePath + "model.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t2, err := template.ParseFiles(basePath + "no_actions/apis.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t3, err := template.ParseFiles(routerFile)
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t4, err := template.ParseFiles(basePath + "js.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t7, err := template.ParseFiles(basePath + "no_actions/service.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/apis/" + tab.ModuleName)
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
@@ -153,7 +219,8 @@ func NOActionsGenV3(tab tools.SysTables) {
 
 }
 
-func ActionsGenV3(tab tools.SysTables) {
+func (e *Gen) ActionsGenV3(c *gin.Context, tab tools.SysTables) {
+	log := api.GetRequestLogger(c)
 	basePath := "template/v4/"
 	routerFile := basePath + "actions/router_check_role.go.template"
 
@@ -162,15 +229,35 @@ func ActionsGenV3(tab tools.SysTables) {
 	}
 
 	t1, err := template.ParseFiles(basePath + "model.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t3, err := template.ParseFiles(routerFile)
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t4, err := template.ParseFiles(basePath + "js.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t5, err := template.ParseFiles(basePath + "vue.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 	t6, err := template.ParseFiles(basePath + "dto.go.template")
-	pkg.HasError(err, "", -1)
+	if err != nil {
+		log.Error(err)
+		e.Error(c, 500, err, "")
+		return
+	}
 
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/models/")
 	_ = pkg.PathCreate("./app/" + tab.PackageName + "/router/")
@@ -196,8 +283,8 @@ func ActionsGenV3(tab tools.SysTables) {
 	pkg.FileCreate(b6, "./app/"+tab.PackageName+"/service/dto/"+tab.BusinessName+".go")
 }
 
-func GenMenuAndApi(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
+func (e *Gen) GenMenuAndApi(c *gin.Context) {
+	log := api.GetRequestLogger(c)
 
 	table := tools.SysTables{}
 	timeNow := pkg.GetCurrentTime()
@@ -207,7 +294,7 @@ func GenMenuAndApi(c *gin.Context) {
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -437,5 +524,5 @@ func GenMenuAndApi(c *gin.Context) {
 	ADelete.UpdatedAt = timeNow
 	ADelete.MenuId, err = ADelete.Create(db)
 
-	app.OK(c, "", "数据生成成功！")
-}
+	e.OK(c, "", "数据生成成功！")
+}

app/admin/apis/tools/systables.go

@@ -7,13 +7,16 @@ import (
 	"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"
 	"go-admin/common/apis"
 )
 
+type SysTable struct {
+	apis.Api
+}
+
 // @Summary 分页列表数据
 // @Description 生成表分页列表
 // @Tags 工具 - 生成表
@@ -22,8 +25,8 @@ import (
 // @Param pageIndex query int false "pageIndex / 页码"
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/page [get]
-func GetSysTableList(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
+func (e *SysTable) GetSysTableList(c *gin.Context) {
+	log := e.GetLogger(c)
 	var data tools.SysTables
 	var err error
 	var pageSize = 10
@@ -37,28 +40,22 @@ func GetSysTableList(c *gin.Context) {
 		pageIndex, err = pkg.StringToInt(index)
 	}
 
-	db, err := pkg.GetOrm(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	data.TBName = c.Request.FormValue("tableName")
 	data.TableComment = c.Request.FormValue("tableComment")
 	result, count, err := data.GetPage(db, pageSize, pageIndex)
-	pkg.HasError(err, "", -1)
-
-	var mp = make(map[string]interface{}, 3)
-	mp["list"] = result
-	mp["count"] = count
-	mp["pageIndex"] = pageIndex
-	mp["pageSize"] = pageSize
-
-	var res app.Response
-	res.Data = mp
-
-	c.JSON(http.StatusOK, res.ReturnOK())
+	if err != nil {
+		log.Errorf("GetPage error, %s", err.Error())
+		e.Error(c, 500, err, "")
+		return
+	}
+	e.PageOK(c, result, count, pageIndex, pageSize, "查询成功")
 }
 
 // @Summary 获取配置
@@ -68,35 +65,36 @@ func GetSysTableList(c *gin.Context) {
 // @Success 200 {object} app.Response "{"code": 200, "data": [...]}"
 // @Router /api/v1/sys/tables/info/{tableId} [get]
 // @Security Bearer
-func GetSysTables(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
-	db, err := pkg.GetOrm(c)
+func (e *SysTable) GetSysTables(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	var data tools.SysTables
 	data.TableId, _ = pkg.StringToInt(c.Param("tableId"))
 	result, err := data.Get(db)
-	pkg.HasError(err, "抱歉未找到相关信息", -1)
+	if err != nil {
+		log.Errorf("Get error, %s", err.Error())
+		e.Error(c, 500, err, "")
+		return
+	}
 
-	var res app.Response
-	res.Data = result
 	mp := make(map[string]interface{})
 	mp["list"] = result.Columns
 	mp["info"] = result
-	res.Data = mp
-	c.JSON(http.StatusOK, res.ReturnOK())
+	e.OK(c, mp, "")
 }
 
-func GetSysTablesInfo(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
-	db, err := pkg.GetOrm(c)
+func (e *SysTable) GetSysTablesInfo(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -105,33 +103,38 @@ func GetSysTablesInfo(c *gin.Context) {
 		data.TBName = c.Request.FormValue("tableName")
 	}
 	result, err := data.Get(db)
-	pkg.HasError(err, "抱歉未找到相关信息", -1)
+	if err != nil {
+		log.Errorf("Get error, %s", err.Error())
+		e.Error(c, 500, err, "抱歉未找到相关信息")
+		return
+	}
 
-	var res app.Response
-	res.Data = result
 	mp := make(map[string]interface{})
 	mp["list"] = result.Columns
 	mp["info"] = result
-	res.Data = mp
-	c.JSON(http.StatusOK, res.ReturnOK())
+	e.OK(c, mp, "")
+	//res.Data = mp
+	//c.JSON(http.StatusOK, res.ReturnOK())
 }
 
-func GetSysTablesTree(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
-	db, err := pkg.GetOrm(c)
+func (e *SysTable) GetSysTablesTree(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	var data tools.SysTables
 	result, err := data.GetTree(db)
-	pkg.HasError(err, "抱歉未找到相关信息", -1)
+	if err != nil {
+		log.Errorf("GetTree error, %s", err.Error())
+		e.Error(c, 500, err, "抱歉未找到相关信息")
+		return
+	}
 
-	var res app.Response
-	res.Data = result
-	c.JSON(http.StatusOK, res.ReturnOK())
+	e.OK(c, result, "")
 }
 
 // @Summary 添加表结构
@@ -144,12 +147,12 @@ func GetSysTablesTree(c *gin.Context) {
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/sys/tables/info [post]
 // @Security Bearer
-func InsertSysTable(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
-	db, err := pkg.GetOrm(c)
+func (e *SysTable) InsertSysTable(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -157,13 +160,20 @@ func InsertSysTable(c *gin.Context) {
 	for i := 0; i < len(tablesList); i++ {
 
 		data, err := genTableInit(db, tablesList, i, c)
+		if err != nil {
+			log.Errorf("genTableInit error, %s", err.Error())
+			e.Error(c, 500, err, "")
+			return
+		}
 
 		_, err = data.Create(db)
-		pkg.HasError(err, "", -1)
+		if err != nil {
+			log.Errorf("Create error, %s", err.Error())
+			e.Error(c, 500, err, "")
+			return
+		}
 	}
-	var res app.Response
-	res.Msg = "添加成功！"
-	c.JSON(http.StatusOK, res.ReturnOK())
+	e.OK(c, nil, "添加成功")
 
 }
 
@@ -176,6 +186,9 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 
 	dbTable.TableName = data.TBName
 	dbtable, err := dbTable.Get(tx)
+	if err != nil {
+		return data, err
+	}
 
 	dbColumn.TableName = data.TBName
 	tablenamelist := strings.Split(dbColumn.TableName, "_")
@@ -277,27 +290,27 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 // @Success 200 {string} string	"{"code": -1, "message": "添加失败"}"
 // @Router /api/v1/sys/tables/info [put]
 // @Security Bearer
-func UpdateSysTable(c *gin.Context) {
+func (e *SysTable) UpdateSysTable(c *gin.Context) {
 	var data tools.SysTables
 	err := c.Bind(&data)
 	pkg.HasError(err, "数据解析失败", 500)
 
-	log := apis.GetRequestLogger(c)
-	db, err := pkg.GetOrm(c)
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	data.UpdateBy = user.GetUserIdStr(c)
 	result, err := data.Update(db)
-	pkg.HasError(err, "", -1)
-
-	var res app.Response
-	res.Data = result
-	res.Msg = "修改成功"
-	c.JSON(http.StatusOK, res.ReturnOK())
+	if err != nil {
+		log.Errorf("Update error, %s", err.Error())
+		e.Error(c, 500, err, "")
+		return
+	}
+	e.OK(c, result, "修改成功")
 }
 
 // @Summary 删除表结构
@@ -307,20 +320,22 @@ func UpdateSysTable(c *gin.Context) {
 // @Success 200 {string} string	"{"code": 200, "message": "删除成功"}"
 // @Success 200 {string} string	"{"code": -1, "message": "删除失败"}"
 // @Router /api/v1/sys/tables/info/{tableId} [delete]
-func DeleteSysTables(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
-	db, err := pkg.GetOrm(c)
+func (e *SysTable) DeleteSysTables(c *gin.Context) {
+	log := e.GetLogger(c)
+	db, err := e.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		e.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
 	var data tools.SysTables
 	IDS := pkg.IdsStrToIdsIntGroup("tableId", c)
 	_, err = data.BatchDelete(db, IDS)
-	pkg.HasError(err, "删除失败", 500)
-	var res app.Response
-	res.Msg = "删除成功"
-	c.JSON(http.StatusOK, res.ReturnOK())
+	if err != nil {
+		log.Errorf("BatchDelete error, %s", err.Error())
+		e.Error(c, 500, err, "删除失败")
+		return
+	}
+	e.OK(c, nil, "删除成功")
 }

app/admin/middleware/handler/auth.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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"
@@ -14,7 +15,6 @@ import (
 
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
-	"go-admin/common/apis"
 )
 
 var store = base64Captcha.DefaultMemStore
@@ -60,11 +60,11 @@ func IdentityHandler(c *gin.Context) interface{} {
 // @Success 200 {string} string "{"code": 200, "expire": "2019-08-07T12:45:48+08:00", "token": ".eyJleHAiOjE1NjUxNTMxNDgsImlkIjoiYWRtaW4iLCJvcmlnX2lhdCI6MTU2NTE0OTU0OH0.-zvzHvbg0A" }"
 // @Router /login [post]
 func Authenticator(c *gin.Context) (interface{}, error) {
-	log := apis.GetRequestLogger(c)
+	log := api.GetRequestLogger(c)
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		response.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return nil, jwt.ErrFailedAuthentication
 	}
 
@@ -107,7 +107,7 @@ func Authenticator(c *gin.Context) (interface{}, error) {
 
 // LoginLogToDB Write log to database
 func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
-	log := apis.GetRequestLogger(c)
+	log := api.GetRequestLogger(c)
 	if config.LoggerConfig.EnabledDB {
 		var loginLog system.SysLoginLog
 		db, err := pkg.GetOrm(c)
@@ -143,7 +143,7 @@ func LoginLogToDB(c *gin.Context, status string, msg string, username string) {
 // @Router /logout [post]
 // @Security Bearer
 func LogOut(c *gin.Context) {
-	log := apis.GetRequestLogger(c)
+	log := api.GetRequestLogger(c)
 	var loginLog system.SysLoginLog
 	ua := user_agent.New(c.Request.UserAgent())
 	loginLog.Ipaddr = c.ClientIP()

app/admin/middleware/logger.go

@@ -1,12 +1,14 @@
 package middleware
 
 import (
+	"encoding/json"
 	"fmt"
 	"net/http"
 	"strings"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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"
@@ -15,21 +17,23 @@ import (
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/models/system"
 	"go-admin/app/admin/service"
-	"go-admin/common/apis"
 )
 
 // LoggerToFile 日志记录到文件
 func LoggerToFile() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		defer c.Next()
-		if c.Request.Method == http.MethodOptions {
-			return
-		}
-		log := apis.GetRequestLogger(c)
 		// 开始时间
 		startTime := time.Now()
 		// 处理请求
 
+		c.Next()
+		// 结束时间
+		endTime := time.Now()
+		if c.Request.Method == http.MethodOptions {
+			return
+		}
+		log := api.GetRequestLogger(c)
+
 		bd, bl := c.Get("body")
 		var body = ""
 		if bl {
@@ -39,7 +43,12 @@ func LoggerToFile() gin.HandlerFunc {
 		rt, bl := c.Get("result")
 		var result = ""
 		if bl {
-			result = rt.(string)
+			rb, err := json.Marshal(rt)
+			if err != nil {
+				log.Warnf("json Marshal result error, %s", err.Error())
+			} else {
+				result = string(rb)
+			}
 		}
 
 		st, bl := c.Get("status")
@@ -56,8 +65,6 @@ func LoggerToFile() gin.HandlerFunc {
 		statusCode := c.Writer.Status()
 		// 请求IP
 		clientIP := c.ClientIP()
-		// 结束时间
-		endTime := time.Now()
 		// 执行时间
 		latencyTime := endTime.Sub(startTime)
 		// 日志格式
@@ -79,11 +86,11 @@ 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)
+	log := api.GetRequestLogger(c)
 	db, err := pkg.GetOrm(c)
 	if err != nil {
 		log.Errorf("get db connection error, %s", err.Error())
-		app.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
+		response.Error(c, http.StatusInternalServerError, err, "数据库连接获取失败")
 		return
 	}
 
@@ -134,5 +141,6 @@ func SetDBOperLog(c *gin.Context, clientIP string, statusCode int, reqUri string
 	}
 	serviceOperaLog := service.SysOperaLog{}
 	serviceOperaLog.Orm = db
+	serviceOperaLog.Log = log
 	_ = serviceOperaLog.InsertSysOperaLog(&sysOperaLog)
 }

app/admin/models/system/sys_config.go

@@ -9,8 +9,9 @@ type SysConfig struct {
 	ConfigName  string `json:"configName" gorm:"type:varchar(128);comment:ConfigName"`   //
 	ConfigKey   string `json:"configKey" gorm:"type:varchar(128);comment:ConfigKey"`     //
 	ConfigValue string `json:"configValue" gorm:"type:varchar(255);comment:ConfigValue"` //
-	ConfigType  string `json:"configType" gorm:"type:varchar(64);comment:ConfigType"`    //
-	Remark      string `json:"remark" gorm:"type:varchar(128);comment:Remark"`           //
+	ConfigType  string `json:"configType" gorm:"type:varchar(64);comment:ConfigType"`
+	IsFrontend  int    `json:"isFrontend" gorm:"type:varchar(64);comment:是否前台"` //
+	Remark      string `json:"remark" gorm:"type:varchar(128);comment:Remark"`  //
 	models.ControlBy
 	models.ModelTime
 }
@@ -26,4 +27,4 @@ func (e *SysConfig) Generate() models.ActiveRecord {
 
 func (e *SysConfig) GetId() interface{} {
 	return e.Id
-}
+}

app/admin/router/sys_config.go

@@ -13,9 +13,10 @@ func init() {
 
 // 需认证的路由代码
 func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
+	api := &sys_config.SysConfig{}
 	r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
 	{
-		api := &sys_config.SysConfig{}
+
 		r.GET("", api.GetSysConfigList)
 		r.GET("/:id", api.GetSysConfig)
 		r.POST("", api.InsertSysConfig)
@@ -25,7 +26,13 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 
 	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
 	{
-		api := &sys_config.SysConfig{}
 		r1.GET("/:configKey", api.GetSysConfigByKEYForService)
 	}
-}
+
+	r2 := v1.Group("/app-config")
+	{
+		r2.GET("", api.GetSysConfigBySysApp)
+	}
+
+
+}

app/admin/router/sys_router.go

@@ -2,6 +2,7 @@ package router
 
 import (
 	"go-admin/app/admin/apis/system/sys_menu"
+	//"go-admin/app/admin/models/tools"
 	middleware2 "go-admin/common/middleware"
 	"mime"
 
@@ -11,7 +12,7 @@ import (
 	"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/apis/tools"
 	"go-admin/app/admin/middleware/handler"
 	_ "go-admin/docs"
 
@@ -57,12 +58,16 @@ func sysSwaggerRouter(r *gin.RouterGroup) {
 func sysNoCheckRoleRouter(r *gin.RouterGroup) {
 	v1 := r.Group("/api/v1")
 
-	v1.GET("/monitor/server", monitor.ServerInfo)
-	v1.GET("/getCaptcha", system.GenerateCaptchaHandler)
-	v1.GET("/gen/preview/:tableId", Preview)
-	v1.GET("/gen/toproject/:tableId", GenCodeV3)
-	v1.GET("/gen/todb/:tableId", GenMenuAndApi)
-	v1.GET("/gen/tabletree", GetSysTablesTree)
+	m := &monitor.Monitor{}
+	v1.GET("/monitor/server", m.ServerInfo)
+	sys := &system.System{}
+	v1.GET("/getCaptcha", sys.GenerateCaptchaHandler)
+	gen := &tools.Gen{}
+	v1.GET("/gen/preview/:tableId", gen.Preview)
+	v1.GET("/gen/toproject/:tableId", gen.GenCodeV3)
+	v1.GET("/gen/todb/:tableId", gen.GenMenuAndApi)
+	sysTable := &tools.SysTable{}
+	v1.GET("/gen/tabletree", sysTable.GetSysTablesTree)
 
 	registerDBRouter(v1)
 	registerSysTableRouter(v1)
@@ -73,22 +78,24 @@ func sysNoCheckRoleRouter(r *gin.RouterGroup) {
 func registerDBRouter(api *gin.RouterGroup) {
 	db := api.Group("/db")
 	{
-		db.GET("/tables/page", GetDBTableList)
-		db.GET("/columns/page", GetDBColumnList)
+		gen := &tools.Gen{}
+		db.GET("/tables/page", gen.GetDBTableList)
+		db.GET("/columns/page", gen.GetDBColumnList)
 	}
 }
 
 func registerSysTableRouter(v1 *gin.RouterGroup) {
 	systables := v1.Group("/sys/tables")
 	{
-		systables.GET("/page", GetSysTableList)
+		sysTable := &tools.SysTable{}
+		systables.GET("/page", sysTable.GetSysTableList)
 		tablesinfo := systables.Group("/info")
 		{
-			tablesinfo.POST("", InsertSysTable)
-			tablesinfo.PUT("", UpdateSysTable)
-			tablesinfo.DELETE("/:tableId", DeleteSysTables)
-			tablesinfo.GET("/:tableId", GetSysTables)
-			tablesinfo.GET("", GetSysTablesInfo)
+			tablesinfo.POST("", sysTable.InsertSysTable)
+			tablesinfo.PUT("", sysTable.UpdateSysTable)
+			tablesinfo.DELETE("/:tableId", sysTable.DeleteSysTables)
+			tablesinfo.GET("/:tableId", sysTable.GetSysTables)
+			tablesinfo.GET("", sysTable.GetSysTablesInfo)
 		}
 	}
 }
@@ -190,17 +197,19 @@ func registerDictRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddlewar
 //}
 func registerSysSettingRouter(v1 *gin.RouterGroup) {
 	api := system.SysSetting{}
+	m := &monitor.Monitor{}
 	setting := v1.Group("/setting")
 	{
 		setting.GET("", api.GetSetting)
 		setting.POST("", api.CreateOrUpdateSetting)
-		setting.GET("/serverInfo", monitor.ServerInfo)
+		setting.GET("/serverInfo", m.ServerInfo)
 	}
 }
 
 func registerPublicRouter(v1 *gin.RouterGroup) {
 	p := v1.Group("/public")
 	{
-		p.POST("/uploadFile", public.UploadFile)
+		file := &public.File{}
+		p.POST("/uploadFile", file.UploadFile)
 	}
 }

app/admin/service/dto/sys_category.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/common/apis"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
@@ -21,7 +21,7 @@ func (m *SysCategorySearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysCategorySearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -49,7 +49,7 @@ type SysCategoryControl struct {
 }
 
 func (s *SysCategoryControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_config.go

@@ -2,10 +2,12 @@ package dto
 
 import (
 	"encoding/json"
+
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+
 	"go-admin/app/admin/models/system"
-	"go-admin/common/apis"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
 )
@@ -13,9 +15,10 @@ import (
 // SysConfigSearch 列表或者搜索使用结构体
 type SysConfigSearch struct {
 	dto.Pagination `search:"-"`
-	ConfigName     string `form:"configName" search:"type:exact;column:config_name;table:sys_config" comment:""`
-	ConfigKey      string `form:"configKey" search:"type:exact;column:config_key;table:sys_config" comment:""`
+	ConfigName     string `form:"configName" search:"type:contains;column:config_name;table:sys_config" comment:""`
+	ConfigKey      string `form:"configKey" search:"type:contains;column:config_key;table:sys_config" comment:""`
 	ConfigType     string `form:"configType" search:"type:exact;column:config_type;table:sys_config" comment:""`
+	IsFrontend     int    `json:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config" comment:""`
 }
 
 func (m *SysConfigSearch) GetNeedSearch() interface{} {
@@ -24,7 +27,7 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysConfigSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -39,12 +42,13 @@ type SysConfigControl struct {
 	ConfigKey   string `uri:"configKey" json:"configKey" comment:""`
 	ConfigValue string `json:"configValue" comment:""`
 	ConfigType  string `json:"configType" comment:""`
+	IsFrontend  int    `json:"isFrontend"`
 	Remark      string `json:"remark" comment:""`
 }
 
 // Bind 映射上下文中的结构体数据
 func (s *SysConfigControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -71,6 +75,7 @@ func (s *SysConfigControl) Generate() (*system.SysConfig, error) {
 		ConfigKey:   s.ConfigKey,
 		ConfigValue: s.ConfigValue,
 		ConfigType:  s.ConfigType,
+		IsFrontend:  s.IsFrontend,
 		Remark:      s.Remark,
 	}, nil
 }
@@ -96,7 +101,7 @@ func (s *SysConfigById) GetId() interface{} {
 }
 
 func (s *SysConfigById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -111,4 +116,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error {
 
 func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
 	return &system.SysConfig{}, nil
-}
+}

app/admin/service/dto/sys_content.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/common/apis"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
@@ -18,7 +18,7 @@ func (m *SysContentSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysContentSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -43,7 +43,7 @@ type SysContentControl struct {
 }
 
 func (s *SysContentControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_dept.go

@@ -2,10 +2,10 @@ package dto
 
 import (
 	"encoding/json"
-	"go-admin/common/apis"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -31,7 +31,7 @@ func (m *SysDeptSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysDeptSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -54,7 +54,7 @@ type SysDeptControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysDeptControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -109,7 +109,7 @@ func (s *SysDeptById) GetId() interface{} {
 }
 
 func (s *SysDeptById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_dict_data.go

@@ -1,10 +1,10 @@
 package dto
 
 import (
-	"go-admin/common/apis"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -25,7 +25,7 @@ func (m *SysDictDataSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysDictDataSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -53,7 +53,7 @@ type SysDictDataControl struct {
 }
 
 func (s *SysDictDataControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_dict_type.go

@@ -2,8 +2,8 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/common/apis"
 
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
 	common "go-admin/common/models"
@@ -22,7 +22,7 @@ func (m *SysDictTypeSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysDictTypeSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -48,7 +48,7 @@ type SysDictTypeControl struct {
 }
 
 func (s *SysDictTypeControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_file_dir.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/common/apis"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
@@ -24,7 +24,7 @@ func (m *SysFileDirSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysFileDirSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -48,7 +48,7 @@ type SysFileDirControl struct {
 }
 
 func (s *SysFileDirControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_job.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/common/apis"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
@@ -24,7 +24,7 @@ func (m *SysJobSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysJobSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Errorf("Bind error: %s", err)

app/admin/service/dto/sys_login_log.go

@@ -1,10 +1,10 @@
 package dto
 
 import (
-	"go-admin/common/apis"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -24,7 +24,7 @@ func (m *SysLoginLogSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysLoginLogSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -47,7 +47,7 @@ type SysLoginLogControl struct {
 }
 
 func (s *SysLoginLogControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -90,7 +90,7 @@ func (s *SysLoginLogById) GetId() interface{} {
 }
 
 func (s *SysLoginLogById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_menu.go

@@ -2,10 +2,10 @@ package dto
 
 import (
 	"encoding/json"
-	"go-admin/common/apis"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -30,7 +30,7 @@ func (m *SysMenuSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysMenuSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -60,7 +60,7 @@ type SysMenuControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysMenuControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -122,7 +122,7 @@ func (s *SysMenuById) GetId() interface{} {
 }
 
 func (s *SysMenuById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_opera_log.go

@@ -1,10 +1,10 @@
 package dto
 
 import (
-	"go-admin/common/apis"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -26,7 +26,7 @@ func (m *SysOperaLogSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysOperaLogSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -57,7 +57,7 @@ type SysOperaLogControl struct {
 }
 
 func (s *SysOperaLogControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -112,7 +112,7 @@ func (s *SysOperaLogById) GetId() interface{} {
 }
 
 func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_post.go

@@ -2,10 +2,10 @@ package dto
 
 import (
 	"encoding/json"
-	"go-admin/common/apis"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -28,7 +28,7 @@ func (m *SysPostSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysPostSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -48,7 +48,7 @@ type SysPostControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysPostControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -100,7 +100,7 @@ func (s *SysPostById) GetId() interface{} {
 }
 
 func (s *SysPostById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_role.go

@@ -2,10 +2,10 @@ package dto
 
 import (
 	"encoding/json"
-	"go-admin/common/apis"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gin-gonic/gin/binding"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -32,7 +32,7 @@ func (m *SysRoleSearch) GetNeedSearch() interface{} {
 
 // Bind 映射上下文中的结构体数据
 func (m *SysRoleSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -56,7 +56,7 @@ type SysRoleControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysRoleControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindBodyWith(s, binding.JSON)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())

app/admin/service/dto/sys_setting.go

@@ -2,9 +2,9 @@ package dto
 
 import (
 	"encoding/json"
-	"go-admin/common/apis"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models"
 )
@@ -18,7 +18,7 @@ type SysSettingControl struct {
 
 // Bind 映射上下文中的结构体数据
 func (s *SysSettingControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 
 	err := ctx.ShouldBind(s)
 	if err != nil {
@@ -70,7 +70,7 @@ func (s *SysSettingById) GetId() interface{} {
 }
 
 func (s *SysSettingById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/sys_user.go

@@ -2,7 +2,7 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
-	"go-admin/common/apis"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models/system"
 	"go-admin/common/dto"
@@ -28,7 +28,7 @@ func (m *SysUserSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysUserSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -58,7 +58,7 @@ type SysUserControl struct {
 }
 
 func (s *SysUserControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	//err := ctx.ShouldBindUri(s)
 	//if err != nil {
 	//	log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/dto/syschinaareadata.go

@@ -1,10 +1,10 @@
 package dto
 
 import (
-	"go-admin/common/apis"
 	"time"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/admin/models"
 	"go-admin/common/dto"
@@ -22,7 +22,7 @@ func (m *SysChinaAreaDataSearch) GetNeedSearch() interface{} {
 }
 
 func (m *SysChinaAreaDataSearch) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBind(m)
 	if err != nil {
 		log.Debugf("ShouldBind error: %s", err.Error())
@@ -40,7 +40,7 @@ type SysChinaAreaDataControl struct {
 }
 
 func (s *SysChinaAreaDataControl) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -83,7 +83,7 @@ func (s *SysChinaAreaDataById) GetId() interface{} {
 }
 
 func (s *SysChinaAreaDataById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())

app/admin/service/sys_config.go

@@ -32,6 +32,22 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC
 	return nil
 }
 
+func (e *SysConfig) GetSysConfigByKey(c *dto.SysConfigSearch, list *[]system.SysConfig) error {
+	var err error
+	var data system.SysConfig
+
+	err = e.Orm.Model(&data).
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+		).
+		Find(list).Error
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+	return nil
+}
+
 // GetSysConfig 获取SysConfig对象
 func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error {
 	var err error
@@ -115,4 +131,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
 	}
 
 	return nil
-}
+}

cmd/api/server.go

@@ -62,6 +62,8 @@ func setup() {
 			config.LoggerConfig.Stdout))
 	//3. 初始化数据库链接
 	database.Setup()
+	//4. 设置缓存
+	sdk.Runtime.SetCacheAdapter(config.CacheConfig.Setup())
 
 	usageStr := `starting api server...`
 	log.Println(usageStr)

cmd/migrate/migration/version/1615447091566_migrate.go

@@ -1,6 +1,7 @@
 package version
 
 import (
+	"fmt"
 	"gorm.io/gorm"
 	"runtime"
 
@@ -16,19 +17,19 @@ func init() {
 func _1615447091566Test(db *gorm.DB, version string) error {
 	return db.Transaction(func(tx *gorm.DB) error {
 
-	    // TODO: 这里开始写入要变更的内容
+		// TODO: 这里开始写入要变更的内容
 
-	    // TODO: 例如 修改表字段 使用过程中请删除此段代码
+		// TODO: 例如 修改表字段 使用过程中请删除此段代码
 		sql1 := "INSERT INTO `sys_menu`(`menu_id`, `menu_name`, `title`, `icon`, `path`, `paths`, `menu_type`, `action`, `permission`, `parent_id`, `no_cache`, `breadcrumb`, `component`, `sort`, `visible`, `create_by`, `update_by`, `is_frame`, `created_at`, `updated_at`, `deleted_at`) VALUES (522, 'SysContentCreate', '新增', 'form', 'syscontent/create', '/0/498/522', 'C', '', 'syscontent:syscontent:add', 498, 0, '', '/syscontent/create.vue', 0, '1', '1', '1', '1', '2020-11-08 17:00:35.259', '2020-11-12 22:55:50.739', NULL);"
 
 		err := tx.Exec(sql1).Error
 		if err != nil {
-			return err
+			fmt.Println(err)
+			return nil
 		}
-		
 
 		return tx.Create(&common.Migration{
 			Version: version,
 		}).Error
 	})
-}
+}

cmd/migrate/migration/version/1615948084336_migrate.go

@@ -0,0 +1,28 @@
+package version
+
+import (
+	"gorm.io/gorm"
+	"runtime"
+
+	"go-admin/cmd/migrate/migration"
+	common "go-admin/common/models"
+)
+
+func init() {
+	_, fileName, _, _ := runtime.Caller(0)
+	migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615948084336Test)
+}
+
+func _1615948084336Test(db *gorm.DB, version string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+
+		err := tx.Exec("alter table sys_config add is_frontend int default 1 null comment '是否前台参数' after config_type").Error
+		if err != nil {
+			return err
+		}
+
+		return tx.Create(&common.Migration{
+			Version: version,
+		}).Error
+	})
+}

cmd/migrate/migration/version/1615950701614_migrate.go

@@ -0,0 +1,33 @@
+package version
+
+import (
+	"gorm.io/gorm"
+	"runtime"
+
+	"go-admin/cmd/migrate/migration"
+	common "go-admin/common/models"
+)
+
+func init() {
+	_, fileName, _, _ := runtime.Caller(0)
+	migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615950701614Test)
+}
+
+func _1615950701614Test(db *gorm.DB, version string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+
+		err := tx.Exec("UPDATE sys_dict_data t SET t.dict_value = '2' WHERE t.dict_code = 16").Error
+		if err != nil {
+			return err
+		}
+
+		err = tx.Exec("UPDATE sys_opera_log t SET t.status = '2' WHERE t.status = '0'").Error
+		if err != nil {
+			return err
+		}
+
+		return tx.Create(&common.Migration{
+			Version: version,
+		}).Error
+	})
+}

cmd/migrate/migration/version/1615961953379_migrate.go

@@ -0,0 +1,33 @@
+package version
+
+import (
+	"gorm.io/gorm"
+	"runtime"
+
+	"go-admin/cmd/migrate/migration"
+	common "go-admin/common/models"
+)
+
+func init() {
+	_, fileName, _, _ := runtime.Caller(0)
+	migration.Migrate.SetVersion(migration.GetFilename(fileName), _1615961953379Test)
+}
+
+func _1615961953379Test(db *gorm.DB, version string) error {
+	return db.Transaction(func(tx *gorm.DB) error {
+
+		err := tx.Exec("INSERT INTO `sys_config` (`id`, `config_name`, `config_key`, `config_value`, `config_type`, `is_frontend`, `remark`, `create_by`, `update_by`, `created_at`, `updated_at`, `deleted_at`) VALUES (4, '系统名称', 'sys_app_name', 'go-admin管理系统', 'Y', 1, '', 1, 0, '2021-03-17 08:52:06.067', '2021-03-17 08:52:06.067', NULL);").Error
+		if err != nil {
+			return err
+		}
+
+		err = tx.Exec("INSERT INTO `sys_config` (`id`, `config_name`, `config_key`, `config_value`, `config_type`, `is_frontend`, `remark`, `create_by`, `update_by`, `created_at`, `updated_at`, `deleted_at`) VALUES (5, '系统logo', 'sys_app_logo', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', 'Y', 1, '', 1, 0, '2021-03-17 08:53:19.462', '2021-03-17 08:53:19.462', NULL);").Error
+		if err != nil {
+			return err
+		}
+
+		return tx.Create(&common.Migration{
+			Version: version,
+		}).Error
+	})
+}

common/actions/create.go

@@ -4,11 +4,11 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"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"
 )
@@ -16,7 +16,7 @@ import (
 // CreateAction 通用新增动作
 func CreateAction(control dto.Control) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		log := apis.GetRequestLogger(c)
+		log := api.GetRequestLogger(c)
 		db, err := pkg.GetOrm(c)
 		if err != nil {
 			log.Error(err)
@@ -27,23 +27,23 @@ func CreateAction(control dto.Control) gin.HandlerFunc {
 		req := control.Generate()
 		err = req.Bind(c)
 		if err != nil {
-			app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+			response.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 			return
 		}
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 			return
 		}
 		object.SetCreateBy(user.GetUserId(c))
 		err = db.WithContext(c).Create(object).Error
 		if err != nil {
 			log.Errorf("Create error: %s", err)
-			app.Error(c, http.StatusInternalServerError, err, "创建失败")
+			response.Error(c, http.StatusInternalServerError, err, "创建失败")
 			return
 		}
-		app.OK(c, object.GetId(), "创建成功")
+		response.OK(c, object.GetId(), "创建成功")
 		c.Next()
 	}
 }

common/actions/delete.go

@@ -28,13 +28,13 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 		err = req.Bind(c)
 		if err != nil {
 			log.Errorf("MsgID[%s] Bind error: %s", msgID, err)
-			app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+			response.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 			return
 		}
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 			return
 		}
 
@@ -48,14 +48,14 @@ func DeleteAction(control dto.Control) gin.HandlerFunc {
 		).Where(req.GetId()).Delete(object)
 		if db.Error != nil {
 			log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
-			app.Error(c, http.StatusInternalServerError, err, "删除失败")
+			response.Error(c, http.StatusInternalServerError, err, "删除失败")
 			return
 		}
 		if db.RowsAffected == 0 {
-			app.Error(c, http.StatusForbidden, nil, "无权删除该数据")
+			response.Error(c, http.StatusForbidden, nil, "无权删除该数据")
 			return
 		}
-		app.OK(c, object.GetId(), "删除成功")
+		response.OK(c, object.GetId(), "删除成功")
 		c.Next()
 	}
 }

common/actions/index.go

@@ -32,7 +32,7 @@ func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.H
 		//查询列表
 		err = req.Bind(c)
 		if err != nil {
-			app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+			response.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 			return
 		}
 
@@ -49,10 +49,10 @@ func IndexAction(m models.ActiveRecord, d dto.Index, f func() interface{}) gin.H
 			Count(&count).Error
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			log.Errorf("MsgID[%s] Index error: %s", msgID, err)
-			app.Error(c, http.StatusInternalServerError, err, "查询失败")
+			response.Error(c, http.StatusInternalServerError, err, "查询失败")
 			return
 		}
-		app.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
+		response.PageOK(c, list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 		c.Next()
 	}
 }

common/actions/permission.go

@@ -34,7 +34,7 @@ func PermissionAction() gin.HandlerFunc {
 			p, err = newDataPermission(db, userId)
 			if err != nil {
 				log.Errorf("MsgID[%s] PermissionAction error: %s", msgID, err)
-				app.Error(c, http.StatusInternalServerError, err, "权限范围鉴定错误")
+				response.Error(c, http.StatusInternalServerError, err, "权限范围鉴定错误")
 				c.Abort()
 				return
 			}

common/actions/update.go

@@ -27,13 +27,13 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 		//更新操作
 		err = req.Bind(c)
 		if err != nil {
-			app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+			response.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 			return
 		}
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 			return
 		}
 		object.SetUpdateBy(user.GetUserId(c))
@@ -46,14 +46,14 @@ func UpdateAction(control dto.Control) gin.HandlerFunc {
 		).Where(req.GetId()).Updates(object)
 		if db.Error != nil {
 			log.Errorf("MsgID[%s] Update error: %s", msgID, err)
-			app.Error(c, http.StatusInternalServerError, err, "更新失败")
+			response.Error(c, http.StatusInternalServerError, err, "更新失败")
 			return
 		}
 		if db.RowsAffected == 0 {
-			app.Error(c, http.StatusForbidden, nil, "无权更新该数据")
+			response.Error(c, http.StatusForbidden, nil, "无权更新该数据")
 			return
 		}
-		app.OK(c, object.GetId(), "更新成功")
+		response.OK(c, object.GetId(), "更新成功")
 		c.Next()
 	}
 }

common/actions/view.go

@@ -2,6 +2,7 @@ package actions
 
 import (
 	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -9,7 +10,6 @@ import (
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"gorm.io/gorm"
 
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"go-admin/common/dto"
 	"go-admin/common/models"
 )
@@ -28,13 +28,13 @@ func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
 		req := control.Generate()
 		err = req.Bind(c)
 		if err != nil {
-			app.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
+			response.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 			return
 		}
 		var object models.ActiveRecord
 		object, err = req.GenerateM()
 		if err != nil {
-			app.Error(c, http.StatusInternalServerError, err, "模型生成失败")
+			response.Error(c, http.StatusInternalServerError, err, "模型生成失败")
 			return
 		}
 
@@ -53,15 +53,15 @@ func ViewAction(control dto.Control, f func() interface{}) gin.HandlerFunc {
 		).Where(req.GetId()).First(rsp).Error
 
 		if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
-			app.Error(c, http.StatusNotFound, nil, "查看对象不存在或无权查看")
+			response.Error(c, http.StatusNotFound, nil, "查看对象不存在或无权查看")
 			return
 		}
 		if err != nil {
 			log.Errorf("MsgID[%s] View error: %s", msgID, err)
-			app.Error(c, http.StatusInternalServerError, err, "查看失败")
+			response.Error(c, http.StatusInternalServerError, err, "查看失败")
 			return
 		}
-		app.OK(c, rsp, "查看成功")
+		response.OK(c, rsp, "查看成功")
 		c.Next()
 	}
 }

common/apis/api.go

@@ -1,15 +1,14 @@
 package apis
 
 import (
-	"encoding/json"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
+	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"gorm.io/gorm"
-
-	"go-admin/common/models"
 )
 
 type Api struct {
@@ -17,7 +16,7 @@ type Api struct {
 
 // GetLogger 获取上下文提供的日志
 func (e *Api) GetLogger(c *gin.Context) *logger.Logger {
-	return GetRequestLogger(c)
+	return api.GetRequestLogger(c)
 }
 
 // GetOrm 获取Orm DB
@@ -32,56 +31,20 @@ func (e *Api) GetOrm(c *gin.Context) (*gorm.DB, error) {
 
 // Error 通常错误数据处理
 func (e *Api) Error(c *gin.Context, code int, err error, msg string) {
-	var res models.Response
-	if err != nil {
-		res.Msg = err.Error()
-	}
-	if msg != "" {
-		res.Msg = msg
-	}
-	res.RequestId = pkg.GenerateMsgIDFromContext(c)
-	Return := res.ReturnError(code)
-	e.setResult(c, Return, res.RequestId, code)
-	c.AbortWithStatusJSON(http.StatusOK, Return)
+	response.Error(c, code, err, msg)
 }
 
 // OK 通常成功数据处理
 func (e *Api) OK(c *gin.Context, data interface{}, msg string) {
-	var res models.Response
-	res.Data = data
-	if msg != "" {
-		res.Msg = msg
-	}
-	res.RequestId = pkg.GenerateMsgIDFromContext(c)
-	Return := res.ReturnOK()
-	e.setResult(c, Return, res.RequestId, 200)
-	c.AbortWithStatusJSON(http.StatusOK, Return)
+	response.OK(c, data, msg)
 }
 
 // PageOK 分页数据处理
 func (e *Api) PageOK(c *gin.Context, result interface{}, count int, pageIndex int, pageSize int, msg string) {
-	var res models.Page
-	res.List = result
-	res.Count = count
-	res.PageIndex = pageIndex
-	res.PageSize = pageSize
-	e.OK(c, res, msg)
+	response.PageOK(c, result, count, pageIndex, pageSize, msg)
 }
 
 // Custom 兼容函数
 func (e *Api) Custom(c *gin.Context, data gin.H) {
-	msgID := pkg.GenerateMsgIDFromContext(c)
-	Return := data
-	e.setResult(c, Return, msgID, 200)
-	c.AbortWithStatusJSON(http.StatusOK, Return)
-}
-
-func (e *Api) setResult(c *gin.Context, Return interface{}, msgID string, status int) {
-	requestLogger := e.GetLogger(c)
-	jsonStr, err := json.Marshal(Return)
-	if err != nil {
-		requestLogger.Debugf("setResult error: %#v", msgID, err.Error())
-	}
-	c.Set("result", string(jsonStr))
-	c.Set("status", status)
+	response.Custum(c, data)
 }

common/dto/generate.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 )
 
 type ObjectById struct {
@@ -13,13 +14,16 @@ type ObjectById struct {
 
 func (s *ObjectById) Bind(ctx *gin.Context) error {
 	var err error
+	log := api.GetRequestLogger(ctx)
 	err = ctx.ShouldBindUri(s)
 	if err != nil {
+		log.Warnf("ShouldBindUri error: %s", err.Error())
 		return err
 	}
 	if ctx.Request.Method == http.MethodDelete {
 		err = ctx.ShouldBind(&s.Ids)
 		if err != nil {
+			log.Warnf("ShouldBind error: %s", err.Error())
 			return err
 		}
 		if len(s.Ids) > 0 {
@@ -37,6 +41,7 @@ func (s *ObjectById) Bind(ctx *gin.Context) error {
 
 func (s *ObjectById) GetId() interface{} {
 	if len(s.Ids) > 0 {
+		s.Ids = append(s.Ids, s.Id)
 		return s.Ids
 	}
 	return s.Id

common/global/adm.go

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

common/global/casbin.go

@@ -4,11 +4,11 @@ import (
 	"github.com/casbin/casbin/v2"
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk"
-	"go-admin/common/apis"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 )
 
 func LoadPolicy(c *gin.Context) (*casbin.SyncedEnforcer, error) {
-	log := apis.GetRequestLogger(c)
+	log := api.GetRequestLogger(c)
 	if err := sdk.Runtime.GetCasbinKey(c.Request.Host).LoadPolicy(); err == nil {
 		return sdk.Runtime.GetCasbinKey(c.Request.Host), err
 	} else {

common/middleware/permission.go

@@ -5,16 +5,15 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
-
-	"go-admin/common/apis"
 )
 
 //权限检查中间件
 func AuthCheckRole() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		log := apis.GetRequestLogger(c)
+		log := api.GetRequestLogger(c)
 		data, _ := c.Get(jwtauth.JwtPayloadKey)
 		v := data.(jwtauth.MapClaims)
 		e := sdk.Runtime.GetCasbinKey(c.Request.Host)
@@ -28,7 +27,7 @@ func AuthCheckRole() gin.HandlerFunc {
 			res, err = e.Enforce(v["rolekey"], c.Request.URL.Path, c.Request.Method)
 			if err != nil {
 				log.Errorf("AuthCheckRole error:%s method:%s path:%s", err, c.Request.Method, c.Request.URL.Path)
-				app.Error(c, 500, err, "")
+				response.Error(c, 500, err, "")
 				return
 			}
 		}

common/middleware/request_id.go

@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"net/http"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -10,6 +11,10 @@ import (
 // RequestId 自动增加requestId
 func RequestId(trafficKey string) gin.HandlerFunc {
 	return func(c *gin.Context) {
+		if c.Request.Method == http.MethodOptions {
+			c.Next()
+			return
+		}
 		requestId := c.GetHeader(trafficKey)
 		if requestId == "" {
 			requestId = c.GetHeader(strings.ToLower(trafficKey))
@@ -17,7 +22,7 @@ func RequestId(trafficKey string) gin.HandlerFunc {
 		if requestId == "" {
 			requestId = uuid.New().String()
 		}
-		c.Header(trafficKey, requestId)
+		c.Request.Header.Set(trafficKey, requestId)
 		c.Set(trafficKey, requestId)
 		c.Next()
 	}

config/db.sql

@@ -144,17 +144,17 @@ INSERT INTO sys_menu VALUES (468, 'sys_job', '创建定时任务', 'bug', '/api/
 INSERT INTO sys_menu VALUES (469, 'sys_job', '修改定时任务', 'bug', '/api/v1/sysjob', '/0/63/465/469', 'A', 'PUT', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL);
 INSERT INTO sys_menu VALUES (470, 'sys_job', '删除定时任务', 'bug', '/api/v1/sysjob/:id', '/0/63/465/470', 'A', 'DELETE', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL);
 INSERT INTO sys_menu VALUES (471, 'job_log', '日志', 'bug', 'job_log', '/0/459/471', 'C', '', '', 459, 0, '', '/sysjob/log', 0, '1', '1', '1', '1', '2020-08-05 21:24:46', '2020-08-06 00:02:20', NULL);
-INSERT INTO sys_menu VALUES (473, 'sysSetting', '系统配置', 'form', 'syssettings', '/0/60/473', 'C', '无', 'syssetting:syssetting:list', 60, 0, '', '/system/settings', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 02:17:10', NULL);
-INSERT INTO sys_menu VALUES (474, 'sys_setting', '分页获取SysSetting', 'pass', 'sys_setting', '/0/60/473/474', 'F', '无', 'syssetting:syssetting:query', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (475, 'sys_setting', '创建SysSetting', 'pass', 'sys_setting', '/0/60/473/475', 'F', '无', 'syssetting:syssetting:add', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (476, 'sys_setting', '修改SysSetting', 'pass', 'sys_setting', '/0/60/473/476', 'F', '无', 'syssetting:syssetting:edit', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (477, 'sys_setting', '删除SysSetting', 'pass', 'sys_setting', '/0/60/473/477', 'F', '无', 'syssetting:syssetting:remove', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (478, 'sys_setting', 'SysSetting', 'bug', 'sys_setting', '/0/63/478', 'M', '无', '', 63, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (479, 'sys_setting', '分页获取SysSetting', 'bug', '/api/v1/syssettingList', '/0/63/478/479', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (480, 'sys_setting', '根据id获取SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/480', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (481, 'sys_setting', '创建SysSetting', 'bug', '/api/v1/syssetting', '/0/63/478/481', 'A', 'POST', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (482, 'sys_setting', '修改SysSetting', 'bug', '/api/v1/syssetting', '/0/63/478/482', 'A', 'PUT', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (483, 'sys_setting', '删除SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/483', 'A', 'DELETE', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (473, 'sysSetting', '系统配置', 'form', 'syssettings', '/0/60/473', 'C', '无', 'syssetting:syssetting:list', 60, 0, '', '/system/settings', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 02:17:10', NULL);
+-- INSERT INTO sys_menu VALUES (474, 'sys_setting', '分页获取SysSetting', 'pass', 'sys_setting', '/0/60/473/474', 'F', '无', 'syssetting:syssetting:query', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (475, 'sys_setting', '创建SysSetting', 'pass', 'sys_setting', '/0/60/473/475', 'F', '无', 'syssetting:syssetting:add', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (476, 'sys_setting', '修改SysSetting', 'pass', 'sys_setting', '/0/60/473/476', 'F', '无', 'syssetting:syssetting:edit', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (477, 'sys_setting', '删除SysSetting', 'pass', 'sys_setting', '/0/60/473/477', 'F', '无', 'syssetting:syssetting:remove', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (478, 'sys_setting', 'SysSetting', 'bug', 'sys_setting', '/0/63/478', 'M', '无', '', 63, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (479, 'sys_setting', '分页获取SysSetting', 'bug', '/api/v1/syssettingList', '/0/63/478/479', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (480, 'sys_setting', '根据id获取SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/480', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (481, 'sys_setting', '创建SysSetting', 'bug', '/api/v1/syssetting', '/0/63/478/481', 'A', 'POST', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (482, 'sys_setting', '修改SysSetting', 'bug', '/api/v1/syssetting', '/0/63/478/482', 'A', 'PUT', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+-- INSERT INTO sys_menu VALUES (483, 'sys_setting', '删除SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/483', 'A', 'DELETE', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
 COMMIT;
 
--- 数据完成 ;
+-- 数据完成 ;

go.mod

@@ -8,8 +8,7 @@ require (
 	github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5
 	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.3.0
-	github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.2
+	github.com/go-admin-team/go-admin-core v1.3.0-rc.0.0.20210317043714-3dd2b8cbf8cc
 	github.com/google/uuid v1.2.0
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/mssola/user_agent v0.5.2

template/v4/actions/router_check_role.go.template

@@ -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/{{.PackageName}}/middleware"
     "go-admin/app/{{.PackageName}}/models"
     "go-admin/app/{{.PackageName}}/service/dto"
     "go-admin/common/actions"
-    jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
+    "go-admin/common/middleware"
 )
 
 func init()  {

template/v4/dto.go.template

@@ -2,11 +2,11 @@ package dto
 
 import (
 	"github.com/gin-gonic/gin"
+	"github.com/go-admin-team/go-admin-core/sdk/api"
 
 	"go-admin/app/{{.PackageName}}/models"
-	common "go-admin/common/models"
 	"go-admin/common/dto"
-	"go-admin/common/apis"
+	common "go-admin/common/models"
 )
 
 type {{.ClassName}}Search struct {
@@ -24,8 +24,13 @@ func (m *{{.ClassName}}Search) GetNeedSearch() interface{} {
 	return *m
 }
 
+func (m *{{.ClassName}}Search) Generate() dto.Index {
+	o := *m
+	return &o
+}
+
 func (m *{{.ClassName}}Search) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
     err := ctx.ShouldBind(m)
     if err != nil {
     	log.Debugf("ShouldBind error: %s", err.Error())
@@ -49,8 +54,13 @@ type {{.ClassName}}Control struct {
     {{- end }}
 }
 
+func (s *{{.ClassName}}Control) Generate() dto.Control {
+	o := *s
+	return &o
+}
+
 func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
     err := ctx.ShouldBindUri(s)
     if err != nil {
         log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -63,7 +73,7 @@ func (s *{{.ClassName}}Control) Bind(ctx *gin.Context) error {
     return err
 }
 
-func (s *{{.ClassName}}Control) Generate() (*models.{{.ClassName}}, error) {
+func (s *{{.ClassName}}Control) GenerateM() (common.ActiveRecord, error) {
 	return &models.{{.ClassName}}{
 	{{ range .Columns -}}
         {{$x := .Pk}}
@@ -86,8 +96,7 @@ func (s *{{.ClassName}}Control) GetId() interface{} {
 }
 
 type {{.ClassName}}ById struct {
-	Id  int   `uri:"id"`
-	Ids []int `json:"ids"`
+	dto.ObjectById
 }
 
 func (s *{{.ClassName}}ById) GetId() interface{} {
@@ -99,7 +108,7 @@ func (s *{{.ClassName}}ById) GetId() interface{} {
 }
 
 func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error {
-	log := apis.GetRequestLogger(ctx)
+	log := api.GetRequestLogger(ctx)
 	err := ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("ShouldBindUri error: %s", err.Error())
@@ -114,4 +123,13 @@ func (s *{{.ClassName}}ById) Bind(ctx *gin.Context) error {
 
 func (s *{{.ClassName}}ById) SetUpdateBy(id int) {
 
-}
+}
+
+func (s *{{.ClassName}}ById) Generate() dto.Control {
+	o := *s
+	return &o
+}
+
+func (s *{{.ClassName}}ById) GenerateM() (common.ActiveRecord, error) {
+	return &models.{{.ClassName}}{}, nil
+}

template/v4/no_actions/apis.go.template

@@ -139,7 +139,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	object, err := control.Generate()
+	object, err := control.GenerateM()
 	if err != nil {
 		log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
@@ -151,7 +151,7 @@ func (e *{{.ClassName}}) Insert{{.ClassName}}(c *gin.Context) {
 	service{{.ClassName}} := service.{{.ClassName}}{}
 	service{{.ClassName}}.Orm = db
 	service{{.ClassName}}.Log = log
-	err = service{{.ClassName}}.Insert{{.ClassName}}(object)
+	err = service{{.ClassName}}.Insert{{.ClassName}}(object.(*(models.{{.ClassName}})))
 	if err != nil {
 		log.Errorf("Insert {{.ClassName}} error, %s", err.Error())
 		e.Error(c, http.StatusInternalServerError, err, "创建失败")
@@ -188,7 +188,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
 		e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
 		return
 	}
-	object, err := control.Generate()
+	object, err := control.GenerateM()
 	if err != nil {
 		log.Errorf("generate {{.ClassName}} model error, %s", err.Error())
 		e.Error(c, http.StatusInternalServerError, err, "模型生成失败")
@@ -202,7 +202,7 @@ func (e *{{.ClassName}}) Update{{.ClassName}}(c *gin.Context) {
 	service{{.ClassName}} := service.{{.ClassName}}{}
 	service{{.ClassName}}.Orm = db
 	service{{.ClassName}}.Log = log
-	err = service{{.ClassName}}.Update{{.ClassName}}(object, p)
+	err = service{{.ClassName}}.Update{{.ClassName}}(object.(*models.{{.ClassName}}), p)
 	if err != nil {
 		log.Errorf("Update {{.ClassName}} error, %s", err.Error())
 		e.Error(c, http.StatusInternalServerError, err, "更新失败")
@@ -254,4 +254,4 @@ func (e *{{.ClassName}}) Delete{{.ClassName}}(c *gin.Context) {
 		return
 	}
 	e.OK(c, control.GetId(), "删除成功")
-}
+}