Преглед изворни кода

统一配置类命名规则

gaodm пре 6 година
родитељ
комит
653b66a4e2
42 измењених фајлова са 316 додато и 316 уклоњено
  1. 1 1
      bi-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java
  2. 1 1
      diagbotman-service/src/main/java/com/diagbot/config/JwtConfiguration.java
  3. 1 1
      diagbotman-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  4. 2 2
      feedback-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java
  5. 1 1
      bi-service/src/main/java/com/diagbot/config/SwaggerConfig.java
  6. 1 1
      diagbotman-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java
  7. 1 1
      bi-service/src/main/java/com/diagbot/config/JwtConfiguration.java
  8. 1 1
      feedback-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  9. 2 2
      knowledge-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java
  10. 1 1
      diagbotman-service/src/main/java/com/diagbot/config/SwaggerConfig.java
  11. 1 1
      feedback-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java
  12. 1 1
      feedback-service/src/main/java/com/diagbot/config/JwtConfiguration.java
  13. 1 1
      bi-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  14. 2 2
      diagbotman-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java
  15. 1 1
      feedback-service/src/main/java/com/diagbot/config/SwaggerConfig.java
  16. 1 1
      knowledge-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java
  17. 1 1
      knowledge-service/src/main/java/com/diagbot/config/JwtConfiguration.java
  18. 1 1
      knowledge-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  19. 2 2
      bi-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java
  20. 1 1
      knowledge-service/src/main/java/com/diagbot/config/SwaggerConfig.java
  21. 0 15
      log-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java
  22. 15 0
      log-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfigurer.java
  23. 0 48
      log-service/src/main/java/com/diagbot/config/JwtConfiguration.java
  24. 48 0
      log-service/src/main/java/com/diagbot/config/JwtConfigurer.java
  25. 0 39
      log-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  26. 39 0
      log-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  27. 0 42
      log-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java
  28. 42 0
      log-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java
  29. 1 1
      log-service/src/main/java/com/diagbot/config/SwaggerConfig.java
  30. 0 39
      uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  31. 39 0
      uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  32. 1 1
      uaa-service/src/main/java/com/diagbot/config/OAuth2Config.java
  33. 1 1
      uaa-service/src/main/java/com/diagbot/config/WebSecurityConfig.java
  34. 0 15
      user-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java
  35. 15 0
      user-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfigurer.java
  36. 0 48
      user-service/src/main/java/com/diagbot/config/JwtConfiguration.java
  37. 48 0
      user-service/src/main/java/com/diagbot/config/JwtConfigurer.java
  38. 0 39
      user-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java
  39. 39 0
      user-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java
  40. 1 1
      user-service/src/main/java/com/diagbot/config/RedisConfig.java
  41. 2 2
      user-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java
  42. 1 1
      user-service/src/main/java/com/diagbot/config/SwaggerConfig.java

+ 1 - 1
bi-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java

@@ -10,6 +10,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
  */
 @Configuration
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalMethodSecurityConfiguration {
+public class GlobalMethodSecurityConfigurer {
 
 }

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/config/JwtConfiguration.java

@@ -19,7 +19,7 @@ import java.io.IOException;
  * @time: 2018/8/2 13:38
  */
 @Configuration
-public class JwtConfiguration {
+public class JwtConfigurer {
     @Autowired
     private CustomAccessTokenConverter customAccessTokenConverter;
 

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 //@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
+public class MybatisPlusConfigurer {
 
     /**
      * mybatis-plus分页插件<br>

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

@@ -17,8 +17,8 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
  */
 @Configuration
 @EnableResourceServer
-public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
-    Logger log = LoggerFactory.getLogger(ResourceServerConfiguration.class);
+public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    Logger log = LoggerFactory.getLogger(ResourceServerConfigurer.class);
 
     @Override
     public void configure(HttpSecurity http) throws Exception {

+ 1 - 1
bi-service/src/main/java/com/diagbot/config/SwaggerConfig.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig {
+public class SwaggerConfigurer {
     /**
      * 全局参数
      *

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java

@@ -10,6 +10,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
  */
 @Configuration
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalMethodSecurityConfiguration {
+public class GlobalMethodSecurityConfigurer {
 
 }

+ 1 - 1
bi-service/src/main/java/com/diagbot/config/JwtConfiguration.java

@@ -19,7 +19,7 @@ import java.io.IOException;
  * @time: 2018/8/2 13:38
  */
 @Configuration
-public class JwtConfiguration {
+public class JwtConfigurer {
     @Autowired
     private CustomAccessTokenConverter customAccessTokenConverter;
 

+ 1 - 1
feedback-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 //@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
+public class MybatisPlusConfigurer {
 
     /**
      * mybatis-plus分页插件<br>

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

@@ -17,8 +17,8 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
  */
 @Configuration
 @EnableResourceServer
-public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
-    Logger log = LoggerFactory.getLogger(ResourceServerConfiguration.class);
+public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    Logger log = LoggerFactory.getLogger(ResourceServerConfigurer.class);
 
     @Override
     public void configure(HttpSecurity http) throws Exception {

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/config/SwaggerConfig.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig {
+public class SwaggerConfigurer {
     /**
      * 全局参数
      *

+ 1 - 1
feedback-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java

@@ -10,6 +10,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
  */
 @Configuration
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalMethodSecurityConfiguration {
+public class GlobalMethodSecurityConfigurer {
 
 }

+ 1 - 1
feedback-service/src/main/java/com/diagbot/config/JwtConfiguration.java

@@ -19,7 +19,7 @@ import java.io.IOException;
  * @time: 2018/8/2 13:38
  */
 @Configuration
-public class JwtConfiguration {
+public class JwtConfigurer {
     @Autowired
     private CustomAccessTokenConverter customAccessTokenConverter;
 

+ 1 - 1
bi-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 //@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
+public class MybatisPlusConfigurer {
 
     /**
      * mybatis-plus分页插件<br>

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

@@ -17,8 +17,8 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
  */
 @Configuration
 @EnableResourceServer
-public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
-    Logger log = LoggerFactory.getLogger(ResourceServerConfiguration.class);
+public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    Logger log = LoggerFactory.getLogger(ResourceServerConfigurer.class);
 
     @Override
     public void configure(HttpSecurity http) throws Exception {

+ 1 - 1
feedback-service/src/main/java/com/diagbot/config/SwaggerConfig.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig {
+public class SwaggerConfigurer {
     /**
      * 全局参数
      *

+ 1 - 1
knowledge-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java

@@ -10,6 +10,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl
  */
 @Configuration
 @EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalMethodSecurityConfiguration {
+public class GlobalMethodSecurityConfigurer {
 
 }

+ 1 - 1
knowledge-service/src/main/java/com/diagbot/config/JwtConfiguration.java

@@ -19,7 +19,7 @@ import java.io.IOException;
  * @time: 2018/8/2 13:38
  */
 @Configuration
-public class JwtConfiguration {
+public class JwtConfigurer {
     @Autowired
     private CustomAccessTokenConverter customAccessTokenConverter;
 

+ 1 - 1
knowledge-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -12,7 +12,7 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 //@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
+public class MybatisPlusConfigurer {
 
     /**
      * mybatis-plus分页插件<br>

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

@@ -17,8 +17,8 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
  */
 @Configuration
 @EnableResourceServer
-public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
-    Logger log = LoggerFactory.getLogger(ResourceServerConfiguration.class);
+public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    Logger log = LoggerFactory.getLogger(ResourceServerConfigurer.class);
 
     @Override
     public void configure(HttpSecurity http) throws Exception {

+ 1 - 1
knowledge-service/src/main/java/com/diagbot/config/SwaggerConfig.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig {
+public class SwaggerConfigurer {
     /**
      * 全局参数
      *

+ 0 - 15
log-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java

@@ -1,15 +0,0 @@
-package com.diagbot.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-
-/**
- * @Description: 安全配置类
- * @author: gaodm
- * @time: 2018/8/2 13:38
- */
-@Configuration
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalMethodSecurityConfiguration {
-
-}

+ 15 - 0
log-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfigurer.java

@@ -0,0 +1,15 @@
+package com.diagbot.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+
+/**
+ * @Description: 安全配置类
+ * @author: gaodm
+ * @time: 2018/8/2 13:38
+ */
+@Configuration
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class GlobalMethodSecurityConfigurer {
+
+}

+ 0 - 48
log-service/src/main/java/com/diagbot/config/JwtConfiguration.java

@@ -1,48 +0,0 @@
-package com.diagbot.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.security.oauth2.provider.token.TokenStore;
-import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
-import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
-import org.springframework.util.FileCopyUtils;
-
-import java.io.IOException;
-
-/**
- * @Description: JWT配置类
- * @author: gaodm
- * @time: 2018/8/2 13:38
- */
-@Configuration
-public class JwtConfiguration {
-    @Autowired
-    private CustomAccessTokenConverter customAccessTokenConverter;
-
-    @Bean
-    @Qualifier("tokenStore")
-    public TokenStore tokenStore() {
-
-        System.out.println("Created JwtTokenStore");
-        return new JwtTokenStore(jwtTokenEnhancer());
-    }
-
-    @Bean
-    protected JwtAccessTokenConverter jwtTokenEnhancer() {
-        JwtAccessTokenConverter converter =  new JwtAccessTokenConverter();
-        Resource resource = new ClassPathResource("public.cert");
-        String publicKey ;
-        try {
-            publicKey = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        converter.setVerifierKey(publicKey);
-        converter.setAccessTokenConverter(customAccessTokenConverter);
-        return converter;
-    }
-}

+ 48 - 0
log-service/src/main/java/com/diagbot/config/JwtConfigurer.java

@@ -0,0 +1,48 @@
+package com.diagbot.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+import org.springframework.util.FileCopyUtils;
+
+import java.io.IOException;
+
+/**
+ * @Description: JWT配置类
+ * @author: gaodm
+ * @time: 2018/8/2 13:38
+ */
+@Configuration
+public class JwtConfigurer {
+    @Autowired
+    private CustomAccessTokenConverter customAccessTokenConverter;
+
+    @Bean
+    @Qualifier("tokenStore")
+    public TokenStore tokenStore() {
+
+        System.out.println("Created JwtTokenStore");
+        return new JwtTokenStore(jwtTokenEnhancer());
+    }
+
+    @Bean
+    protected JwtAccessTokenConverter jwtTokenEnhancer() {
+        JwtAccessTokenConverter converter =  new JwtAccessTokenConverter();
+        Resource resource = new ClassPathResource("public.cert");
+        String publicKey ;
+        try {
+            publicKey = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        converter.setVerifierKey(publicKey);
+        converter.setAccessTokenConverter(customAccessTokenConverter);
+        return converter;
+    }
+}

+ 0 - 39
log-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -1,39 +0,0 @@
-package com.diagbot.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: MybatisPlus配置类
- * @author: gaodm
- * @time: 2018/8/2 13:39
- */
-@Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
-
-    /**
-     * mybatis-plus分页插件<br>
-     * 文档:http://mp.baomidou.com<br>
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        return paginationInterceptor;
-    }
-
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
-}

+ 39 - 0
log-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

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

+ 0 - 42
log-service/src/main/java/com/diagbot/config/ResourceServerConfiguration.java

@@ -1,42 +0,0 @@
-package com.diagbot.config;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
-import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
-import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
-import org.springframework.security.oauth2.provider.token.TokenStore;
-
-/**
- * @Description: 权限资源配置类
- * @author: gaodm
- * @time: 2018/8/2 14:21
- */
-@Configuration
-@EnableResourceServer
-public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
-    Logger log = LoggerFactory.getLogger(ResourceServerConfiguration.class);
-
-    @Override
-    public void configure(HttpSecurity http) throws Exception {
-        http
-                .csrf().disable()
-                .authorizeRequests()
-                .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/druid.*","/actuator.*","/hystrix.*").permitAll()
-                .antMatchers("/**").authenticated();
-//        .antMatchers("/**").permitAll();
-    }
-
-
-    @Override
-    public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
-        log.info("Configuring ResourceServerSecurityConfigurer ");
-        resources.resourceId("user-service").tokenStore(tokenStore);
-    }
-
-    @Autowired
-    TokenStore tokenStore;
-}

+ 42 - 0
log-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -0,0 +1,42 @@
+package com.diagbot.config;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.oauth2.config.annotation.web.configuration.EnableResourceServer;
+import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter;
+import org.springframework.security.oauth2.config.annotation.web.configurers.ResourceServerSecurityConfigurer;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+
+/**
+ * @Description: 权限资源配置类
+ * @author: gaodm
+ * @time: 2018/8/2 14:21
+ */
+@Configuration
+@EnableResourceServer
+public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    Logger log = LoggerFactory.getLogger(ResourceServerConfigurer.class);
+
+    @Override
+    public void configure(HttpSecurity http) throws Exception {
+        http
+                .csrf().disable()
+                .authorizeRequests()
+                .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/druid.*","/actuator.*","/hystrix.*").permitAll()
+                .antMatchers("/**").authenticated();
+//        .antMatchers("/**").permitAll();
+    }
+
+
+    @Override
+    public void configure(ResourceServerSecurityConfigurer resources) throws Exception {
+        log.info("Configuring ResourceServerSecurityConfigurer ");
+        resources.resourceId("user-service").tokenStore(tokenStore);
+    }
+
+    @Autowired
+    TokenStore tokenStore;
+}

+ 1 - 1
log-service/src/main/java/com/diagbot/config/SwaggerConfig.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig {
+public class SwaggerConfigurer {
     /**
      * 全局参数
      *

+ 0 - 39
uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -1,39 +0,0 @@
-package com.diagbot.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: MybatisPlus配置类
- * @author: gaodm
- * @time: 2018/8/2 13:39
- */
-@Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
-
-    /**
-     * mybatis-plus分页插件<br>
-     * 文档:http://mp.baomidou.com<br>
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        return paginationInterceptor;
-    }
-
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
-}

+ 39 - 0
uaa-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -0,0 +1,39 @@
+package com.diagbot.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: MybatisPlus配置类
+ * @author: gaodm
+ * @time: 2018/8/2 13:39
+ */
+@Configuration
+//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+public class MybatisPlusConfigurer {
+
+    /**
+     * mybatis-plus分页插件<br>
+     * 文档:http://mp.baomidou.com<br>
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        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
uaa-service/src/main/java/com/diagbot/config/OAuth2Config.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
  */
 @Configuration
 @EnableAuthorizationServer
-public class OAuth2Config extends AuthorizationServerConfigurerAdapter {
+public class OAuth2Configurer extends AuthorizationServerConfigurerAdapter {
     @Override
     public void configure(ClientDetailsServiceConfigurer clients) throws Exception {
         clients.inMemory()

+ 1 - 1
uaa-service/src/main/java/com/diagbot/config/WebSecurityConfig.java

@@ -23,7 +23,7 @@ import java.io.IOException;
  * @time: 2018/8/2 14:24
  */
 @Configuration
-class WebSecurityConfig extends WebSecurityConfigurerAdapter {
+class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
 
     @Override
     @Bean

+ 0 - 15
user-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfiguration.java

@@ -1,15 +0,0 @@
-package com.diagbot.config;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-
-/**
- * @Description: 安全配置类
- * @author: gaodm
- * @time: 2018/8/2 13:38
- */
-@Configuration
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class GlobalMethodSecurityConfiguration {
-
-}

+ 15 - 0
user-service/src/main/java/com/diagbot/config/GlobalMethodSecurityConfigurer.java

@@ -0,0 +1,15 @@
+package com.diagbot.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+
+/**
+ * @Description: 安全配置类
+ * @author: gaodm
+ * @time: 2018/8/2 13:38
+ */
+@Configuration
+@EnableGlobalMethodSecurity(prePostEnabled = true)
+public class GlobalMethodSecurityConfigurer {
+
+}

+ 0 - 48
user-service/src/main/java/com/diagbot/config/JwtConfiguration.java

@@ -1,48 +0,0 @@
-package com.diagbot.config;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
-import org.springframework.security.oauth2.provider.token.TokenStore;
-import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
-import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
-import org.springframework.util.FileCopyUtils;
-
-import java.io.IOException;
-
-/**
- * @Description: JWT配置类
- * @author: gaodm
- * @time: 2018/8/2 13:38
- */
-@Configuration
-public class JwtConfiguration {
-    @Autowired
-    private CustomAccessTokenConverter customAccessTokenConverter;
-
-    @Bean
-    @Qualifier("tokenStore")
-    public TokenStore tokenStore() {
-
-        System.out.println("Created JwtTokenStore");
-        return new JwtTokenStore(jwtTokenEnhancer());
-    }
-
-    @Bean
-    protected JwtAccessTokenConverter jwtTokenEnhancer() {
-        JwtAccessTokenConverter converter =  new JwtAccessTokenConverter();
-        Resource resource = new ClassPathResource("public.cert");
-        String publicKey ;
-        try {
-            publicKey = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-        converter.setVerifierKey(publicKey);
-        converter.setAccessTokenConverter(customAccessTokenConverter);
-        return converter;
-    }
-}

+ 48 - 0
user-service/src/main/java/com/diagbot/config/JwtConfigurer.java

@@ -0,0 +1,48 @@
+package com.diagbot.config;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.Resource;
+import org.springframework.security.oauth2.provider.token.TokenStore;
+import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
+import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+import org.springframework.util.FileCopyUtils;
+
+import java.io.IOException;
+
+/**
+ * @Description: JWT配置类
+ * @author: gaodm
+ * @time: 2018/8/2 13:38
+ */
+@Configuration
+public class JwtConfigurer {
+    @Autowired
+    private CustomAccessTokenConverter customAccessTokenConverter;
+
+    @Bean
+    @Qualifier("tokenStore")
+    public TokenStore tokenStore() {
+
+        System.out.println("Created JwtTokenStore");
+        return new JwtTokenStore(jwtTokenEnhancer());
+    }
+
+    @Bean
+    protected JwtAccessTokenConverter jwtTokenEnhancer() {
+        JwtAccessTokenConverter converter =  new JwtAccessTokenConverter();
+        Resource resource = new ClassPathResource("public.cert");
+        String publicKey ;
+        try {
+            publicKey = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        converter.setVerifierKey(publicKey);
+        converter.setAccessTokenConverter(customAccessTokenConverter);
+        return converter;
+    }
+}

+ 0 - 39
user-service/src/main/java/com/diagbot/config/MybatisPlusConfig.java

@@ -1,39 +0,0 @@
-package com.diagbot.config;
-
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import org.mybatis.spring.mapper.MapperScannerConfigurer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @Description: MybatisPlus配置类
- * @author: gaodm
- * @time: 2018/8/2 13:39
- */
-@Configuration
-//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
-public class MybatisPlusConfig {
-
-    /**
-     * mybatis-plus分页插件<br>
-     * 文档:http://mp.baomidou.com<br>
-     */
-    @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        return paginationInterceptor;
-    }
-
-    /**
-     * 相当于顶部的:
-     * {@code @MapperScan("com.diagbot.mapper*")}
-     * 这里可以扩展,比如使用配置文件来配置扫描Mapper的路径
-     */
-    @Bean
-    public MapperScannerConfigurer mapperScannerConfigurer() {
-        MapperScannerConfigurer scannerConfigurer = new MapperScannerConfigurer();
-        scannerConfigurer.setBasePackage("com.diagbot.mapper*");
-        return scannerConfigurer;
-    }
-
-}

+ 39 - 0
user-service/src/main/java/com/diagbot/config/MybatisPlusConfigurer.java

@@ -0,0 +1,39 @@
+package com.diagbot.config;
+
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.mybatis.spring.mapper.MapperScannerConfigurer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description: MybatisPlus配置类
+ * @author: gaodm
+ * @time: 2018/8/2 13:39
+ */
+@Configuration
+//@MapperScan("com.diagbot.mapper*")//这个注解,作用相当于下面的@Bean MapperScannerConfigurer,2者配置1份即可
+public class MybatisPlusConfigurer {
+
+    /**
+     * mybatis-plus分页插件<br>
+     * 文档:http://mp.baomidou.com<br>
+     */
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        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/java/com/diagbot/config/RedisConfig.java

@@ -24,7 +24,7 @@ import redis.clients.jedis.JedisPoolConfig;
 @Configuration
 @EnableCaching
 @Slf4j
-public class RedisConfig extends CachingConfigurerSupport {
+public class RedisConfigurer extends CachingConfigurerSupport {
 
     @Value("${spring.redis.database.cache}")
     private String databaseCache;

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

@@ -17,8 +17,8 @@ import org.springframework.security.oauth2.provider.token.TokenStore;
  */
 @Configuration
 @EnableResourceServer
-public class ResourceServerConfiguration extends ResourceServerConfigurerAdapter {
-    Logger log = LoggerFactory.getLogger(ResourceServerConfiguration.class);
+public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
+    Logger log = LoggerFactory.getLogger(ResourceServerConfigurer.class);
 
     @Override
     public void configure(HttpSecurity http) throws Exception {

+ 1 - 1
user-service/src/main/java/com/diagbot/config/SwaggerConfig.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 @Configuration
 @EnableSwagger2
-public class SwaggerConfig {
+public class SwaggerConfigurer {
     /**
      * 全局参数
      *