[Enhancement] 升级底层 Spring Boot 版本至 2.7.2 (#1367) (#1435)

2025-12-11 03:58:14 +00:00 · 2024-07-20 14:38:46 +08:00
parent 7d64aa893c
commit 3797cc2ce8
18 changed files with 16176 additions and 12974 deletions
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -185,8 +185,6 @@
        <dependency>
            <groupId>dev.langchain4j</groupId>
            <artifactId>langchain4j-embeddings</artifactId>
-
-
        </dependency>
        <dependency>
            <groupId>dev.langchain4j</groupId>
--- a/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java
+++ b/common/src/main/java/com/tencent/supersonic/common/config/DataBaseConfig.java
@@ -16,7 +16,10 @@ public class DataBaseConfig {
    @Primary
    @ConfigurationProperties("spring.datasource")
    public DataSource dataSource() {
-        return new DruidDataSource();
+        DruidDataSource druidDataSource = new DruidDataSource();
+        druidDataSource.setTestWhileIdle(true);
+        druidDataSource.setValidationQuery("select 1");
+        return druidDataSource;
    }

 }
--- a/headless/api/pom.xml
+++ b/headless/api/pom.xml
@@ -12,11 +12,11 @@
    <artifactId>headless-api</artifactId>

    <dependencies>
-<!--        <dependency>-->
-<!--            <groupId>ru.yandex.clickhouse</groupId>-->
-<!--            <artifactId>clickhouse-jdbc</artifactId>-->
-<!--            <version>${clickhouse.jdbc.version}</version>-->
-<!--        </dependency>-->
+        <!--<dependency>
+            <groupId>ru.yandex.clickhouse</groupId>
+            <artifactId>clickhouse-jdbc</artifactId>
+            <version>${clickhouse.jdbc.version}</version>
+        </dependency>-->
        <dependency>
            <groupId>com.clickhouse</groupId>
            <artifactId>clickhouse-jdbc</artifactId>
@@ -43,7 +43,7 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
+            <!--<version>${spring.version}</version>-->
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
@@ -58,7 +58,7 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.version}</version>
+            <!--<version>${spring.version}</version>-->
        </dependency>
        <dependency>
            <groupId>com.tencent.supersonic</groupId>
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/JdbcDataSource.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/JdbcDataSource.java
@@ -30,6 +30,7 @@ public class JdbcDataSource {
    private static final Object lockLock = new Object();
    private static volatile Map<String, DruidDataSource> dataSourceMap = new ConcurrentHashMap<>();
    private static volatile Map<String, Lock> dataSourceLockMap = new ConcurrentHashMap<>();
+
    @Value("${source.lock-time:30}")
    @Getter
    protected Long lockTime;
@@ -94,11 +95,11 @@ public class JdbcDataSource {
    @Getter
    protected int validationQueryTimeout;

-    @Value("${source.validation-query:'select 1'}")
+    @Value("${source.validation-query:select 1}")
    @Getter
    protected String validationQuery;

-    @Value("${source.filters:'stat'}")
+    @Value("${source.filters:stat}")
    @Getter
    protected String filters;
    @Autowired
--- a/headless/core/src/test/resources/application.yaml
+++ b/headless/core/src/test/resources/application.yaml
@@ -2,6 +2,11 @@ mybatis:
  mapper-locations: classpath:mapper/*.xml

 spring:
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER
  h2:
    console:
      path: /h2-console/semantic
@@ -12,6 +17,8 @@ spring:
    url: jdbc:h2:mem:semantic;DATABASE_TO_UPPER=false
    username: root
    password: semantic
-    schema: classpath:db/chat-schema-h2.sql
-    data: classpath:db/chat-data-h2.sql
+  sql:
+    init:
+      schema-locations: classpath:db/chat-schema-h2.sql
+      data-locations: classpath:db/chat-data-h2.sql

--- a/launchers/chat/pom.xml
+++ b/launchers/chat/pom.xml
@@ -72,6 +72,7 @@
                <artifactId>maven-assembly-plugin</artifactId>
                <version>2.4</version>
                <configuration>
+                    <tarLongFileMode>gnu</tarLongFileMode>
                    <skipAssembly>false</skipAssembly>
                    <archive>
                        <manifest>
--- a/launchers/chat/src/main/resources/application-local.yaml
+++ b/launchers/chat/src/main/resources/application-local.yaml
@@ -6,11 +6,13 @@ spring:
      enabled: true
  datasource:
    driver-class-name: org.h2.Driver
-    schema: classpath:db/chat-schema-h2.sql
-    data: classpath:db/chat-data-h2.sql
    url: jdbc:h2:mem:chat;DATABASE_TO_UPPER=false
    username: root
    password: chat
+  sql:
+    init:
+      schema-locations: classpath:db/chat-schema-h2.sql
+      data-locations: classpath:db/chat-data-h2.sql

 server:
  port: 9082
--- a/launchers/chat/src/main/resources/application.yaml
+++ b/launchers/chat/src/main/resources/application.yaml
@@ -2,4 +2,9 @@ spring:
  profiles:
    active: local
  application:
-    name: chat
+    name: chat
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER
--- a/launchers/headless/pom.xml
+++ b/launchers/headless/pom.xml
@@ -83,6 +83,7 @@
                <artifactId>maven-assembly-plugin</artifactId>
                <version>2.4</version>
                <configuration>
+                    <tarLongFileMode>gnu</tarLongFileMode>
                    <skipAssembly>false</skipAssembly>
                    <archive>
                        <manifest>
--- a/launchers/headless/src/main/resources/application-local.yaml
+++ b/launchers/headless/src/main/resources/application-local.yaml
@@ -14,8 +14,10 @@ spring:
    url: jdbc:h2:mem:semantic;DATABASE_TO_UPPER=false
    username: root
    password: semantic
-    schema: classpath:db/semantic-schema-h2.sql
-    data: classpath:db/semantic-data-h2.sql
+  sql:
+    init:
+      schema-locations: classpath:db/semantic-schema-h2.sql
+      data-locations: classpath:db/semantic-data-h2.sql

 authentication:
  enable: true
--- a/launchers/headless/src/main/resources/application.yaml
+++ b/launchers/headless/src/main/resources/application.yaml
@@ -2,4 +2,9 @@ spring:
  profiles:
    active: local
  application:
-    name: headless
+    name: headless
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER
--- a/launchers/standalone/pom.xml
+++ b/launchers/standalone/pom.xml
@@ -147,6 +147,7 @@
                <artifactId>maven-assembly-plugin</artifactId>
                <version>2.4</version>
                <configuration>
+                    <tarLongFileMode>gnu</tarLongFileMode>
                    <skipAssembly>false</skipAssembly>
                    <archive>
                        <manifest>
--- a/launchers/standalone/src/main/resources/application-local.yaml
+++ b/launchers/standalone/src/main/resources/application-local.yaml
@@ -1,11 +1,13 @@
 spring:
  datasource:
    driver-class-name: org.h2.Driver
-    schema: classpath:db/schema-h2.sql
-    data: classpath:db/data-h2.sql
    url: jdbc:h2:mem:semantic;DATABASE_TO_UPPER=false
    username: root
    password: semantic
+  sql:
+    init:
+      schema-locations: classpath:db/schema-h2.sql
+      data-locations: classpath:db/data-h2.sql
  h2:
    console:
      path: /h2-console/semantic
--- a/launchers/standalone/src/main/resources/application.yaml
+++ b/launchers/standalone/src/main/resources/application.yaml
@@ -21,6 +21,11 @@ spring:
      - spring.dev.langchain4j.azure.openai.spring.AutoConfig
      - spring.dev.langchain4j.azure.aisearch.spring.AutoConfig
      - spring.dev.langchain4j.anthropic.spring.AutoConfig
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER

 mybatis:
  mapper-locations=classpath:mappers/custom/*.xml,classpath*:/mappers/*.xml
--- a/launchers/standalone/src/test/resources/application-local.yaml
+++ b/launchers/standalone/src/test/resources/application-local.yaml
@@ -1,11 +1,13 @@
 spring:
  datasource:
    driver-class-name: org.h2.Driver
-    schema: classpath:db/schema-h2.sql
-    data: classpath:db/data-h2.sql
    url: jdbc:h2:mem:semantic;DATABASE_TO_UPPER=false
    username: root
    password: semantic
+  sql:
+    init:
+      schema-locations: classpath:db/schema-h2.sql
+      data-locations: classpath:db/data-h2.sql
  h2:
    console:
      path: /h2-console/semantic
--- a/launchers/standalone/src/test/resources/application.yaml
+++ b/launchers/standalone/src/test/resources/application.yaml
@@ -21,6 +21,11 @@ spring:
      - spring.dev.langchain4j.azure.openai.spring.AutoConfig
      - spring.dev.langchain4j.azure.aisearch.spring.AutoConfig
      - spring.dev.langchain4j.anthropic.spring.AutoConfig
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ANT_PATH_MATCHER

 mybatis:
  mapper-locations=classpath:mappers/custom/*.xml,classpath*:/mappers/*.xml
--- a/pom.xml
+++ b/pom.xml
@@ -5,10 +5,10 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.tencent.supersonic</groupId>
-
    <artifactId>supersonic</artifactId>
    <packaging>pom</packaging>
    <version>${revision}</version>
+
    <modules>
        <module>auth</module>
        <module>chat</module>
@@ -22,7 +22,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.1</version>
+        <version>2.7.2</version>
    </parent>

    <properties>
@@ -58,7 +58,7 @@
        <transmittable.version>2.12.1</transmittable.version>
        <commons.compress.version>1.21</commons.compress.version>
        <jetty.util.version>6.1.26</jetty.util.version>
-        <spring.version>2.5.1</spring.version>
+        <!--<spring.version>2.7.2</spring.version>-->
        <jsonpath.version>2.8.0</jsonpath.version>
        <calcite.version>1.37.0</calcite.version>
        <calcite.avatica.version>1.23.0</calcite.avatica.version>
@@ -205,11 +205,11 @@
                <version>${langchain4j.version}</version>
            </dependency>
            <!---langchain4j-->
-            <dependency>
+            <!--<dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-autoconfigure-processor</artifactId>
                <version>${spring.version}</version>
-            </dependency>
+            </dependency>-->
            <dependency>
                <groupId>com.google.code.gson</groupId>
                <artifactId>gson</artifactId>
--- a/webapp/pnpm-lock.yaml
+++ b/webapp/pnpm-lock.yaml