From a3de9cd56996a55273720a154f4471fb3f19672c Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 22 May 2021 23:38:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?docs=F0=9F=93=9D=20=E4=BF=AE=E6=94=B9versio?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/global/adm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/global/adm.go b/common/global/adm.go index fc21f04..7350d9e 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -2,7 +2,7 @@ package global const ( // Version go-admin Version Info - Version = "1.3.5" + Version = "1.3.7" ) var ( From 7491ff4459b6fb6382cd13e8e96cff3145b85687 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 23 May 2021 18:12:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=B9=E6=8D=AEid=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_config.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index d87ec95..c452e3d 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -18,7 +18,7 @@ type SysConfigSearch struct { 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:""` - IsFrontend int `json:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config" comment:""` + IsFrontend int `form:"isFrontend" search:"type:exact;column:is_frontend;table:sys_config" comment:""` } func (m *SysConfigSearch) GetNeedSearch() interface{} { @@ -87,7 +87,6 @@ func (s *SysConfigControl) GetId() interface{} { // SysConfigById 获取单个或者删除的结构体 type SysConfigById struct { - Id int `uri:"id"` Ids []int `json:"ids"` } @@ -97,7 +96,11 @@ func (s *SysConfigById) Generate() *SysConfigById { } func (s *SysConfigById) GetId() interface{} { - return s.Ids + if len(s.Ids) > 0 { + s.Ids = append(s.Ids, s.Id) + return s.Ids + } + return s.Id } func (s *SysConfigById) Bind(ctx *gin.Context) error { @@ -116,4 +119,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 +} From 18d9b77ccaa3bd86b3f5ce4a0446bbe5c5bc49f2 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sun, 23 May 2021 18:13:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?format=F0=9F=A5=9A=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/service/dto/sys_config.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/admin/service/dto/sys_config.go b/app/admin/service/dto/sys_config.go index c452e3d..ab277db 100644 --- a/app/admin/service/dto/sys_config.go +++ b/app/admin/service/dto/sys_config.go @@ -87,7 +87,8 @@ func (s *SysConfigControl) GetId() interface{} { // SysConfigById 获取单个或者删除的结构体 type SysConfigById struct { - Ids []int `json:"ids"` + Id int `uri:"id"` + Ids []int `json:"ids"` } func (s *SysConfigById) Generate() *SysConfigById {