center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix(定时报告): cron表达式错误文案

Browse Source
This commit is contained in:
fit2cloud-chenyw 2023-01-04 10:50:53 +08:00
parent 1bdb65fd30
commit eb0976f4b0
5 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/job/sechedule/ScheduleManager.java
View File

@ -2,6 +2,7 @@ package io.dataease.job.sechedule;
import io.dataease.commons.utils.LogUtil; import io.dataease.commons.utils.LogUtil;
import io.dataease.exception.DataEaseException; import io.dataease.exception.DataEaseException;
import io.dataease.i18n.Translator;
import org.quartz.*; import org.quartz.*;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -399,7 +400,8 @@ public class ScheduleManager {
public static CronTrigger getCronTrigger(String cron) { public static CronTrigger getCronTrigger(String cron) {
if (!CronExpression.isValidExpression(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") return TriggerBuilder.newTrigger().withIdentity("Calculate Date")
.withSchedule(CronScheduleBuilder.cronSchedule(cron)).build(); .withSchedule(CronScheduleBuilder.cronSchedule(cron)).build();

2
backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
View File

@ -31,6 +31,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ByteArrayResource;
import org.springframework.http.*; import org.springframework.http.*;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Base64Utils; import org.springframework.util.Base64Utils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.util.HtmlUtils; import org.springframework.web.util.HtmlUtils;
@ -128,6 +129,7 @@ public class XEmailTaskServer {
@RequiresPermissions("task-email:add") @RequiresPermissions("task-email:add")
@PostMapping("/save") @PostMapping("/save")
@Transactional
public void save(@RequestBody XpackEmailCreate param) throws Exception { public void save(@RequestBody XpackEmailCreate param) throws Exception {
XpackEmailTaskRequest request = param.fillContent(); XpackEmailTaskRequest request = param.fillContent();
EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);

1
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -261,3 +261,4 @@ I18N_LOG_FORMAT_PREFIX=With authority of %s\u3010%s\u3011
\u6C34\u5370\u7BA1\u7406=Watermark \u6C34\u5370\u7BA1\u7406=Watermark
\u8840\u7F18\u5173\u7CFB=Relationship \u8840\u7F18\u5173\u7CFB=Relationship
I18N_CRON_ERROR=Cron expression error

1
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -261,4 +261,5 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6743\u9650
\u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406
\u8840\u7F18\u5173\u7CFB=\u8840\u7F18\u5173\u7CFB \u8840\u7F18\u5173\u7CFB=\u8840\u7F18\u5173\u7CFB
I18N_CRON_ERROR=cron\u8868\u8FBE\u5F0F\u9519\u8BEF

2
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -256,3 +256,5 @@ I18N_LOG_FORMAT_PREFIX=\u4EE5%s\u3010%s\u3011\u6B0A\u9650
\u5220\u9664\u8BB0\u5F55=\u522A\u9664\u8A18\u9304 \u5220\u9664\u8BB0\u5F55=\u522A\u9664\u8A18\u9304
\u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406 \u6C34\u5370\u7BA1\u7406=\u6C34\u5370\u7BA1\u7406
\u8840\u7F18\u5173\u7CFB=\u8840\u7DE3\u95DC\u7CFB \u8840\u7F18\u5173\u7CFB=\u8840\u7DE3\u95DC\u7CFB
I18N_CRON_ERROR=cron\u8868\u9054\u5F0F\u932F\u8AA4