Merge branch 'refs/heads/release' into dev

# Conflicts:
#	jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java
#	pom.xml

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/api/shopify/CreateFulfillmentRequest.java

@@ -17,20 +17,22 @@ public class CreateFulfillmentRequest extends ShopifyRequest {
         DPD_BE("https://www.dpdgroup.com/be/mydpd/my-parcels/track?parcelNumber=%s", "DPD", "06086316[0-9]{6}"),
         DPD_DE("https://www.dpd.com/de/de/", "DPD", "0150534[0-9]{7}"),
         DPD_AT("https://www.mydpd.at", "DPD", "06215167[0-9]{6}"),
+        DPD_CH("https://www.dpdgroup.com/ch/mydpd/my-parcels/incoming?parcelNumber=%s", "DPD", "06086328[0-9]{6}"),
         CANADA_POST("https://www.canadapost-postescanada.ca/track-reperage/en#/search?searchFor=%s", "Canada Post", "(201255|732131)[0-9]{10}"),
-        SWISS_POST("https://service.post.ch/ekp-web/ui/entry/search/%s", "Swiss Post", "[0-9]{18}"),
+        SWISS_POST("https://service.post.ch/ekp-web/ui/entry/search/%s", "Swiss Post", "[0-9]{18}|LW[0-9]{9}CH"),
         EARLY_BIRD("https://earlybird.se/", "Early Bird", "[0-9]{19}"),
         DAO("https://www.dao.as/privat/find-din-pakke?stregkode=%s", "DAO", "00057151270[0-9]{10}"),
         DHL_PACKET("https://www.dhl.de/en/privatkunden/pakete-empfangen/verfolgen.html?piececode=%s", "DHL Packet", "0034[0-9]{16}"),
         GLS_NL("https://www.gls-info.nl/tracking", "GLS", "[0-9]{20}"),
         GLS_NL_2("https://www.gls-info.nl/tracking", "GLS", "(1437|1000)[0-9]{10}"),
-        USPS("https://tools.usps.com/go/TrackConfirmAction?qtc_tLabels1=%s", "USPS", "[0-9]{22,34}"),
+//        USPS("https://tools.usps.com/go/TrackConfirmAction?qtc_tLabels1=%s", "USPS", "[0-9]{22,34}"),
         AUSTRIAN_POST("https://www.post.at/s/sendungsdetails?snr=%s", "Austrian Post", "15828030053[0-9]{13}"),
         DHL_PACKET_WIA("https://www.dhl.de/en/privatkunden/pakete-empfangen/verfolgen.html?piececode=%s", "DHL Packet", "CD[0-9]{9}DE"),
         DHL_PARCEL_WIA_NL("https://my.dhlparcel.nl/home/tracktrace/%s/%s?lang=nl_NL", "DHL Parcel", "3S[A-Z]{4}[0-9]{9}"),
         GLS_IT("https://gls-group.com/IT/it/servizi-online/ricerca-spedizioni.html?match=%s&type=NAT", "GLS", "LT[0-9]{9}"),
-        COLIS_PRIVE_BE_LU("https://colisprive.com/moncolis/pages/detailColis.aspx?numColis=%s", "Colis Privé", "Q[0-9]{11}[BL][0-9]{4}"),
+        COLIS_PRIVE_BE("https://colisprive.com/moncolis/pages/detailColis.aspx?numColis=%sB%s&lang=fr", "Colis Privé", "Q[0-9]{11}[B][0-9]{4}|801000[0-9]{6}"),
-        COLIS_PRIVE_BE_WIA("https://colisprive.com/moncolis/pages/detailColis.aspx?numColis=%s%s", "Colis Privé", "LC[0-9]{10}"),
+        COLIS_PRIVE_LU("https://colisprive.com/moncolis/pages/detailColis.aspx?numColis=%s", "Colis Privé", "Q[0-9]{11}[L][0-9]{4}"),
+        COLIS_PRIVE_BE_WIA("https://colisprive.com/moncolis/pages/detailColis.aspx?numColis=%sB%s", "Colis Privé", "LC[0-9]{10}"),
         COLIS_PRIVE_FR("https://colisprive.com/moncolis/pages/detailColis.aspx?numColis=%s", "Colis Privé", "(D|Q)[0-9]{16}"),
         POSTI("https://www.posti.fi/fi/seuranta#/lahetys/%s", "Posti", "SP[0-9]{9}FI"),
         POSTE_ITALIANE("https://www.poste.it/cerca/index.html#/risultati-spedizioni/%s", "Poste Italiane", "5P[0-9]{2}[A-Z][0-9]{8}"),
@@ -44,6 +46,8 @@ public class CreateFulfillmentRequest extends ShopifyRequest {
         COLI_COLI("https://www.colicoli.fr/trackings?id=%s", "Coli Coli", "CC[0-9]{14}[A-Z]*"),
         LUXEMBOURG_POST("https://www.post.lu/particuliers/colis-courrier/track-and-trace#/search", "Luxembourg Post", "LL[0-9]{9}LU"),
         CJ_LOGISTICS("https://www.cjlogistics.com/ko/tool/parcel/tracking", "CJ대한통운", "57575[0-9]{7}|58476[0-9]{7}|5901[0-9]{8}|57476[0-9]{7}"),
+        QUICKPAC("https://quickpac.ch/de/tracking", "Quickpac", "44001091[0-9]{10}"),
+        CTT_EXPRESS("https://www.cttexpress.com/localizador-de-envios/", "CTT Express", "0082800082909[0-9]{9}"),
         ;
 
         private final String trackingUrl;

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/domain/job/AddPortraitTubeJob.java

@@ -47,17 +47,17 @@ public class AddPortraitTubeJob implements Job {
     private static final String TUBE_NEW_60_SKU_MULTIPLE = "PJ349600045-JCH";
 
     private static final List<String> TUBE_SKUS = Arrays.asList(TUBE_30_SKU_SINGLE_DOUBLE, TUBE_50_SKU_SINGLE,
-            TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE, TUBE_NEW_60_SKU_MULTIPLE,
+            TUBE_NEW_40_SKU_MULTIPLE, TUBE_NEW_50_SKU_MULTIPLE, TUBE_NEW_60_SKU_SINGLE,
-            TUBE_NEW_40_SKU_SINGLE);
+            TUBE_NEW_60_SKU_MULTIPLE, TUBE_NEW_40_SKU_SINGLE);
     private static final String PREFIX_50_CANVAS = "JJ2501";
     private static final String PREFIX_50_CANVAS_CHROME = "JJ2001";
     private static final String PREFIX_40_CANVAS = "JJ2500";
     private static final String PREFIX_40_CANVAS_CHROME = "JJ2000";
     private static final String PREFIX_30_CANVAS = "JJ2502";
     private static final String PREFIX_30_CANVAS_CHROME = "JJ2002";
-    private static final String PREFIX_NEW_56_CANVAS = "JJ314VF02";
+    private static final String REGEX_NEW_56_CANVAS = "JJ314V(F|A)02.*-JCH";
-    private static final String PREFIX_NEW_46_CANVAS = "JJ314VF01";
+    private static final String REGEX_NEW_46_CANVAS = "JJ314V(F|A)01.*-JCH";
-    private static final String PREFIX_NEW_36_CANVAS = "JJ314VF00";
+    private static final String REGEX_NEW_36_CANVAS = "JJ314V(F|A)00.*-JCH";
 
     @Autowired
     private IPlatformOrderService platformOrderService;
@@ -188,11 +188,11 @@ public class AddPortraitTubeJob implements Job {
                 canvas40Count += quantity;
             } else if (sku.startsWith(PREFIX_30_CANVAS) || sku.startsWith(PREFIX_30_CANVAS_CHROME)) {
                 canvas30Count += quantity;
-            } else if (sku.startsWith(PREFIX_NEW_36_CANVAS)) {
+            } else if (sku.matches(REGEX_NEW_36_CANVAS) ) {
                 canvasNew36Count += quantity;
-            } else if (sku.startsWith(PREFIX_NEW_46_CANVAS)) {
+            } else if (sku.matches(REGEX_NEW_46_CANVAS)) {
                 canvasNew46Count += quantity;
-            } else if (sku.startsWith(PREFIX_NEW_56_CANVAS)) {
+            } else if (sku.matches(REGEX_NEW_56_CANVAS)) {
                 canvasNew56Count += quantity;
             }
         }

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.9.3
+WIA APP Version: 2.9.6
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 Website: www.wia-sourcing.com
 ${AnsiColor.BLACK}

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jeecgframework.boot</groupId>
   <artifactId>jeecg-boot-parent</artifactId>
-   <version>3.0.0</version>
+   <version>3.6.3</version>
   <packaging>pom</packaging>
   <name>WIA APP ${project.version}</name>
 
@@ -116,16 +116,6 @@
 	</repositories>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.github.loki4j</groupId>
-			<artifactId>loki-logback-appender</artifactId>
-			<version>1.4.1</version>
-		</dependency>
-		<dependency>
-			<!-- For MongoDB connectivity -->
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-mongodb</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>