From 51bc4423f70b4fc4db7bb79f432a0a6d4030d0b7 Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Wed, 17 Mar 2021 10:18:47 +0800 Subject: [PATCH] =?UTF-8?q?feat=E2=9C=A8=20=EF=BC=9A=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 注意:系统配置表将设置为过时功能 --- .../apis/system/sys_config/sys_config.go | 38 ++++++++++++++++++- app/admin/router/sys_config.go | 13 +++++-- app/admin/service/dto/sys_config.go | 6 +-- app/admin/service/sys_config.go | 18 ++++++++- 4 files changed, 67 insertions(+), 8 deletions(-) diff --git a/app/admin/apis/system/sys_config/sys_config.go b/app/admin/apis/system/sys_config/sys_config.go index bf4b675..1789451 100644 --- a/app/admin/apis/system/sys_config/sys_config.go +++ b/app/admin/apis/system/sys_config/sys_config.go @@ -47,6 +47,42 @@ func (e *SysConfig) GetSysConfigList(c *gin.Context) { 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) { log := e.GetLogger(c) control := new(dto.SysConfigById) @@ -228,4 +264,4 @@ func (e *SysConfig) GetSysConfigByKEYForService(c *gin.Context) { return } e.OK(c, v, s.Msg) -} +} \ No newline at end of file diff --git a/app/admin/router/sys_config.go b/app/admin/router/sys_config.go index f6cc894..6664345 100644 --- a/app/admin/router/sys_config.go +++ b/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) + } + + +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index 935f360..38433f1 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -15,8 +15,8 @@ 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:""` } @@ -113,4 +113,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error { func (s *SysConfigById) GenerateM() (*system.SysConfig, error) { return &system.SysConfig{}, nil -} +} \ No newline at end of file diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index d3176f8..eb11d50 100644 --- a/app/admin/service/sys_config.go +++ b/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 -} +} \ No newline at end of file