push

README.md

@@ -11,7 +11,7 @@ base-framework下每个项目都有一个application.yml文件里面配置着默
 ### 技术栈
 注册中心:consul
 配置中心:git2consul
-json序列化工具:sping自带的jackson,由于fastJson问题较多就不使用了
+json序列化工具:sping中引用的jackson,由于fastJson问题较多就不使用了
 redis:采用redisson工具类
 使用了lombok来减少实体中的代码,如果要提供给第三方引用的jar包,那么第三方jar包中就不要用lombok了
 使用了swagger3来提供文档,好处:更改代码可以同步修改文档

base-springframework-starter/pom.xml

@@ -21,8 +21,8 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <lombok.version>1.18.12</lombok.version>
-        <spring-boot-starter.version>2.3.1.RELEASE</spring-boot-starter.version>
-        <spring.version>5.2.7.RELEASE</spring.version>
+        <spring-boot-starter.version>2.3.4.RELEASE</spring-boot-starter.version>
+        <spring.version>5.2.9.RELEASE</spring.version>
     </properties>
 
     <dependencies>

base-springframework/base-springframework-cloud/src/main/java/com/wei/base/springframework/cloud/config/RibbonConfig.java

@@ -41,8 +41,7 @@ public class RibbonConfig {
         List<ServiceInstance> serviceInstances = consulDiscoveryClient.getAllInstances();
         List<String> clients = Lists.newArrayListWithCapacity(serviceInstances.size());
 
-        List<String> excludes = Lists.newArrayList();
-        excludes = eagerLoad.getExcludes();
+        List<String> excludes = eagerLoad.getExcludes();
         for (ServiceInstance serviceInstance : serviceInstances) {
             String serviceId = serviceInstance.getServiceId();
             if (CollectionUtils.isNotEmpty(excludes)) {

base-springframework/base-springframework-db/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,2 @@
-#org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-#  com.wei.base.springframework.mysql.mybatisplus.config.MybatisPlusConfig,\
-#  com.wei.base.springframework.mysql.mybatisplus.core.injector.CustomSqlInjector,\
-#  com.wei.base.springframework.mysql.mybatisplus.config.CustomMybatisPlusProperties
-
 org.springframework.boot.env.EnvironmentPostProcessor=\
   com.wei.base.springframework.db.env.InitializeCustomConfiguration

base-springframework/pom.xml

@@ -29,7 +29,6 @@
         <lombok.version>1.18.12</lombok.version>
         <spring-boot-starter.version>2.3.4.RELEASE</spring-boot-starter.version>
         <spring-boot-starter-web.version>2.3.4.RELEASE</spring-boot-starter-web.version>
-        <fastjson.version>1.2.73</fastjson.version>
         <guava.version>29.0-jre</guava.version>
         <commons-lang3.version>3.10</commons-lang3.version>
         <commons-collections4.version>4.4</commons-collections4.version>

wei-user/wei-user-app/pom.xml

@@ -19,7 +19,7 @@
 
         <dependency>
             <groupId>com.wei</groupId>
-            <artifactId>base-springframework-mysql</artifactId>
+            <artifactId>base-springframework-db</artifactId>
             <version>${project.version}</version>
         </dependency>
 

wei-user/wei-user-app/src/main/resources/bootstrap.yml

@@ -2,6 +2,8 @@ server:
   port: 8201
 
 spring:
+  main:
+    allow-bean-definition-overriding: true
   application:
     name: wei-user
   cloud: