feat: SpringBoot2.5.4升级2.6.3，SpringCloud2020.0.3升级2021.0.0

2024-12-22 20:54:26 +08:00 · 2022-01-29 23:28:08 +08:00 · 2022-01-29 23:28:08 +08:00 · b5c6ca7ad2
commit b5c6ca7ad2
parent 730fe7a503
21 changed files with 73 additions and 46 deletions
--- 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:
      # 注册中心
--- 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:
--- 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
--- 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:
      # 注册中心
--- 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:
--- 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
--- 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:
      # 注册中心
--- 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:
--- 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

--- 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:
      # 注册中心
--- 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:
--- 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
--- 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>
--- 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>

        <!-- 分布式对象存储 -->
--- 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:
      # 注册中心
--- 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:
--- 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
--- 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:
      # 注册中心
--- 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:
--- 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
--- 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>