From b5c6ca7ad2e2f828497e75aececdb0b851277dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=9D=E5=85=88=E7=91=9E?= <1490493387@qq.com>
Date: Sat, 29 Jan 2022 23:28:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20SpringBoot2.5.4=E5=8D=87=E7=BA=A72.6.3?=
 =?UTF-8?q?=EF=BC=8CSpringCloud2020.0.3=E5=8D=87=E7=BA=A72021.0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/bootstrap-dev.yml      |  7 +++++--
 .../src/main/resources/bootstrap-prod.yml     |  7 +++++--
 .../oms-boot/src/main/resources/bootstrap.yml |  2 ++
 .../src/main/resources/bootstrap-dev.yml      |  7 +++++--
 .../src/main/resources/bootstrap-prod.yml     |  7 +++++--
 .../pms-boot/src/main/resources/bootstrap.yml |  2 ++
 .../src/main/resources/bootstrap-dev.yml      |  7 +++++--
 .../src/main/resources/bootstrap-prod.yml     |  7 +++++--
 .../sms-boot/src/main/resources/bootstrap.yml |  2 ++
 .../src/main/resources/bootstrap-dev.yml      |  7 +++++--
 .../src/main/resources/bootstrap-prod.yml     |  7 +++++--
 .../ums-boot/src/main/resources/bootstrap.yml |  2 ++
 pom.xml                                       | 20 +++----------------
 youlai-admin/admin-boot/pom.xml               |  1 +
 .../src/main/resources/bootstrap-dev.yml      |  7 +++++--
 .../src/main/resources/bootstrap-prod.yml     |  7 +++++--
 .../src/main/resources/bootstrap.yml          |  2 ++
 .../src/main/resources/bootstrap-dev.yml      |  5 +++--
 .../src/main/resources/bootstrap-prod.yml     |  5 +++--
 youlai-auth/src/main/resources/bootstrap.yml  |  2 ++
 youlai-common/common-web/pom.xml              |  6 +-----
 21 files changed, 73 insertions(+), 46 deletions(-)

diff --git a/mall-oms/oms-boot/src/main/resources/bootstrap-dev.yml b/mall-oms/oms-boot/src/main/resources/bootstrap-dev.yml
index c123db40e..d0693dc13 100644
--- a/mall-oms/oms-boot/src/main/resources/bootstrap-dev.yml
+++ b/mall-oms/oms-boot/src/main/resources/bootstrap-dev.yml
@@ -2,8 +2,11 @@ server:
   port: 8803
 
 spring:
-  application:
-    name: mall-oms
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       # 注册中心
diff --git a/mall-oms/oms-boot/src/main/resources/bootstrap-prod.yml b/mall-oms/oms-boot/src/main/resources/bootstrap-prod.yml
index 40360d091..c711d2a49 100644
--- a/mall-oms/oms-boot/src/main/resources/bootstrap-prod.yml
+++ b/mall-oms/oms-boot/src/main/resources/bootstrap-prod.yml
@@ -2,8 +2,11 @@ server:
   port: 8603
 
 spring:
-  application:
-    name: mall-oms
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       discovery:
diff --git a/mall-oms/oms-boot/src/main/resources/bootstrap.yml b/mall-oms/oms-boot/src/main/resources/bootstrap.yml
index 3d7808a0c..f97f88e56 100644
--- a/mall-oms/oms-boot/src/main/resources/bootstrap.yml
+++ b/mall-oms/oms-boot/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
 spring:
+  application:
+    name: mall-oms
   profiles:
     active: dev
diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml b/mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml
index 883d9f822..4956ac2de 100644
--- a/mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml
+++ b/mall-pms/pms-boot/src/main/resources/bootstrap-dev.yml
@@ -2,8 +2,11 @@ server:
   port: 8802
 
 spring:
-  application:
-    name: mall-pms
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       # 注册中心
diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap-prod.yml b/mall-pms/pms-boot/src/main/resources/bootstrap-prod.yml
index c3c8714e5..1def8d5c3 100644
--- a/mall-pms/pms-boot/src/main/resources/bootstrap-prod.yml
+++ b/mall-pms/pms-boot/src/main/resources/bootstrap-prod.yml
@@ -2,8 +2,11 @@ server:
   port: 8802
 
 spring:
-  application:
-    name: mall-pms
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       discovery:
diff --git a/mall-pms/pms-boot/src/main/resources/bootstrap.yml b/mall-pms/pms-boot/src/main/resources/bootstrap.yml
index 3d7808a0c..3855dbb71 100644
--- a/mall-pms/pms-boot/src/main/resources/bootstrap.yml
+++ b/mall-pms/pms-boot/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
 spring:
+  application:
+    name: mall-pms
   profiles:
     active: dev
diff --git a/mall-sms/sms-boot/src/main/resources/bootstrap-dev.yml b/mall-sms/sms-boot/src/main/resources/bootstrap-dev.yml
index 3e3e9b1e0..29ed8ffd3 100644
--- a/mall-sms/sms-boot/src/main/resources/bootstrap-dev.yml
+++ b/mall-sms/sms-boot/src/main/resources/bootstrap-dev.yml
@@ -2,8 +2,11 @@ server:
   port: 8804
 
 spring:
-  application:
-    name: mall-sms
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       # 注册中心
diff --git a/mall-sms/sms-boot/src/main/resources/bootstrap-prod.yml b/mall-sms/sms-boot/src/main/resources/bootstrap-prod.yml
index da2d5ed23..11084987c 100644
--- a/mall-sms/sms-boot/src/main/resources/bootstrap-prod.yml
+++ b/mall-sms/sms-boot/src/main/resources/bootstrap-prod.yml
@@ -2,8 +2,11 @@ server:
   port: 8804
 
 spring:
-  application:
-    name: mall-sms
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       discovery:
diff --git a/mall-sms/sms-boot/src/main/resources/bootstrap.yml b/mall-sms/sms-boot/src/main/resources/bootstrap.yml
index ad9a17115..26abac39f 100644
--- a/mall-sms/sms-boot/src/main/resources/bootstrap.yml
+++ b/mall-sms/sms-boot/src/main/resources/bootstrap.yml
@@ -1,4 +1,6 @@
 spring:
+  application:
+    name: mall-sms
   profiles:
     active: dev
 
diff --git a/mall-ums/ums-boot/src/main/resources/bootstrap-dev.yml b/mall-ums/ums-boot/src/main/resources/bootstrap-dev.yml
index fbabb284f..c183253a6 100644
--- a/mall-ums/ums-boot/src/main/resources/bootstrap-dev.yml
+++ b/mall-ums/ums-boot/src/main/resources/bootstrap-dev.yml
@@ -2,8 +2,11 @@ server:
   port: 8801
 
 spring:
-  application:
-    name: mall-ums
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       # 注册中心
diff --git a/mall-ums/ums-boot/src/main/resources/bootstrap-prod.yml b/mall-ums/ums-boot/src/main/resources/bootstrap-prod.yml
index e4301d02f..f21f7768f 100644
--- a/mall-ums/ums-boot/src/main/resources/bootstrap-prod.yml
+++ b/mall-ums/ums-boot/src/main/resources/bootstrap-prod.yml
@@ -2,8 +2,11 @@ server:
   port: 8601
 
 spring:
-  application:
-    name: mall-ums
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       discovery:
diff --git a/mall-ums/ums-boot/src/main/resources/bootstrap.yml b/mall-ums/ums-boot/src/main/resources/bootstrap.yml
index 3d7808a0c..5131bdfcc 100644
--- a/mall-ums/ums-boot/src/main/resources/bootstrap.yml
+++ b/mall-ums/ums-boot/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
 spring:
+  application:
+    name: mall-ums
   profiles:
     active: dev
diff --git a/pom.xml b/pom.xml
index 8d732383a..060f7fa34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,15 +24,15 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.4</version>
+        <version>2.6.3</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <youlai.version>2.0.0</youlai.version>
 
-        <spring-boot.version>2.5.4</spring-boot.version>
-        <spring-cloud.version>2020.0.3</spring-cloud.version>
+        <spring-boot.version>2.6.3</spring-boot.version>
+        <spring-cloud.version>2021.0.0</spring-cloud.version>
         <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -47,7 +47,6 @@
         <weixin-java.version>4.1.5.B</weixin-java.version>
         <hibernate-validator.version>6.0.13.Final</hibernate-validator.version>
         <seata.version>1.4.1</seata.version>
-        <commons-pool2.version>2.9.0</commons-pool2.version>
         <knife4j.version>2.0.9</knife4j.version>
         <redisson.version>3.15.1</redisson.version>
         <logstash-logback-encoder.version>6.6</logstash-logback-encoder.version>
@@ -150,12 +149,6 @@
                 <version>${seata.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-pool2</artifactId>
-                <version>${commons-pool2.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.github.xiaoymin</groupId>
                 <artifactId>knife4j-spring-boot-starter</artifactId>
@@ -206,13 +199,6 @@
                 <version>${redisson.version}</version>
             </dependency>
 
-            <!-- IP转地区工具 -->
-            <dependency>
-                <groupId>org.lionsoul</groupId>
-                <artifactId>ip2region</artifactId>
-                <version>${ip2region.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.github.dozermapper</groupId>
                 <artifactId>dozer-core</artifactId>
diff --git a/youlai-admin/admin-boot/pom.xml b/youlai-admin/admin-boot/pom.xml
index a75c9ade8..0200b3616 100644
--- a/youlai-admin/admin-boot/pom.xml
+++ b/youlai-admin/admin-boot/pom.xml
@@ -74,6 +74,7 @@
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
+            <version>9.16.1</version>
         </dependency>
 
         <!-- 分布式对象存储 -->
diff --git a/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml b/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
index b46a7cbee..c464d25e0 100644
--- a/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
+++ b/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
@@ -2,8 +2,11 @@ server:
   port: 8800
 
 spring:
-  application:
-    name: youlai-admin
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       # 注册中心
diff --git a/youlai-admin/admin-boot/src/main/resources/bootstrap-prod.yml b/youlai-admin/admin-boot/src/main/resources/bootstrap-prod.yml
index 15f2de348..996288cee 100644
--- a/youlai-admin/admin-boot/src/main/resources/bootstrap-prod.yml
+++ b/youlai-admin/admin-boot/src/main/resources/bootstrap-prod.yml
@@ -2,8 +2,11 @@ server:
   port: 8800
 
 spring:
-  application:
-    name: youlai-admin
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       discovery:
diff --git a/youlai-admin/admin-boot/src/main/resources/bootstrap.yml b/youlai-admin/admin-boot/src/main/resources/bootstrap.yml
index 3d7808a0c..09d757db7 100644
--- a/youlai-admin/admin-boot/src/main/resources/bootstrap.yml
+++ b/youlai-admin/admin-boot/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
 spring:
+  application:
+    name: youlai-admin
   profiles:
     active: dev
diff --git a/youlai-auth/src/main/resources/bootstrap-dev.yml b/youlai-auth/src/main/resources/bootstrap-dev.yml
index ea33f0aef..ce6ee4113 100644
--- a/youlai-auth/src/main/resources/bootstrap-dev.yml
+++ b/youlai-auth/src/main/resources/bootstrap-dev.yml
@@ -2,8 +2,9 @@ server:
   port: 8000
 
 spring:
-  application:
-    name: youlai-auth
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       # 注册中心
diff --git a/youlai-auth/src/main/resources/bootstrap-prod.yml b/youlai-auth/src/main/resources/bootstrap-prod.yml
index df2787c25..0dbfb406f 100644
--- a/youlai-auth/src/main/resources/bootstrap-prod.yml
+++ b/youlai-auth/src/main/resources/bootstrap-prod.yml
@@ -2,8 +2,9 @@ server:
   port: 8000
 
 spring:
-  application:
-    name: youlai-auth
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   cloud:
     nacos:
       discovery:
diff --git a/youlai-auth/src/main/resources/bootstrap.yml b/youlai-auth/src/main/resources/bootstrap.yml
index 3d7808a0c..2b4fec0cc 100644
--- a/youlai-auth/src/main/resources/bootstrap.yml
+++ b/youlai-auth/src/main/resources/bootstrap.yml
@@ -1,3 +1,5 @@
 spring:
   profiles:
     active: dev
+  application:
+    name: youlai-auth
\ No newline at end of file
diff --git a/youlai-common/common-web/pom.xml b/youlai-common/common-web/pom.xml
index 988704ba6..d893f7f88 100644
--- a/youlai-common/common-web/pom.xml
+++ b/youlai-common/common-web/pom.xml
@@ -53,14 +53,10 @@
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.lionsoul</groupId>
-            <artifactId>ip2region</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
+            <version>9.16.1</version>
         </dependency>
 
     </dependencies>