From 8d272e8862b252bc269eadaeff62b003c61c04cf Mon Sep 17 00:00:00 2001 From: wenjianzhang Date: Tue, 25 May 2021 19:36:57 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E2=9C=A8=20=E6=8E=92=E5=BA=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=8E=A5=E5=8F=97=E5=8F=82=E6=95=B0=E5=90=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_api.go | 6 +++--- app/admin/service/dto/sys_config.go | 18 ++++++++++++++++++ app/admin/service/dto/sys_dict_type.go | 2 +- app/admin/service/dto/sys_login_log.go | 4 ++-- app/admin/service/dto/sys_role.go | 10 +++++----- app/admin/service/dto/sys_user.go | 8 ++++---- app/admin/service/sys_config.go | 4 ++-- 7 files changed, 35 insertions(+), 17 deletions(-) diff --git a/app/admin/service/dto/sys_api.go b/app/admin/service/dto/sys_api.go index f172b45..e6e8d38 100644 --- a/app/admin/service/dto/sys_api.go +++ b/app/admin/service/dto/sys_api.go @@ -16,9 +16,9 @@ type SysApiSearch struct { } type SysApiOrder struct { - TitleOrder string `search:"type:order;column:title;table:sys_api" form:"title_order"` - PathOrder string `search:"type:order;column:path;table:sys_api" form:"path_order"` - CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAt_order"` + TitleOrder string `search:"type:order;column:title;table:sys_api" form:"titleOrder"` + PathOrder string `search:"type:order;column:path;table:sys_api" form:"pathOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_api" form:"createdAtOrder"` } func (m *SysApiSearch) GetNeedSearch() interface{} { diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index 21041d1..b78306a 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -13,6 +13,15 @@ type SysConfigSearch struct { ConfigKey string `form:"configKey" search:"type:contains;column:config_key;table:sys_config"` ConfigType string `form:"configType" search:"type:exact;column:config_type;table:sys_config"` IsFrontend int `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config"` + SysConfigOrder +} + +type SysConfigOrder struct { + IdOrder string `search:"type:order;column:id;table:sys_config" form:"idOrder"` + ConfigNameOrder string `search:"type:order;column:config_name;table:sys_config" form:"configNameOrder"` + ConfigKeyOrder string `search:"type:order;column:config_key;table:sys_config" form:"configKeyOrder"` + ConfigTypeOrder string `search:"type:order;column:config_type;table:sys_config" form:"configTypeOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_config" form:"createdAtOrder"` } func (m *SysConfigSearch) GetNeedSearch() interface{} { @@ -50,6 +59,15 @@ func (s *SysConfigControl) GetId() interface{} { return s.Id } +// SysConfigByKeyReq 根据Key获取配置 +type SysConfigByKeyReq struct { + ConfigKey string `uri:"configKey" search:"type:contains;column:config_key;table:sys_config"` +} + +func (m *SysConfigByKeyReq) GetNeedSearch() interface{} { + return *m +} + // SysConfigById 获取单个或者删除的结构体 type SysConfigById struct { Id int `uri:"id"` diff --git a/app/admin/service/dto/sys_dict_type.go b/app/admin/service/dto/sys_dict_type.go index 508facf..c0fcb0b 100644 --- a/app/admin/service/dto/sys_dict_type.go +++ b/app/admin/service/dto/sys_dict_type.go @@ -18,7 +18,7 @@ type SysDictTypeSearch struct { } type SysDictTypeOrder struct { - DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dict_id_order"` + DictIdOrder string `search:"type:order;column:dict_id;table:sys_dict_type" form:"dictIdOrder"` } func (m *SysDictTypeSearch) GetNeedSearch() interface{} { diff --git a/app/admin/service/dto/sys_login_log.go b/app/admin/service/dto/sys_login_log.go index 1dec4b4..37085b4 100644 --- a/app/admin/service/dto/sys_login_log.go +++ b/app/admin/service/dto/sys_login_log.go @@ -20,7 +20,7 @@ type SysLoginLogSearch struct { } type SysLoginLogOrder struct { - HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"created_at_order"` + HandleOrder string `search:"type:order;column:created_at;table:sys_login_log" form:"createdAtOrder"` } func (m *SysLoginLogSearch) GetNeedSearch() interface{} { @@ -115,4 +115,4 @@ func (s *SysLoginLogById) Generate() *SysLoginLogById { func (s *SysLoginLogById) GenerateM() (*models.SysLoginLog, error) { return &models.SysLoginLog{}, nil -} +} \ No newline at end of file diff --git a/app/admin/service/dto/sys_role.go b/app/admin/service/dto/sys_role.go index e3b17b6..e329466 100644 --- a/app/admin/service/dto/sys_role.go +++ b/app/admin/service/dto/sys_role.go @@ -28,11 +28,11 @@ type SysRoleSearch struct { } type SysRoleOrder struct { - RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleId_order"` - RoleNameOrder string `search:"type:order;column:role_name;table:sys_role" form:"roleName_order"` - RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"username_order"` - StatusOrder string `search:"type:order;column:status;table:sys_role" form:"status_order"` - CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAt_order"` + RoleIdOrder string `search:"type:order;column:role_id;table:sys_role" form:"roleIdOrder"` + RoleNameOrder string `search:"type:order;column:role_name;table:sys_role" form:"roleNameOrder"` + RoleSortOrder string `search:"type:order;column:role_sort;table:sys_role" form:"usernameOrder"` + StatusOrder string `search:"type:order;column:status;table:sys_role" form:"statusOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_role" form:"createdAtOrder"` } func (m *SysRoleSearch) GetNeedSearch() interface{} { diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go index 18d73cd..d445c38 100644 --- a/app/admin/service/dto/sys_user.go +++ b/app/admin/service/dto/sys_user.go @@ -23,10 +23,10 @@ type SysUserSearch struct { } type SysUserOrder struct { - UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userId_order"` - UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"username_order"` - StatusOrder string `search:"type:order;column:status;table:sys_user" form:"status_order"` - CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAt_order"` + UserIdOrder string `search:"type:order;column:user_id;table:sys_user" form:"userIdOrder"` + UsernameOrder string `search:"type:order;column:username;table:sys_user" form:"usernameOrder"` + StatusOrder string `search:"type:order;column:status;table:sys_user" form:"statusOrder"` + CreatedAtOrder string `search:"type:order;column:created_at;table:sys_user" form:"createdAtOrder"` } func (m *SysUserSearch) GetNeedSearch() interface{} { diff --git a/app/admin/service/sys_config.go b/app/admin/service/sys_config.go index bc017f6..938cfb1 100644 --- a/app/admin/service/sys_config.go +++ b/app/admin/service/sys_config.go @@ -71,7 +71,7 @@ func (e *SysConfig) InsertSysConfig(c *dto.SysConfigControl) error { var err error var data models.SysConfig c.Generate(&data) - err = e.Orm.Create(data).Error + err = e.Orm.Create(&data).Error if err != nil { e.Log.Errorf("Service InsertSysConfig error:%s", err) return err @@ -117,7 +117,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById) error { } // GetSysConfigByKEY 根据Key获取SysConfig -func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigControl) error { +func (e *SysConfig) GetSysConfigByKEY(c *dto.SysConfigByKeyReq) error { var err error var data models.SysConfig data.ConfigKey = c.ConfigKey