From 4f9d302fcfe5f71e40daea0627c29b206afd580d Mon Sep 17 00:00:00 2001 From: "xie.bx" Date: Wed, 15 Nov 2023 21:45:04 +0800 Subject: [PATCH] =?UTF-8?q?springboot=20=E7=89=88=E6=9C=AC=E5=8D=87?= =?UTF-8?q?=E8=87=B32.7.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bx/imclient/task/AbstractPullMessageTask.java | 10 ++++++---- im-platform/pom.xml | 4 ++++ .../com/bx/implatform/config/GlobalCorsConfig.java | 2 +- .../src/main/java/com/bx/implatform/dto/LoginDTO.java | 1 - im-platform/src/main/resources/application.yml | 7 ++++++- .../com/bx/imserver/task/AbstractPullMessageTask.java | 8 +++++--- pom.xml | 8 +++++++- 7 files changed, 29 insertions(+), 11 deletions(-) diff --git a/im-client/src/main/java/com/bx/imclient/task/AbstractPullMessageTask.java b/im-client/src/main/java/com/bx/imclient/task/AbstractPullMessageTask.java index a77c45f..a21fe14 100644 --- a/im-client/src/main/java/com/bx/imclient/task/AbstractPullMessageTask.java +++ b/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;iorg.springframework.session spring-session-data-redis + + org.springframework.boot + spring-boot-starter-validation + io.minio diff --git a/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java b/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java index 04b24f7..4ee8955 100644 --- a/im-platform/src/main/java/com/bx/implatform/config/GlobalCorsConfig.java +++ b/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 diff --git a/im-platform/src/main/java/com/bx/implatform/dto/LoginDTO.java b/im-platform/src/main/java/com/bx/implatform/dto/LoginDTO.java index 0f16599..5bdfb44 100644 --- a/im-platform/src/main/java/com/bx/implatform/dto/LoginDTO.java +++ b/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; diff --git a/im-platform/src/main/resources/application.yml b/im-platform/src/main/resources/application.yml index 6c77e0b..2e84bff 100644 --- a/im-platform/src/main/resources/application.yml +++ b/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的具体路径 diff --git a/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java index 8b1acdc..9559315 100644 --- a/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java +++ b/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); diff --git a/pom.xml b/pom.xml index e369a1e..61fdd8c 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,7 @@ 3.3.3 3.8.1 1.18.16 + 5.1.46 @@ -43,7 +44,7 @@ org.springframework.boot spring-boot-dependencies - 2.0.3.RELEASE + 2.7.17 pom import @@ -92,6 +93,11 @@ hutool-all ${hutool.version} + + mysql + mysql-connector-java + ${mysql.version} + org.apache.poi poi-ooxml