From a06b2feefddc047394c6cacf40945bbdca4cbd9a Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Mon, 15 May 2023 13:42:24 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/vue.config.js b/frontend/vue.config.js index 4e993325df..f5298600b0 100644 --- a/frontend/vue.config.js +++ b/frontend/vue.config.js @@ -50,7 +50,7 @@ module.exports = { '@': resolve('src') } }, - output: { + output: process.env.NODE_ENV === 'development' ? {} : { filename: `js/[name].[contenthash:8].${pkg.version}.js`, publicPath: '/', chunkFilename: `js/[name].[contenthash:8].${pkg.version}.js` From 52b67a04df844dc87dcc3cdf76f5a924ac35d869 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 15 May 2023 14:13:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E5=88=A0=E9=99=A4=E5=B7=B2=E8=AF=BB=E6=B6=88=E6=81=AFapi?= =?UTF-8?q?=E5=AD=98=E5=9C=A8IDOR=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java | 3 ++- .../main/java/io/dataease/service/message/SysMsgService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java b/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java index 45e48f0f66..c0155e1a42 100644 --- a/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java +++ b/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java @@ -29,9 +29,10 @@ public interface ExtSysMsgMapper { "", " #{msgId}", "", + " and user_id = #{uid} ", "" }) - int batchDelete(@Param("msgIds") List msgIds); + int batchDelete(@Param("msgIds") List msgIds, @Param("uid") Long uid); int batchInsert(@Param("settings") List settings); diff --git a/backend/src/main/java/io/dataease/service/message/SysMsgService.java b/backend/src/main/java/io/dataease/service/message/SysMsgService.java index 0d6dadd22a..99038d3b57 100644 --- a/backend/src/main/java/io/dataease/service/message/SysMsgService.java +++ b/backend/src/main/java/io/dataease/service/message/SysMsgService.java @@ -109,7 +109,7 @@ public class SysMsgService { } public void batchDelete(List msgIds) { - extSysMsgMapper.batchDelete(msgIds); + extSysMsgMapper.batchDelete(msgIds, AuthUtils.getUser().getUserId()); } public void save(SysMsg sysMsg) { From 5cfbbdf1e49ba80a4978100e67eb3002a44f842d Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 15 May 2023 15:45:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):?= =?UTF-8?q?=20=E7=AB=8B=E5=8D=B3=E6=89=A7=E8=A1=8C=E5=81=9C=E6=AD=A2?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/plugins/server/XEmailTaskServer.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 3f38ea5a4f..ba3447052f 100644 --- a/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java +++ b/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java @@ -18,6 +18,7 @@ import io.dataease.plugins.common.entity.XpackConditionEntity; import io.dataease.plugins.common.entity.XpackGridRequest; import io.dataease.plugins.config.SpringContextUtil; import io.dataease.plugins.xpack.email.dto.request.*; +import io.dataease.plugins.xpack.email.dto.response.XpackTaskEntity; import io.dataease.plugins.xpack.email.dto.response.XpackTaskGridDTO; import io.dataease.plugins.xpack.email.dto.response.XpackTaskInstanceDTO; import io.dataease.plugins.xpack.email.service.EmailXpackService; @@ -35,6 +36,9 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.util.HtmlUtils; import springfox.documentation.annotations.ApiIgnore; +import javax.annotation.Resource; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.io.*; import java.net.URLEncoder; import java.util.ArrayList; @@ -43,10 +47,6 @@ import java.util.List; import java.util.concurrent.Future; import java.util.stream.Collectors; -import javax.annotation.Resource; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; - @ApiIgnore @RequestMapping("/plugin/task") @RestController @@ -108,8 +108,8 @@ public class XEmailTaskServer { @PostMapping("/fireNow/{taskId}") public void fireNow(@PathVariable("taskId") Long taskId) throws Exception { EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class); - XpackEmailTaskRequest request = emailXpackService.taskForm(taskId); - GlobalTaskEntity globalTaskEntity = BeanUtils.copyBean(new GlobalTaskEntity(), request); + XpackTaskEntity xpackTaskEntity = emailXpackService.taskDetail(taskId); + GlobalTaskEntity globalTaskEntity = BeanUtils.copyBean(new GlobalTaskEntity(), xpackTaskEntity); Boolean invalid = false; if (CronUtils.taskExpire(globalTaskEntity.getEndTime())) { globalTaskEntity.setEndTime(null); From 11ae4a32394eb4c2941e57bf93fe224dcb6663ff Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 15 May 2023 15:54:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86):?= =?UTF-8?q?=20=E6=B6=88=E6=81=AF=E6=89=B9=E9=87=8F=E5=B7=B2=E8=AF=BBapi?= =?UTF-8?q?=E5=AD=98=E5=9C=A8IDOR=E5=AE=89=E5=85=A8=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java | 3 ++- .../java/io/dataease/service/message/SysMsgService.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java b/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java index c0155e1a42..efc5ad7b23 100644 --- a/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java +++ b/backend/src/main/java/io/dataease/ext/ExtSysMsgMapper.java @@ -19,9 +19,10 @@ public interface ExtSysMsgMapper { "", " #{msgId}", "", + " and user_id = #{uid}", "" }) - int batchStatus(@Param("msgIds") List msgIds, @Param("time") Long time); + int batchStatus(@Param("msgIds") List msgIds, @Param("time") Long time, @Param("uid") Long uid); @Delete({ "