spring boot升级到2.1.9

README.md

@@ -74,7 +74,7 @@ java -jar len-web.jar
 
 ## 技术
 * jdk：1.8
-* 核心框架：spring boot 2.0.1.RELEASE
+* 核心框架：spring boot 2.1.9.RELEASE
 * 安全框架：Apache Shiro
 * 工作流引擎：Activiti
 * 数据库连接池：druid

len-web/pom.xml

@@ -32,12 +32,12 @@
     <dependency>
       <groupId>de.codecentric</groupId>
       <artifactId>spring-boot-admin-starter-client</artifactId>
-      <version>2.0.1</version>
+      <version>2.1.6</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.cloud</groupId>
       <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-      <version>2.0.1.RELEASE</version>
+      <version>2.1.3.RELEASE</version>
     </dependency>
 
     <dependency>
@@ -68,7 +68,7 @@
           <artifactId>spring-boot-maven-plugin</artifactId>
           <configuration>
             <fork>true</fork>
-            <mainClass>com.len.Application</mainClass>
+            <mainClass>com.len.LenApplication</mainClass>
             <layout>ZIP</layout>
           </configuration>
           <executions>

len-web/src/main/java/com/len/LenApplication.java

@@ -4,7 +4,6 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@@ -23,15 +22,13 @@ import tk.mybatis.spring.annotation.MapperScan;
 @MapperScan(basePackages = {"com.len.mapper"})
 @EnableDiscoveryClient
 @EnableAutoConfiguration(exclude = {
-        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class
+        org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+        org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration.class
 })
-public class Application {
+public class LenApplication {
 
     public static void main(String[] args) {
-        ApplicationContext applicationContext = SpringApplication.run(Application.class, args);
-//    String[] names = applicationContext.getBeanDefinitionNames();
-        //1.8 forEach循环
-//    Arrays.asList(names).forEach(System.out::println);
+        SpringApplication.run(LenApplication.class, args);
         System.out.println("Server start succ");
     }
 

len-web/src/main/java/test/ActivitiDemo.java

@@ -1,11 +1,9 @@
 package test;
 
-import com.len.Application;
-import java.io.FileNotFoundException;
+import com.len.LenApplication;
+
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -17,14 +15,11 @@ import org.activiti.engine.ProcessEngineConfiguration;
 import org.activiti.engine.RepositoryService;
 import org.activiti.engine.RuntimeService;
 import org.activiti.engine.TaskService;
-import org.activiti.engine.history.HistoricActivityInstance;
-import org.activiti.engine.history.HistoricProcessInstance;
 import org.activiti.engine.history.HistoricTaskInstance;
 import org.activiti.engine.impl.RepositoryServiceImpl;
 import org.activiti.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.activiti.engine.impl.context.Context;
 import org.activiti.engine.impl.persistence.entity.ProcessDefinitionEntity;
-import org.activiti.engine.impl.pvm.PvmTransition;
 import org.activiti.engine.impl.pvm.process.ActivityImpl;
 import org.activiti.engine.repository.Deployment;
 import org.activiti.engine.repository.ProcessDefinition;
@@ -48,7 +43,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
  * 本demo 根据官网doc教程 address：http://www.mossle.com/docs/activiti/index.html
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = LenApplication.class)
 @WebAppConfiguration
 public class ActivitiDemo {
 

len-web/src/main/java/test/ActivitiGateWay.java

@@ -1,6 +1,6 @@
 package test;
 
-import com.len.Application;
+import com.len.LenApplication;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.util.List;
@@ -31,7 +31,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
  * 网关
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = LenApplication.class)
 @WebAppConfiguration
 public class ActivitiGateWay {
 

len-web/src/main/java/test/ActivitiVariable.java

@@ -1,6 +1,6 @@
 package test;
 
-import com.len.Application;
+import com.len.LenApplication;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -27,7 +27,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
  * @email 154040976@qq.com
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = LenApplication.class)
 @WebAppConfiguration
 public class ActivitiVariable {
 

len-web/src/main/java/test/BlogTest.java

@@ -1,6 +1,6 @@
 package test;
 
-import com.len.Application;
+import com.len.LenApplication;
 import com.len.entity.BlogCategory;
 import com.len.service.ArticleCategoryService;
 import com.len.service.BlogCategoryService;
@@ -24,7 +24,7 @@ import java.util.UUID;
  * @email 154040976@qq.com
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = LenApplication.class)
 @WebAppConfiguration
 public class BlogTest {
 

len-web/src/main/java/test/BootTest.java

@@ -1,6 +1,6 @@
 package test;
 
-import com.len.Application;
+import com.len.LenApplication;
 import com.len.entity.SysUser;
 import com.len.redis.RedisService;
 import com.len.service.SysUserService;
@@ -17,7 +17,7 @@ import org.springframework.test.context.web.WebAppConfiguration;
  * @email 154040976@qq.com
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@SpringBootTest(classes = Application.class)
+@SpringBootTest(classes = LenApplication.class)
 @WebAppConfiguration
 public class BootTest {
 

len-web/src/main/resources/application-mysql-dev.yml

@@ -1,6 +1,8 @@
 server:
   port: 8081
 spring:
+  main:
+    allow-bean-definition-overriding: true
   devtools:
       restart:
         enabled: true

pom.xml

@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.0.1.RELEASE</version>
+    <version>2.1.9.RELEASE</version>
     <relativePath />
   </parent>
   <properties>
@@ -93,7 +93,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-data-redis</artifactId>
-      <version>2.0.1.RELEASE</version>
+      <version>2.1.9.RELEASE</version>
     </dependency>