Merge remote-tracking branch 'origin/dev/one' into dev/one

# Conflicts:
#	diagbotman-service/src/main/java/com/diagbot/facade/OrderDetailsFacade.java
#	diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

admin-service/src/main/java/com/diagbot/AdminServiceApplication.java

@@ -25,8 +25,8 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
  * @author: gaodm
  * @time: 2018/8/7 10:48
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableTurbine
 @EnableHystrixDashboard
 @EnableHystrix
@@ -40,36 +40,6 @@ public class AdminServiceApplication {
         SpringApplication.run(AdminServiceApplication.class, args);
     }
 
-//    // tag::configuration-spring-security[]
-//    @Configuration
-//    public static class SecurityConfig extends WebSecurityConfigurerAdapter {
-//        @Override
-//        protected void configure(HttpSecurity http) throws Exception {
-//            // Page with login form is served as /login.html and does a POST on /login
-//            http.formLogin().loginPage("/login.html").loginProcessingUrl("/login").permitAll();
-//            // The UI does a POST on /logout on logout
-//            http.logout().logoutUrl("/logout");
-//            // The ui currently doesn't support csrf
-//            http.csrf().disable();
-//
-//            // Requests for the login page and the static assets are allowed
-//            http.authorizeRequests()
-//                    .antMatchers("/login.html", "/**/*.css", "/img/**", "/third-party/**")
-//                    .permitAll();
-//            // ... and any other request needs to be authorized
-//            http.authorizeRequests().antMatchers("/**").authenticated();
-//
-//            // Enable so that the clients can authenticate via HTTP basic for registering
-//            http.httpBasic();
-//        }
-//    }
-//
-//    @Autowired
-//    public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
-//        auth
-//                .inMemoryAuthentication()
-//                .withUser("admin").password("123456").roles("USER");
-//    }
     @Profile("local")
     @Configuration
     public static class SecurityPermitAllConfigLocal extends WebSecurityConfigurerAdapter {
@@ -82,7 +52,17 @@ public class AdminServiceApplication {
 
     @Profile("dev")
     @Configuration
-    public static class SecurityPermitAllConfig extends WebSecurityConfigurerAdapter {
+    public static class SecurityPermitAllConfigDev extends WebSecurityConfigurerAdapter {
+        @Override
+        protected void configure(HttpSecurity http) throws Exception {
+            http.authorizeRequests().anyRequest().permitAll()
+                    .and().csrf().disable();
+        }
+    }
+
+    @Profile("test")
+    @Configuration
+    public static class SecurityPermitAllConfigTest extends WebSecurityConfigurerAdapter {
         @Override
         protected void configure(HttpSecurity http) throws Exception {
             http.authorizeRequests().anyRequest().permitAll()

admin-service/src/main/resources/bootstrap.yml

@@ -3,13 +3,13 @@ spring:
     name: admin-service
   cloud:
     config:
-#      uri: http://${myuri}:8769
+      #uri: http://${myuri}:8769
       fail-fast: true
       discovery:
         enabled: true
         serviceId: config-server
   profiles:
-      active: local
+    active: local
 
 eureka:
   client:

admin-service/src/main/resources/logback-spring.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 项目名称 -->
-    <property name="APPDIR" value="admin-service" />
+    <property name="APPDIR" value="admin-service"/>
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_PATH" value="../logs" />
+    <property name="LOG_PATH" value="../logs"/>
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="clr"
+                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <!--包名输出缩进对齐-->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <!--  日志记录器，日期滚动记录
             ERROR 级别
@@ -26,12 +31,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>30</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-error-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -39,7 +46,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件记录error级别的 -->
@@ -62,12 +70,14 @@
             <!-- 归档的日志文件的路径，例如今天1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-warn-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -75,7 +85,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录warn级别的 -->
@@ -98,12 +109,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-info-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -111,7 +124,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录info级别的 -->
@@ -134,12 +148,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-debug-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -147,7 +163,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录debug级别的 -->
@@ -175,31 +192,31 @@
 
     <!--&lt;!&ndash;输出到mysql数据库的appender配置     &ndash;&gt;-->
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
-        <!--<connectionSource-->
-                <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-            <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
-            <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
-            <!--<user>root</user>-->
-            <!--<password>a123456789</password>-->
-        <!--</connectionSource>-->
+    <!--<connectionSource-->
+    <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
+    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
+    <!--<user>root</user>-->
+    <!--<password>a123456789</password>-->
+    <!--</connectionSource>-->
     <!--</appender>-->
 
     <!-- FrameworkServlet日志-->
-    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
-    <logger name="org.apache.ibatis" level="DEBUG" />
-    <logger name="java.sql" level="DEBUG" />
+    <logger name="org.apache.ibatis" level="DEBUG"/>
+    <logger name="java.sql" level="DEBUG"/>
 
     <!--  项目 mapper 路径
             console控制台显示sql语句：STDOUT.filter.level -> debug级别
     -->
-    <logger name="com.diagbot.mapper" level="DEBUG" />
+    <logger name="com.diagbot.mapper" level="DEBUG"/>
 
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"appname":"admin-service"}</customFields>
         </encoder>
     </appender>
@@ -207,49 +224,49 @@
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
+            <appender-ref ref="STDOUT"/>
         </root>
     </springProfile>
 
     <!-- 开发环境下的日志配置 -->
     <springProfile name="dev">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 
     <!-- 测试环境下的日志配置 -->
     <springProfile name="test">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 
     <!-- 生产环境下的日志配置 -->
     <springProfile name="prod">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 </configuration>

bi-service/src/main/java/com/diagbot/BiServiceApplication.java

@@ -18,10 +18,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: gaodm
  * @time: 2018/8/7 9:24
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableEurekaClient
-@EnableFeignClients({"com.diagbot.client"})
+@EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrixDashboard
 @EnableHystrix
 @EnableCircuitBreaker

bi-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -42,7 +42,7 @@ public class SysLoggerAspect {
 
         SysLog sysLog = new SysLog();
         SysLogger sysLogger = method.getAnnotation(SysLogger.class);
-        if(sysLogger != null){
+        if (sysLogger != null) {
             //注解上的描述
             sysLog.setOperation(sysLogger.value());
         }
@@ -52,18 +52,18 @@ public class SysLoggerAspect {
         sysLog.setMethod(className + "." + methodName + "()");
         //请求的参数
         Object[] args = joinPoint.getArgs();
-        String params="";
-        for(Object o:args){
-            params+=GsonUtil.toJson(o);
+        String params = "";
+        for (Object o : args) {
+            params += GsonUtil.toJson(o);
         }
-        if(!StringUtil.isEmpty(params)) {
+        if (!StringUtil.isEmpty(params)) {
             sysLog.setParams(params);
         }
         //设置IP地址
         sysLog.setIp(HttpUtils.getIpAddress());
         //用户名
         String username = UserUtils.getCurrentPrinciple();
-        if(!StringUtil.isEmpty(username)) {
+        if (!StringUtil.isEmpty(username)) {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());

bi-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestHeader;
  * @author: gaodm
  * @time: 2018/8/6 9:52
  */
-@FeignClient(value = "user-service",fallback = UserServiceHystrix.class )
+@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
 public interface UserServiceClient {
 
     @PostMapping(value = "/user/{username}")

bi-service/src/main/java/com/diagbot/config/JwtConfigurer.java

@@ -33,9 +33,9 @@ public class JwtConfigurer {
 
     @Bean
     protected JwtAccessTokenConverter jwtTokenEnhancer() {
-        JwtAccessTokenConverter converter =  new JwtAccessTokenConverter();
+        JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
         Resource resource = new ClassPathResource("public.cert");
-        String publicKey ;
+        String publicKey;
         try {
             publicKey = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
         } catch (IOException e) {

bi-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -25,9 +25,9 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         http
                 .csrf().disable()
                 .authorizeRequests()
-                .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/druid.*","/actuator.*","/hystrix.*").permitAll()
+                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*").permitAll()
                 .antMatchers("/**").authenticated();
-//        .antMatchers("/**").permitAll();
+        //        .antMatchers("/**").permitAll();
     }
 
 

bi-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
-@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
+@ConditionalOnProperty(prefix = "swagger", value = { "enable" }, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**
@@ -52,8 +52,8 @@ public class SwaggerConfigurer {
                 .apis(RequestHandlerSelectors.basePackage("com.diagbot.web"))
                 .paths(PathSelectors.any())
                 .build().globalOperationParameters(parameter());
-                //.securitySchemes(newArrayList(oauth()))
-               // .securityContexts(newArrayList(securityContext()));
+        //.securitySchemes(newArrayList(oauth()))
+        // .securityContexts(newArrayList(securityContext()));
     }
 
     private ApiInfo apiInfo() {

bi-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -25,7 +25,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
     public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException {
         HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
         String url, method;
-        if ("anonymousUser".equals(authentication.getPrincipal())){
+        if ("anonymousUser".equals(authentication.getPrincipal())) {
             if (matchers("/swagger/**", request)
                     || matchers("/v2/**", request)
                     || matchers("/swagger-ui.html/**", request)
@@ -34,7 +34,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/druid/**", request)
                     || matchers("/actuator/**", request)
                     || matchers("/hystrix/**", request)
-                    || matchers("/", request)){
+                    || matchers("/", request)) {
                 return;
             } else {
                 throw new AccessDeniedException("no right");

bi-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -179,18 +179,18 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", ip=" + ip +
-        ", sysType=" + sysType +
-        ", method=" + method +
-        ", operation=" + operation +
-        ", params=" + params +
-        ", username=" + username +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", ip=" + ip +
+                ", sysType=" + sysType +
+                ", method=" + method +
+                ", operation=" + operation +
+                ", params=" + params +
+                ", username=" + username +
+                "}";
     }
 }

bi-service/src/main/java/com/diagbot/entity/User.java

@@ -129,14 +129,14 @@ public class User implements Serializable {
     @Override
     public String toString() {
         return "User{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", password=" + password +
-        ", username=" + username +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", password=" + password +
+                ", username=" + username +
+                "}";
     }
 }

bi-service/src/main/java/com/diagbot/exception/CommonExceptionHandler.java

@@ -30,7 +30,7 @@ public class CommonExceptionHandler {
     @ExceptionHandler(Exception.class)
     public ResponseEntity<RespDTO> handleException(Exception e) {
         RespDTO resp = new RespDTO();
-        if(e instanceof BindException) {
+        if (e instanceof BindException) {
             BindException ex = (BindException) e;
             Map<String, String> stringMap = new HashMap<>();
             for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
@@ -42,7 +42,7 @@ public class CommonExceptionHandler {
             resp.msg = msg;
             return new ResponseEntity(resp, HttpStatus.OK);
         }
-        if(e instanceof MethodArgumentNotValidException) {
+        if (e instanceof MethodArgumentNotValidException) {
             MethodArgumentNotValidException ex = (MethodArgumentNotValidException) e;
             Map<String, String> stringMap = new HashMap<>();
             for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
@@ -54,7 +54,7 @@ public class CommonExceptionHandler {
             resp.msg = msg;
             return new ResponseEntity(resp, HttpStatus.OK);
         }
-        if(e instanceof MissingServletRequestParameterException) {
+        if (e instanceof MissingServletRequestParameterException) {
             MissingServletRequestParameterException ex = (MissingServletRequestParameterException) e;
             Map<String, String> stringMap = new HashMap<>();
             stringMap.put(ex.getParameterName(), "不能为null");
@@ -64,7 +64,7 @@ public class CommonExceptionHandler {
             resp.msg = msg;
             return new ResponseEntity(resp, HttpStatus.OK);
         }
-        if(e instanceof CommonException) {
+        if (e instanceof CommonException) {
             CommonException taiChiException = (CommonException) e;
             resp.code = taiChiException.getCode();
             resp.msg = e.getMessage();

bi-service/src/main/java/com/diagbot/mapper/SysLogMapper.java

@@ -5,7 +5,7 @@ import com.diagbot.entity.SysLog;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author gaodm

bi-service/src/main/java/com/diagbot/rabbit/MySender.java

@@ -15,13 +15,13 @@ import org.springframework.stereotype.Component;
  * @time: 2018/8/29 13:41
  */
 @Component
-@EnableBinding({MyProcessor.class})
+@EnableBinding({ MyProcessor.class })
 public class MySender {
     @Autowired
     @Qualifier("outputLog")
     MessageChannel outputLog;
 
-    public void outputLogSend(SysLog sysLog){
+    public void outputLogSend(SysLog sysLog) {
         outputLog.send(MessageBuilder.withPayload(GsonUtil.toJson(sysLog)).build());
     }
 }

bi-service/src/main/java/com/diagbot/service/SysLogService.java

@@ -5,7 +5,7 @@ import com.diagbot.entity.SysLog;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author gaodm

bi-service/src/main/java/com/diagbot/service/impl/SysLogServiceImpl.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author gaodm

bi-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -43,7 +43,7 @@ public class SysLogController {
     @ApiOperation(value = "添加日志", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
-    public RespDTO add(@RequestBody SysLogVo sysLogVo){
+    public RespDTO add(@RequestBody SysLogVo sysLogVo) {
         //初始化新增日志信息
         SysLog sysLog = new SysLog();
         sysLog.setGmtCreate(new Date());
@@ -51,47 +51,51 @@ public class SysLogController {
         sysLog.setMethod(sysLogVo.getMethod());
         sysLog.setOperation(sysLogVo.getOperation());
         sysLog.setParams(sysLogVo.getParams());
-        return RespDTO.onSuc(sysLogFacade.save(sysLog)?"添加成功":"添加失败");
+        return RespDTO.onSuc(sysLogFacade.save(sysLog) ? "添加成功" : "添加失败");
     }
 
     /**
      * 删除日志
+     *
      * @param id 日志信息ID
      * @return 删除是否成功
      */
     @ApiOperation(value = "删除日志", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
-    public RespDTO delete(@PathVariable(value = "id") Integer id){
-        return RespDTO.onSuc(sysLogFacade.removeById(id)?"删除成功":"删除失败");
+    public RespDTO delete(@PathVariable(value = "id") Integer id) {
+        return RespDTO.onSuc(sysLogFacade.removeById(id) ? "删除成功" : "删除失败");
     }
 
     /**
      * 修改日志
+     *
      * @param sysLog 修改日志输入参数
      * @return 修改是否成功
      */
     @ApiOperation(value = "修改日志", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
-    public RespDTO update(@RequestBody SysLog sysLog){
-        return RespDTO.onSuc(sysLogFacade.updateById(sysLog)?"修改成功":"修改失败");
+    public RespDTO update(@RequestBody SysLog sysLog) {
+        return RespDTO.onSuc(sysLogFacade.updateById(sysLog) ? "修改成功" : "修改失败");
     }
 
     /**
      * 获取日志列表
+     *
      * @return 日志列信息
      */
     @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
-    public RespDTO list(){
+    public RespDTO list() {
         Wrapper<SysLog> wrapper = new QueryWrapper<>();
         return RespDTO.onSuc(sysLogFacade.list(wrapper));
     }
 
     /**
      * 获取日志翻页信息
+     *
      * @return 日志翻页信息
      */
     @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")

bi-service/src/main/resources/bootstrap.yml

@@ -3,13 +3,13 @@ spring:
     name: bi-service
   cloud:
     config:
-#      uri: http://${myuri}:8769
+      #uri: http://${myuri}:8769
       fail-fast: true
       discovery:
         enabled: true
         serviceId: config-server
   profiles:
-      active: local
+    active: local
 
 eureka:
   client:

bi-service/src/main/resources/logback-spring.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 项目名称 -->
-    <property name="APPDIR" value="bi-service" />
+    <property name="APPDIR" value="bi-service"/>
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_PATH" value="../logs" />
+    <property name="LOG_PATH" value="../logs"/>
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="clr"
+                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <!--包名输出缩进对齐-->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <!--  日志记录器，日期滚动记录
             ERROR 级别
@@ -26,12 +31,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>30</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-error-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -39,7 +46,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件记录error级别的 -->
@@ -62,12 +70,14 @@
             <!-- 归档的日志文件的路径，例如今天1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-warn-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -75,7 +85,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录warn级别的 -->
@@ -98,12 +109,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-info-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -111,7 +124,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录info级别的 -->
@@ -134,12 +148,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-debug-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -147,7 +163,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录debug级别的 -->
@@ -175,31 +192,31 @@
 
     <!--&lt;!&ndash;输出到mysql数据库的appender配置     &ndash;&gt;-->
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
-        <!--<connectionSource-->
-                <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-            <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
-            <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
-            <!--<user>root</user>-->
-            <!--<password>a123456789</password>-->
-        <!--</connectionSource>-->
+    <!--<connectionSource-->
+    <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
+    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
+    <!--<user>root</user>-->
+    <!--<password>a123456789</password>-->
+    <!--</connectionSource>-->
     <!--</appender>-->
 
     <!-- FrameworkServlet日志-->
-    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
-    <logger name="org.apache.ibatis" level="DEBUG" />
-    <logger name="java.sql" level="DEBUG" />
+    <logger name="org.apache.ibatis" level="DEBUG"/>
+    <logger name="java.sql" level="DEBUG"/>
 
     <!--  项目 mapper 路径
             console控制台显示sql语句：STDOUT.filter.level -> debug级别
     -->
-    <logger name="com.diagbot.mapper" level="DEBUG" />
+    <logger name="com.diagbot.mapper" level="DEBUG"/>
 
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"appname":"bi-service"}</customFields>
         </encoder>
     </appender>
@@ -207,49 +224,49 @@
     <!-- 本地环境下的日志配置 -->
     <springProfile name="local">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
+            <appender-ref ref="STDOUT"/>
         </root>
     </springProfile>
 
     <!-- 开发环境下的日志配置 -->
     <springProfile name="dev">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 
     <!-- 测试环境下的日志配置 -->
     <springProfile name="test">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 
     <!-- 生产环境下的日志配置 -->
     <springProfile name="prod">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 </configuration>

bi-service/src/main/resources/mapper/SysLogMapper.xml

@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.SysLogMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.SysLog">
-        <id column="id" property="id" />
-        <result column="is_deleted" property="isDeleted" />
-        <result column="gmt_create" property="gmtCreate" />
-        <result column="gmt_modified" property="gmtModified" />
-        <result column="creator" property="creator" />
-        <result column="modifier" property="modifier" />
-        <result column="ip" property="ip" />
-        <result column="sys_type" property="sysType" />
-        <result column="method" property="method" />
-        <result column="operation" property="operation" />
-        <result column="params" property="params" />
-        <result column="username" property="username" />
+        <id column="id" property="id"/>
+        <result column="is_deleted" property="isDeleted"/>
+        <result column="gmt_create" property="gmtCreate"/>
+        <result column="gmt_modified" property="gmtModified"/>
+        <result column="creator" property="creator"/>
+        <result column="modifier" property="modifier"/>
+        <result column="ip" property="ip"/>
+        <result column="sys_type" property="sysType"/>
+        <result column="method" property="method"/>
+        <result column="operation" property="operation"/>
+        <result column="params" property="params"/>
+        <result column="username" property="username"/>
     </resultMap>
 
 </mapper>

common/src/main/java/com/diagbot/dto/RespDTO.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
  * @author: gaodm
  * @time: 2018/8/1 14:55
  */
-public class RespDTO<T> implements Serializable{
+public class RespDTO<T> implements Serializable {
 
 
     public String code = "0";

common/src/main/java/com/diagbot/enums/IsDeleteEnum.java

@@ -10,8 +10,8 @@ import lombok.Setter;
  */
 public enum IsDeleteEnum {
 
-    Y("Y","是"),
-    N("N","否");
+    Y("Y", "是"),
+    N("N", "否");
 
     @Getter
     @Setter
@@ -20,7 +20,8 @@ public enum IsDeleteEnum {
     @Getter
     @Setter
     private String name;
-    IsDeleteEnum(String key, String name){
+
+    IsDeleteEnum(String key, String name) {
         this.key = key;
         this.name = name;
     }

common/src/main/java/com/diagbot/enums/SysTypeEnum.java

@@ -5,8 +5,8 @@ import lombok.Setter;
 
 /**
  * @Description: 访问的系统类型
- *  1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,
- *  5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
+ * 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,
+ * 5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web
  * @author: gaodm
  * @time: 2018/9/14 9:15
  */

common/src/main/java/com/diagbot/exception/CommonErrorCode.java

@@ -2,8 +2,8 @@ package com.diagbot.exception;
 
 /**
  * @Description: 通用错误码
- *      系统码(3位) + 等级码(1位) + 4位顺序号
- *      系统码 通用码 000；用户中心 100； 管理中心 200；
+ * 系统码(3位) + 等级码(1位) + 4位顺序号
+ * 系统码 通用码 000；用户中心 100； 管理中心 200；
  * @author: gaodm
  * @time: 2018/8/1 14:56
  */
@@ -11,9 +11,9 @@ public enum CommonErrorCode implements ErrorCode {
 
     OK("00000000", "操作成功"),
     FAIL("00000001", "操作失败"),
-    RPC_ERROR("00000002","远程调度失败"),
+    RPC_ERROR("00000002", "远程调度失败"),
     PARAM_ERROR("00029999", "%s"), //参数错误
-    NOT_EXISTS ("00020001", "该数据不存在!"),
+    NOT_EXISTS("00020001", "该数据不存在!"),
     INSERT_DATA_FAILED("00020002", "数据库写入失败!"),
     UPDATE_INFO_FAIL("00020003", "更新数据失败!"),
     PARAM_IS_NULL("00020004", "传入的参数为空!"),

common/src/main/java/com/diagbot/exception/ErrorCode.java

@@ -7,7 +7,7 @@ import java.io.Serializable;
  * @author: gaodm
  * @time: 2018/9/10 11:01
  */
-public interface ErrorCode extends Serializable{
+public interface ErrorCode extends Serializable {
 
     String getCode();
 

common/src/main/java/com/diagbot/util/ArrayUtil.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.ArrayUtils;
 public class ArrayUtil {
     /**
      * 判断数组是否为空
+     *
      * @param array 数组
      * @return 是否为空
      */
@@ -19,9 +20,10 @@ public class ArrayUtil {
 
     /**
      * 数组合并
-     * @param array 一个数组
+     *
+     * @param array        一个数组
      * @param anotherArray 另外一个数组
-     * @param <T> 数组类型
+     * @param <T>          数组类型
      * @return 合并后的数组
      */
     public static <T> T[] add(T[] array, T[] anotherArray) {

common/src/main/java/com/diagbot/util/BeanUtil.java

@@ -16,23 +16,25 @@ import java.util.List;
 public class BeanUtil {
     /**
      * 把一个对象的属性值复制给另外一个对象的属性值
+     *
      * @param source 源对象，被转换的对象
      * @param target 目标对象，即转换后对象
      */
-    public static void copyProperties(Object source, Object target){
-        BeanUtils.copyProperties(source,target);
+    public static void copyProperties(Object source, Object target) {
+        BeanUtils.copyProperties(source, target);
     }
 
     /**
      * 复制集合
+     *
      * @param <E>
-     * @param source 转换前的列表
+     * @param source           转换前的列表
      * @param destinationClass 转换后列表类
      * @return 转换后列表
      */
-    public static <E> List<E> listCopyTo(List<?> source, Class<E> destinationClass){
-        try{
-            if (source.size() == 0){
+    public static <E> List<E> listCopyTo(List<?> source, Class<E> destinationClass) {
+        try {
+            if (source.size() == 0) {
                 return Collections.emptyList();
             }
             List<E> res = new ArrayList<E>(source.size());
@@ -42,9 +44,9 @@ public class BeanUtil {
                 res.add(e);
             }
             return res;
-        }catch (IllegalAccessException ex){
+        } catch (IllegalAccessException ex) {
             throw new RuntimeException(ex);
-        }catch (InstantiationException ex){
+        } catch (InstantiationException ex) {
             throw new RuntimeException(ex);
         }
     }

common/src/main/java/com/diagbot/util/DateUtil.java

@@ -22,15 +22,25 @@ public class DateUtil {
     public static final long MILLISECOND_OF_DAY = MILLISECOND_OF_HOUR * 24;
     public static final long MILLISECOND_OF_WEEK = MILLISECOND_OF_DAY * 7;
 
-    /** 日期格式：yyyy-MM-dd */
+    /**
+     * 日期格式：yyyy-MM-dd
+     */
     public static final String DATE_FORMAT = "yyyy-MM-dd";
-    /** 日期格式：yyyyMMdd */
+    /**
+     * 日期格式：yyyyMMdd
+     */
     public static final String DATE_FORMAT_NO_SPLIT = "yyyyMMdd";
-    /** 日期格式：yyyyMMddHHmmss */
+    /**
+     * 日期格式：yyyyMMddHHmmss
+     */
     public static final String DATE_TIME_FORMAT_NO_SPLIT = "yyyyMMddHHmmss";
-    /** 日期格式：yyyy-MM-dd HH:mm:ss */
+    /**
+     * 日期格式：yyyy-MM-dd HH:mm:ss
+     */
     public static final String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
-    /** 日期格式：yyyy-MM-dd HH:mm:ss.SSS */
+    /**
+     * 日期格式：yyyy-MM-dd HH:mm:ss.SSS
+     */
     public static final String DATE_TIME_MS_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS";
 
     public static final String FORMAT_TIME = "HH:mm:ss";
@@ -67,12 +77,9 @@ public class DateUtil {
      * <p>
      * <code>add(Calendar.DAY_OF_MONTH, -5)</code>.
      *
-     * @param date
-     *            the date of before the changed.
-     * @param field
-     *            the calendar field.
-     * @param amount
-     *            the amount of date or time to be added to the field.
+     * @param date   the date of before the changed.
+     * @param field  the calendar field.
+     * @param amount the amount of date or time to be added to the field.
      * @return
      */
     public static Date add(final Date date, Integer field, Integer amount) {
@@ -86,10 +93,9 @@ public class DateUtil {
 
     /**
      * 添加天数
-     * @param date
-     *           要操作的日期
-     * @param days
-     *            天数
+     *
+     * @param date 要操作的日期
+     * @param days 天数
      * @return
      */
     public static Date addDate(final Date date, Integer days) {
@@ -98,7 +104,8 @@ public class DateUtil {
 
     /**
      * 按指定的格式，将日期转换成为字符
-     * @param date 日期
+     *
+     * @param date   日期
      * @param format 格式
      * @return 按指定的格式，将日期转换成为字符
      */
@@ -117,6 +124,7 @@ public class DateUtil {
 
     /**
      * 判断字符串是否为空
+     *
      * @param str 要判断的字符串
      * @return boolean
      */
@@ -126,6 +134,7 @@ public class DateUtil {
 
     /**
      * 将日期转换成为字符（yyyy-MM-dd）
+     *
      * @param date
      * @return
      */
@@ -134,8 +143,9 @@ public class DateUtil {
     }
 
     /**
-     *  今天日期的字符（yyyy-MM-dd）
-     * @return  今天日期的字符（yyyy-MM-dd）
+     * 今天日期的字符（yyyy-MM-dd）
+     *
+     * @return 今天日期的字符（yyyy-MM-dd）
      */
     public static String today() {
         return formatDate(new Date());
@@ -143,6 +153,7 @@ public class DateUtil {
 
     /**
      * 将日期转换成为字符（yyyy-MM-dd HH:mm:ss）
+     *
      * @param date
      * @return
      */
@@ -152,6 +163,7 @@ public class DateUtil {
 
     /**
      * 当前时间的字符（yyyy-MM-dd HH:mm:ss）
+     *
      * @return 当前时间的字符（yyyy-MM-dd HH:mm:ss）
      */
     public static String nowString() {
@@ -160,6 +172,7 @@ public class DateUtil {
 
     /**
      * 当前时间
+     *
      * @return 当前时间
      */
     public static Date now() {
@@ -178,6 +191,7 @@ public class DateUtil {
 
     /**
      * 生成日期
+     *
      * @param object 要转换的数据
      * @return 生成日期
      */
@@ -187,8 +201,9 @@ public class DateUtil {
 
     /**
      * 按指定的格式，将字符转换为日期
+     *
      * @param dateString 日期
-     * @param format 格式
+     * @param format     格式
      * @return 按指定的格式，将字符转换为日期
      */
     public static Date parseDate(String dateString, String format) {
@@ -204,13 +219,13 @@ public class DateUtil {
     }
 
 
-
     /**
      * 获取昨天的日期格式化字符串 yyyy-MM-dd
+     *
      * @return
      */
-    public static String yesterdayFormate(){
-        Date  date = new Date();
+    public static String yesterdayFormate() {
+        Date date = new Date();
         Date dBefore = new Date();
         Calendar calendar = Calendar.getInstance(); //得到日历
         calendar.setTime(date);//把当前时间赋给日历
@@ -220,9 +235,9 @@ public class DateUtil {
     }
 
 
-
     /**
      * 将字符（yyyy-MM-dd）转换为日期
+     *
      * @param dateString
      * @return 将字符（yyyy-MM-dd）转换为日期
      */
@@ -232,6 +247,7 @@ public class DateUtil {
 
     /**
      * 将字符（yyyy-MM-dd HH:mm:ss）转换为日期
+     *
      * @param dateString
      * @return 将字符（yyyy-MM-dd HH:mm:ss）转换为日期
      */
@@ -243,7 +259,7 @@ public class DateUtil {
      * milliseconds 转化为日期
      *
      * @param date
-     * @return  milliseconds 转化为日期
+     * @return milliseconds 转化为日期
      */
     public static Date toDate(Long date) {
         if (date == null) {
@@ -264,8 +280,7 @@ public class DateUtil {
     /**
      * 获取当前时间字符串 默认格式：yyyy-MM-dd HH:mm:ss
      *
-     * @param dateFormatPattern
-     *            日期转换格式
+     * @param dateFormatPattern 日期转换格式
      * @return 获取当前时间字符串 默认格式：yyyy-MM-dd HH:mm:ss
      */
     public static String getCurrentDateStr(String dateFormatPattern) {
@@ -299,7 +314,8 @@ public class DateUtil {
 
     /**
      * 添加或减少月
-     * @param date 要操作的日期
+     *
+     * @param date   要操作的日期
      * @param months 月
      * @return操作过的日期
      */
@@ -312,7 +328,8 @@ public class DateUtil {
 
     /**
      * 添加或减少周
-     * @param date 要操作的日期
+     *
+     * @param date  要操作的日期
      * @param weeks 周
      * @return操作过的日期
      */
@@ -325,6 +342,7 @@ public class DateUtil {
 
     /**
      * 添加或减少天数
+     *
      * @param date 日期
      * @param days 天数
      * @return 操作过的日期
@@ -338,7 +356,8 @@ public class DateUtil {
 
     /**
      * 添加或减少小时
-     * @param date 要操作的日期
+     *
+     * @param date  要操作的日期
      * @param hours 小时
      * @return 操作过的日期
      */
@@ -350,8 +369,9 @@ public class DateUtil {
     }
 
     /**
-     *  添加或减少分钟
-     * @param date 要操作的日期
+     * 添加或减少分钟
+     *
+     * @param date    要操作的日期
      * @param minutes 分钟
      * @return 操作过的日期
      */
@@ -365,7 +385,7 @@ public class DateUtil {
     /**
      * 获得某个月的第一天0时0分0秒的时间
      *
-     * @param year 年
+     * @param year  年
      * @param month 月
      * @return java.util.Date
      */
@@ -384,9 +404,9 @@ public class DateUtil {
     /**
      * 获取某一天的0时0分0秒的时间
      *
-     * @param year 年
+     * @param year  年
      * @param month 月
-     * @param day 日
+     * @param day   日
      * @return 返回加上0点的时间
      */
     public static Date getFirstTimeOfDay(int year, int month, int day) {
@@ -436,7 +456,7 @@ public class DateUtil {
      *
      * @param year  年
      * @param month 月
-     * @param day 日
+     * @param day   日
      * @return 时间点
      */
     public static Date getDateFromTime(int year, int month, int day, int hour, int minute, int second) {
@@ -454,30 +474,32 @@ public class DateUtil {
 
     /**
      * 将时间字符串进行相加后操作后格式化输出
+     *
      * @param timeStr 格式<HH:mm:ss>
-     * @param hour 小时
-     * @param minute 分钟
-     * @param second 秒
+     * @param hour    小时
+     * @param minute  分钟
+     * @param second  秒
      * @return 格式<HH:mm>
      */
-    public static String timeOperate(String timeStr, int hour, int minute, int second){
+    public static String timeOperate(String timeStr, int hour, int minute, int second) {
         SimpleDateFormat df = new SimpleDateFormat(FORMAT_TIME);
         String[] times = timeStr.trim().split(":");
         Calendar calendar = Calendar.getInstance();
-        calendar.set(Calendar.HOUR_OF_DAY,Integer.valueOf(times[0]));
-        calendar.set(Calendar.MINUTE,Integer.valueOf(times[1]));
-        if(times.length==3){
-            calendar.set(Calendar.SECOND,Integer.valueOf(times[2]));
+        calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(times[0]));
+        calendar.set(Calendar.MINUTE, Integer.valueOf(times[1]));
+        if (times.length == 3) {
+            calendar.set(Calendar.SECOND, Integer.valueOf(times[2]));
         }
-        calendar.add(Calendar.HOUR_OF_DAY,hour);
-        calendar.add(Calendar.MINUTE,minute);
-        calendar.add(Calendar.SECOND,second);
+        calendar.add(Calendar.HOUR_OF_DAY, hour);
+        calendar.add(Calendar.MINUTE, minute);
+        calendar.add(Calendar.SECOND, second);
         return df.format(calendar.getTime());
 
     }
 
     /**
      * 根据指定string生成当天时间
+     *
      * @param timeStr 格式<HH:mm> or <HH:mm:ss>
      * @return 当天时间
      */
@@ -486,10 +508,10 @@ public class DateUtil {
         Calendar calendar = Calendar.getInstance();
         calendar.set(Calendar.HOUR_OF_DAY, Integer.valueOf(times[0]));
         calendar.set(Calendar.MINUTE, Integer.valueOf(times[1]));
-        if(times.length==3){
-            calendar.set(Calendar.SECOND,Integer.valueOf(times[2]));
-        }else {
-            calendar.set(Calendar.SECOND,0);
+        if (times.length == 3) {
+            calendar.set(Calendar.SECOND, Integer.valueOf(times[2]));
+        } else {
+            calendar.set(Calendar.SECOND, 0);
         }
         calendar.set(Calendar.MILLISECOND, 0);
         return calendar.getTime();
@@ -499,7 +521,7 @@ public class DateUtil {
      * 根据指定string生成指定日期时间
      *
      * @param timeStr 格式<HH:mm> or <HH:mm:ss>
-     * @param date 日期
+     * @param date    日期
      * @return 日期时间
      */
     public static Date getSpecialDayTimeByStr(Date date, String timeStr) {
@@ -510,7 +532,7 @@ public class DateUtil {
         calendar.set(Calendar.MINUTE, Integer.valueOf(times[1]));
         if (times.length == 3) {
             calendar.set(Calendar.SECOND, Integer.valueOf(times[2]));
-        }else {
+        } else {
             calendar.set(Calendar.SECOND, 0);
         }
         calendar.set(Calendar.MILLISECOND, 0);
@@ -519,11 +541,12 @@ public class DateUtil {
 
     /**
      * 获取两个日期间所跨0点次数
+     *
      * @param d1 开始日期
      * @param d2 结束日期
      * @return 得到两个日期相差的天数
      */
-    public static  Integer getDaysBetweenTwoDate(Date d1,Date d2) {
+    public static Integer getDaysBetweenTwoDate(Date d1, Date d2) {
         SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
         try {
             Date d11 = sdf.parse(sdf.format(d1));
@@ -560,6 +583,7 @@ public class DateUtil {
 
     /**
      * 获取日期年份
+     *
      * @param date 日期
      * @return
      */
@@ -567,11 +591,11 @@ public class DateUtil {
         SimpleDateFormat df = new SimpleDateFormat(FORMAT_FULL);
         return df.format(date).substring(0, 4);
     }
+
     /**
      * 功能描述：返回月
      *
-     * @param date
-     *            Date 日期
+     * @param date Date 日期
      * @return 返回月份
      */
     public static int getMonth(Date date) {
@@ -583,8 +607,7 @@ public class DateUtil {
     /**
      * 功能描述：返回日
      *
-     * @param date
-     *            Date 日期
+     * @param date Date 日期
      * @return 返回日份
      */
     public static int getDay(Date date) {
@@ -596,8 +619,7 @@ public class DateUtil {
     /**
      * 功能描述：返回小
      *
-     * @param date
-     *            日期
+     * @param date 日期
      * @return 返回小时
      */
     public static int getHour(Date date) {
@@ -609,8 +631,7 @@ public class DateUtil {
     /**
      * 功能描述：返回分
      *
-     * @param date
-     *            日期
+     * @param date 日期
      * @return 返回分钟
      */
     public static int getMinute(Date date) {
@@ -622,8 +643,7 @@ public class DateUtil {
     /**
      * 返回秒钟
      *
-     * @param date
-     *            Date 日期
+     * @param date Date 日期
      * @return 返回秒钟
      */
     public static int getSecond(Date date) {
@@ -635,8 +655,7 @@ public class DateUtil {
     /**
      * 功能描述：返回毫
      *
-     * @param date
-     *            日期
+     * @param date 日期
      * @return 返回毫
      */
     public static long getMillis(Date date) {

common/src/main/java/com/diagbot/util/EntityUtil.java

@@ -33,9 +33,10 @@ public class EntityUtil {
 
     /**
      * 将list中元素的某一成员组装成list返回。注意：会去重!
-     * @param list 元素列表
+     *
+     * @param list      元素列表
      * @param fieldName 成员变量的field
-     * @param <T> 元素类型
+     * @param <T>       元素类型
      * @return 返回该字段组成的list
      */
     public static <T> List makeListByFieldName(List<T> list, String fieldName) {
@@ -50,7 +51,7 @@ public class EntityUtil {
         }
         try {
             for (T o : list) {
-                if(!returnList.contains(field.get(o))) {
+                if (!returnList.contains(field.get(o))) {
                     returnList.add(field.get(o));
                 }
             }
@@ -63,9 +64,10 @@ public class EntityUtil {
 
     /**
      * 将Collection中元素的某一成员组装成Set返回
+     *
      * @param collection 元素列表
-     * @param fieldName 成员变量的field
-     * @param <T> 元素类型
+     * @param fieldName  成员变量的field
+     * @param <T>        元素类型
      * @return 返回该字段组成的LinkedHashSet。若元素中不存在名为fieldName的成员变量，则返回EmptySet
      */
     public static <T> LinkedHashSet makeLinkedSetByFieldName(Collection<T> collection, String fieldName) {
@@ -96,12 +98,12 @@ public class EntityUtil {
      * 将list中的元素放到Map<M, N>以建立 key - value 索引<p>
      * modified from com.tqmall.saint.biz.util.EntityUtil#makeEntityMap(java.util.List, java.lang.String)
      *
-     * @param collection Collection<V> 元素列表
-     * @param keyFieldName String 元素的属性名称, 该属性的值作为Map的key
+     * @param collection     Collection<V> 元素列表
+     * @param keyFieldName   String 元素的属性名称, 该属性的值作为Map的key
      * @param valueFieldName String 元素的属性名称, 该属性的值作为Map的value
-     * @param <M> key类型
-     * @param <N> value类型
-     * @param <V> 列表元素类型
+     * @param <M>            key类型
+     * @param <N>            value类型
+     * @param <V>            列表元素类型
      * @return
      */
     @SuppressWarnings("unchecked")
@@ -132,19 +134,18 @@ public class EntityUtil {
     }
 
     /**
-     *
      * 将list中的元素放到Map<K, V>以建立 key - value 索引<p>
      *
-     * @param list  List<V> 元素列表
+     * @param list         List<V> 元素列表
      * @param keyFieldName String 元素的属性名称, 该属性的值作为索引key
-     * @param <K> key类型
-     * @param <V> value类型
-     * @return Map<K, V> key - value 索引
+     * @param <K>          key类型
+     * @param <V>          value类型
+     * @return Map<K   ,       V> key - value 索引
      */
     @SuppressWarnings("unchecked")
     public static <K, V> Map<K, V> makeEntityMap(List<V> list, String keyFieldName) {
         Map<K, V> map = new HashMap<>();
-        if(list == null || list.size() == 0) {
+        if (list == null || list.size() == 0) {
             return map;
         }
         try {
@@ -160,32 +161,31 @@ public class EntityUtil {
     }
 
     /**
-     *
      * 将list中的元素放到Map<String, V>以建立 key - value 索引<p>
      *
-     * @param list  List<V> 元素列表
-     * @param splitVar  属性之间间隔
+     * @param list          List<V> 元素列表
+     * @param splitVar      属性之间间隔
      * @param keyFieldNames String 元素的属性名称动态数组, 依次循环该属性的值作为索引key
-     * @param <V> value类型
-     * @return Map<String, V> key - value 索引
+     * @param <V>           value类型
+     * @return Map<String   ,       V> key - value 索引
      */
 
     @SuppressWarnings("unchecked")
-    public static <V> Map<String, V> makeEntityMapByKeys(List<V> list,String splitVar , String... keyFieldNames) {
+    public static <V> Map<String, V> makeEntityMapByKeys(List<V> list, String splitVar, String... keyFieldNames) {
         Map<String, V> map = new HashMap<>();
-        if(list == null || list.size() == 0 || keyFieldNames == null || keyFieldNames.length==0 || StringUtil.isEmpty(splitVar)) {
+        if (list == null || list.size() == 0 || keyFieldNames == null || keyFieldNames.length == 0 || StringUtil.isEmpty(splitVar)) {
             return map;
         }
         try {
             List<Method> getterList = new ArrayList<>();
-            for(String key : keyFieldNames){
-                getterList.add(getMethod(list.get(0).getClass(),key, "get"));
+            for (String key : keyFieldNames) {
+                getterList.add(getMethod(list.get(0).getClass(), key, "get"));
             }
             for (V item : list) {
-                StringBuffer keys= new StringBuffer("");
-                for (int i=0;i<getterList.size();i++){
+                StringBuffer keys = new StringBuffer("");
+                for (int i = 0; i < getterList.size(); i++) {
                     keys.append(getterList.get(i).invoke(item));
-                    if(i<getterList.size()-1){
+                    if (i < getterList.size() - 1) {
                         keys.append(splitVar);
                     }
                 }
@@ -197,19 +197,19 @@ public class EntityUtil {
         }
         return map;
     }
+
     /**
-     *
      * 将list中的元素放到Map<K, List<V>> 以建立 key - List<value> 索引<p>
      *
-     * @param list  List<V> 元素列表
+     * @param list         List<V> 元素列表
      * @param keyFieldName String 元素的属性名称, 该属性的值作为索引key
-     * @param <K> key类型
-     * @param <V> value类型
-     * @return Map<K, V> key - value 索引
+     * @param <K>          key类型
+     * @param <V>          value类型
+     * @return Map<K   ,       V> key - value 索引
      */
     public static <K, V> Map<K, List<V>> makeEntityListMap(List<V> list, String keyFieldName) {
         Map<K, List<V>> map = new LinkedHashMap<>();
-        if(list == null || list.size() == 0) {
+        if (list == null || list.size() == 0) {
             return map;
         }
         try {
@@ -243,37 +243,38 @@ public class EntityUtil {
     }
 
     /**
-     *  比较两个对象改变了的属性值，然后以string拼接返回
+     * 比较两个对象改变了的属性值，然后以string拼接返回
+     *
      * @param oldObj 对象1
      * @param newObj 对象2
      * @return 改变的属性值拼接的字符串
      */
-    public static <T> String compareToObjProperty(T oldObj,T newObj){
+    public static <T> String compareToObjProperty(T oldObj, T newObj) {
         String modifiedStr = "";
         Field[] fields = oldObj.getClass().getDeclaredFields();
-        for(Field field : fields){
+        for (Field field : fields) {
             try {
-                if(!Modifier.isStatic(field.getModifiers())){
-                    String tempFieldType =field.getType().getName();
+                if (!Modifier.isStatic(field.getModifiers())) {
+                    String tempFieldType = field.getType().getName();
                     Method tempMethod = getMethod(oldObj.getClass(), field.getName(), "get");
-                    if(field.getName().equals("ATTRIBUTE_ORDER_SN")){
+                    if (field.getName().equals("ATTRIBUTE_ORDER_SN")) {
                         System.out.println("aa");
                     }
-                    if(tempMethod!=null){
+                    if (tempMethod != null) {
                         Object tempOld = tempMethod.invoke(oldObj);
                         Object tempNew = tempMethod.invoke(newObj);
-                        if(findDifference(tempOld,tempNew)){
-                            if(tempFieldType.equals("java.util.Date")){
+                        if (findDifference(tempOld, tempNew)) {
+                            if (tempFieldType.equals("java.util.Date")) {
                                 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd mm:HH:ss");
-                                modifiedStr += field.getName() + "[" + ( tempOld == null ? null: sdf.format(tempOld)) + "," +
+                                modifiedStr += field.getName() + "[" + (tempOld == null ? null : sdf.format(tempOld)) + "," +
                                         (tempNew == null ? null : sdf.format(tempNew)) + "],";
                             } else {
-                                modifiedStr += field.getName()+"["+tempOld+","+ tempNew+"],";
+                                modifiedStr += field.getName() + "[" + tempOld + "," + tempNew + "],";
                             }
                         }
                     }
                 }
-            }catch (Exception e) {
+            } catch (Exception e) {
                 log.error("compareTo error", e);
             }
         }
@@ -282,7 +283,8 @@ public class EntityUtil {
 
     /**
      * 获取所有field，不包含field，修改自FieldUtils的getAllFieldsList方法
-     * @param cls 类
+     *
+     * @param cls         类
      * @param forceAccess 是否包含private的field
      * @return
      */
@@ -306,7 +308,8 @@ public class EntityUtil {
 
     /**
      * 获取所有field，包含所有父类，来自FieldUtils的getAllFieldsList方法
-     * @param cls 类
+     *
+     * @param cls         类
      * @param forceAccess 是否包含private的field
      * @return
      */
@@ -333,7 +336,8 @@ public class EntityUtil {
 
     /**
      * 获取类型的field
-     * @param cls 类型
+     *
+     * @param cls         类型
      * @param checkSupers 是否要获取父类的field
      * @param forceAccess 是否包含private的field
      * @return
@@ -348,12 +352,13 @@ public class EntityUtil {
 
     /**
      * 比较两个对象改变了的属性值，然后以string拼接返回
-     * @param oldObj 对象1
-     * @param newObj 对象2
-     * @param formatter 格式(默认为%s[%s,%s]，第一个%s对应fieldname，第二个%对应对象1的fieldname的值，第三个%s对应对象2的fieldname的值)
+     *
+     * @param oldObj      对象1
+     * @param newObj      对象2
+     * @param formatter   格式(默认为%s[%s,%s]，第一个%s对应fieldname，第二个%对应对象1的fieldname的值，第三个%s对应对象2的fieldname的值)
      * @param checkSupers 是否需要比较所有父类(无视继承的接口)
      * @param forceAccess 是否需要比较private成员变量
-     * @param <T> 要比较的对象类型
+     * @param <T>         要比较的对象类型
      * @return
      */
     public static <T> String compareToObjProperty(T oldObj, T newObj, String formatter, final boolean checkSupers, final boolean forceAccess) {
@@ -382,7 +387,7 @@ public class EntityUtil {
                     }
                 }
             } catch (Exception e) {
-                log.error("compareTo error",e);
+                log.error("compareTo error", e);
             }
         }
         return builder.toString();
@@ -390,33 +395,34 @@ public class EntityUtil {
 
     /**
      * 比较两个对象的值是否不同
+     *
      * @param obj1 对象1
      * @param obj2 对象2
-     * @param <T> object
+     * @param <T>  object
      * @return 若俩对象的值不相同则为true，反之为false
      */
-    public static <T> Boolean findDifference(T obj1,T obj2){
-        if(obj1 == null && obj2 == null){
+    public static <T> Boolean findDifference(T obj1, T obj2) {
+        if (obj1 == null && obj2 == null) {
             return false;
         }
-        if(obj1 == null || obj2 == null){
+        if (obj1 == null || obj2 == null) {
             return true;
         }
-        if(obj1 instanceof BigDecimal){
-            return ((BigDecimal) obj1).compareTo((BigDecimal)obj2) != 0;
-        }else {
+        if (obj1 instanceof BigDecimal) {
+            return ((BigDecimal) obj1).compareTo((BigDecimal) obj2) != 0;
+        } else {
             return !obj1.equals(obj2);
         }
     }
 
-    public static <V,K> Map<V, K> makeEntityMapNew(List<Map<String,Object>> hashMap,String keyFieldName) {
+    public static <V, K> Map<V, K> makeEntityMapNew(List<Map<String, Object>> hashMap, String keyFieldName) {
         Map<V, K> map = new HashMap<>();
-        if(hashMap == null || hashMap.size() == 0) {
+        if (hashMap == null || hashMap.size() == 0) {
             return map;
         }
         try {
-            for(Map linkedHashMap:hashMap){
-                map.put((V)linkedHashMap.get(keyFieldName).toString(),(K)linkedHashMap);
+            for (Map linkedHashMap : hashMap) {
+                map.put((V) linkedHashMap.get(keyFieldName).toString(), (K) linkedHashMap);
             }
         } catch (Exception e) {
             log.error("makeEntityListMap error list is " + hashMap, e);
@@ -426,14 +432,14 @@ public class EntityUtil {
     }
 
 
-    public static Map<Integer, Map> makeEntityMapSpecial(List<Map> hashMap,String keyFieldName) {
+    public static Map<Integer, Map> makeEntityMapSpecial(List<Map> hashMap, String keyFieldName) {
         Map<Integer, Map> map = new HashMap<>();
-        if(hashMap == null || hashMap.size() == 0) {
+        if (hashMap == null || hashMap.size() == 0) {
             return map;
         }
         try {
-            for(Map linkedHashMap:hashMap){
-                map.put(Integer.valueOf(linkedHashMap.get(keyFieldName).toString()),linkedHashMap);
+            for (Map linkedHashMap : hashMap) {
+                map.put(Integer.valueOf(linkedHashMap.get(keyFieldName).toString()), linkedHashMap);
             }
         } catch (Exception e) {
             log.error("makeEntityListMap error list is " + hashMap, e);

common/src/main/java/com/diagbot/util/FastJsonUtils.java

@@ -2,6 +2,7 @@ package com.diagbot.util;
 
 import java.util.List;
 import java.util.Map;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.TypeReference;
 
@@ -15,8 +16,9 @@ public class FastJsonUtils {
 
     /**
      * 功能描述：把JSON数据转换成指定的java对象
+     *
      * @param jsonData JSON数据
-     * @param clazz 指定的java对象
+     * @param clazz    指定的java对象
      * @return 指定的java对象
      */
     public static <T> T getJsonToBean(String jsonData, Class<T> clazz) {
@@ -25,6 +27,7 @@ public class FastJsonUtils {
 
     /**
      * 功能描述：把java对象转换成JSON数据
+     *
      * @param object java对象
      * @return JSON数据
      */
@@ -34,8 +37,9 @@ public class FastJsonUtils {
 
     /**
      * 功能描述：把JSON数据转换成指定的java对象列表
+     *
      * @param jsonData JSON数据
-     * @param clazz 指定的java对象
+     * @param clazz    指定的java对象
      * @return List<T>
      */
     public static <T> List<T> getJsonToList(String jsonData, Class<T> clazz) {
@@ -44,8 +48,9 @@ public class FastJsonUtils {
 
     /**
      * 功能描述：把JSON数据转换成较为复杂的List<Map<String, Object>>
+     *
      * @param jsonData JSON数据
-     * @return List<Map<String, Object>>
+     * @return List<Map   <   String   ,       Object>>
      */
     public static List<Map<String, Object>> getJsonToListMap(String jsonData) {
         return JSON.parseObject(jsonData, new TypeReference<List<Map<String, Object>>>() {

common/src/main/java/com/diagbot/util/GsonUtil.java

@@ -13,6 +13,7 @@ import java.util.Map;
  */
 public class GsonUtil {
     private static Gson gson = null;
+
     static {
         if (gson == null) {
             gson = new Gson();
@@ -71,7 +72,7 @@ public class GsonUtil {
      * json转成list中有map的
      *
      * @param gsonString
-     * @return List<Map<String, T>>
+     * @return List<Map < String ,   T>>
      */
     public static <T> List<Map<String, T>> toListMaps(String gsonString) {
         List<Map<String, T>> list = null;
@@ -86,7 +87,7 @@ public class GsonUtil {
      * json转成map的
      *
      * @param gsonString
-     * @return Map<String, T>
+     * @return Map<String ,   T>
      */
     public static <T> Map<String, T> gsonToMaps(String gsonString) {
         Map<String, T> map = null;

common/src/main/java/com/diagbot/util/IdcardValidatorUtil.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * @Description: 身份证合法性校验
  * --15位身份证号码：第7、8位为出生年份(两位数)，第9、10位为出生月份，第11、12位代表出生日期，第15位代表性别，奇数为男，偶数为女。
  * --18位身份证号码：第7、8、9、10位为出生年份(四位数)，第11、第12位为出生月份，第13、14位代表出生日期，第17位代表性别，奇数为男，偶数为女。
- *    最后一位为校验位
+ * 最后一位为校验位
  * @author: gaodm
  * @time: 2018/9/6 13:35
  */
@@ -43,8 +43,7 @@ public class IdcardValidatorUtil {
     /**
      * 验证所有的身份证的合法性
      *
-     * @param idcard
-     *            身份证
+     * @param idcard 身份证
      * @return 合法返回true，否则返回false
      */
     public static boolean isValidatedAllIdcard(String idcard) {

common/src/main/java/com/diagbot/util/IntegerUtil.java

@@ -8,6 +8,7 @@ package com.diagbot.util;
 public class IntegerUtil {
     /**
      * 当无法转换时返回0
+     *
      * @param s
      * @return
      */

common/src/main/java/com/diagbot/util/ListUtil.java

@@ -50,6 +50,7 @@ public class ListUtil {
 
     /**
      * 判断List是否为非空
+     *
      * @param list
      * @return
      */

common/src/main/java/com/diagbot/util/MapUtil.java

@@ -18,6 +18,7 @@ public class MapUtil {
 
     /**
      * 把Map转换成String。注意以英文分号字符'；'开始和结束
+     *
      * @param attrs
      * @return
      */
@@ -37,6 +38,7 @@ public class MapUtil {
 
     /**
      * 把key:value;key:value格式的String转换成Map
+     *
      * @param str
      * @return
      */
@@ -63,8 +65,9 @@ public class MapUtil {
     }
 
     public static Object mapToObject(Map<String, Object> map, Class<?> beanClass) throws Exception {
-        if (map == null)
+        if (map == null) {
             return null;
+        }
 
         Object obj = beanClass.newInstance();
 
@@ -81,8 +84,9 @@ public class MapUtil {
     }
 
     public static Map<String, Object> objectToMap(Object obj) throws Exception {
-        if (obj == null)
+        if (obj == null) {
             return null;
+        }
 
         Map<String, Object> map = new HashMap<String, Object>();
 

common/src/main/java/com/diagbot/util/RegexValidateUtil.java

@@ -49,6 +49,7 @@ public class RegexValidateUtil {
     /**
      * 验证密码
      * 密码必须数字和字母组成，并且要同时含有数字和字母，且长度要在6-16位之间
+     *
      * @param password 密码
      * @return
      */

common/src/main/java/com/diagbot/util/SqlExecuteUtil.java

@@ -12,28 +12,25 @@ import java.util.List;
 public class SqlExecuteUtil {
 
     /**
-     *
      * sql批量执行时，参数分组后按组提交，避免游标、数据量超过限制
      *
      * @param originList 原始参数列表
      * @param capacity   分组后每组的大小
-     *
-     * @return List<List<T>> 分组后的参数列表
-     *
+     * @return List<List   <   T>> 分组后的参数列表
      */
-    public static <T> List<List<T>>divideList(List<T> originList, int capacity) {
+    public static <T> List<List<T>> divideList(List<T> originList, int capacity) {
         List<List<T>> list = new LinkedList<>();
         int originListSize = originList.size();
 
         int length = originListSize / capacity;
-        if(length == 0) {
+        if (length == 0) {
             list.add(originList);
             return list;
         }
-        if(originListSize % capacity > 0) {
+        if (originListSize % capacity > 0) {
             length = length + 1;
         }
-        for(int i = 0; i < length; i++) {
+        for (int i = 0; i < length; i++) {
             int fromIndex = i * capacity;
             int toIndex = (i + 1) * capacity > originListSize ? originListSize : (i + 1) * capacity;
             list.add(new ArrayList<T>(originList.subList(fromIndex, toIndex)));

common/src/main/java/com/diagbot/util/StringUtil.java

@@ -10,37 +10,41 @@ import org.apache.commons.lang3.StringUtils;
 public class StringUtil {
     /**
      * 判断某字符串是否为空或长度为0或由空白符(whitespace) 构成
+     *
      * @param str 需要判断的字符串
      * @return
      */
-    public static boolean isBlank(String str){
+    public static boolean isBlank(String str) {
         return StringUtils.isBlank(str);
     }
 
     /**
      * 判断某字符串是否不是为空或长度为0或由空白符(whitespace) 构成
+     *
      * @param str 需要判断的字符串
      * @return
      */
-    public static boolean isNotBlank(String str){
+    public static boolean isNotBlank(String str) {
         return StringUtils.isNotBlank(str);
     }
 
     /**
      * 判断某字符串是否为空，为空的标准是 str==null 或 str.length()==0
+     *
      * @param str 需要判断的字符串
      * @return
      */
-    public static boolean isEmpty(String str){
+    public static boolean isEmpty(String str) {
         return StringUtils.isEmpty(str);
     }
 
     /**
      * 判断某字符串是否不为空，为空的标准是 str==null 或 str.length()==0
+     *
      * @param str 需要判断的字符串
      * @return
      */
-    public static boolean isNotEmpty(String str){
+    public static boolean isNotEmpty(String str) {
         return StringUtils.isNotEmpty(str);
     }
 }

common/src/main/java/com/diagbot/util/UserUtils.java

@@ -20,6 +20,7 @@ public class UserUtils {
 
     /**
      * 获取当前请求的token
+     *
      * @return
      */
     public static String getCurrentToken() {
@@ -28,6 +29,7 @@ public class UserUtils {
 
     /**
      * 获取当前请求的用户名称
+     *
      * @return
      */
     public static String getCurrentPrinciple() {
@@ -36,6 +38,7 @@ public class UserUtils {
 
     /**
      * 获取当前请求的用户ID
+     *
      * @return
      */
     public static String getCurrentPrincipleID() {
@@ -65,6 +68,7 @@ public class UserUtils {
 
     /**
      * 获取当前请求的权限信息
+     *
      * @return
      */
     public static List<SimpleGrantedAuthority> getCurrentAuthorities() {

config-server/src/main/java/com/diagbot/ConfigServerApplication.java

@@ -14,8 +14,8 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
  * @author: gaodm
  * @time: 2018/8/1 14:56
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableConfigServer
 @EnableEurekaClient
 public class ConfigServerApplication {

config-server/src/main/resources/application.yml

@@ -18,8 +18,8 @@ spring:
         native:
           search-locations: classpath:/shared
   profiles:
-     active: native
-#
+    active: native
+  #
   application:
     name: config-server
 #  #mq
@@ -62,8 +62,8 @@ management:
         allowed-origins: "*"
         allowed-methods: "*"
   endpoint:
-      health:
-        show-details: ALWAYS
+    health:
+      show-details: ALWAYS
   security:
     enabled: false
 

config-server/src/main/resources/logback-spring.xml

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 项目名称 -->
-    <property name="APPDIR" value="config-server" />
+    <property name="APPDIR" value="config-server"/>
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-    <property name="LOG_PATH" value="../logs" />
+    <property name="LOG_PATH" value="../logs"/>
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+    <conversionRule conversionWord="clr"
+                    converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
     <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%logger){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
     <!--包名输出缩进对齐-->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}" />
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
 
     <!--  日志记录器，日期滚动记录
             ERROR 级别
@@ -26,12 +31,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/error/${APPDIR}-error-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>30</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-error-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -39,7 +46,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件记录error级别的 -->
@@ -62,12 +70,14 @@
             <!-- 归档的日志文件的路径，例如今天1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/warn/${APPDIR}-warn-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-warn-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -75,7 +85,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录warn级别的 -->
@@ -98,12 +109,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/info/${APPDIR}-info-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-info-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -111,7 +124,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录info级别的 -->
@@ -134,12 +148,14 @@
             <!-- 归档的日志文件的路径，例如今天是1992-11-06日志，当前写的日志文件路径为file节点指定，
             可以将此文件与file指定文件路径设置为不同路径，从而将当前日志文件或归档日志文件置不同的目录。
             而1992-11-06的日志文件在由fileNamePattern指定。%d{yyyy-MM-dd}指定日期格式，%i指定索引 -->
-            <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+            <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log
+            </fileNamePattern>
             <!--  保留日志天数 -->
             <maxHistory>15</maxHistory>
             <!-- 除按日志记录之外，还配置了日志文件不能超过10MB，若超过10MB，日志文件会以索引0开始，
             命名日志文件，例如log-debug-1992-11-06.0.log -->
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <maxFileSize>10MB</maxFileSize>
             </timeBasedFileNamingAndTriggeringPolicy>
         </rollingPolicy>
@@ -147,7 +163,8 @@
         <append>true</append>
         <!-- 日志文件的格式 -->
         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n</pattern>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level --- [%thread] %logger Line:%-3L - %msg%n
+            </pattern>
             <charset>utf-8</charset>
         </encoder>
         <!-- 此日志文件只记录debug级别的 -->
@@ -175,31 +192,31 @@
 
     <!--&lt;!&ndash;输出到mysql数据库的appender配置     &ndash;&gt;-->
     <!--<appender name="db" class="ch.qos.logback.classic.db.DBAppender">-->
-        <!--<connectionSource-->
-                <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
-            <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
-            <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
-            <!--<user>root</user>-->
-            <!--<password>a123456789</password>-->
-        <!--</connectionSource>-->
+    <!--<connectionSource-->
+    <!--class="ch.qos.logback.core.db.DriverManagerConnectionSource">-->
+    <!--<driverClass>com.mysql.jdbc.Driver</driverClass>-->
+    <!--<url>jdbc:mysql://120.77.222.42:3306/logback_member?characterEncoding=utf8</url>-->
+    <!--<user>root</user>-->
+    <!--<password>a123456789</password>-->
+    <!--</connectionSource>-->
     <!--</appender>-->
 
     <!-- FrameworkServlet日志-->
-    <logger name="org.springframework" level="WARN" />
+    <logger name="org.springframework" level="WARN"/>
 
     <!-- mybatis日志打印-->
-    <logger name="org.apache.ibatis" level="DEBUG" />
-    <logger name="java.sql" level="DEBUG" />
+    <logger name="org.apache.ibatis" level="DEBUG"/>
+    <logger name="java.sql" level="DEBUG"/>
 
     <!--  项目 mapper 路径
             console控制台显示sql语句：STDOUT.filter.level -> debug级别
     -->
-    <logger name="com.diagbot.mapper" level="DEBUG" />
+    <logger name="com.diagbot.mapper" level="DEBUG"/>
 
     <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
         <destination>192.168.2.236:5044</destination>
         <!-- encoder必须配置,有多种可选 -->
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
             <customFields>{"appname":"config-server"}</customFields>
         </encoder>
     </appender>
@@ -207,59 +224,59 @@
     <!-- 本地环境下的日志配置 -->
     <springProfile name="native">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
+            <appender-ref ref="STDOUT"/>
         </root>
     </springProfile>
     <springProfile name="local">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
+            <appender-ref ref="STDOUT"/>
         </root>
     </springProfile>
 
     <!-- 开发环境下的日志配置 -->
     <springProfile name="dev">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 
     <!-- 测试环境下的日志配置 -->
     <springProfile name="test">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
             <!-- 生产环境将请stdout去掉 -->
-            <appender-ref ref="STDOUT" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 
     <!-- 生产环境下的日志配置 -->
     <springProfile name="prod">
         <root level="INFO">
-            <appender-ref ref="ERROR" />
-            <appender-ref ref="WARN" />
-            <appender-ref ref="INFO" />
-            <appender-ref ref="DEBUG" />
-            <appender-ref ref="LOGSTASH" />
+            <appender-ref ref="ERROR"/>
+            <appender-ref ref="WARN"/>
+            <appender-ref ref="INFO"/>
+            <appender-ref ref="DEBUG"/>
+            <appender-ref ref="LOGSTASH"/>
         </root>
     </springProfile>
 </configuration>

config-server/src/main/resources/shared/admin-service-dev.yml

@@ -11,17 +11,17 @@ server:
 #        location: monitor-service
 
 security2:
-    user:
-      name: "admin"
-      password: "123456"
+  user:
+    name: "admin"
+    password: "123456"
 
 
 spring:
   profiles: dev
-#  security:
-#    user:
-#      name: ${security2.user.name}
-#      password: ${security2.user.password}
+  #  security:
+  #    user:
+  #      name: ${security2.user.name}
+  #      password: ${security2.user.password}
   #mq
   rabbitmq:
     host: 192.168.2.236

config-server/src/main/resources/shared/admin-service-local.yml

@@ -11,17 +11,17 @@ server:
 #        location: monitor-service
 
 security2:
-    user:
-      name: "admin"
-      password: "123456"
+  user:
+    name: "admin"
+    password: "123456"
 
 
 spring:
   profiles: local
-#  security:
-#    user:
-#      name: ${security2.user.name}
-#      password: ${security2.user.password}
+  #  security:
+  #    user:
+  #      name: ${security2.user.name}
+  #      password: ${security2.user.password}
   #mq
   rabbitmq:
     host: localhost

config-server/src/main/resources/shared/admin-service-pro.yml

@@ -11,9 +11,9 @@ server:
 #        location: monitor-service
 
 security2:
-    user:
-      name: "admin"
-      password: "123456"
+  user:
+    name: "admin"
+    password: "123456"
 
 
 spring:

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

@@ -8,7 +8,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 2000
+            timeoutInMilliseconds: 3000
 
 eureka:
   instance:
@@ -42,8 +42,8 @@ management:
         allowed-origins: "*"
         allowed-methods: "*"
   endpoint:
-      health:
-        show-details: always
+    health:
+      show-details: always
 feign:
   hystrix:
     enabled: true

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

@@ -8,7 +8,7 @@ hystrix:
       execution:
         isolation:
           thread:
-            timeoutInMilliseconds: 2000
+            timeoutInMilliseconds: 3000
 
 eureka:
   instance:
@@ -42,8 +42,8 @@ management:
         allowed-origins: "*"
         allowed-methods: "*"
   endpoint:
-      health:
-        show-details: always
+    health:
+      show-details: always
 feign:
   hystrix:
     enabled: true

config-server/src/main/resources/shared/bi-service-dev.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/bi-service-local.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/diagbotman-service-dev.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/diagbotman-service-local.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/feedback-service-dev.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/feedback-service-local.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/gateway-service-dev.yml

@@ -20,57 +20,57 @@ spring:
     publisher-confirms: true
     virtual-host: /
   cloud:
-      gateway:
-        default-filters:
-        routes:
-        - id: user-service
-          uri: lb://user-service
-          predicates:
-          - Path=/api/user/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: logger-service
-          uri: lb://logger-service
-          predicates:
-          - Path=/api/log/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: bi-service
-          uri: lb://bi-service
-          predicates:
-          - Path=/api/bi/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: diagbotman-service
-          uri: lb://diagbotman-service
-          predicates:
-          - Path=/api/diagbotman/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: feedback-service
-          uri: lb://feedback-service
-          predicates:
-          - Path=/api/feedback/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: knowledge-service
-          uri: lb://knowledge-service
-          predicates:
-          - Path=/api/knowledge/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: icss
-          uri: http://192.168.2.224:9080
-          predicates:
-          - Path=/api/icss/**
-          filters:
-          - StripPrefix=2
+    gateway:
+      default-filters:
+      routes:
+      - id: user-service
+        uri: lb://user-service
+        predicates:
+        - Path=/api/user/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: logger-service
+        uri: lb://logger-service
+        predicates:
+        - Path=/api/log/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: bi-service
+        uri: lb://bi-service
+        predicates:
+        - Path=/api/bi/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: diagbotman-service
+        uri: lb://diagbotman-service
+        predicates:
+        - Path=/api/diagbotman/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: feedback-service
+        uri: lb://feedback-service
+        predicates:
+        - Path=/api/feedback/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: knowledge-service
+        uri: lb://knowledge-service
+        predicates:
+        - Path=/api/knowledge/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: icss
+        uri: http://192.168.2.224:9080
+        predicates:
+        - Path=/api/icss/**
+        filters:
+        - StripPrefix=2
 
 server:
   port: 5050

config-server/src/main/resources/shared/gateway-service-local.yml

@@ -20,57 +20,57 @@ spring:
     publisher-confirms: true
     virtual-host: /
   cloud:
-      gateway:
-        default-filters:
-        routes:
-        - id: user-service
-          uri: lb://user-service
-          predicates:
-          - Path=/api/user/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: logger-service
-          uri: lb://logger-service
-          predicates:
-          - Path=/api/log/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: bi-service
-          uri: lb://bi-service
-          predicates:
-          - Path=/api/bi/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: diagbotman-service
-          uri: lb://diagbotman-service
-          predicates:
-          - Path=/api/diagbotman/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: feedback-service
-          uri: lb://feedback-service
-          predicates:
-          - Path=/api/feedback/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: knowledge-service
-          uri: lb://knowledge-service
-          predicates:
-          - Path=/api/knowledge/**
-          filters:
-          - SwaggerHeaderFilter
-          - StripPrefix=2
-        - id: icss
-          uri: http://192.168.2.224:9080
-          predicates:
-          - Path=/api/icss/**
-          filters:
-          - StripPrefix=2
+    gateway:
+      default-filters:
+      routes:
+      - id: user-service
+        uri: lb://user-service
+        predicates:
+        - Path=/api/user/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: logger-service
+        uri: lb://logger-service
+        predicates:
+        - Path=/api/log/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: bi-service
+        uri: lb://bi-service
+        predicates:
+        - Path=/api/bi/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: diagbotman-service
+        uri: lb://diagbotman-service
+        predicates:
+        - Path=/api/diagbotman/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: feedback-service
+        uri: lb://feedback-service
+        predicates:
+        - Path=/api/feedback/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: knowledge-service
+        uri: lb://knowledge-service
+        predicates:
+        - Path=/api/knowledge/**
+        filters:
+        - SwaggerHeaderFilter
+        - StripPrefix=2
+      - id: icss
+        uri: http://192.168.2.224:9080
+        predicates:
+        - Path=/api/icss/**
+        filters:
+        - StripPrefix=2
 
 server:
   port: 5050

config-server/src/main/resources/shared/knowledge-service-dev.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/knowledge-service-local.yml

@@ -44,13 +44,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -63,7 +63,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/logger-service-dev.yml

@@ -45,13 +45,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -64,7 +64,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+        #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
         inputLog:
           destination: myLog
           group: logReceiveGroup     # 具体分组 对应 MQ 是 队列名称 并且持久化队列

config-server/src/main/resources/shared/logger-service-local.yml

@@ -45,13 +45,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -64,7 +64,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+        #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
         inputLog:
           destination: myLog
           group: logReceiveGroup     # 具体分组 对应 MQ 是 队列名称 并且持久化队列

config-server/src/main/resources/shared/uaa-service-dev.yml

@@ -41,13 +41,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*

config-server/src/main/resources/shared/uaa-service-local.yml

@@ -41,13 +41,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*

config-server/src/main/resources/shared/user-service-dev.yml

@@ -45,13 +45,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -64,7 +64,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

config-server/src/main/resources/shared/user-service-local.yml

@@ -45,13 +45,13 @@ spring:
       filters.commons-log.connection-logger-name: stat,wall,log4j
       filter.stat.log-slow-sql: true
       filter.stat.slow-sql-millis: 2000
-#监控配置
+      #监控配置
       web-stat-filter:
         enabled: true
         url-pattern: /*
         exclusions: '*.js,*.gif,*.jpg,*.bmp,*.png,*.css,*.ico,/druid/*'
 
-# StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
+      # StatViewServlet配置，说明请参考Druid Wiki，配置_StatViewServlet配置
       stat-view-servlet:
         enabled: true
         url-pattern: /druid/*
@@ -64,7 +64,7 @@ spring:
       bindings:
         outputLog:
           destination: myLog
-#          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
+  #          contentType: text/plain      # 实体 json string 在传递的类型装换 查看 http://docs.spring
 
   #mq
   rabbitmq:

diagbotman-service/src/main/java/com/diagbot/DiagbotmanServiceApplication.java

@@ -18,10 +18,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @author: gaodm
  * @time: 2018/8/7 9:24
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableEurekaClient
-@EnableFeignClients({"com.diagbot.client"})
+@EnableFeignClients({ "com.diagbot.client" })
 @EnableHystrixDashboard
 @EnableHystrix
 @EnableCircuitBreaker

diagbotman-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -42,7 +42,7 @@ public class SysLoggerAspect {
 
         SysLog sysLog = new SysLog();
         SysLogger sysLogger = method.getAnnotation(SysLogger.class);
-        if(sysLogger != null){
+        if (sysLogger != null) {
             //注解上的描述
             sysLog.setOperation(sysLogger.value());
         }
@@ -52,18 +52,18 @@ public class SysLoggerAspect {
         sysLog.setMethod(className + "." + methodName + "()");
         //请求的参数
         Object[] args = joinPoint.getArgs();
-        String params="";
-        for(Object o:args){
-            params+=GsonUtil.toJson(o);
+        String params = "";
+        for (Object o : args) {
+            params += GsonUtil.toJson(o);
         }
-        if(!StringUtil.isEmpty(params)) {
+        if (!StringUtil.isEmpty(params)) {
             sysLog.setParams(params);
         }
         //设置IP地址
         sysLog.setIp(HttpUtils.getIpAddress());
         //用户名
         String username = UserUtils.getCurrentPrinciple();
-        if(!StringUtil.isEmpty(username)) {
+        if (!StringUtil.isEmpty(username)) {
             sysLog.setUsername(username);
         }
         sysLog.setGmtCreate(new Date());

diagbotman-service/src/main/java/com/diagbot/client/UserServiceClient.java

@@ -19,7 +19,7 @@ import java.util.Map;
  * @author: gaodm
  * @time: 2018/8/6 9:52
  */
-@FeignClient(value = "user-service",fallback = UserServiceHystrix.class )
+@FeignClient(value = "user-service", fallback = UserServiceHystrix.class)
 public interface UserServiceClient {
 
     @PostMapping(value = "/user/{username}")

diagbotman-service/src/main/java/com/diagbot/client/hystrix/UserServiceHystrix.java

@@ -29,13 +29,13 @@ public class UserServiceHystrix implements UserServiceClient {
 
     @Override
     public RespDTO<Map<Long, UserOrgDTO>> getUserAndOrg(List<Long> userIds) {
-        log.error("【hystrix】调用{}异常","getUserAndOrg");
+        log.error("【hystrix】调用{}异常", "getUserAndOrg");
         return null;
     }
 
     @Override
     public RespDTO<List<Long>> getUserByOrgName(String orgName) {
-        log.error("【hystrix】调用{}异常","getUserByOrgName");
+        log.error("【hystrix】调用{}异常", "getUserByOrgName");
         return null;
     }
 }

diagbotman-service/src/main/java/com/diagbot/config/IdcConfigurer.java

@@ -1,6 +1,7 @@
 package com.diagbot.config;
 
 //import com.diagbot.idc.InvisibleIdCreater;
+
 import com.diagbot.idc.VisibleIdCreater;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -18,8 +19,8 @@ public class IdcConfigurer {
         return new VisibleIdCreater(0, 0);
     }
 
-//    @Bean
-//    public InvisibleIdCreater invisibleIdCreater() {
-//        return new InvisibleIdCreater(0, 0);
-//    }
+    //    @Bean
+    //    public InvisibleIdCreater invisibleIdCreater() {
+    //        return new InvisibleIdCreater(0, 0);
+    //    }
 }

diagbotman-service/src/main/java/com/diagbot/config/JwtConfigurer.java

@@ -33,9 +33,9 @@ public class JwtConfigurer {
 
     @Bean
     protected JwtAccessTokenConverter jwtTokenEnhancer() {
-        JwtAccessTokenConverter converter =  new JwtAccessTokenConverter();
+        JwtAccessTokenConverter converter = new JwtAccessTokenConverter();
         Resource resource = new ClassPathResource("public.cert");
-        String publicKey ;
+        String publicKey;
         try {
             publicKey = new String(FileCopyUtils.copyToByteArray(resource.getInputStream()));
         } catch (IOException e) {

diagbotman-service/src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -25,14 +25,14 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         http
                 .csrf().disable()
                 .authorizeRequests()
-                .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/druid.*","/actuator.*","/hystrix.*"
-                        ,"/service_filter/getAll", "/serviceToken/hasPermission").permitAll()
+                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/druid.*", "/actuator.*", "/hystrix.*"
+                        , "/service_filter/getAll", "/serviceToken/hasPermission").permitAll()
                 .antMatchers("/getDiagbotManEnumsData").permitAll()
                 .antMatchers("/diagLantoneProduct/selectProduct").permitAll()
                 .antMatchers("/morServices/addOrder").permitAll()
                 .antMatchers("/diagLantoneProduct/opendedProduct").permitAll()
                 .antMatchers("/**").authenticated();
-//        .antMatchers("/**").permitAll();
+        //        .antMatchers("/**").permitAll();
     }
 
 

diagbotman-service/src/main/java/com/diagbot/config/SwaggerConfigurer.java

@@ -25,7 +25,7 @@ import java.util.List;
  * @time: 2018/8/2 14:21
  */
 @Configuration
-@ConditionalOnProperty(prefix = "swagger", value = {"enable"}, havingValue = "true")
+@ConditionalOnProperty(prefix = "swagger", value = { "enable" }, havingValue = "true")
 @EnableSwagger2
 public class SwaggerConfigurer {
     /**
@@ -52,8 +52,8 @@ public class SwaggerConfigurer {
                 .apis(RequestHandlerSelectors.basePackage("com.diagbot.web"))
                 .paths(PathSelectors.any())
                 .build().globalOperationParameters(parameter());
-                //.securitySchemes(newArrayList(oauth()))
-               // .securityContexts(newArrayList(securityContext()));
+        //.securitySchemes(newArrayList(oauth()))
+        // .securityContexts(newArrayList(securityContext()));
     }
 
     private ApiInfo apiInfo() {

diagbotman-service/src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -25,7 +25,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
     public void decide(Authentication authentication, Object object, Collection<ConfigAttribute> configAttributes) throws AccessDeniedException, InsufficientAuthenticationException {
         HttpServletRequest request = ((FilterInvocation) object).getHttpRequest();
         String url, method;
-        if ("anonymousUser".equals(authentication.getPrincipal())){
+        if ("anonymousUser".equals(authentication.getPrincipal())) {
             if (matchers("/swagger/**", request)
                     || matchers("/v2/**", request)
                     || matchers("/swagger-ui.html/**", request)
@@ -40,7 +40,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                     || matchers("/diagLantoneProduct/selectProduct", request)
                     || matchers("/morServices/addOrder", request)
                     || matchers("/diagLantoneProduct/opendedProduct", request)
-                    || matchers("/", request)){
+                    || matchers("/", request)) {
                 return;
             } else {
                 throw new AccessDeniedException("no right");

diagbotman-service/src/main/java/com/diagbot/dto/AuthDetailDTO.java

@@ -7,32 +7,32 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class AuthDetailDTO implements Serializable{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	/**
-	 * 订单号
-	 */
-	private String num;
-
-	/**
+public class AuthDetailDTO implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订单号
+     */
+    private String num;
+
+    /**
      * 产品名称
      */
     private String name;
-	
+
     /**
      * 是否通过审核,N:未通过，Y:已通过
      */
     private String auditStatus;
-	
+
     /**
      * 不通过原因
      */
     private String rejectReason;
-	
+
 
 }

diagbotman-service/src/main/java/com/diagbot/dto/EnShowOptionDTO.java

@@ -7,21 +7,21 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class EnShowOptionDTO implements Serializable{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+public class EnShowOptionDTO implements Serializable {
 
-	/**
-	 * 可开通产品数量
-	 */
-	private Integer openedCount;
-	
-	/**
-	 * 可试用产品数量
-	 */
-	private Integer onTrialCount;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 可开通产品数量
+     */
+    private Integer openedCount;
+
+    /**
+     * 可试用产品数量
+     */
+    private Integer onTrialCount;
 
 }

diagbotman-service/src/main/java/com/diagbot/dto/GetConsoleOnTrialDTO.java

@@ -7,38 +7,38 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class GetConsoleOnTrialDTO implements Serializable{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 产品id
-	 */
-	private Long id;
-	
-	/**
-	 * 产品名
-	 */
-	private String name;
-	
-	/**
-	 * 接入模式
-	 */
-	private String accessType;
-	
+public class GetConsoleOnTrialDTO implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产品id
+     */
+    private Long id;
+
+    /**
+     * 产品名
+     */
+    private String name;
+
+    /**
+     * 接入模式
+     */
+    private String accessType;
+
     /**
      * 是否已试用
      */
     private String isUsed;
-	
+
     /**
      * 试用地址
      */
     private String trialUrl;
-    
+
     /**
      * 开通日期
      */

diagbotman-service/src/main/java/com/diagbot/dto/GetConsoleOpenedDTO.java

@@ -7,23 +7,23 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class GetConsoleOpenedDTO implements Serializable{
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
+public class GetConsoleOpenedDTO implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    /**
      * 已开通产品id
      */
     private Integer openId;
-	
-	 /**
+
+    /**
      * 产品id
      */
     private Integer productId;
-    
+
     /**
      * 产品名称
      */
@@ -38,11 +38,11 @@ public class GetConsoleOpenedDTO implements Serializable{
      * 结束日期
      */
     private String endTime;
-    
+
     /**
      * 当前用户的产品停用状态
      */
     private Integer serviceStatus;
-    
+
 
 }

diagbotman-service/src/main/java/com/diagbot/dto/OpenUpOnTrialDTO.java

@@ -9,14 +9,14 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class OpenUpOnTrialDTO implements Serializable{
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	
-	private ServiceToken serviceToken;
-	
+public class OpenUpOnTrialDTO implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+
+    private ServiceToken serviceToken;
+
 }

diagbotman-service/src/main/java/com/diagbot/dto/ProductAuthProgressDTO.java

@@ -13,21 +13,21 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ProductAuthProgressDTO implements Serializable{
+public class ProductAuthProgressDTO implements Serializable {
 
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	/**
+    /**
      * 订单编号
      */
-	private String num;
+    private String num;
+
+    /**
+     * 订单详情
+     */
+    private List<AuthDetailDTO> products;
 
-	/**
-	 * 订单详情
-	 */
-	private List<AuthDetailDTO> products;
-	
 }

diagbotman-service/src/main/java/com/diagbot/dto/UserAndProdutDTO.java

@@ -1,28 +1,28 @@
 package com.diagbot.dto;
 
 import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 
- * @Description: 用户已开通产品出参
  * @author wangfeng
+ * @Description: 用户已开通产品出参
  * @date 2018年9月21日 上午10:32:52
  */
 
 @Getter
 @Setter
 public class UserAndProdutDTO {
-	
-	private Long  Id;//开通的id
-	private Long  productId;//产品Id
-	private Long userId;//用户Id
-	private Date startTime;//开通时间
-	private Date endTime;//结束时间
-	private Integer serviceStatus;//启用状态
-	private Integer accessType;//接入方式
-	private Integer chargeType;//结算方式
-	private String  productName;//产品名称
+
+    private Long Id;//开通的id
+    private Long productId;//产品Id
+    private Long userId;//用户Id
+    private Date startTime;//开通时间
+    private Date endTime;//结束时间
+    private Integer serviceStatus;//启用状态
+    private Integer accessType;//接入方式
+    private Integer chargeType;//结算方式
+    private String productName;//产品名称
 
 }

diagbotman-service/src/main/java/com/diagbot/dto/UserOrgDTO.java

@@ -13,18 +13,18 @@ import java.io.Serializable;
 
 @Getter
 @Setter
-public class UserOrgDTO implements Serializable{
-	
-	 private static final long serialVersionUID = 1L;
+public class UserOrgDTO implements Serializable {
 
-	    private Long userId;//用户ID
-	    private String username;// 用户名
-	    private String linkman;//联系人
-	    private String email;// 邮箱
-	    private Long orgId;//机构ID
-	    private String orgName;//机构名称
-		private Integer isReject; //是否通过认证
-		private Integer subNum;//机构数量
-		private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
+    private static final long serialVersionUID = 1L;
+
+    private Long userId;//用户ID
+    private String username;// 用户名
+    private String linkman;//联系人
+    private String email;// 邮箱
+    private Long orgId;//机构ID
+    private String orgName;//机构名称
+    private Integer isReject; //是否通过认证
+    private Integer subNum;//机构数量
+    private Integer auStatus;  //认证状态（0：未认证，1：已认证，2：认证中）
 
 }

diagbotman-service/src/main/java/com/diagbot/dto/WaitExamOrderCouDTO.java

@@ -7,14 +7,14 @@ import lombok.Setter;
 
 @Getter
 @Setter
-public class WaitExamOrderCouDTO implements Serializable{
-	
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	
-	private Integer count;
+public class WaitExamOrderCouDTO implements Serializable {
+
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private Integer count;
 
 }

diagbotman-service/src/main/java/com/diagbot/entity/OpenedProductsIndex.java

@@ -41,12 +41,12 @@ public class OpenedProductsIndex implements Serializable {
     private Integer orderId;
 
     /**
-        每页显示条数
+     * 每页显示条数
      */
     private Long size;
 
     /**
-        页数
+     * 页数
      */
     private Long current;
 

diagbotman-service/src/main/java/com/diagbot/entity/OrderDetails.java

@@ -208,20 +208,20 @@ public class OrderDetails implements Serializable {
     @Override
     public String toString() {
         return "OrderDetails{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", orderNum=" + orderNum +
-        ", productId=" + productId +
-        ", userId=" + userId +
-        ", auditStatus=" + auditStatus +
-        ", unitPrice=" + unitPrice +
-        ", status=" + status +
-        ", rejectType=" + rejectType +
-        ", rejectReason=" + rejectReason +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", orderNum=" + orderNum +
+                ", productId=" + productId +
+                ", userId=" + userId +
+                ", auditStatus=" + auditStatus +
+                ", unitPrice=" + unitPrice +
+                ", status=" + status +
+                ", rejectType=" + rejectType +
+                ", rejectReason=" + rejectReason +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/OrderDetailsIndex.java

@@ -50,12 +50,12 @@ public class OrderDetailsIndex implements Serializable {
     private Integer status;
 
     /**
-     每页显示条数
+     * 每页显示条数
      */
     private Long size;
 
     /**
-     页数
+     * 页数
      */
     private Long current;
 

diagbotman-service/src/main/java/com/diagbot/entity/ProductOrder.java

@@ -74,7 +74,6 @@ public class ProductOrder implements Serializable {
 
     /**
      * 审核状态
-
      */
     private Integer auditStatus;
 
@@ -169,16 +168,16 @@ public class ProductOrder implements Serializable {
     @Override
     public String toString() {
         return "ProductOrder{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", num=" + num +
-        ", userId=" + userId +
-        ", time=" + time +
-        ", totalPrices=" + totalPrices +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", num=" + num +
+                ", userId=" + userId +
+                ", time=" + time +
+                ", totalPrices=" + totalPrices +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/ProductOrderIndex.java

@@ -28,17 +28,16 @@ public class ProductOrderIndex implements Serializable {
 
     /**
      * 审核状态
-
      */
     private Integer auditStatus;
 
     /**
-     每页显示条数
+     * 每页显示条数
      */
     private Long size;
 
     /**
-     页数
+     * 页数
      */
     private Long current;
 

diagbotman-service/src/main/java/com/diagbot/entity/ProductService.java

@@ -3,6 +3,7 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -138,15 +139,15 @@ public class ProductService implements Serializable {
     @Override
     public String toString() {
         return "ProductService{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", productId=" + productId +
-        ", serviceId=" + serviceId +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", productId=" + productId +
+                ", serviceId=" + serviceId +
+                ", remark=" + remark +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/ServiceFilter.java

@@ -55,7 +55,7 @@ public class ServiceFilter implements Serializable {
     private String name;
 
     /**
-     *  产品id
+     * 产品id
      */
     private Long productId;
 
@@ -65,5 +65,4 @@ public class ServiceFilter implements Serializable {
     private String remark;
 
 
-
 }

diagbotman-service/src/main/java/com/diagbot/entity/ServiceInfo.java

@@ -3,6 +3,7 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -144,16 +145,16 @@ public class ServiceInfo implements Serializable {
     @Override
     public String toString() {
         return "ServiceInfo{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", description=" + description +
-        ", userId=" + userId +
-        ", type=" + type +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", description=" + description +
+                ", userId=" + userId +
+                ", type=" + type +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/ServiceToken.java

@@ -205,20 +205,20 @@ public class ServiceToken implements Serializable {
     @Override
     public String toString() {
         return "ServiceToken{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", productServiceId=" + productServiceId +
-        ", appKeyId=" + appKeyId +
-        ", appKeySecret=" + appKeySecret +
-        ", type=" + type +
-        ", status=" + status +
-        ", startingDate=" + startingDate +
-        ", expiringDate=" + expiringDate +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", productServiceId=" + productServiceId +
+                ", appKeyId=" + appKeyId +
+                ", appKeySecret=" + appKeySecret +
+                ", type=" + type +
+                ", status=" + status +
+                ", startingDate=" + startingDate +
+                ", expiringDate=" + expiringDate +
+                ", remark=" + remark +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/SysLog.java

@@ -179,18 +179,18 @@ public class SysLog implements Serializable {
     @Override
     public String toString() {
         return "SysLog{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", ip=" + ip +
-        ", sysType=" + sysType +
-        ", method=" + method +
-        ", operation=" + operation +
-        ", params=" + params +
-        ", username=" + username +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", ip=" + ip +
+                ", sysType=" + sysType +
+                ", method=" + method +
+                ", operation=" + operation +
+                ", params=" + params +
+                ", username=" + username +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/User.java

@@ -129,14 +129,14 @@ public class User implements Serializable {
     @Override
     public String toString() {
         return "User{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", password=" + password +
-        ", username=" + username +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", password=" + password +
+                ", username=" + username +
+                "}";
     }
 }

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/OpendProductWrapper.java

@@ -13,7 +13,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-public class OpendProductWrapper extends OpenedProducts{
+public class OpendProductWrapper extends OpenedProducts {
     private Date orderTime;
     private String username;// 用户名
     private String linkman;//联系人

diagbotman-service/src/main/java/com/diagbot/exception/CommonExceptionHandler.java

@@ -30,7 +30,7 @@ public class CommonExceptionHandler {
     @ExceptionHandler(Exception.class)
     public ResponseEntity<RespDTO> handleException(Exception e) {
         RespDTO resp = new RespDTO();
-        if(e instanceof BindException) {
+        if (e instanceof BindException) {
             BindException ex = (BindException) e;
             Map<String, String> stringMap = new HashMap<>();
             for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
@@ -42,7 +42,7 @@ public class CommonExceptionHandler {
             resp.msg = msg;
             return new ResponseEntity(resp, HttpStatus.OK);
         }
-        if(e instanceof MethodArgumentNotValidException) {
+        if (e instanceof MethodArgumentNotValidException) {
             MethodArgumentNotValidException ex = (MethodArgumentNotValidException) e;
             Map<String, String> stringMap = new HashMap<>();
             for (FieldError fieldError : ex.getBindingResult().getFieldErrors()) {
@@ -54,7 +54,7 @@ public class CommonExceptionHandler {
             resp.msg = msg;
             return new ResponseEntity(resp, HttpStatus.OK);
         }
-        if(e instanceof MissingServletRequestParameterException) {
+        if (e instanceof MissingServletRequestParameterException) {
             MissingServletRequestParameterException ex = (MissingServletRequestParameterException) e;
             Map<String, String> stringMap = new HashMap<>();
             stringMap.put(ex.getParameterName(), "不能为null");
@@ -64,7 +64,7 @@ public class CommonExceptionHandler {
             resp.msg = msg;
             return new ResponseEntity(resp, HttpStatus.OK);
         }
-        if(e instanceof CommonException) {
+        if (e instanceof CommonException) {
             CommonException taiChiException = (CommonException) e;
             resp.code = taiChiException.getCode();
             resp.msg = e.getMessage();

diagbotman-service/src/main/java/com/diagbot/exception/ServiceErrorCode.java

@@ -2,13 +2,13 @@ package com.diagbot.exception;
 
 /**
  * @Description: 本服务错误码
- *      系统码(3位) + 等级码(1位) + 4位顺序号
- *      系统码 通用码 000；用户中心 100； 管理中心 200；
+ * 系统码(3位) + 等级码(1位) + 4位顺序号
+ * 系统码 通用码 000；用户中心 100； 管理中心 200；
  * @author: gaodm
  * @time: 2018/9/10 11:11
  */
 public enum ServiceErrorCode implements ErrorCode {
-    LOG_IS_NOT_EXIST("90020001","该日志不存在");
+    LOG_IS_NOT_EXIST("90020001", "该日志不存在");
 
     private String code;
     private String msg;

diagbotman-service/src/main/java/com/diagbot/facade/EnumsDataFacade.java

@@ -20,9 +20,10 @@ public class EnumsDataFacade {
 
     /**
      * 用户枚举数据获取
+     *
      * @return 用户枚举类map
      */
-    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData(){
+    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         return enumsDataService.getEnumsData();
     }
 

diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -43,12 +43,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
 
     /**
      * 产品线管理添加产品
+     *
      * @param addProductsVO 需要提供的参数（产品名称，产品介绍，产品url，产品计费方式）
      * @return Boolean true
      */
     public Boolean addProducts(AddProductsVO addProductsVO) {
-        LantoneProduct lantoneProduct =new LantoneProduct();
-        BeanUtil.copyProperties(addProductsVO,lantoneProduct);
+        LantoneProduct lantoneProduct = new LantoneProduct();
+        BeanUtil.copyProperties(addProductsVO, lantoneProduct);
         lantoneProduct.setGmtCreate(DateUtil.now());
         lantoneProduct.setCreator(UserUtils.getCurrentPrincipleID());
         if (!save(lantoneProduct)) {
@@ -61,12 +62,13 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
 
     /**
      * 朗通产品线管理修改产品
+     *
      * @param updateProductVO 所需参数（产品名称，url，产品描述，接入模式，收费模式，是否试用）
      * @return Boolean true
      */
     public Boolean updateProduct(UpdateProductVO updateProductVO) {
-        LantoneProduct lantoneProduct =this.getById(updateProductVO.getId());
-        BeanUtil.copyProperties(updateProductVO,lantoneProduct);
+        LantoneProduct lantoneProduct = this.getById(updateProductVO.getId());
+        BeanUtil.copyProperties(updateProductVO, lantoneProduct);
         lantoneProduct.setModifier(UserUtils.getCurrentPrincipleID());
         lantoneProduct.setGmtModified(DateUtil.now());
         if (!updateById(lantoneProduct)) {
@@ -78,17 +80,18 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
 
     /**
      * 删除产品业务逻辑
+     *
      * @param updateProductVO 所需参数（产品id）
      * @return Boolean true
      */
     public Boolean deleteProduct(UpdateProductVO updateProductVO) {
         LantoneProduct lantoneProduct = getById(updateProductVO.getId());
-        OpenedProducts openedProducts= new OpenedProducts();
+        OpenedProducts openedProducts = new OpenedProducts();
         openedProducts.setId(updateProductVO.getId());
         openedProducts.setServiceStatus(StatusEnum.Enable.getKey());
-        if(openedProductsFacade.getOpendById(openedProducts).size()!=0){
-                throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
-                        "本产品还有用户使用，删除失败");
+        if (openedProductsFacade.getOpendById(openedProducts).size() != 0) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+                    "本产品还有用户使用，删除失败");
         }
         lantoneProduct.setModifier(UserUtils.getCurrentPrincipleID());
         lantoneProduct.setGmtModified(DateUtil.now());
@@ -100,7 +103,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
         return true;
     }
 
-   /* *//**
+    /* *//**
      * 更改产品状态业务逻辑
      * @param lantoneProduct
      * @return Boolean true
@@ -117,66 +120,70 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
 
     /**
      * 查询当前用户已开通产品
+     *
      * @return 查询当前用户已开通产品
      */
     public List<LantoneProductWrapper> opendedProductByCurrentUser() {
-        Long userId=Long.parseLong(UserUtils.getCurrentPrincipleID());
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         return this.opendedProductByUserId(userId);
     }
 
     /**
      * 根据用户id查询是否有开通产品
+     *
      * @param page 页数和每页显示的条数默认显示10条
      * @return 根据用户id查询是否有开通产品
      */
-    public IPage<LantoneProduct> productLine(Page page){
+    public IPage<LantoneProduct> productLine(Page page) {
         Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        IPage<LantoneProduct> diagLantoneProducts =productLine(page,userId);
+        IPage<LantoneProduct> diagLantoneProducts = productLine(page, userId);
         return diagLantoneProducts;
     }
 
 
     /**
      * 根据产品id查询产品
+     *
      * @param id 产品id
      * @return 产品信息
      */
-    public LantoneProduct selectLanProduct(Long id){
+    public LantoneProduct selectLanProduct(Long id) {
         return getById(id);
     }
 
     /**
      * 根据产品id查询当条产品线下所有订单信息
+     *
      * @param oppendedProductVO 所需参数（产品id，页数，和每页条数，默认显示10条）
      * @return 当条产品线下所有订单信息
      */
-    public List<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO){
-        OpenedProductsIndex openedProductsIndex =new OpenedProductsIndex();
+    public List<OpendProductWrapper> opendedProduct(OppendedProductVO oppendedProductVO) {
+        OpenedProductsIndex openedProductsIndex = new OpenedProductsIndex();
         Long curren = oppendedProductVO.getCurrent();
-        Long size =oppendedProductVO.getSize();
-        if(curren==null){
+        Long size = oppendedProductVO.getSize();
+        if (curren == null) {
             oppendedProductVO.setCurrent(1L);
         }
-        if (size==null){
+        if (size == null) {
             oppendedProductVO.setSize(10L);
         }
         BeanUtil.copyProperties(oppendedProductVO, openedProductsIndex);
-        openedProductsIndex.setIndex((oppendedProductVO.getCurrent().longValue()-1)*oppendedProductVO.getSize().longValue());
+        openedProductsIndex.setIndex((oppendedProductVO.getCurrent().longValue() - 1) * oppendedProductVO.getSize().longValue());
         List<OpendProductWrapper> list = openedProductsFacade.getByProductId(openedProductsIndex);
-        List<Long> list1 =new ArrayList<>();
-        for (OpendProductWrapper opendProducts:list) {
+        List<Long> list1 = new ArrayList<>();
+        for (OpendProductWrapper opendProducts : list) {
             Long longs = opendProducts.getUserId();
             list1.add(longs);
         }
         RespDTO<Map<Long, UserOrgDTO>> mapRespDTO = userServiceClient.getUserAndOrg(list1);
-        if(mapRespDTO == null || !"0".equals(mapRespDTO.code) ) {
+        if (mapRespDTO == null || !"0".equals(mapRespDTO.code)) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
                     "获取用户和机构信息失败");
         }
         Map<Long, UserOrgDTO> dataMap = mapRespDTO.data;
-        for(OpendProductWrapper bean : list) {
+        for (OpendProductWrapper bean : list) {
             UserOrgDTO uo = dataMap.get(bean.getUserId());
-            if(uo != null) {
+            if (uo != null) {
                 bean.setUsername(uo.getUsername());
                 bean.setLinkman(uo.getLinkman());
                 bean.setEmail(uo.getEmail());

diagbotman-service/src/main/java/com/diagbot/facade/OpenedProductsFacade.java

@@ -4,21 +4,31 @@ import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import com.diagbot.dto.EnShowOptionDTO;
 import com.diagbot.dto.GetConsoleOnTrialDTO;
 import com.diagbot.dto.GetConsoleOpenedDTO;
 import com.diagbot.dto.OpenUpOnTrialDTO;
 import com.diagbot.dto.ProductServiceDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.OpenedProducts;
 import com.diagbot.entity.ProductService;
 import com.diagbot.entity.ServiceInfo;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OpenedProductsServiceImpl;
+import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
+import com.diagbot.vo.ModifyOpeningTimeVO;
 import com.diagbot.vo.OpenUpOnTrialVO;
 import com.diagbot.vo.ProductServiceSaveVO;
+import com.diagbot.vo.StartAndendByUserIdVO;
 
 /**
  * @Description:已开通产品业务层
@@ -27,10 +37,10 @@ import com.diagbot.vo.ProductServiceSaveVO;
  */
 @Component
 public class OpenedProductsFacade extends OpenedProductsServiceImpl {
-	@Autowired
-	private ServiceInfoFacade serviceInfoFacade;
-	@Autowired
-	private ProductServiceFacade productServiceFacade;
+    @Autowired
+    private ServiceInfoFacade serviceInfoFacade;
+    @Autowired
+    private ProductServiceFacade productServiceFacade;
 
     public List<OpenedProducts> getByAppkeyAndSecretFac(Map map) {
         return this.getByAppkeyAndSecret(map);
@@ -38,75 +48,133 @@ public class OpenedProductsFacade extends OpenedProductsServiceImpl {
 
     /**
      * 得到所有已开通的产品
+     *
      * @return 所有已经开通的产品
      */
-    public List<GetConsoleOpenedDTO> getConsoleOpened(){
-    	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+    public List<GetConsoleOpenedDTO> getConsoleOpened() {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         return baseMapper.getConsoleOpened(userId);
     }
 
     /**
      * 得到所有可试用的产品
+     *
      * @return 所有可试用的产品
      */
-    public List<GetConsoleOnTrialDTO> getConsoleOnTrial(){
-    	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+    public List<GetConsoleOnTrialDTO> getConsoleOnTrial() {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
         return baseMapper.getConsoleOnTrial(userId);
     }
-    
+
     /**
      * 产品立即试用接口，返回所需要的token
+     *
      * @param openUpOnTrialVO 产品立即试用接口请求参数
      * @return 包含token
      */
-    public OpenUpOnTrialDTO openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO){
-    	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-    	String userName = UserUtils.getCurrentPrinciple();
-    	Date now = new Date();
-    	ServiceInfo serviceInfo = new ServiceInfo();
-    	serviceInfo.setType(2);
-    	serviceInfo.setUserId(userId);
-    	serviceInfo.setDescription("用户试用产品-虚拟服务");
-    	serviceInfo.setName("虚拟服务");
-    	serviceInfo.setCreator(userName);
-    	serviceInfo.setGmtCreate(now);
-    	serviceInfo.setIsDeleted("N");
-    	serviceInfoFacade.save(serviceInfo);
-    	
-    	ProductService productService = new ProductService();
-    	productService.setServiceId(serviceInfo.getId());
-    	productService.setProductId(openUpOnTrialVO.getProductId());
-    	productService.setCreator(userName);
-    	productService.setGmtCreate(now);
-    	productService.setIsDeleted("N");
-    	productServiceFacade.save(productService);
-    	
-    	ProductServiceSaveVO productServiceSaveVO = new ProductServiceSaveVO();
-    	productServiceSaveVO.setProductId(openUpOnTrialVO.getProductId());
-    	productServiceSaveVO.setServiceId(serviceInfo.getId());
-    	productServiceSaveVO.setType(3);
-    	ProductServiceDTO poroductServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
-    	
-    	OpenUpOnTrialDTO openUpOnTrialDTO = new OpenUpOnTrialDTO();
-    	openUpOnTrialDTO.setServiceToken(poroductServiceDTO.getServiceToken());
-    	
-    	return openUpOnTrialDTO;	
+    public OpenUpOnTrialDTO openUpOnTrial(OpenUpOnTrialVO openUpOnTrialVO) {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        String userName = UserUtils.getCurrentPrinciple();
+        Date now = new Date();
+        ServiceInfo serviceInfo = new ServiceInfo();
+        serviceInfo.setType(2);
+        serviceInfo.setUserId(userId);
+        serviceInfo.setDescription("用户试用产品-虚拟服务");
+        serviceInfo.setName("虚拟服务");
+        serviceInfo.setCreator(userName);
+        serviceInfo.setGmtCreate(now);
+        serviceInfo.setIsDeleted("N");
+        serviceInfoFacade.save(serviceInfo);
+
+        ProductService productService = new ProductService();
+        productService.setServiceId(serviceInfo.getId());
+        productService.setProductId(openUpOnTrialVO.getProductId());
+        productService.setCreator(userName);
+        productService.setGmtCreate(now);
+        productService.setIsDeleted("N");
+        productServiceFacade.save(productService);
+
+        ProductServiceSaveVO productServiceSaveVO = new ProductServiceSaveVO();
+        productServiceSaveVO.setProductId(openUpOnTrialVO.getProductId());
+        productServiceSaveVO.setServiceId(serviceInfo.getId());
+        productServiceSaveVO.setType(3);
+        ProductServiceDTO poroductServiceDTO = productServiceFacade.genProductService(productServiceSaveVO);
+
+        OpenUpOnTrialDTO openUpOnTrialDTO = new OpenUpOnTrialDTO();
+        openUpOnTrialDTO.setServiceToken(poroductServiceDTO.getServiceToken());
+
+        return openUpOnTrialDTO;
     }
-    
+
     /**
      * 计算可展示的选项卡
+     *
      * @return 可展是的选项卡
      */
-    public EnShowOptionDTO enShowOption(){
-    	Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-    	int openedCount = baseMapper.getConsoleOpenedCount(userId);
-    	int onTrialCount = baseMapper.getConsoleOnTrialCount(userId);
-    	
-    	EnShowOptionDTO enShowOptionDTO = new EnShowOptionDTO();
-    	enShowOptionDTO.setOpenedCount(openedCount);
-    	enShowOptionDTO.setOnTrialCount(onTrialCount);
-    	
-    	return enShowOptionDTO;
+    public EnShowOptionDTO enShowOption() {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        int openedCount = baseMapper.getConsoleOpenedCount(userId);
+        int onTrialCount = baseMapper.getConsoleOnTrialCount(userId);
+
+        EnShowOptionDTO enShowOptionDTO = new EnShowOptionDTO();
+        enShowOptionDTO.setOpenedCount(openedCount);
+        enShowOptionDTO.setOnTrialCount(onTrialCount);
+
+        return enShowOptionDTO;
+    }
+
+    /**
+     * @param startAndendByUserIdVO
+     * @return 根据用户id和产品id，删除开通信息
+     */
+    public RespDTO<StartAndendByUserIdVO> startAndendByuserIds(StartAndendByUserIdVO startAndendByUserIdVO) {
+        OpenedProducts openedProducts = new OpenedProducts();
+        openedProducts.setUserId(startAndendByUserIdVO.getUserId());
+        openedProducts.setProductId(startAndendByUserIdVO.getProductId());
+        openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+        openedProducts.setGmtCreate(DateUtil.now());
+        openedProducts.setServiceStatus(startAndendByUserIdVO.getServiceStatus());
+        boolean res = startAndendByuserId(openedProducts);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
+    }
+
+    /**
+     * @param userId
+     * @param productId
+     * @return 根据用户id和产品id，删除开通信息
+     */
+    public RespDTO delInformationAvailables(Long userId, Long productId) {
+        OpenedProducts openedProducts = new OpenedProducts();
+        openedProducts.setUserId(userId);
+        openedProducts.setProductId(productId);
+        openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+        openedProducts.setGmtCreate(DateUtil.now());
+        boolean res = delInformationAvailable(openedProducts);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
     }
 
+    /**
+     * @param modifyOpeningTimeVO
+     * @return 根据用户id和产品id，修改开通时间
+     */
+    public RespDTO<ModifyOpeningTimeVO> modifyOpeningTimes(ModifyOpeningTimeVO modifyOpeningTimeVO) {
+        OpenedProducts openedProducts = new OpenedProducts();
+        openedProducts.setUserId(modifyOpeningTimeVO.getUserId());
+        openedProducts.setProductId(modifyOpeningTimeVO.getProductId());
+        openedProducts.setStartTime(DateUtil.parseDate(modifyOpeningTimeVO.getStartTime()));
+        openedProducts.setEndTime(DateUtil.parseDate(modifyOpeningTimeVO.getEndTime()));
+        openedProducts.setCreator(UserUtils.getCurrentPrincipleID());
+        openedProducts.setGmtCreate(DateUtil.now());
+        boolean res = modifyOpeningTime(openedProducts);
+        if (!res) {
+            throw new CommonException(CommonErrorCode.UPDATE_INFO_FAIL);
+        }
+        return RespDTO.onSuc(res);
+    }
 }