From 761308c470a0478c66d38cbbb04dd0d3a6453805 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Tue, 2 Jul 2024 16:34:11 +0200 Subject: [PATCH 1/3] Release 2.5.0 --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index b65ae1d7a..2ddcb1c6b 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 2.4.1 +WIA APP Version: 2.5.0 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index d32c7f671..7d71be69f 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - 2.4.1 + 2.5.0 pom WIA APP ${project.version} From bc442b304e69346a4c6c2593fea295cae0382504 Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Tue, 2 Jul 2024 17:11:06 +0200 Subject: [PATCH 2/3] Hotfix 2.5.1 : Quit job when no local tracking number can be updated --- .../modules/business/domain/job/YDTrackingNumberJob.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/YDTrackingNumberJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/YDTrackingNumberJob.java index e73a11d81..0c4d43c54 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/YDTrackingNumberJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/YDTrackingNumberJob.java @@ -113,6 +113,10 @@ public class YDTrackingNumberJob implements Job { long nbSuccesses = results.stream().filter(b -> b).count(); log.info("{}/{} local tracking numbers have been retrieved.", nbSuccesses, ydRequests.size()); + if (localTrackingNumbers.isEmpty()) { + log.info("No local tracking numbers to be updated, quitting."); + return; + } log.info("Started updating {} local tracking numbers", localTrackingNumbers.size()); platformOrderService.updateLocalTrackingNumber(localTrackingNumbers); log.info("Ended updating local tracking numbers for the following orders : {}", localTrackingNumbers.stream() From 730088a6ba8105e46810e15f9635b46308cdd63a Mon Sep 17 00:00:00 2001 From: Qiuyi LI Date: Tue, 2 Jul 2024 17:11:44 +0200 Subject: [PATCH 3/3] Update project version --- .../jeecg-system-start/src/main/resources/banner.txt | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt index 2ddcb1c6b..d52691ee4 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt +++ b/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt @@ -8,7 +8,7 @@ ${AnsiColor.BRIGHT_BLUE} ${AnsiColor.BRIGHT_GREEN} -WIA APP Version: 2.5.0 +WIA APP Version: 2.5.1 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version} Website: www.wia-sourcing.com ${AnsiColor.BLACK} diff --git a/pom.xml b/pom.xml index 7d71be69f..b3890d533 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.jeecgframework.boot jeecg-boot-parent - 2.5.0 + 2.5.1 pom WIA APP ${project.version}