diff --git a/ai-analytic-center-biz/pom.xml b/ai-analytic-center-biz/pom.xml
index 35dc96d..8084d29 100644
--- a/ai-analytic-center-biz/pom.xml
+++ b/ai-analytic-center-biz/pom.xml
@@ -61,6 +61,7 @@
com.alibaba
druid-spring-boot-starter
+ 1.2.18
io.springfox
@@ -71,7 +72,7 @@
com.baomidou
mybatis-plus-boot-starter
- 3.3.0
+ 3.5.3.1
@@ -157,11 +158,6 @@
com.zaxxer
HikariCP
-
- com.alibaba
- druid-spring-boot-starter
- 1.1.13
-
com.volvo
diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/AiAnalyticCenterServiceApplication.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/AiAnalyticCenterServiceApplication.java
index 7eddcf7..913f6d4 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/AiAnalyticCenterServiceApplication.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/AiAnalyticCenterServiceApplication.java
@@ -1,21 +1,21 @@
package com.volvo.ai.analytic.center;
+import com.volvo.common.feign.annotation.EnableVolvoFeignClients;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.context.annotation.Bean;
import org.springframework.retry.annotation.EnableRetry;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.client.RestTemplate;
-import com.volvo.common.feign.annotation.EnableVolvoFeignClients;
-
-@SpringBootApplication(scanBasePackages = {"com.volvo"})
+@SpringBootApplication(scanBasePackages = {"com.volvo"},exclude = {DataSourceAutoConfiguration.class})
@EnableVolvoFeignClients
@EnableScheduling
-@MapperScan({"com.volvo.ai.analytic.center.mapper"})
+@MapperScan("com.volvo.ai.analytic.center.mapper")
@EnableDiscoveryClient
@EnableRetry
public class AiAnalyticCenterServiceApplication {
diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java
index e85a0c6..af9a189 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/ExecutorConfig.java
@@ -22,7 +22,7 @@ public class ExecutorConfig {
@Value("${task.pool.queueCapacity}")
private int queueCapacity;
- @Bean("corpusProcessExecutor")
+ @Bean("threadPoolTaskExecutor")
public ThreadPoolTaskExecutor corpusProcessExecutor() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
int corePoolSize = Runtime.getRuntime().availableProcessors() + 2;
diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/RedisConfig.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/RedisConfig.java
new file mode 100644
index 0000000..1e12d47
--- /dev/null
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/config/RedisConfig.java
@@ -0,0 +1,24 @@
+package com.volvo.ai.analytic.center.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+@Configuration
+public class RedisConfig {
+
+ @Bean
+ public RedisTemplate redisTemplate(RedisConnectionFactory factory) {
+ RedisTemplate template = new RedisTemplate<>();
+ template.setConnectionFactory(factory);
+ template.setKeySerializer(new StringRedisSerializer());
+ template.setValueSerializer(new GenericJackson2JsonRedisSerializer());
+ template.setHashKeySerializer(new StringRedisSerializer());
+ template.setHashValueSerializer(new GenericJackson2JsonRedisSerializer());
+ template.afterPropertiesSet();
+ return template;
+ }
+}
diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java
index 6990d21..707fad1 100644
--- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java
+++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/controller/TestController.java
@@ -14,10 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.kafka.core.KafkaTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.sql.DataSource;
@RestController
@@ -41,6 +40,9 @@ public class TestController {
@Qualifier("dccKafkaTemplate")
private KafkaTemplate dccKafkaProducer;
+ @Autowired
+ private DataSource dataSource;
+
@PostMapping("/mockMq")
@ApiOperation(value = "补偿处理消息")
public ResultMsg