feat✨优化配置信息

This commit is contained in:
wenjianzhang committed 2021-05-08 16:50:51 +08:00
1 parent f56839926e
commit 6222765e20
5 files changed
+46 -30

No files matched your search

+8 -10
View File
@@ -1,6 +1,7 @@
package apis package apis
import ( import (
"github.com/gin-gonic/gin/binding"
"net/http" "net/http"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@@ -25,9 +26,9 @@ func (e SysConfig) GetSysConfigList(c *gin.Context) {
log.Error(err) log.Error(err)
return return
} }
err = e.Bind(d, binding.Query)
//查询列表 //查询列表
err = d.Bind(c) //err = d.Bind(c)
if err != nil { if err != nil {
log.Errorf("参数验证失败, error:%s", err) log.Errorf("参数验证失败, error:%s", err)
e.Error(500, err, "参数验证失败") e.Error(500, err, "参数验证失败")
@@ -58,7 +59,7 @@ func (e SysConfig) GetSysConfigBySysApp(c *gin.Context) {
log.Error(err) log.Error(err)
return return
} }
err = d.Bind(c) err = e.Bind(d, binding.Query)
if err != nil { if err != nil {
log.Errorf("参数验证失败, error:%s", err) log.Errorf("参数验证失败, error:%s", err)
e.Error(500, err, "参数验证失败") e.Error(500, err, "参数验证失败")
@@ -98,6 +99,7 @@ func (e SysConfig) GetSysConfig(c *gin.Context) {
return return
} }
//查看详情 //查看详情
err = e.Bind(control)
err = control.Bind(c) err = control.Bind(c)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
@@ -132,7 +134,7 @@ func (e SysConfig) InsertSysConfig(c *gin.Context) {
} }
//新增操作 //新增操作
err = control.Bind(c) err = e.Bind(control, binding.JSON)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("Orm获取失败, error:%s", err) log.Errorf("Orm获取失败, error:%s", err)
@@ -175,7 +177,7 @@ func (e SysConfig) UpdateSysConfig(c *gin.Context) {
} }
//更新操作 //更新操作
err = control.Bind(c) err = e.Bind(control, binding.JSON)
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
@@ -216,19 +218,16 @@ func (e SysConfig) DeleteSysConfig(c *gin.Context) {
} }
//删除操作 //删除操作
err = control.Bind(c) err = e.Bind(control, binding.JSON)
if err != nil { if err != nil {
log.Errorf("Bind error: %s", err) log.Errorf("Bind error: %s", err)
e.Error(http.StatusUnprocessableEntity, err, "参数验证失败") e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return return
} }
object, err := control.GenerateM() object, err := control.GenerateM()
if err != nil { if err != nil {
e.Error(http.StatusInternalServerError, err, "模型生成失败") e.Error(http.StatusInternalServerError, err, "模型生成失败")
log.Errorf("Orm获取失败, error:%s", err) log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return return
} }
@@ -242,7 +241,6 @@ func (e SysConfig) DeleteSysConfig(c *gin.Context) {
if err != nil { if err != nil {
e.Error(http.StatusUnprocessableEntity, err, "删除失败") e.Error(http.StatusUnprocessableEntity, err, "删除失败")
log.Errorf("Orm获取失败, error:%s", err) log.Errorf("Orm获取失败, error:%s", err)
e.Error(500, err, "Orm获取失败")
return return
} }
e.OK(object.GetId(), "删除成功") e.OK(object.GetId(), "删除成功")
+8 -8
View File
@@ -26,14 +26,14 @@ func (m *SysConfigSearch) GetNeedSearch() interface{} {
} }
// Bind 映射上下文中的结构体数据 // Bind 映射上下文中的结构体数据
func (m *SysConfigSearch) Bind(ctx *gin.Context) error { //func (m *SysConfigSearch) Bind(ctx *gin.Context) error {
log := api.GetRequestLogger(ctx) // log := api.GetRequestLogger(ctx)
err := ctx.ShouldBind(m) // err := ctx.ShouldBind(m)
if err != nil { // if err != nil {
log.Debugf("ShouldBind error: %s", err.Error()) // log.Debugf("ShouldBind error: %s", err.Error())
} // }
return err // return err
} //}
// SysConfigControl 增、改使用的结构体 // SysConfigControl 增、改使用的结构体
type SysConfigControl struct { type SysConfigControl struct {
+2 -2
View File
@@ -104,7 +104,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e
var data system.SysConfig var data system.SysConfig
db := e.Orm.Model(&data). db := e.Orm.Model(&data).
Where(d.GetId()).Delete(c) Where(d.Ids).Delete(c)
if db.Error != nil { if db.Error != nil {
err = db.Error err = db.Error
e.Log.Errorf("Service RemoveSysConfig error:%s", err) e.Log.Errorf("Service RemoveSysConfig error:%s", err)
@@ -129,4 +129,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
} }
return nil return nil
} }
+6 -7
View File
@@ -30,6 +30,7 @@ type File struct {
apis.Api apis.Api
} }
// UploadFile 上传图片
// @Summary 上传图片 // @Summary 上传图片
// @Description 获取JSON // @Description 获取JSON
// @Tags 公共接口 // @Tags 公共接口
@@ -40,31 +41,29 @@ type File struct {
// @Success 200 {string} string "{"code": -1, "message": "添加失败"}" // @Success 200 {string} string "{"code": -1, "message": "添加失败"}"
// @Router /api/v1/public/uploadFile [post] // @Router /api/v1/public/uploadFile [post]
func (e File) UploadFile(c *gin.Context) { func (e File) UploadFile(c *gin.Context) {
e.Context = c e.SetContext(c)
tag, _ := c.GetPostForm("type") tag, _ := c.GetPostForm("type")
urlPerfix := fmt.Sprintf("http://%s/", c.Request.Host) urlPrefix := fmt.Sprintf("http://%s/", c.Request.Host)
var fileResponse FileResponse var fileResponse FileResponse
if tag == "" { if tag == "" {
e.Error(500, nil, "缺少标识") e.Error(500, nil, "缺少标识")
//app.Error(c, 200, errors.New(""), "缺少标识")
return return
} else { } else {
switch tag { switch tag {
case "1": // 单图 case "1": // 单图
var done bool var done bool
fileResponse, done = e.singleFile(c, fileResponse, urlPerfix) fileResponse, done = e.singleFile(c, fileResponse, urlPrefix)
if done { if done {
return return
} }
e.OK(fileResponse, "上传成功") e.OK(fileResponse, "上传成功")
return return
case "2": // 多图 case "2": // 多图
multipartFile := e.multipleFile(c, urlPerfix) multipartFile := e.multipleFile(c, urlPrefix)
e.OK(multipartFile, "上传成功") e.OK(multipartFile, "上传成功")
return return
case "3": // base64 case "3": // base64
fileResponse = e.baseImg(c, fileResponse, urlPerfix) fileResponse = e.baseImg(c, fileResponse, urlPrefix)
e.OK(fileResponse, "上传成功") e.OK(fileResponse, "上传成功")
} }
} }
+22 -3
View File
@@ -2,10 +2,10 @@ package apis
import ( import (
"github.com/gin-gonic/gin/binding" "github.com/gin-gonic/gin/binding"
"github.com/go-admin-team/go-admin-core/sdk/api"
"net/http" "net/http"
"github.com/gin-gonic/gin" "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"
"github.com/go-admin-team/go-admin-core/sdk/pkg/logger" "github.com/go-admin-team/go-admin-core/sdk/pkg/logger"
"github.com/go-admin-team/go-admin-core/sdk/pkg/response" "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
@@ -19,11 +19,12 @@ type Api struct {
func (e Api) SetContext(c *gin.Context) { func (e Api) SetContext(c *gin.Context) {
e.Context = c e.Context = c
e.Logger = api.GetRequestLogger(c)
} }
// GetLogger 获取上下文提供的日志 // GetLogger 获取上下文提供的日志
func (e Api) GetLogger() *logger.Logger { func (e Api) GetLogger() *logger.Logger {
e.Logger = api.GetRequestLogger(e.Context)
return e.Logger return e.Logger
} }
@@ -33,6 +34,24 @@ func (e Api) Bind(d interface{}, bindings ...binding.Binding) error {
switch bindings[i] { switch bindings[i] {
case binding.JSON: case binding.JSON:
err = e.Context.ShouldBindWith(d, binding.JSON) err = e.Context.ShouldBindWith(d, binding.JSON)
case binding.XML:
err = e.Context.ShouldBindWith(d, binding.XML)
case binding.Form:
err = e.Context.ShouldBindWith(d, binding.Form)
case binding.Query:
err = e.Context.ShouldBindWith(d, binding.Query)
case binding.FormPost:
err = e.Context.ShouldBindWith(d, binding.FormPost)
case binding.FormMultipart:
err = e.Context.ShouldBindWith(d, binding.FormMultipart)
case binding.ProtoBuf:
err = e.Context.ShouldBindWith(d, binding.ProtoBuf)
case binding.MsgPack:
err = e.Context.ShouldBindWith(d, binding.MsgPack)
case binding.YAML:
err = e.Context.ShouldBindWith(d, binding.YAML)
case binding.Header:
err = e.Context.ShouldBindWith(d, binding.Header)
default: default:
err = e.Context.ShouldBindUri(d) err = e.Context.ShouldBindUri(d)
} }
@@ -71,4 +90,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int,
// Custom 兼容函数 // Custom 兼容函数
func (e Api) Custom(data gin.H) { func (e Api) Custom(data gin.H) {
response.Custum(e.Context, data) response.Custum(e.Context, data)
} }