diff --git a/app/admin/apis/monitor/server.go b/app/admin/apis/monitor/server.go index 4436cf6..a715d71 100644 --- a/app/admin/apis/monitor/server.go +++ b/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, diff --git a/app/admin/apis/public/file.go b/app/admin/apis/public/file.go index 650e1d4..af899de 100644 --- a/app/admin/apis/public/file.go +++ b/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 diff --git a/app/admin/apis/sys_job/sys_job.go b/app/admin/apis/sys_job/sys_job.go index 0a49f18..d528a31 100644 --- a/app/admin/apis/sys_job/sys_job.go +++ b/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) } diff --git a/app/admin/apis/system/captcha.go b/app/admin/apis/system/captcha.go index 0fb5896..03c20c9 100644 --- a/app/admin/apis/system/captcha.go +++ b/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, diff --git a/app/admin/apis/system/sys_config/sys_config.go b/app/admin/apis/system/sys_config/sys_config.go index 93976cc..bf4b675 100644 --- a/app/admin/apis/system/sys_config/sys_config.go +++ b/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,7 +41,7 @@ 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(), "查询成功") @@ -61,7 +60,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 +72,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 +93,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 +114,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 +136,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 +155,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 +176,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 +197,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 +215,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 +224,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) } diff --git a/app/admin/apis/tools/dbcolumns.go b/app/admin/apis/tools/dbcolumns.go index 80e95df..e4dbd00 100644 --- a/app/admin/apis/tools/dbcolumns.go +++ b/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, "查询成功") } diff --git a/app/admin/apis/tools/dbtables.go b/app/admin/apis/tools/dbtables.go index c24d714..99bd974 100644 --- a/app/admin/apis/tools/dbtables.go +++ b/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, "查询成功") } diff --git a/app/admin/apis/tools/gen.go b/app/admin/apis/tools/gen.go index 93faddc..1c6bf8a 100644 --- a/app/admin/apis/tools/gen.go +++ b/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, "", "数据生成成功!") -} \ No newline at end of file + e.OK(c, "", "数据生成成功!") +} diff --git a/app/admin/apis/tools/systables.go b/app/admin/apis/tools/systables.go index 058741d..4140ab2 100644 --- a/app/admin/apis/tools/systables.go +++ b/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, "删除成功") } diff --git a/app/admin/middleware/handler/auth.go b/app/admin/middleware/handler/auth.go index 0dda629..24d18e3 100644 --- a/app/admin/middleware/handler/auth.go +++ b/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() diff --git a/app/admin/middleware/logger.go b/app/admin/middleware/logger.go index 666bec7..30be7a5 100644 --- a/app/admin/middleware/logger.go +++ b/app/admin/middleware/logger.go @@ -7,6 +7,7 @@ import ( "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,7 +16,6 @@ import ( "go-admin/app/admin/models" "go-admin/app/admin/models/system" "go-admin/app/admin/service" - "go-admin/common/apis" ) // LoggerToFile 日志记录到文件 @@ -25,7 +25,7 @@ func LoggerToFile() gin.HandlerFunc { if c.Request.Method == http.MethodOptions { return } - log := apis.GetRequestLogger(c) + log := api.GetRequestLogger(c) // 开始时间 startTime := time.Now() // 处理请求 @@ -79,11 +79,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 } diff --git a/app/admin/router/sys_router.go b/app/admin/router/sys_router.go index 0e63063..d503ed8 100644 --- a/app/admin/router/sys_router.go +++ b/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) } } diff --git a/app/admin/service/dto/sys_category.go b/app/admin/service/dto/sys_category.go index 3b43425..74632f1 100644 --- a/app/admin/service/dto/sys_category.go +++ b/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()) diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index 3b250a7..935f360 100644 --- a/app/admin/service/dto/sys_config.go +++ b/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" ) @@ -24,7 +26,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()) @@ -44,7 +46,7 @@ type SysConfigControl struct { // 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()) @@ -96,7 +98,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()) diff --git a/app/admin/service/dto/sys_content.go b/app/admin/service/dto/sys_content.go index fdc21b5..9d75f7a 100644 --- a/app/admin/service/dto/sys_content.go +++ b/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()) diff --git a/app/admin/service/dto/sys_dept.go b/app/admin/service/dto/sys_dept.go index 4ccb21c..f9c652e 100644 --- a/app/admin/service/dto/sys_dept.go +++ b/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()) diff --git a/app/admin/service/dto/sys_dict_data.go b/app/admin/service/dto/sys_dict_data.go index 5724bf1..130d591 100644 --- a/app/admin/service/dto/sys_dict_data.go +++ b/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()) diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index d4b4387..377a7dd 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/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()) diff --git a/app/admin/service/dto/sys_file_dir.go b/app/admin/service/dto/sys_file_dir.go index a4d73c4..834258c 100644 --- a/app/admin/service/dto/sys_file_dir.go +++ b/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()) diff --git a/app/admin/service/dto/sys_job.go b/app/admin/service/dto/sys_job.go index 38a5b24..6953cab 100644 --- a/app/admin/service/dto/sys_job.go +++ b/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) diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 11d22e4..1984713 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/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()) diff --git a/app/admin/service/dto/sys_menu.go b/app/admin/service/dto/sys_menu.go index 2920878..dbf5756 100644 --- a/app/admin/service/dto/sys_menu.go +++ b/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()) diff --git a/app/admin/service/dto/sys_opera_log.go b/app/admin/service/dto/sys_opera_log.go index bc6e1e0..3d1c23d 100644 --- a/app/admin/service/dto/sys_opera_log.go +++ b/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()) diff --git a/app/admin/service/dto/sys_post.go b/app/admin/service/dto/sys_post.go index 82fc52d..95cc81f 100644 --- a/app/admin/service/dto/sys_post.go +++ b/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()) diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index 9512f03..260cffc 100644 --- a/app/admin/service/dto/sys_role.go +++ b/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()) diff --git a/app/admin/service/dto/sys_setting.go b/app/admin/service/dto/sys_setting.go index e5d4c6a..5a8c771 100644 --- a/app/admin/service/dto/sys_setting.go +++ b/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()) diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 0888724..ef0d6ee 100644 --- a/app/admin/service/dto/sys_user.go +++ b/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()) diff --git a/app/admin/service/dto/syschinaareadata.go b/app/admin/service/dto/syschinaareadata.go index ce2abd4..e236975 100644 --- a/app/admin/service/dto/syschinaareadata.go +++ b/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()) diff --git a/common/actions/create.go b/common/actions/create.go index d765da3..e15c409 100644 --- a/common/actions/create.go +++ b/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() } } diff --git a/common/actions/delete.go b/common/actions/delete.go index 3555bd3..ff4f35f 100644 --- a/common/actions/delete.go +++ b/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() } } diff --git a/common/actions/index.go b/common/actions/index.go index e32f947..aeafe3f 100644 --- a/common/actions/index.go +++ b/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() } } diff --git a/common/actions/permission.go b/common/actions/permission.go index e7b25f1..1c6f82e 100644 --- a/common/actions/permission.go +++ b/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 } diff --git a/common/actions/update.go b/common/actions/update.go index c2e2e16..51be20b 100644 --- a/common/actions/update.go +++ b/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() } } diff --git a/common/actions/view.go b/common/actions/view.go index 1eec5db..97e0661 100644 --- a/common/actions/view.go +++ b/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() } } diff --git a/common/apis/api.go b/common/apis/api.go index e88286a..2eb4498 100644 --- a/common/apis/api.go +++ b/common/apis/api.go @@ -2,10 +2,11 @@ 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" "gorm.io/gorm" @@ -17,7 +18,7 @@ type Api struct { // GetLogger 获取上下文提供的日志 func (e *Api) GetLogger(c *gin.Context) *logger.Logger { - return GetRequestLogger(c) + return api.GetRequestLogger(c) } // GetOrm 获取Orm DB diff --git a/common/dto/generate.go b/common/dto/generate.go index 0f54c67..f37877c 100644 --- a/common/dto/generate.go +++ b/common/dto/generate.go @@ -4,8 +4,7 @@ import ( "net/http" "github.com/gin-gonic/gin" - - "go-admin/common/apis" + "github.com/go-admin-team/go-admin-core/sdk/api" ) type ObjectById struct { @@ -15,7 +14,7 @@ type ObjectById struct { func (s *ObjectById) Bind(ctx *gin.Context) error { var err error - log := apis.GetRequestLogger(ctx) + log := api.GetRequestLogger(ctx) err = ctx.ShouldBindUri(s) if err != nil { log.Warnf("ShouldBindUri error: %s", err.Error()) diff --git a/common/global/casbin.go b/common/global/casbin.go index 2770630..72b7e6c 100644 --- a/common/global/casbin.go +++ b/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 { diff --git a/common/middleware/permission.go b/common/middleware/permission.go index 9c71999..109f97b 100644 --- a/common/middleware/permission.go +++ b/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 } } diff --git a/go.mod b/go.mod index a3cf335..89bdf0c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( 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/sdk v1.3.0-rc.2.0.20210312075832-894c7ed987f2 github.com/google/uuid v1.2.0 github.com/mojocn/base64Captcha v1.3.1 github.com/mssola/user_agent v0.5.2 diff --git a/template/v4/dto.go.template b/template/v4/dto.go.template index dd51b58..1bc14b5 100644 --- a/template/v4/dto.go.template +++ b/template/v4/dto.go.template @@ -2,10 +2,10 @@ package dto import ( "github.com/gin-gonic/gin" + "github.com/go-admin-team/go-admin-core/sdk/api" "go-admin/app/{{.PackageName}}/models" "go-admin/common/dto" - "go-admin/common/apis" common "go-admin/common/models" ) @@ -30,7 +30,7 @@ func (m *{{.ClassName}}Search) Generate() dto.Index { } 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()) @@ -60,7 +60,7 @@ func (s *{{.ClassName}}Control) Generate() dto.Control { } 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()) @@ -108,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())