提交 34bf5b15 编写于 作者: sq3536's avatar sq3536

bug

上级 aff89ee4
...@@ -42,6 +42,10 @@ ...@@ -42,6 +42,10 @@
<artifactId>spring-data-commons</artifactId> <artifactId>spring-data-commons</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
...@@ -69,6 +73,12 @@ ...@@ -69,6 +73,12 @@
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>springfox-swagger2</artifactId>
<exclusions>
<exclusion>
<artifactId>mapstruct</artifactId>
<groupId>org.mapstruct</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>io.springfox</groupId>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
<properties> <properties>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<spring-boot.version>2.4.0</spring-boot.version> <spring-boot.version>2.4.0</spring-boot.version>
...@@ -50,11 +49,13 @@ ...@@ -50,11 +49,13 @@
<springfox-swagger.version>2.9.2</springfox-swagger.version> <springfox-swagger.version>2.9.2</springfox-swagger.version>
<!--MapStruct高性能属性映射工具--> <!--MapStruct高性能属性映射工具-->
<mapstruct.version>1.3.0.Final</mapstruct.version> <mapstruct.version>1.3.0.Final</mapstruct.version>
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
<alibaba-druid.version>1.2.11</alibaba-druid.version> <alibaba-druid.version>1.2.11</alibaba-druid.version>
<!--Liquibase数据库版本更新工具--> <!--Liquibase数据库版本更新工具-->
<liquibase.version>3.9.0</liquibase.version> <liquibase.version>3.9.0</liquibase.version>
<!-- Mybatis Plus --> <!-- Mybatis Plus -->
<mybatis.version>3.5.9</mybatis.version>
<mybatis-plus.version>3.4.1</mybatis-plus.version> <mybatis-plus.version>3.4.1</mybatis-plus.version>
<mybatis-plus-dynamic-datasource.version>3.4.1</mybatis-plus-dynamic-datasource.version> <mybatis-plus-dynamic-datasource.version>3.4.1</mybatis-plus-dynamic-datasource.version>
<!--baomidou-jobs定时服务 --> <!--baomidou-jobs定时服务 -->
...@@ -64,9 +65,9 @@ ...@@ -64,9 +65,9 @@
<!-- JBPM+Drools --> <!-- JBPM+Drools -->
<drools-version>7.23.0.Final</drools-version> <drools-version>7.23.0.Final</drools-version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<maven.deploy.skip>false</maven.deploy.skip> <maven.deploy.skip>false</maven.deploy.skip>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
...@@ -192,6 +193,12 @@ ...@@ -192,6 +193,12 @@
<version>${mapstruct.version}</version> <version>${mapstruct.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
<version>${lombok-mapstruct-binding.version}</version>
</dependency>
<!-- Alibaba Druid --> <!-- Alibaba Druid -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -199,6 +206,13 @@ ...@@ -199,6 +206,13 @@
<version>${alibaba-druid.version}</version> <version>${alibaba-druid.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
<version>${mybatis.version}</version>
</dependency>
<!-- Mybatis Plus --> <!-- Mybatis Plus -->
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
......
...@@ -43,6 +43,17 @@ ...@@ -43,6 +43,17 @@
<dependency> <dependency>
<groupId>com.alibaba.cloud</groupId> <groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-loadbalancer</artifactId>
</dependency> </dependency>
<!-- Alibaba Sentinel --> <!-- Alibaba Sentinel -->
...@@ -54,6 +65,16 @@ ...@@ -54,6 +65,16 @@
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -111,6 +132,11 @@ ...@@ -111,6 +132,11 @@
<artifactId>mapstruct-processor</artifactId> <artifactId>mapstruct-processor</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok-mapstruct-binding</artifactId>
</dependency>
</dependencies> </dependencies>
......
...@@ -3,9 +3,12 @@ package cn.ibizlab.util.security; ...@@ -3,9 +3,12 @@ package cn.ibizlab.util.security;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
@Order(Ordered.HIGHEST_PRECEDENCE)
public class SpringContextHolder implements ApplicationContextAware public class SpringContextHolder implements ApplicationContextAware
{ {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册