From 6ed2fcbf6c5ff0d8aeccb275f937ec7bbdd53170 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Fri, 27 May 2022 22:47:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=F0=9F=90=9B:=20=E6=B7=BB=E5=8A=A0roleKe?= =?UTF-8?q?y=E9=AA=8C=E8=AF=81(#649)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/apis/sys_role.go | 2 +- app/admin/service/sys_role.go | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/admin/apis/sys_role.go b/app/admin/apis/sys_role.go index f83e365..507132e 100644 --- a/app/admin/apis/sys_role.go +++ b/app/admin/apis/sys_role.go @@ -125,7 +125,7 @@ func (e SysRole) Insert(c *gin.Context) { err = s.Insert(&req, cb) if err != nil { e.Logger.Error(err) - e.Error(500, err, "创建失败") + e.Error(500, err, "创建失败,"+err.Error()) return } _, err = global.LoadPolicy(c) diff --git a/app/admin/service/sys_role.go b/app/admin/service/sys_role.go index c1f1853..6c51404 100644 --- a/app/admin/service/sys_role.go +++ b/app/admin/service/sys_role.go @@ -83,6 +83,18 @@ func (e *SysRole) Insert(c *dto.SysRoleInsertReq, cb *casbin.SyncedEnforcer) err } }() } + var count int64 + err = tx.Model(&data).Where("role_key = ?", c.RoleKey).Count(&count).Error + if err != nil { + e.Log.Errorf("db error:%s", err) + return err + } + + if count > 0 { + err = errors.New("roleKey已存在,需更换在提交!") + e.Log.Errorf("db error:%s", err) + return err + } err = tx.Create(&data).Error if err != nil { From cd0792e3d23ba7e4ae5e4a9daf61d8bd16a34ef8 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 28 May 2022 00:14:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor=F0=9F=8E=A8:=20=20=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0readme(#623)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.Zh-cn.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.Zh-cn.md b/README.Zh-cn.md index 1d3a477..1e1f3e6 100644 --- a/README.Zh-cn.md +++ b/README.Zh-cn.md @@ -182,6 +182,13 @@ $ ./go-admin server -c config/settings.yml $ go-admin.exe server -c config/settings.yml ``` +#### sys_api 表的数据如何添加 + +在项目启动时,使用`-a true` 系统会自动添加缺少的接口数据 +```bash +./go-admin server -c config/settings.yml -a true +``` + #### 使用docker 编译启动 ```shell From 88030e301a8ba736cd63e5c4f3b6786091b7f0fb Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 28 May 2022 00:17:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?patch=F0=9F=9A=91:=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= 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 f593fa6..1204cfc 100644 --- a/common/global/adm.go +++ b/common/global/adm.go @@ -2,7 +2,7 @@ package global const ( // Version go-admin version info - Version = "2.0.10" + Version = "2.0.11" ) var ( From 717903a2b67a172610bcc6d40246a77898d08df4 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Sat, 28 May 2022 00:34:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=F0=9F=90=9B:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=B8=AD=E7=9A=84job=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E9=97=AE=E9=A2=98(#638)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/jobs/apis/sys_job.go | 2 +- app/jobs/service/sys_job.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/jobs/apis/sys_job.go b/app/jobs/apis/sys_job.go index 5817400..296138d 100644 --- a/app/jobs/apis/sys_job.go +++ b/app/jobs/apis/sys_job.go @@ -62,7 +62,7 @@ func (e SysJob) StartJobForService(c *gin.Context) { err = s.StartJob(&v) if err != nil { log.Errorf("GetCrontabKey error, %s", err.Error()) - e.Error(500, err, "") + e.Error(500, err, err.Error()) return } e.OK(nil, s.Msg) diff --git a/app/jobs/service/sys_job.go b/app/jobs/service/sys_job.go index 4e566d0..9d7268e 100644 --- a/app/jobs/service/sys_job.go +++ b/app/jobs/service/sys_job.go @@ -1,6 +1,7 @@ package service import ( + "github.com/pkg/errors" "time" "github.com/go-admin-team/go-admin-core/sdk/service" @@ -52,6 +53,12 @@ func (e *SysJob) StartJob(c *dto.GeneralGetDto) error { e.Log.Errorf("db error: %s", err) return err } + + if data.Status == 1 { + err = errors.New("当前Job是关闭状态不能被启动,请先启用。") + return err + } + if data.JobType == 1 { var j = &jobs.HttpJob{} j.InvokeTarget = data.InvokeTarget