From 7e85fb2e25b3ffa270ceb410e7be43ceefaf976c Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Fri, 18 Mar 2022 14:10:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E8=A7=84=E5=AE=9A=E5=A4=A7=E5=B0=8F=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index 3ac841d1..26830c54 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -253,7 +253,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { // 1M int len = 1024 * 1024; if (size > (maxSize * len)) { - throw new BadRequestException("文件超出规定大小"); + throw new BadRequestException("文件超出规定大小：" + maxSize + "M"); } } From 76ac60e9948e77b87cd4ad47a28af6a4f93f028b Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Fri, 18 Mar 2022 14:33:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=B6=85=E5=87=BA?= =?UTF-8?q?=E8=A7=84=E5=AE=9A=E5=A4=A7=E5=B0=8F=E6=8F=90=E7=A4=BA=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java index 26830c54..0d8d5fb4 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/FileUtil.java @@ -253,7 +253,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { // 1M int len = 1024 * 1024; if (size > (maxSize * len)) { - throw new BadRequestException("文件超出规定大小：" + maxSize + "M"); + throw new BadRequestException("文件超出规定大小:" + maxSize + "MB"); } } From acd8d8628c8acee4639bb83b5b2d25bf50429ccd Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Tue, 22 Mar 2022 13:24:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d345eea1..7462baca 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ **开发文档：** [https://el-admin.vip](https://el-admin.vip) -**体验地址：** [https://el-admin.xin](https://el-admin.xin) +**体验地址：** [https://el-admin.vip/demo](https://el-admin.vip/demo) **账号密码：** `admin / 123456` From f78adec4ec757b6e22f116abd60eba0ae081bac7 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Tue, 12 Apr 2022 10:15:18 +0800 Subject: [PATCH 4/5] update --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c75c505b..9acb04ae 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ */target/* */*.iml /.gradle/ +/application.pid \ No newline at end of file From e37d485b4b5084528b07f88ade463543dfba16a3 Mon Sep 17 00:00:00 2001 From: Zheng Jie <201507802@qq.com> Date: Fri, 20 May 2022 13:26:42 +0800 Subject: [PATCH 5/5] update --- .../java/me/zhengjie/modules/quartz/config/JobRunner.java | 4 +--- .../main/java/me/zhengjie/modules/quartz/task/TestTask.java | 2 -- eladmin-system/src/main/resources/banner.txt | 2 +- eladmin-system/src/main/resources/config/application-prod.yml | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java index 547e822b..a5a9c91f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/config/JobRunner.java @@ -24,7 +24,6 @@ import org.slf4j.LoggerFactory; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; - import java.util.List; /** @@ -45,9 +44,8 @@ public class JobRunner implements ApplicationRunner { */ @Override public void run(ApplicationArguments applicationArguments) { - log.info("--------------------注入系统定时任务------------------"); List quartzJobs = quartzJobRepository.findByIsPauseIsFalse(); quartzJobs.forEach(quartzManage::addJob); - log.info("--------------------定时任务注入完成------------------"); + log.info("Timing task injection complete"); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java index aff0ac86..da1c8ff4 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/quartz/task/TestTask.java @@ -16,7 +16,6 @@ package me.zhengjie.modules.quartz.task; import lombok.extern.slf4j.Slf4j; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; /** @@ -25,7 +24,6 @@ import org.springframework.stereotype.Component; * @date 2019-01-08 */ @Slf4j -@Async @Component public class TestTask { diff --git a/eladmin-system/src/main/resources/banner.txt b/eladmin-system/src/main/resources/banner.txt index d0f401a8..fc2a4370 100644 --- a/eladmin-system/src/main/resources/banner.txt +++ b/eladmin-system/src/main/resources/banner.txt @@ -5,4 +5,4 @@ | __| | | (_| | (_| | | | | | | | | | | \___|_| \__,_|\__,_|_| |_| |_|_|_| |_| - :: Spring Boot :: (v2.1.0.RELEASE) \ No newline at end of file + :: Spring Boot :: (v2.2.10.RELEASE) \ No newline at end of file diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml index 52e52ddf..bdfe5687 100644 --- a/eladmin-system/src/main/resources/config/application-prod.yml +++ b/eladmin-system/src/main/resources/config/application-prod.yml @@ -93,7 +93,7 @@ jwt: # IP 本地解析 ip: - local-parsing: false + local-parsing: true #是否允许生成代码，生产环境设置为false generator: