Bläddra i källkod

springboot 版本升至2.7.17

xie.bx 2 år sedan
förälder
incheckning
4f9d302fcf

+ 6 - 4
im-client/src/main/java/com/bx/imclient/task/AbstractPullMessageTask.java

@@ -2,20 +2,21 @@ package com.bx.imclient.task;
 
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.CommandLineRunner;
 
-import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.util.concurrent.*;
 
 @Slf4j
-public abstract class AbstractPullMessageTask {
+public abstract class AbstractPullMessageTask implements CommandLineRunner {
 
     private int threadNum = 8;
 
     private ExecutorService executorService = Executors.newFixedThreadPool(threadNum);
 
-    @PostConstruct
-    public void init(){
+
+    @Override
+    public void run(String... args) throws Exception {
         // 初始化定时器
         for(int i=0;i<threadNum;i++){
             executorService.execute(new Runnable() {
@@ -36,6 +37,7 @@ public abstract class AbstractPullMessageTask {
         }
     }
 
+
     @PreDestroy
     public void destroy(){
         log.info("{}线程任务关闭",this.getClass().getSimpleName());

+ 4 - 0
im-platform/pom.xml

@@ -69,6 +69,10 @@
             <groupId>org.springframework.session</groupId>
             <artifactId>spring-session-data-redis</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <!--minio-->
         <dependency>
             <groupId>io.minio</groupId>

+ 1 - 1
im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java

@@ -10,7 +10,7 @@ import org.springframework.web.filter.CorsFilter;
 
 import java.util.Arrays;
 
-@Configuration
+//@Configuration
 public class GlobalCorsConfig {
 
     @Bean

+ 0 - 1
im-platform/src/main/java/com/bx/implatform/dto/LoginDTO.java

@@ -3,7 +3,6 @@ package com.bx.implatform.dto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;

+ 6 - 1
im-platform/src/main/resources/application.yml

@@ -3,6 +3,11 @@ server:
   port: 8888
 #配置项目的数据源
 spring:
+  main:
+    allow-circular-references: true
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://localhost:3306/box-im?useSSL=false&useUnicode=true&characterEncoding=utf-8&allowPublicKeyRetrieval=true
@@ -23,7 +28,7 @@ mybatis-plus:
   configuration:
     # 是否开启自动驼峰命名规则(camel case)映射,即从经典数据库列名 A_COLUMN(下划线命名) 到经典 Java 属性名 aColumn(驼峰命名) 的类似映射
     map-underscore-to-camel-case: false
-    #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     # mapper
   mapper-locations:
     # *.xml的具体路径

+ 5 - 3
im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java

@@ -4,13 +4,14 @@ import com.bx.imserver.netty.IMServerGroup;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.CommandLineRunner;
 
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import java.util.concurrent.*;
 
 @Slf4j
-public abstract class AbstractPullMessageTask {
+public abstract class AbstractPullMessageTask  implements CommandLineRunner {
 
     private int threadNum = 1;
     private ExecutorService executorService;
@@ -26,8 +27,9 @@ public abstract class AbstractPullMessageTask {
         this.threadNum = threadNum;
     }
 
-    @PostConstruct
-    public void init() {
+
+    @Override
+    public void run(String... args) {
         // 初始化定时器
         executorService = Executors.newFixedThreadPool(threadNum);
 

+ 7 - 1
pom.xml

@@ -34,6 +34,7 @@
         <zxing.version>3.3.3</zxing.version>
         <commons-lang3.version>3.8.1</commons-lang3.version>
         <lombok.version>1.18.16</lombok.version>
+        <mysql.version>5.1.46</mysql.version>
     </properties>
 
 
@@ -43,7 +44,7 @@
                 <!-- Import dependency management from Spring Boot -->
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
-                <version>2.0.3.RELEASE</version>
+                <version>2.7.17</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -92,6 +93,11 @@
                 <artifactId>hutool-all</artifactId>
                 <version>${hutool.version}</version>
             </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>${mysql.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi-ooxml</artifactId>