From cd3122f9e022a141e27f9ccb8a4594ffe9139f85 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 4 Jan 2023 09:48:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(api):=20=E6=81=A2=E5=A4=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/auth/filter/F2CDocFilter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java index f584cbf0a3..d5d8438c3a 100644 --- a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java +++ b/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java @@ -40,10 +40,10 @@ public class F2CDocFilter extends AccessControlFilter { DefaultLicenseService defaultLicenseService = CommonBeanFactory.getBean(DefaultLicenseService.class); F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.validateLicense(); Status status = f2CLicenseResponse.getStatus(); - /*if (status != Status.valid) { + if (status != Status.valid) { request.setAttribute(RESULT_URI_KEY, NOLIC_PAGE); return false; - }*/ + } } catch (Exception e) { request.setAttribute(RESULT_URI_KEY, NOLIC_PAGE); LogUtil.error(e.getMessage(), e); From eb0976f4b0122ab47681c17865e6c552e866d45d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 4 Jan 2023 10:50:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):?= =?UTF-8?q?=20cron=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=94=99=E8=AF=AF=E6=96=87?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/job/sechedule/ScheduleManager.java | 4 +++- .../java/io/dataease/plugins/server/XEmailTaskServer.java | 2 ++ backend/src/main/resources/i18n/messages_en_US.properties | 1 + backend/src/main/resources/i18n/messages_zh_CN.properties | 1 + backend/src/main/resources/i18n/messages_zh_TW.properties | 2 ++ 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java index 3a41798e93..0a8a24758a 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java +++ b/backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java @@ -2,6 +2,7 @@ package io.dataease.job.sechedule; import io.dataease.commons.utils.LogUtil; import io.dataease.exception.DataEaseException; +import io.dataease.i18n.Translator; import org.quartz.*; import org.springframework.stereotype.Component; @@ -399,7 +400,8 @@ public class ScheduleManager { public static CronTrigger getCronTrigger(String cron) { if (!CronExpression.isValidExpression(cron)) { - DataEaseException.throwException("cron :" + cron + " error"); + String msg = Translator.get("I18N_CRON_ERROR"); + DataEaseException.throwException(msg + " : " + cron); } return TriggerBuilder.newTrigger().withIdentity("Calculate Date") .withSchedule(CronScheduleBuilder.cronSchedule(cron)).build(); diff --git a/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java b/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java index 1e0ecb114f..965889d66a 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java @@ -31,6 +31,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ByteArrayResource; import org.springframework.http.*; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Base64Utils; import org.springframework.web.bind.annotation.*; import org.springframework.web.util.HtmlUtils; @@ -128,6 +129,7 @@ public class XEmailTaskServer { @RequiresPermissions("task-email:add") @PostMapping("/save") + @Transactional public void save(@RequestBody XpackEmailCreate param) throws Exception { XpackEmailTaskRequest request = param.fillContent(); EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties index 1b815bb37e..63c80bb089 100644 --- a/backend/src/main/resources/i18n/messages_en_US.properties +++ b/backend/src/main/resources/i18n/messages_en_US.properties @@ -261,3 +261,4 @@ I18N_LOG_FORMAT_PREFIX=With authority of %s\u3010%s\u3011 \u6C34\u5370\u7BA1\u7406=Watermark \u8840\u7F18\u5173\u7CFB=Relationship +I18N_CRON_ERROR=Cron expression error \ No newline at end of file diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties index 188ff1523f..a0a278575f 100644 --- a/backend/src/main/resources/i18n/messages_zh_CN.properties +++ b/backend/src/main/resources/i18n/messages_zh_CN.properties @@ -261,4 +261,5 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 \u8840\u7F18\u5173\u7CFB=\u8840\u7F18\u5173\u7CFB +I18N_CRON_ERROR=cron\u8868\u8FBE\u5F0F\u9519\u8BEF diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties index 1301d7a0c0..fe253c3b6f 100644 --- a/backend/src/main/resources/i18n/messages_zh_TW.properties +++ b/backend/src/main/resources/i18n/messages_zh_TW.properties @@ -256,3 +256,5 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6B0A\u9650 \u5220\u9664\u8BB0\u5F55=\u522A\u9664\u8A18\u9304 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 \u8840\u7F18\u5173\u7CFB=\u8840\u7DE3\u95DC\u7CFB + +I18N_CRON_ERROR=cron\u8868\u9054\u5F0F\u932F\u8AA4 \ No newline at end of file From cf8c4eca46d815b602b175b17f70a219a2624b02 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 4 Jan 2023 11:05:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E5=8F=96=E6=B6=88=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E7=9A=84=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=9C=A8=E6=94=B6?= =?UTF-8?q?=E8=97=8F=E9=87=8C=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V47__1.18-panel-subject-add.sql | 3 ++- frontend/src/views/panel/list/PanelViewShow.vue | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql b/backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql index af92d97c11..89142acceb 100644 --- a/backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql +++ b/backend/src/main/resources/db/migration/V47__1.18-panel-subject-add.sql @@ -1,5 +1,6 @@ delete -from `panel_subject`; +from `panel_subject` +where id in ('system_1', 'system_2'); BEGIN; INSERT INTO `panel_subject` (`id`, `name`, `type`, `details`, `create_num`, `create_time`, `create_by`, `update_time`, `update_by`) diff --git a/frontend/src/views/panel/list/PanelViewShow.vue b/frontend/src/views/panel/list/PanelViewShow.vue index e5e5bc15b9..6fb0456d20 100644 --- a/frontend/src/views/panel/list/PanelViewShow.vue +++ b/frontend/src/views/panel/list/PanelViewShow.vue @@ -120,6 +120,7 @@