瀏覽代碼

优化启动报警,优化系统启动速度

gaodm 6 年之前
父節點
當前提交
f3c3269bd9
共有 23 個文件被更改,包括 90 次插入114 次删除
  1. 6 1
      admin-service/src/main/java/com/diagbot/AdminServiceApplication.java
  2. 6 1
      bi-service/src/main/java/com/diagbot/BiServiceApplication.java
  3. 2 14
      bi-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  4. 6 1
      config-server/src/main/java/com/diagbot/ConfigServerApplication.java
  5. 1 1
      config-server/src/main/resources/shared/application-dev.yml
  6. 1 1
      config-server/src/main/resources/shared/application-local.yml
  7. 6 1
      diagbotman-service/src/main/java/com/diagbot/DiagbotmanServiceApplication.java
  8. 2 14
      diagbotman-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  9. 6 1
      eureka-server/src/main/java/com/diagbot/EurekaServerApplication.java
  10. 6 1
      feedback-service/src/main/java/com/diagbot/FeedbackServiceApplication.java
  11. 2 14
      feedback-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  12. 6 1
      gateway-service/src/main/java/com/diagbot/GatewayServiceApplication.java
  13. 6 1
      knowledge-service/src/main/java/com/diagbot/KnowledgeServiceApplication.java
  14. 2 14
      knowledge-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  15. 6 1
      log-service/src/main/java/com/diagbot/LogServiceApplication.java
  16. 2 14
      log-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  17. 6 1
      monitor-service/src/main/java/com/diagbot/MonitorServiceApplication.java
  18. 1 1
      pom.xml
  19. 6 1
      uaa-service/src/main/java/com/diagbot/UaaServiceApplication.java
  20. 2 14
      uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  21. 6 1
      user-service/src/main/java/com/diagbot/UserServiceApplication.java
  22. 2 14
      user-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  23. 1 1
      user-service/src/main/resources/mapper/UserMapper.xml

+ 6 - 1
admin-service/src/main/java/com/diagbot/AdminServiceApplication.java

@@ -6,6 +6,10 @@ import de.codecentric.boot.admin.server.config.EnableAdminServer;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
@@ -21,7 +25,8 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
  * @author: gaodm
  * @time: 2018/8/7 10:48
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableTurbine
 @EnableHystrixDashboard
 @EnableHystrix

+ 6 - 1
bi-service/src/main/java/com/diagbot/BiServiceApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -14,7 +18,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: gaodm
  * @time: 2018/8/7 9:24
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @EnableHystrixDashboard

+ 2 - 14
bi-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 6 - 1
config-server/src/main/java/com/diagbot/ConfigServerApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.config.server.EnableConfigServer;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
@@ -10,7 +14,8 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
  * @author: gaodm
  * @time: 2018/8/1 14:56
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableConfigServer
 @EnableEurekaClient
 public class ConfigServerApplication {

+ 1 - 1
config-server/src/main/resources/shared/application-dev.yml

@@ -37,7 +37,7 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh,health,info
+        include: refresh,health,info,hystrix.stream
       cors:
         allowed-origins: "*"
         allowed-methods: "*"

+ 1 - 1
config-server/src/main/resources/shared/application-local.yml

@@ -37,7 +37,7 @@ management:
   endpoints:
     web:
       exposure:
-        include: refresh,health,info
+        include: refresh,health,info,hystrix.stream
       cors:
         allowed-origins: "*"
         allowed-methods: "*"

+ 6 - 1
diagbotman-service/src/main/java/com/diagbot/DiagbotmanServiceApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -14,7 +18,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: gaodm
  * @time: 2018/8/7 9:24
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @EnableHystrixDashboard

+ 2 - 14
diagbotman-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 6 - 1
eureka-server/src/main/java/com/diagbot/EurekaServerApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
 
 /**
@@ -9,7 +13,8 @@ import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
  * @author: gaodm
  * @time: 2018/8/1 14:57
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaServer
 public class EurekaServerApplication {
 

+ 6 - 1
feedback-service/src/main/java/com/diagbot/FeedbackServiceApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -14,7 +18,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: gaodm
  * @time: 2018/8/7 9:26
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @EnableHystrixDashboard

+ 2 - 14
feedback-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 6 - 1
gateway-service/src/main/java/com/diagbot/GatewayServiceApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
@@ -10,7 +14,8 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
  * @author: gaodm
  * @time: 2018/8/1 14:58
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @RefreshScope
 public class GatewayServiceApplication {

+ 6 - 1
knowledge-service/src/main/java/com/diagbot/KnowledgeServiceApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -9,7 +13,8 @@ import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @EnableHystrixDashboard

+ 2 - 14
knowledge-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 6 - 1
log-service/src/main/java/com/diagbot/LogServiceApplication.java

@@ -2,6 +2,10 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -14,7 +18,8 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: gaodm
  * @time: 2018/8/1 15:00
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+		JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @EnableHystrix

+ 2 - 14
log-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 6 - 1
monitor-service/src/main/java/com/diagbot/MonitorServiceApplication.java

@@ -2,13 +2,18 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.hystrix.EnableHystrix;
 import org.springframework.cloud.netflix.hystrix.dashboard.EnableHystrixDashboard;
 import org.springframework.cloud.netflix.turbine.EnableTurbine;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableTurbine
 @EnableHystrixDashboard
 @EnableHystrix

+ 1 - 1
pom.xml

@@ -37,7 +37,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
-        <mybatis-plus-boot-starter.version>3.0.1</mybatis-plus-boot-starter.version>
+        <mybatis-plus-boot-starter.version>3.0.2</mybatis-plus-boot-starter.version>
         <mybatis-spring-boot.version>1.3.2</mybatis-spring-boot.version>
         <druid.version>1.1.9</druid.version>
         <swagger.version>2.9.2</swagger.version>

+ 6 - 1
uaa-service/src/main/java/com/diagbot/UaaServiceApplication.java

@@ -2,10 +2,15 @@ package com.diagbot;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+		JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @RefreshScope
 public class UaaServiceApplication {

+ 2 - 14
uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 6 - 1
user-service/src/main/java/com/diagbot/UserServiceApplication.java

@@ -4,6 +4,10 @@ import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration;
+import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
+import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration;
 import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -19,7 +23,8 @@ import org.springframework.web.bind.annotation.RestController;
  * @author: gaodm
  * @time: 2018/8/3 17:47
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+		JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
 @EnableEurekaClient
 @EnableFeignClients
 @RestController

+ 2 - 14
user-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -1,7 +1,7 @@
 package com.diagbot.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Configuration;
  * @time: 2018/8/2 13:39
  */
 @Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
 public class MybatisPlusConfigurer {
 
     /**
@@ -24,16 +24,4 @@ public class MybatisPlusConfigurer {
         return paginationInterceptor;
     }
 
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
 }

+ 1 - 1
user-service/src/main/resources/mapper/UserMapper.xml

@@ -19,7 +19,7 @@
         where username = #{username}
     </select>
 
-    <select id="selectUserListPage" resultType="com.diagbot.entity.User">
+    <select id="selectUserListPage" resultMap="BaseResultMap">
 		select u.*
 		from sys_user u
         LEFT JOIN sys_user_role ur on u.id= ur.user_id