topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-04-29 20:44:25 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

(improvement)(headless | chat | common | launcher) springboot3 upgrade

Browse Source
This commit is contained in:
wua.ming
2024-11-13 09:53:54 +08:00
parent 87729956e8
commit d9b9932820
84 changed files with 17359 additions and 19577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
launchers/chat/pom.xml
View File

@@ -12,8 +12,8 @@
<artifactId>launchers-chat</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<start-class>com.tencent.supersonic.ChatLauncher</start-class>
</properties>

6
launchers/common/pom.xml
View File

@@ -12,8 +12,8 @@
<artifactId>launchers-common</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>
<dependencies>
@@ -46,4 +46,4 @@
</dependencies>
</project>
</project>

23
launchers/common/src/main/java/com/tencent/supersonic/config/RestTemplateConfig.java
View File

@@ -1,8 +1,11 @@
package com.tencent.supersonic.config;
import org.apache.http.client.HttpClient;
import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.impl.client.LaxRedirectStrategy;
import org.apache.hc.client5.http.impl.DefaultRedirectStrategy;
//import org.apache.hc.client5.http.impl.LaxRedirectStrategy;
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
@@ -16,14 +19,18 @@ public class RestTemplateConfig {
@Bean
public RestTemplate restTemplate() {
// HttpClient 5 较新版本才会有LaxRedirectStrategy, 所以我重新定义了
CloseableHttpClient httpClient =
HttpClientBuilder.create().setRedirectStrategy(new DefaultRedirectStrategy()) // 使用宽松重定向策略
//HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()) // 使用宽松重定向策略
.build();
HttpComponentsClientHttpRequestFactory httpRequestFactory =
new HttpComponentsClientHttpRequestFactory();
new HttpComponentsClientHttpRequestFactory(httpClient);
httpRequestFactory.setConnectionRequestTimeout(2000);
httpRequestFactory.setConnectTimeout(10000);
httpRequestFactory.setReadTimeout(7200000);
HttpClient httpClient =
HttpClientBuilder.create().setRedirectStrategy(new LaxRedirectStrategy()).build();
httpRequestFactory.setHttpClient(httpClient);
RestTemplate restTemplate = new RestTemplate(httpRequestFactory);
restTemplate.getMessageConverters().set(1,
new StringHttpMessageConverter(StandardCharsets.UTF_8));

7
launchers/common/src/main/java/com/tencent/supersonic/web/WebConfig.java
View File

@@ -3,14 +3,15 @@ package com.tencent.supersonic.web;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
public class WebConfig extends WebMvcConfigurerAdapter {
public class WebConfig implements WebMvcConfigurer {
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/webapp/**").addResourceLocations("classpath:/webapp/");
registry.addResourceHandler("/webapp/**")
.addResourceLocations("classpath:/webapp/");
}
@Override

9
launchers/standalone/pom.xml
View File

@@ -12,8 +12,8 @@
<artifactId>launchers-standalone</artifactId>
<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
<start-class>com.tencent.supersonic.StandaloneLauncher</start-class>
</properties>
<dependencies>
@@ -115,6 +115,11 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-properties-migrator</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

10
launchers/standalone/src/main/resources/db/schema-h2-demo.sql
View File

@@ -60,8 +60,8 @@ CREATE TABLE IF NOT EXISTS `company` (
`company_established_time` varchar(20) NOT NULL ,
`founder` varchar(20) NOT NULL ,
`ceo` varchar(20) NOT NULL ,
`annual_turnover` bigint(15) ,
`employee_count` int(7) ,
`annual_turnover` bigint ,
`employee_count` int ,
PRIMARY KEY (`company_id`)
);
@@ -72,7 +72,7 @@ CREATE TABLE IF NOT EXISTS `brand` (
`brand_established_time` varchar(20) NOT NULL ,
`company_id` varchar(50) NOT NULL ,
`legal_representative` varchar(20) NOT NULL ,
`registered_capital` bigint(15) ,
`registered_capital` bigint ,
PRIMARY KEY (`brand_id`)
);
@@ -89,8 +89,8 @@ CREATE TABLE IF NOT EXISTS `company_brand_revenue` (
`imp_date` varchar(50) ,
`year_time` varchar(10) NOT NULL ,
`brand_id` varchar(50) NOT NULL ,
`revenue` bigint(15) NOT NULL,
`profit` bigint(15) NOT NULL ,
`revenue` bigint NOT NULL,
`profit` bigint NOT NULL ,
`revenue_growth_year_on_year` double NOT NULL ,
`profit_growth_year_on_year` double NOT NULL
);

4
launchers/standalone/src/main/resources/db/schema-h2.sql
View File

@@ -32,7 +32,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_query`
`create_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`query_text` mediumtext,
`user_name` varchar(150) DEFAULT NULL COMMENT '',
`query_state` int(1) DEFAULT NULL,
`query_state` int DEFAULT NULL,
`chat_id` BIGINT NOT NULL , -- context chat id
`query_result` mediumtext NOT NULL ,
`score` int DEFAULT '0',
@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_statistics`
`user_name` varchar(150) DEFAULT NULL COMMENT '',
`query_text` varchar(200),
`interface_name` varchar(100) DEFAULT NULL COMMENT '',
`cost` INT(6) NOT NULL ,
`cost` INT NOT NULL ,
`type` INT NOT NULL ,
`create_time` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP
);