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

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>

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

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