feat :系统配置统一使用参数设置功能

注意:系统配置表将设置为过时功能
This commit is contained in:
wenjianzhang
2021-03-17 10:18:47 +08:00
parent 55a85babf8
commit 51bc4423f7
4 changed files with 67 additions and 8 deletions
+37 -1
View File
@@ -47,6 +47,42 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) {
e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功") 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
}
d.ConfigKey = "sys_app_"
if err != nil {
log.Errorf("参数验证失败, error:%s", err)
e.Error(c, 500, err, "参数验证失败")
return
}
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) { func (e *SysConfig) GetSysConfig(c *gin.Context) {
log := e.GetLogger(c) log := e.GetLogger(c)
control := new(dto.SysConfigById) control := new(dto.SysConfigById)
@@ -228,4 +264,4 @@ func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) {
return return
} }
e.OK(c, v, s.Msg) e.OK(c, v, s.Msg)
} }
+10 -3
View File
@@ -13,9 +13,10 @@ func init() {
// 需认证的路由代码 // 需认证的路由代码
func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
api := &sys_config.SysConfig{}
r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole()) r := v1.Group("/config").Use(authMiddleware.MiddlewareFunc()).Use(middleware2.AuthCheckRole())
{ {
api := &sys_config.SysConfig{}
r.GET("", api.GetSysConfigList) r.GET("", api.GetSysConfigList)
r.GET("/:id", api.GetSysConfig) r.GET("/:id", api.GetSysConfig)
r.POST("", api.InsertSysConfig) r.POST("", api.InsertSysConfig)
@@ -25,7 +26,13 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc()) r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
{ {
api := &sys_config.SysConfig{}
r1.GET("/:configKey", api.GetSysConfigByKEYForService) r1.GET("/:configKey", api.GetSysConfigByKEYForService)
} }
}
r2 := v1.Group("/app-config")
{
r2.GET("", api.GetSysConfigBySysApp)
}
}
+3 -3
View File
@@ -15,8 +15,8 @@ import (
// SysConfigSearch 列表或者搜索使用结构体 // SysConfigSearch 列表或者搜索使用结构体
type SysConfigSearch struct { type SysConfigSearch struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
ConfigName string `form:"configName" search:"type:exact;column:config_name;table:sys_config" comment:""` ConfigName string `form:"configName" search:"type:contains;column:config_name;table:sys_config" comment:""`
ConfigKey string `form:"configKey" search:"type:exact;column:config_key;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:""` ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config" comment:""`
} }
@@ -113,4 +113,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error {
func (s *SysConfigById) GenerateM() (*system.SysConfig, error) { func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
return &system.SysConfig{}, nil return &system.SysConfig{}, nil
} }
+17 -1
View File
@@ -32,6 +32,22 @@ func (e *SysConfig) GetSysConfigPage(c *dto.SysConfigSearch, list *[]system.SysC
return nil 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对象 // GetSysConfig 获取SysConfig对象
func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error { func (e *SysConfig) GetSysConfig(d *dto.SysConfigById, model *system.SysConfig) error {
var err error var err error
@@ -115,4 +131,4 @@ func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error {
} }
return nil return nil
} }