格式化代码

uaa-service/src/main/java/com/diagbot/UaaServiceApplication.java

@@ -9,13 +9,13 @@ import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfigurati
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
-		JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class})
+@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class,
+        JmxAutoConfiguration.class, ThymeleafAutoConfiguration.class })
 @EnableEurekaClient
 @RefreshScope
 public class UaaServiceApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(UaaServiceApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(UaaServiceApplication.class, args);
+    }
 }

uaa-service/src/main/java/com/diagbot/config/CustomTokenEnhancer.java

@@ -16,15 +16,15 @@ import java.util.Map;
  */
 public class CustomTokenEnhancer implements TokenEnhancer {
 
-	@Override
-	public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) {
-		final Map<String, Object> additionalInfo = new HashMap<>();
-		User user = (User) authentication.getUserAuthentication().getPrincipal();
-		additionalInfo.put("user_id", user.getId());
-//		additionalInfo.put("username", user.getUsername());
-//		additionalInfo.put("authorities", user.getAuthorities());
-		((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
-		return accessToken;
-	}
+    @Override
+    public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) {
+        final Map<String, Object> additionalInfo = new HashMap<>();
+        User user = (User) authentication.getUserAuthentication().getPrincipal();
+        additionalInfo.put("user_id", user.getId());
+        //		additionalInfo.put("username", user.getUsername());
+        //		additionalInfo.put("authorities", user.getAuthorities());
+        ((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
+        return accessToken;
+    }
 
 }

uaa-service/src/main/java/com/diagbot/config/OAuth2Configurer.java

@@ -34,8 +34,8 @@ public class OAuth2Configurer extends AuthorizationServerConfigurerAdapter {
                 .secret("{noop}123456")
                 .scopes("service")
                 .autoApprove(true)
-                .authorizedGrantTypes("implicit","refresh_token", "password", "authorization_code")
-                .accessTokenValiditySeconds(365*24*3600);//todo gaodm 现改为365天，正式改为24小时过期
+                .authorizedGrantTypes("implicit", "refresh_token", "password", "authorization_code")
+                .accessTokenValiditySeconds(365 * 24 * 3600);//todo gaodm 现改为365天，正式改为24小时过期
     }
 
     /**

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

@@ -35,9 +35,9 @@ class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
     protected void configure(HttpSecurity http) throws Exception {
         //CSRF:因为不再依赖于Cookie，所以你就不需要考虑对CSRF（跨站请求伪造）的防范。
         http
-            .csrf().disable()
+                .csrf().disable()
                 .exceptionHandling()
-               // .authenticationEntryPoint((request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED))
+                // .authenticationEntryPoint((request, response, authException) -> response.sendError(HttpServletResponse.SC_UNAUTHORIZED))
                 .authenticationEntryPoint(new AuthenticationEntryPoint() {
                     @Override
                     public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, AuthenticationException e) throws IOException, ServletException {
@@ -48,7 +48,7 @@ class WebSecurityConfigurer extends WebSecurityConfigurerAdapter {
                 .authorizeRequests()
                 .regexMatchers("/actuator.*").permitAll()
                 .antMatchers("/**").authenticated()
-            .and()
+                .and()
                 .httpBasic();
     }
 

uaa-service/src/main/java/com/diagbot/entity/Permission.java

@@ -157,16 +157,16 @@ public class Permission implements Serializable {
     @Override
     public String toString() {
         return "Permission{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", permissionUrl=" + permissionUrl +
-        ", method=" + method +
-        ", descritpion=" + descritpion +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", permissionUrl=" + permissionUrl +
+                ", method=" + method +
+                ", descritpion=" + descritpion +
+                "}";
     }
 }

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

@@ -21,7 +21,7 @@ import java.util.List;
  * @since 2018-08-30
  */
 @TableName("sys_user")
-public class User implements UserDetails,Serializable {
+public class User implements UserDetails, Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -169,14 +169,14 @@ public class User implements UserDetails,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 +
+                "}";
     }
 }

uaa-service/src/main/java/com/diagbot/mapper/PermissionMapper.java

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author gaodm

uaa-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author gaodm

uaa-service/src/main/java/com/diagbot/service/UrlGrantedAuthority.java

@@ -35,6 +35,6 @@ public class UrlGrantedAuthority implements GrantedAuthority {
 
     @Override
     public String getAuthority() {
-        return this.permissionUrl + ";"+this.method;
+        return this.permissionUrl + ";" + this.method;
     }
 }

uaa-service/src/main/java/com/diagbot/service/UrlUserService.java

@@ -25,6 +25,7 @@ public class UrlUserService implements UserDetailsService {
     UserMapper userMapper;
     @Autowired
     PermissionMapper permissionMapper;
+
     @Override
     public UserDetails loadUserByUsername(String userName) { //重写loadUserByUsername 方法获得 userdetails 类型用户
 
@@ -33,8 +34,8 @@ public class UrlUserService implements UserDetailsService {
             List<Permission> permissions = permissionMapper.getByUserId(user.getId());
             List<GrantedAuthority> grantedAuthorities = new ArrayList<>();
             for (Permission permission : permissions) {
-                if (permission != null && permission.getName()!=null) {
-                    GrantedAuthority grantedAuthority = new UrlGrantedAuthority(permission.getPermissionUrl(),permission.getMethod());
+                if (permission != null && permission.getName() != null) {
+                    GrantedAuthority grantedAuthority = new UrlGrantedAuthority(permission.getPermissionUrl(), permission.getMethod());
                     grantedAuthorities.add(grantedAuthority);
                 }
             }

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

@@ -3,13 +3,13 @@ spring:
     name: uaa-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:

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

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 项目名称 -->
-    <property name="APPDIR" value="uaa-service" />
+    <property name="APPDIR" value="uaa-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":"uaa-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>

uaa-service/src/main/resources/mapper/PermissionMapper.xml

@@ -1,22 +1,24 @@
 <?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.PermissionMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Permission">
-        <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="name" property="name" />
-        <result column="permissionUrl" property="permissionUrl" />
-        <result column="method" property="method" />
-        <result column="descritpion" property="descritpion" />
+        <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="name" property="name"/>
+        <result column="permissionUrl" property="permissionUrl"/>
+        <result column="method" property="method"/>
+        <result column="descritpion" property="descritpion"/>
     </resultMap>
-    
-    <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">
+
+    <select id="getByUserId" parameterType="java.lang.Long"
+            resultType="com.diagbot.entity.Permission">
       select p.*
         from sys_user u
         LEFT JOIN sys_user_role sru on u.id= sru.user_id and sru.is_deleted = 'N'

uaa-service/src/main/resources/mapper/UserMapper.xml

@@ -1,29 +1,30 @@
 <?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.UserMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
-        <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="password" property="password" />
-        <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="password" property="password"/>
+        <result column="username" property="username"/>
     </resultMap>
 
 
     <resultMap id="userMap" type="com.diagbot.entity.User">
-        <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="password" property="password" />
-        <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="password" property="password"/>
+        <result column="username" property="username"/>
     </resultMap>
 
     <select id="getByUserName" parameterType="java.lang.String" resultMap="userMap">

user-service/src/main/java/com/diagbot/UserServiceApplication.java

@@ -23,10 +23,10 @@ import org.springframework.web.bind.annotation.RestController;
  * @author: gaodm
  * @time: 2018/8/3 17:47
  */
-@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" })
 @RestController
 @EnableHystrixDashboard
 @EnableHystrix
@@ -34,21 +34,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RefreshScope
 public class UserServiceApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(UserServiceApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(UserServiceApplication.class, args);
+    }
 
-	@Value("${foo}")
-	String foo;
+    @Value("${foo}")
+    String foo;
 
-	@RequestMapping("/hi")
-	@HystrixCommand(fallbackMethod = "hiError")
-	public String home(@RequestParam(value = "name", defaultValue = "gaodm") String name) {
-		return "hi " + name + " ,i am from port:" + foo;
-	}
+    @RequestMapping("/hi")
+    @HystrixCommand(fallbackMethod = "hiError")
+    public String home(@RequestParam(value = "name", defaultValue = "gaodm") String name) {
+        return "hi " + name + " ,i am from port:" + foo;
+    }
 
-	public String hiError(String name) {
-		return "hi,"+name+",sorry,error!";
-	}
+    public String hiError(String name) {
+        return "hi," + name + ",sorry,error!";
+    }
 
 }

user-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());

user-service/src/main/java/com/diagbot/client/AuthServiceClient.java

@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @author: gaodm
  * @time: 2018/8/2 13:37
  */
-@FeignClient(value = "uaa-service",fallback =AuthServiceHystrix.class )
+@FeignClient(value = "uaa-service", fallback = AuthServiceHystrix.class)
 public interface AuthServiceClient {
 
     @PostMapping(value = "/oauth/token")

user-service/src/main/java/com/diagbot/client/hystrix/AuthServiceHystrix.java

@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 public class AuthServiceHystrix implements AuthServiceClient {
     @Override
     public JWT getToken(String authorization, String type, String username, String password) {
-        log.error("【hystrix】调用{}异常","getToken");
+        log.error("【hystrix】调用{}异常", "getToken");
         return null;
     }
 }

user-service/src/main/java/com/diagbot/config/AliyunConfigurer.java

@@ -36,7 +36,7 @@ public class AliyunConfigurer {
         IClientProfile profile = DefaultProfile.getProfile("cn-hangzhou", aliyunConfig.getAccessKeyId(), aliyunConfig.getAccessKeySecret());
         try {
             DefaultProfile.addEndpoint("cn-hangzhou", "cn-hangzhou", aliyunConfig.getProduct(), aliyunConfig.getDomain());
-        } catch (ClientException e){
+        } catch (ClientException e) {
             e.printStackTrace();
             throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR);
         }

user-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) {

user-service/src/main/java/com/diagbot/config/RedisConfigurer.java

@@ -35,13 +35,13 @@ public class RedisConfigurer extends CachingConfigurerSupport {
     @Value("${spring.redis.database.img}")
     private String databaseImg;
     @Value("${spring.redis.host}")
-    private  String host;
+    private String host;
     @Value("${spring.redis.password}")
-    private  String password;
+    private String password;
     @Value("${spring.redis.port}")
-    private  int port;
+    private int port;
     @Value("${spring.redis.timeout}")
-    private  int timeout;
+    private int timeout;
     @Value("${spring.redis.jedis.pool.max-active}")
     private int maxActive;
     @Value("${spring.redis.jedis.pool.max-idle}")
@@ -55,7 +55,7 @@ public class RedisConfigurer extends CachingConfigurerSupport {
     private JedisConnectionFactory jedisConnectionFactory;
 
     @Bean
-    public JedisPoolConfig getRedisConfig(){
+    public JedisPoolConfig getRedisConfig() {
         JedisPoolConfig jedisPoolConfig = new JedisPoolConfig();
         jedisPoolConfig.setMaxTotal(maxActive);
         jedisPoolConfig.setMaxIdle(maxIdle);

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

@@ -25,7 +25,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         http
                 .csrf().disable()
                 .authorizeRequests()
-                .regexMatchers(".*swagger.*",".*v2.*",".*webjars.*","/user/login.*","/user/registry.*","/user/test.*","/druid.*","/actuator.*","/hystrix.*","/hi.*","/test.*").permitAll()
+                .regexMatchers(".*swagger.*", ".*v2.*", ".*webjars.*", "/user/login.*", "/user/registry.*", "/user/test.*", "/druid.*", "/actuator.*", "/hystrix.*", "/hi.*", "/test.*").permitAll()
                 .antMatchers("/userver/getImgVerification").permitAll()
                 .antMatchers("/userver/verifyImgVerification").permitAll()
                 .antMatchers("/userver/getSmsWithRegister").permitAll()
@@ -41,7 +41,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/user/getUserAndOrg").permitAll()
                 .antMatchers("/user/getUserByOrgName").permitAll()
                 .antMatchers("/**").authenticated();
-//        .antMatchers("/**").permitAll();
+        //        .antMatchers("/**").permitAll();
     }
 
 

user-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 {
     /**

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

@@ -25,41 +25,41 @@ 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 (matchers("/swagger/**", request)
-                || matchers("/v2/**", request)
-                || matchers("/swagger-ui.html/**", request)
-                || matchers("/swagger-resources/**", request)
-                || matchers("/webjars/**", request)
-                || matchers("/user/login/**", request)
-                || matchers("/user/registry/**", request)
-                || matchers("/user/resetPassword", request)
-                || matchers("/user/test/**", request)
-                || matchers("/user/resetPassword", request)
-                || matchers("/druid/**", request)
-                || matchers("/actuator/**", request)
-                || matchers("/hystrix/**", request)
-                || matchers("/hi/**", request)
-                || matchers("/test/**", request)
-                || matchers("/userver/getImgVerification", request)
-                || matchers("/userver/verifyImgVerification", request)
-                || matchers("/userver/getSmsWithRegister", request)
-                || matchers("/userver/getSmsWithResetPassword", request)
-                || matchers("/userver/verifySmsVerification", request)
-                || matchers("/getUserEnumsData", request)
-                || matchers("/userInfo/getUserInfoPag", request)
-                || matchers("/user/getPermission", request)
-                || matchers("/user/index", request)
-                || matchers("/user/getUserByOrgName", request)
-                || matchers("/user/getUserAndOrg", request)
-                || matchers("/userInfo/updateUserInfoAll", request)
-                || matchers("/userInfo/updateDeleted", request)
-                
-                || matchers("/", request)){
-                    return;
-                } else {
-                    throw new AccessDeniedException("no right");
-                }
+        if ("anonymousUser".equals(authentication.getPrincipal())) {
+            if (matchers("/swagger/**", request)
+                    || matchers("/v2/**", request)
+                    || matchers("/swagger-ui.html/**", request)
+                    || matchers("/swagger-resources/**", request)
+                    || matchers("/webjars/**", request)
+                    || matchers("/user/login/**", request)
+                    || matchers("/user/registry/**", request)
+                    || matchers("/user/resetPassword", request)
+                    || matchers("/user/test/**", request)
+                    || matchers("/user/resetPassword", request)
+                    || matchers("/druid/**", request)
+                    || matchers("/actuator/**", request)
+                    || matchers("/hystrix/**", request)
+                    || matchers("/hi/**", request)
+                    || matchers("/test/**", request)
+                    || matchers("/userver/getImgVerification", request)
+                    || matchers("/userver/verifyImgVerification", request)
+                    || matchers("/userver/getSmsWithRegister", request)
+                    || matchers("/userver/getSmsWithResetPassword", request)
+                    || matchers("/userver/verifySmsVerification", request)
+                    || matchers("/getUserEnumsData", request)
+                    || matchers("/userInfo/getUserInfoPag", request)
+                    || matchers("/user/getPermission", request)
+                    || matchers("/user/index", request)
+                    || matchers("/user/getUserByOrgName", request)
+                    || matchers("/user/getUserAndOrg", request)
+                    || matchers("/userInfo/updateUserInfoAll", request)
+                    || matchers("/userInfo/updateDeleted", request)
+
+                    || matchers("/", request)) {
+                return;
+            } else {
+                throw new AccessDeniedException("no right");
+            }
         } else {
             for (GrantedAuthority ga : authentication.getAuthorities()) {
                 String[] authority = ga.getAuthority().split(";");

user-service/src/main/java/com/diagbot/dto/GetConsoleUserInfoDTO.java

@@ -9,8 +9,8 @@ import lombok.Setter;
 
 /**
  * 控制台账户信息
- * @author rgb
  *
+ * @author rgb
  */
 @Getter
 @Setter
@@ -19,5 +19,5 @@ public class GetConsoleUserInfoDTO {
     private User user;
     private Organization organization;
     private UserAuthentication userAuthentication;
-	
+
 }

user-service/src/main/java/com/diagbot/dto/QueryAuthProgressDTO.java

@@ -12,17 +12,17 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class QueryAuthProgressDTO implements Serializable{
-   
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-
-	private Integer status;
-	
-	private Integer isReject;
-	
-	private String rejectComment;
-	
+public class QueryAuthProgressDTO implements Serializable {
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
+
+    private Integer status;
+
+    private Integer isReject;
+
+    private String rejectComment;
+
 }

user-service/src/main/java/com/diagbot/dto/ResultModelDTO.java

@@ -1,115 +1,137 @@
 package com.diagbot.dto;
+
 import java.io.Serializable;
+
 /**
  * 数据服务接口
  * 返回结果实体类
- * @version 0.0.1
+ *
  * @author wangfeng
- * @since  2018-09-19
+ * @version 0.0.1
+ * @since 2018-09-19
  */
 public final class ResultModelDTO implements Serializable {
     private static final long serialVersionUID = 1L;
     public static final ResultModelDTO resultModel = new ResultModelDTO(true);
-	/**true表示处理成功**/
-	private boolean result;
-	/**消息体**/
-	private String message;
-    /**返回结果**/
-	private Object data;
-	/**扩展数据**/
-	private Object extendData;
-
-	/**
-	 * 构造
-	 * @param boolean
-	 * @return ResultModel
-	 */
-    public ResultModelDTO(final boolean success){
-        this(success,null,null,null);
+    /**
+     * true表示处理成功
+     **/
+    private boolean result;
+    /**
+     * 消息体
+     **/
+    private String message;
+    /**
+     * 返回结果
+     **/
+    private Object data;
+    /**
+     * 扩展数据
+     **/
+    private Object extendData;
+
+    /**
+     * 构造
+     *
+     * @param boolean
+     * @return ResultModel
+     */
+    public ResultModelDTO(final boolean success) {
+        this(success, null, null, null);
     }
+
     /**
-	 * 构造
-	 * @return ResultModel
-	 */
-	public ResultModelDTO() {
+     * 构造
+     *
+     * @return ResultModel
+     */
+    public ResultModelDTO() {
         super();
     }
-	/**
-	 * 构造
-	 * @param success
-	 * @param msg
-	 * @param data
-	 * @param extendData
-	 * @return ResultModel
-	 */
-    public ResultModelDTO(final boolean success, final String msg,final Object data,final Object extendData) {
+
+    /**
+     * 构造
+     *
+     * @param success
+     * @param msg
+     * @param data
+     * @param extendData
+     * @return ResultModel
+     */
+    public ResultModelDTO(final boolean success, final String msg, final Object data, final Object extendData) {
         super();
         this.result = success;
         this.message = msg;
         this.data = data;
         this.extendData = extendData;
     }
-     /**
-      * createSuccess 方法
-      * @param msg
-      * @param data
-      * @param extendData
-      * @return ResultModel
-      */
-	public static ResultModelDTO createSuccess(final String msg,final Object data,final Object extendData){
-	    return new ResultModelDTO(true,msg,data,extendData);
-	}
-	/**
-	 * create 方法
-	 * @param success
-	 * @param msg
-	 * @param data
-	 * @param extendData
-	 * @return ResultModel
-	 */
-    public static ResultModelDTO create(final boolean success, final String msg,final Object data,final Object extendData){
-        return new ResultModelDTO(success,msg,data,extendData);
+
+    /**
+     * createSuccess 方法
+     *
+     * @param msg
+     * @param data
+     * @param extendData
+     * @return ResultModel
+     */
+    public static ResultModelDTO createSuccess(final String msg, final Object data, final Object extendData) {
+        return new ResultModelDTO(true, msg, data, extendData);
     }
+
+    /**
+     * create 方法
+     *
+     * @param success
+     * @param msg
+     * @param data
+     * @param extendData
+     * @return ResultModel
+     */
+    public static ResultModelDTO create(final boolean success, final String msg, final Object data, final Object extendData) {
+        return new ResultModelDTO(success, msg, data, extendData);
+    }
+
     /**
      * create 方法
+     *
      * @param success
      * @param msg
      * @param data
      * @return create
      */
-    public static ResultModelDTO create(final boolean success, final String msg,final Object data){
-        return new ResultModelDTO(success,msg,data,null);
+    public static ResultModelDTO create(final boolean success, final String msg, final Object data) {
+        return new ResultModelDTO(success, msg, data, null);
     }
 
-	public boolean isResult() {
-		return result;
-	}
+    public boolean isResult() {
+        return result;
+    }
 
-	public void setResult(boolean result) {
-		this.result = result;
-	}
+    public void setResult(boolean result) {
+        this.result = result;
+    }
 
-	public String getMessage() {
-		return message;
-	}
+    public String getMessage() {
+        return message;
+    }
 
-	public void setMessage(String message) {
-		this.message = message;
-	}
+    public void setMessage(String message) {
+        this.message = message;
+    }
 
-	public Object getData() {
-		return data;
-	}
+    public Object getData() {
+        return data;
+    }
 
-	public void setData(Object data) {
-		this.data = data;
-	}
+    public void setData(Object data) {
+        this.data = data;
+    }
 
-	public Object getExtendData() {
-		return extendData;
-	}
+    public Object getExtendData() {
+        return extendData;
+    }
 
-	public void setExtendData(Object extendData) {
-		this.extendData = extendData;
-	}
+    public void setExtendData(Object extendData) {
+        this.extendData = extendData;
+    }
 }

user-service/src/main/java/com/diagbot/dto/UserAuthenticationDTO.java

@@ -3,7 +3,9 @@ package com.diagbot.dto;
 import com.diagbot.entity.Organization;
 import com.diagbot.entity.User;
 import com.diagbot.entity.UserAuthentication;
+
 import java.util.Map;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -18,5 +20,5 @@ public class UserAuthenticationDTO {
     private User user;
     private Organization organization;
     private UserAuthentication userAuthentication;
-    private Map<Integer,Object> organizationType;
+    private Map<Integer, Object> organizationType;
 }

user-service/src/main/java/com/diagbot/dto/UserInfoDTO.java

@@ -13,155 +13,188 @@ import lombok.Getter;
 import lombok.Setter;
 
 /**
- * 
  * @author wangfeng
  * @Description: 用户信息类表
  * @date 2018年9月17日 下午4:35:35
  */
-public class UserInfoDTO implements Serializable{
-	
-	 private static final long serialVersionUID = 1L;
-
-	    @TableId(value = "id", type = IdType.AUTO)
-	    private Long userId;//用户ID
-	    private Date userGmtCreate;//记录创建时间
-	    private String userName;// 用户名
-	    private String linKman;//联系人
-	    private String email;// 邮箱
-	    @TableId(value = "id", type = IdType.AUTO)
-	    private Long orgId;//机构ID
-	    private Date orgGmtCreate;//记录创建时间
-	    private String orgName;//机构名称
-	    private Integer orgType;//机构属性
-	    private String  orgTypeStr;//机构属性String
-	    private String orgPrincipal;//负责人
-	    private String orgAddress;//机构地址
-	    private Long orgParentId;//上级机构id
-	    private Integer orgSubNum;//下属机构数量
-	    private String autPosition;//岗位信息
-	    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
-	    private Integer autStatus;//认证状态
-	    private String autStatusStr;//认证状态String
-		public Long getUserId() {
-			return userId;
-		}
-		public void setUserId(Long userId) {
-			this.userId = userId;
-		}
-		public Date getUserGmtCreate() {
-			return userGmtCreate;
-		}
-		public void setUserGmtCreate(Date userGmtCreate) {
-			this.userGmtCreate = userGmtCreate;
-		}
-		public String getUserName() {
-			return userName;
-		}
-		public void setUserName(String userName) {
-			this.userName = userName;
-		}
-		public String getLinKman() {
-			return linKman;
-		}
-		public void setLinKman(String linKman) {
-			this.linKman = linKman;
-		}
-		public String getEmail() {
-			return email;
-		}
-		public void setEmail(String email) {
-			this.email = email;
-		}
-		public Long getOrgId() {
-			return orgId;
-		}
-		public void setOrgId(Long orgId) {
-			this.orgId = orgId;
-		}
-		public Date getOrgGmtCreate() {
-			return orgGmtCreate;
-		}
-		public void setOrgGmtCreate(Date orgGmtCreate) {
-			this.orgGmtCreate = orgGmtCreate;
-		}
-		public String getOrgName() {
-			return orgName;
-		}
-		public void setOrgName(String orgName) {
-			this.orgName = orgName;
-		}
-		public Integer getOrgType() {
-			return orgType;
-		}
-		public void setOrgType(Integer orgType) {
-			if(orgType!=null){
-				setOrgTypeStr(OrganizationTypeEnum.getName(orgType));	
-			}
-			this.orgType = orgType;
-		}
-		public String getOrgTypeStr() {
-			return orgTypeStr;
-		}
-		public void setOrgTypeStr(String orgTypeStr) {
-			this.orgTypeStr = orgTypeStr;
-		}
-		public String getOrgPrincipal() {
-			return orgPrincipal;
-		}
-		public void setOrgPrincipal(String orgPrincipal) {
-			this.orgPrincipal = orgPrincipal;
-		}
-		public String getOrgAddress() {
-			return orgAddress;
-		}
-		public void setOrgAddress(String orgAddress) {
-			this.orgAddress = orgAddress;
-		}
-		public Long getOrgParentId() {
-			return orgParentId;
-		}
-		public void setOrgParentId(Long orgParentId) {
-			this.orgParentId = orgParentId;
-		}
-		public Integer getOrgSubNum() {
-			return orgSubNum;
-		}
-		public void setOrgSubNum(Integer orgSubNum) {
-			this.orgSubNum = orgSubNum;
-		}
-		public String getAutPosition() {
-			return autPosition;
-		}
-		public void setAutPosition(String autPosition) {
-			this.autPosition = autPosition;
-		}
-		public Integer getAutIsReject() {
-			return autIsReject;
-		}
-		public void setAutIsReject(Integer autIsReject) {
-			this.autIsReject = autIsReject;
-		}
-		public Integer getAutStatus() {
-			return autStatus;
-		}
-		public void setAutStatus(Integer autStatus) {
-			if(autStatus!=null){
-				setAutStatusStr(AuthStatusEnum.getName(autStatus));
-			}
-			this.autStatus = autStatus;
-		}
-		public static long getSerialversionuid() {
-			return serialVersionUID;
-		}
-		public String getAutStatusStr() {
-			return autStatusStr;
-		}
-		public void setAutStatusStr(String autStatusStr) {
-			this.autStatusStr = autStatusStr;
-		}
-	
-	    
-	    
-	    
+public class UserInfoDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long userId;//用户ID
+    private Date userGmtCreate;//记录创建时间
+    private String userName;// 用户名
+    private String linKman;//联系人
+    private String email;// 邮箱
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long orgId;//机构ID
+    private Date orgGmtCreate;//记录创建时间
+    private String orgName;//机构名称
+    private Integer orgType;//机构属性
+    private String orgTypeStr;//机构属性String
+    private String orgPrincipal;//负责人
+    private String orgAddress;//机构地址
+    private Long orgParentId;//上级机构id
+    private Integer orgSubNum;//下属机构数量
+    private String autPosition;//岗位信息
+    private Integer autIsReject;//是否通过认证 N:未通过，Y:已通过
+    private Integer autStatus;//认证状态
+    private String autStatusStr;//认证状态String
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Date getUserGmtCreate() {
+        return userGmtCreate;
+    }
+
+    public void setUserGmtCreate(Date userGmtCreate) {
+        this.userGmtCreate = userGmtCreate;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public String getLinKman() {
+        return linKman;
+    }
+
+    public void setLinKman(String linKman) {
+        this.linKman = linKman;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Long getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
+
+    public Date getOrgGmtCreate() {
+        return orgGmtCreate;
+    }
+
+    public void setOrgGmtCreate(Date orgGmtCreate) {
+        this.orgGmtCreate = orgGmtCreate;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+
+    public Integer getOrgType() {
+        return orgType;
+    }
+
+    public void setOrgType(Integer orgType) {
+        if (orgType != null) {
+            setOrgTypeStr(OrganizationTypeEnum.getName(orgType));
+        }
+        this.orgType = orgType;
+    }
+
+    public String getOrgTypeStr() {
+        return orgTypeStr;
+    }
+
+    public void setOrgTypeStr(String orgTypeStr) {
+        this.orgTypeStr = orgTypeStr;
+    }
+
+    public String getOrgPrincipal() {
+        return orgPrincipal;
+    }
+
+    public void setOrgPrincipal(String orgPrincipal) {
+        this.orgPrincipal = orgPrincipal;
+    }
+
+    public String getOrgAddress() {
+        return orgAddress;
+    }
+
+    public void setOrgAddress(String orgAddress) {
+        this.orgAddress = orgAddress;
+    }
+
+    public Long getOrgParentId() {
+        return orgParentId;
+    }
+
+    public void setOrgParentId(Long orgParentId) {
+        this.orgParentId = orgParentId;
+    }
+
+    public Integer getOrgSubNum() {
+        return orgSubNum;
+    }
+
+    public void setOrgSubNum(Integer orgSubNum) {
+        this.orgSubNum = orgSubNum;
+    }
+
+    public String getAutPosition() {
+        return autPosition;
+    }
+
+    public void setAutPosition(String autPosition) {
+        this.autPosition = autPosition;
+    }
+
+    public Integer getAutIsReject() {
+        return autIsReject;
+    }
+
+    public void setAutIsReject(Integer autIsReject) {
+        this.autIsReject = autIsReject;
+    }
+
+    public Integer getAutStatus() {
+        return autStatus;
+    }
+
+    public void setAutStatus(Integer autStatus) {
+        if (autStatus != null) {
+            setAutStatusStr(AuthStatusEnum.getName(autStatus));
+        }
+        this.autStatus = autStatus;
+    }
+
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
+
+    public String getAutStatusStr() {
+        return autStatusStr;
+    }
+
+    public void setAutStatusStr(String autStatusStr) {
+        this.autStatusStr = autStatusStr;
+    }
+
 
 }

user-service/src/main/java/com/diagbot/dto/UserInfoExportDTO.java

@@ -10,15 +10,14 @@ import lombok.Setter;
 
 
 /**
- * 
- * @Description: 导出类
  * @author wangfeng
+ * @Description: 导出类
  * @date 2018年9月25日 上午11:08:24
  */
 @Setter
 @Getter
 public class UserInfoExportDTO {
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
     private String userId;//用户ID
     private String userGmtCreate;//记录创建时间
     private String userName;// 用户名
@@ -35,27 +34,28 @@ public class UserInfoExportDTO {
     private String autPosition;//岗位信息
     private String autIsReject;//是否通过认证 N:未通过，Y:已通过
     private String autStatus;//认证状态
-    
+
     public UserInfoExportDTO(String userId, String userGmtCreate, String userName, String linKman, String email, String orgId,
-			String orgName, String orgType, String orgPrincipal, String orgAddress, String orgParentId,
-			String orgSubNum, String autPosition, String autIsReject, String autStatus) {
-		this.userId = userId;
-		this.userGmtCreate=userGmtCreate;
-		this.userName=userName;
-		this.linKman=linKman;
-		this.email=email;
-		this.orgId=orgId;
-		this.orgName=orgName;
-		this.orgType=orgType;
-		this.orgPrincipal=orgPrincipal;
-		this.orgAddress=orgAddress;
-		this.orgParentId=orgParentId;
-		this.orgSubNum=orgSubNum;
-		this.autPosition=autPosition;
-		this.autIsReject=autIsReject;
-		this.autStatus=autStatus;
-	}
-    public UserInfoExportDTO(){
-    	
+                             String orgName, String orgType, String orgPrincipal, String orgAddress, String orgParentId,
+                             String orgSubNum, String autPosition, String autIsReject, String autStatus) {
+        this.userId = userId;
+        this.userGmtCreate = userGmtCreate;
+        this.userName = userName;
+        this.linKman = linKman;
+        this.email = email;
+        this.orgId = orgId;
+        this.orgName = orgName;
+        this.orgType = orgType;
+        this.orgPrincipal = orgPrincipal;
+        this.orgAddress = orgAddress;
+        this.orgParentId = orgParentId;
+        this.orgSubNum = orgSubNum;
+        this.autPosition = autPosition;
+        this.autIsReject = autIsReject;
+        this.autStatus = autStatus;
+    }
+
+    public UserInfoExportDTO() {
+
     }
 }

user-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：认证中）
 
 }

user-service/src/main/java/com/diagbot/dto/WaitAuthenDTO.java

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

user-service/src/main/java/com/diagbot/entity/Menu.java

@@ -73,5 +73,4 @@ public class Menu implements Serializable {
     private String remark;
 
 
-
 }

user-service/src/main/java/com/diagbot/entity/Organization.java

@@ -3,6 +3,7 @@ package com.diagbot.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+
 import java.util.Date;
 import java.io.Serializable;
 
@@ -193,19 +194,19 @@ public class Organization implements Serializable {
     @Override
     public String toString() {
         return "Organization{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", name=" + name +
-        ", type=" + type +
-        ", principal=" + principal +
-        ", address=" + address +
-        ", parentId=" + parentId +
-        ", subNum=" + subNum +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", name=" + name +
+                ", type=" + type +
+                ", principal=" + principal +
+                ", address=" + address +
+                ", parentId=" + parentId +
+                ", subNum=" + subNum +
+                ", remark=" + remark +
+                "}";
     }
 }

user-service/src/main/java/com/diagbot/entity/Permission.java

@@ -72,13 +72,11 @@ public class Permission implements Serializable {
      * 资源描述
      */
     private String descritpion;
-    
+
     /**
      * 备注
      */
     private String remark;
 
 
-
-
 }

user-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 +
+                "}";
     }
 }

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

@@ -71,29 +71,26 @@ public class User implements Serializable {
      * 邮箱
      */
     private String email;
-    
+
     /**
      * 用户类型
      */
     private Integer type;
 
 
+    public Integer getType() {
+        return type;
+    }
 
-    
-
-	public Integer getType() {
-		return type;
-	}
-
-	public void setType(Integer type) {
-		this.type = type;
-	}
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
 
-	public Long getId() {
+    public Long getId() {
         return id;
     }
 

user-service/src/main/java/com/diagbot/entity/UserAuthentication.java

@@ -191,19 +191,19 @@ public class UserAuthentication implements Serializable {
     @Override
     public String toString() {
         return "UserAuthentication{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", userId=" + userId +
-        ", position=" + position +
-        ", isReject=" + isReject +
-        ", rejectType=" + rejectType +
-        ", rejectComment=" + rejectComment +
-        ", status=" + status +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", userId=" + userId +
+                ", position=" + position +
+                ", isReject=" + isReject +
+                ", rejectType=" + rejectType +
+                ", rejectComment=" + rejectComment +
+                ", status=" + status +
+                ", remark=" + remark +
+                "}";
     }
 }

user-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();

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

@@ -2,23 +2,23 @@ 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 {
-    USER_NOT_FOUND("10020000","该手机号暂未注册！"),
-    USER_PASSWORD_ERROR("10020001","手机号或密码不正确！"),
-    GET_TOKEN_FAIL("10020002","获取token失败！"),
-    TOKEN_IS_NOT_MATCH_USER("10020003","请使用自己的token进行接口请求！"),
+    USER_NOT_FOUND("10020000", "该手机号暂未注册！"),
+    USER_PASSWORD_ERROR("10020001", "手机号或密码不正确！"),
+    GET_TOKEN_FAIL("10020002", "获取token失败！"),
+    TOKEN_IS_NOT_MATCH_USER("10020003", "请使用自己的token进行接口请求！"),
 
     SMS_SEND_ERROR("10020004", "短信发送错误!"),
     USER_BIND_ERROR("10020005", "用户手机号已经绑定无需再次验证!"),
     USER_UN_BIND_ERROR("10020006", "用户手机号未绑定无需解绑!"),
     VERIFYCODE_ERROR("10020007", "图片验证码生成错误!"),
     USER_EXIST("10020008", "该手机已注册!"),
-    EMAIL_IS_NULL("10020009","请输入邮箱！");
+    EMAIL_IS_NULL("10020009", "请输入邮箱！");
 
     private String code;
     private String msg;

user-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();
     }
 

user-service/src/main/java/com/diagbot/facade/MenuFacade.java

@@ -11,6 +11,5 @@ import org.springframework.stereotype.Component;
 @Component
 public class MenuFacade extends MenuServiceImpl {
 
-   
 
 }

user-service/src/main/java/com/diagbot/facade/OrganizationFacade.java

@@ -11,6 +11,5 @@ import org.springframework.stereotype.Component;
 @Component
 public class OrganizationFacade extends OrganizationServiceImpl {
 
-   
 
 }

user-service/src/main/java/com/diagbot/facade/PermissionFacade.java

@@ -31,16 +31,16 @@ public class PermissionFacade extends PermissionServiceImpl {
      */
     public RespDTO getPermission(String appkey, String secret) {
         User user = userFacade.findByName(appkey);
-        if(null == user){
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "未找到对应的appkey【" + appkey + "】" );
+        if (null == user) {
+            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "未找到对应的appkey【" + appkey + "】");
         }
         PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder();
-        if(!passwordEncoder.matches(secret, user.getPassword())){
+        if (!passwordEncoder.matches(secret, user.getPassword())) {
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "appkey 或 secret 错误！【" + appkey + "," + secret + "】");
         }
         List<Permission> permissions = this.getPermissionByUserId(user.getId());
         return RespDTO.onSuc(permissions);
     }
-   
+
 
 }

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -520,8 +520,8 @@ public class UserFacade extends UserServiceImpl {
 
 
     }
+
     /**
-     * 
      * @param userInfoOrganizationsVO
      * @return 修改用户信息和机构信息
      */
@@ -541,8 +541,8 @@ public class UserFacade extends UserServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
+
     /**
-     * 
      * @param userInfoAuditVO
      * @return 审核用户信息和机构信息
      */
@@ -562,8 +562,8 @@ public class UserFacade extends UserServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
+
     /**
-     * 
      * @param organizationVO
      * @return
      */
@@ -592,8 +592,8 @@ public class UserFacade extends UserServiceImpl {
         }
         return RespDTO.onSuc(res);
     }
+
     /**
-     * 
      * @param userAndOrganizationVO
      * @return 添加用户信息和机构信息管理员
      */
@@ -652,8 +652,8 @@ public class UserFacade extends UserServiceImpl {
 
         return RespDTO.onSuc("绑定成功");
     }
+
     /**
-     * 
      * @param userId
      * @return 删除用户信息和机构信息
      */

user-service/src/main/java/com/diagbot/facade/UserOrganizationFacade.java

@@ -11,6 +11,5 @@ import org.springframework.stereotype.Component;
 @Component
 public class UserOrganizationFacade extends UserOrganizationServiceImpl {
 
-   
 
 }

user-service/src/main/java/com/diagbot/facade/UserRoleFacade.java

@@ -11,6 +11,5 @@ import org.springframework.stereotype.Component;
 @Component
 public class UserRoleFacade extends UserRoleServiceImpl {
 
-   
 
 }

user-service/src/main/java/com/diagbot/idc/IdCreater.java

@@ -11,12 +11,14 @@ public interface IdCreater<T> {
 
     /**
      * 生成一个id
+     *
      * @return 生成的id
      */
     Long getNextId(T param);
 
     /**
      * 批量生成id
+     *
      * @param size 生成数量
      * @return 生成的id列表
      */

user-service/src/main/java/com/diagbot/mapper/UserAuthenticationMapper.java

@@ -12,6 +12,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-09-17
  */
 public interface UserAuthenticationMapper extends BaseMapper<UserAuthentication> {
-    
+
     int getAllWaitAuthCou();
 }

user-service/src/main/java/com/diagbot/mapper/UserMapper.java

@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author gaodm
@@ -26,6 +26,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     /**
      * 根据用户查找信息
+     *
      * @param username 用户名
      * @return 用户信息
      */
@@ -33,6 +34,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     /**
      * 根据用户id获取用户信息(示例)
+     *
      * @param page 翻页信息
      * @param user 用户输入信息
      * @return 翻页用户信息
@@ -41,21 +43,21 @@ public interface UserMapper extends BaseMapper<User> {
 
     IPage<User> indexPage(Page page, @Param("user") User user);
 
-    IPage<UserInfoDTO> selectUserInfoListPage(Page page,@Param("userInfo") UserInfoDTO userInfo);
-    
+    IPage<UserInfoDTO> selectUserInfoListPage(Page page, @Param("userInfo") UserInfoDTO userInfo);
+
     public boolean updateUserInfoAll(@Param("userMap") Map<String, Object> userMap);
-    
-    public boolean updateDeleted(@Param("map") Map<String,Object> map);
+
+    public boolean updateDeleted(@Param("map") Map<String, Object> map);
 
     public List<User> getByIds(List<Long> ids);
 
     public List<UserOrgDTO> getUserOrgDTOByIds(List<Long> ids);
-    
-    public boolean auditUserInfoAll(@Param("auditMap") Map<String,Object> auditMap);
-    
-    public Integer updateById(Map<String,String> map);
-    
-    public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String,Object> map);
+
+    public boolean auditUserInfoAll(@Param("auditMap") Map<String, Object> auditMap);
+
+    public Integer updateById(Map<String, String> map);
+
+    public List<UserInfoDTO> dependentuserInfoByTime(@Param("userExport") Map<String, Object> map);
 
     public List<User> getUserByOrgName(String orgName);
 

user-service/src/main/java/com/diagbot/mapper/UserOrganizationMapper.java

@@ -13,12 +13,11 @@ import com.diagbot.entity.UserOrganization;
  * @Date: 2018/9/13 17:19
  */
 public interface UserOrganizationMapper extends BaseMapper<UserOrganization> {
-	
-	/**
-	 * 
-	 * @param organizationId 根据机构id查绑定的用户
-	 * @return
-	 */
-	 public List<UserOrganization> getAgencyPersonnel(@Param("userORG") UserOrganization userORG);
+
+    /**
+     * @param organizationId 根据机构id查绑定的用户
+     * @return
+     */
+    public List<UserOrganization> getAgencyPersonnel(@Param("userORG") UserOrganization userORG);
 
 }

user-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());
     }
 }

user-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -19,10 +19,11 @@ public class EnumsDataServiceImpl implements EnumsDataService {
 
     /**
      * 用户枚举数据获取
+     *
      * @return 用户枚举类map
      */
     @Override
-    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData(){
+    public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("authStatusEnum", AuthStatusEnum.values())
                 .addEnums("organizationTypeEnum", OrganizationTypeEnum.values())

user-service/src/main/java/com/diagbot/service/impl/ImgVerServiceImpl.java

@@ -50,16 +50,17 @@ public class ImgVerServiceImpl implements ImgVerService {
 
     /**
      * 创建用户图片验证信息
+     *
      * @param imgVerInfo 图片验证码验证信息
      * @return 图片验证码数据流
      */
     @Override
-    public byte[] createImgVerification(ImgVerInfo imgVerInfo){
-        if (null == imgVerInfo){
+    public byte[] createImgVerification(ImgVerInfo imgVerInfo) {
+        if (null == imgVerInfo) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "用户图片验证信息不能为空!");
         }
-        if (StringUtil.isBlank(imgVerInfo.getImgId())){
+        if (StringUtil.isBlank(imgVerInfo.getImgId())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "图片验证码唯一标志不能为空!");
         }
@@ -95,16 +96,16 @@ public class ImgVerServiceImpl implements ImgVerService {
      * 验证短信验证码是否有效
      */
     @Override
-    public Boolean verifyImgVerification(ImgVerInfo imgVerInfo){
-        if (null == imgVerInfo){
+    public Boolean verifyImgVerification(ImgVerInfo imgVerInfo) {
+        if (null == imgVerInfo) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "用户图片验证信息不能为空!");
         }
-        if (StringUtil.isBlank(imgVerInfo.getImgId())){
+        if (StringUtil.isBlank(imgVerInfo.getImgId())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "图片验证码唯一标志不能为空!");
         }
-        if (StringUtil.isBlank(imgVerInfo.getCode())){
+        if (StringUtil.isBlank(imgVerInfo.getCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "验证码不能为空!");
         }
@@ -147,11 +148,12 @@ public class ImgVerServiceImpl implements ImgVerService {
 
     /**
      * 获取用户短信验证码信息
+     *
      * @param imgId
      * @return
      */
     @Override
-    public ImgVerInfo getImgVerification(String imgId){
+    public ImgVerInfo getImgVerification(String imgId) {
         return (ImgVerInfo) redisForImg.execute(new RedisCallback<Object>() {
             @Override
             public Object doInRedis(RedisConnection connection) throws DataAccessException {
@@ -169,7 +171,7 @@ public class ImgVerServiceImpl implements ImgVerService {
      * 删除用户短信验证码信息
      */
     @Override
-    public Boolean deleteImgVerification(String imgId){
+    public Boolean deleteImgVerification(String imgId) {
         final byte[] redis_key = getUserImgKey(imgId);
         Long l = (Long) redisForImg.execute(new RedisCallback<Long>() {
             @Override

user-service/src/main/java/com/diagbot/service/impl/MenuServiceImpl.java

@@ -25,6 +25,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 根据用户id获取菜单信息
+     *
      * @param userId 用户id
      * @return 菜单信息
      */
@@ -36,6 +37,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements Me
 
     /**
      * 获取下级菜单
+     *
      * @param id 菜单id
      * @return 子菜单信息
      */

user-service/src/main/java/com/diagbot/service/impl/OrganizationServiceImpl.java

@@ -21,6 +21,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
 
     /**
      * 根据参数查询机构信息
+     *
      * @param map 参数
      * @return
      */
@@ -34,7 +35,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
      * @Author: ztg
      * @Date: 2018/9/13 19:24
      */
-    public Organization getByUserId(Long userId){
+    public Organization getByUserId(Long userId) {
         return baseMapper.getByUserId(userId);
     }
 
@@ -44,8 +45,8 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
      * @Author: wangfeng
      * @Date: 2018/9/19 15:24
      */
-    public List<Organization> findOrganization(String organizationName){
-    	 return baseMapper.findOrganization(organizationName);
+    public List<Organization> findOrganization(String organizationName) {
+        return baseMapper.findOrganization(organizationName);
     }
 
 }

user-service/src/main/java/com/diagbot/service/impl/SmsVerServiceImpl.java

@@ -24,8 +24,7 @@ import org.springframework.stereotype.Service;
 import java.util.Date;
 
 /**
- * @Description:
- * 短信验证接口实现
+ * @Description: 短信验证接口实现
  * 阿里短信验证码发送
  * @author: gaodm
  * @time: 2018/9/4 16:25
@@ -57,8 +56,8 @@ public class SmsVerServiceImpl implements SmsVerService {
         return serializeKey(String.format(userSmsFormat, mobile));
     }
 
-    public String smsSend(String mobile,String smsTemplateCode){
-        if (StringUtil.isBlank(mobile)){
+    public String smsSend(String mobile, String smsTemplateCode) {
+        if (StringUtil.isBlank(mobile)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "电话号码不能为空!");
         }
@@ -72,7 +71,7 @@ public class SmsVerServiceImpl implements SmsVerService {
         //必填:短信模板-可在短信控制台中找到
         request.setTemplateCode(smsTemplateCode);
         String code = SmsCodeUtil.getVerCode();
-        String json="{\"code\":\""
+        String json = "{\"code\":\""
                 + code
                 + "\"}";
         //可选:模板中的变量替换JSON串,如模板内容为"您的验证码是${code}，有效期为3分钟，感谢您使用朗通医疗云平台。"时,此处的值为
@@ -86,7 +85,7 @@ public class SmsVerServiceImpl implements SmsVerService {
             //此处可能会抛出异常，注意catch
             SendSmsResponse rsp = acsClient.getAcsResponse(request);
             System.out.println(GsonUtil.toJson(rsp));
-            if ((null == rsp) || !(rsp.getCode().equals("OK"))){
+            if ((null == rsp) || !(rsp.getCode().equals("OK"))) {
                 throw new CommonException(ServiceErrorCode.SMS_SEND_ERROR);
             }
         } catch (Exception e) {
@@ -100,16 +99,16 @@ public class SmsVerServiceImpl implements SmsVerService {
      * 创建用户短信验证信息
      */
     @Override
-    public Boolean createSmsVerification(SwsVerInfo swsVerInfo){
-        if (null == swsVerInfo){
+    public Boolean createSmsVerification(SwsVerInfo swsVerInfo) {
+        if (null == swsVerInfo) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "用户短信验证信息不能为空!");
         }
-        if (StringUtil.isBlank(swsVerInfo.getMobile())){
+        if (StringUtil.isBlank(swsVerInfo.getMobile())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "用户电话不能为空!");
         }
-        if (StringUtil.isBlank(swsVerInfo.getCode())){
+        if (StringUtil.isBlank(swsVerInfo.getCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "验证码不能为空!");
         }
@@ -142,16 +141,16 @@ public class SmsVerServiceImpl implements SmsVerService {
      * 验证短信验证码是否有效
      */
     @Override
-    public Boolean verifySmsVerification(SwsVerInfo swsVerInfo){
-        if (null == swsVerInfo){
+    public Boolean verifySmsVerification(SwsVerInfo swsVerInfo) {
+        if (null == swsVerInfo) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "用户短信验证信息不能为空!");
         }
-        if (StringUtil.isBlank(swsVerInfo.getMobile())){
+        if (StringUtil.isBlank(swsVerInfo.getMobile())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "用户电话不能为空!");
         }
-        if (StringUtil.isBlank(swsVerInfo.getCode())){
+        if (StringUtil.isBlank(swsVerInfo.getCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
                     "短信验证码不能为空!");
         }
@@ -179,7 +178,7 @@ public class SmsVerServiceImpl implements SmsVerService {
                     "用户电话不一致!");
         }
         if (!swsVerInfoRes.getCode().equals(swsVerInfo.getCode())) {
-            log.info("短信验证码输入有误!用户电话：{}，验证码：{}", swsVerInfo.getMobile(),swsVerInfo.getCode());
+            log.info("短信验证码输入有误!用户电话：{}，验证码：{}", swsVerInfo.getMobile(), swsVerInfo.getCode());
             throw new CommonException(CommonErrorCode.PARAM_IS_ERROR,
                     "短信验证码输入有误!");
         }
@@ -194,11 +193,12 @@ public class SmsVerServiceImpl implements SmsVerService {
 
     /**
      * 获取用户短信验证码信息
+     *
      * @param mobile 用户电话
      * @return 用户短信验证码信息
      */
     @Override
-    public SwsVerInfo getSmsVerification(String mobile){
+    public SwsVerInfo getSmsVerification(String mobile) {
         return (SwsVerInfo) redisForSms.execute(new RedisCallback<Object>() {
             @Override
             public Object doInRedis(RedisConnection connection) throws DataAccessException {
@@ -216,7 +216,7 @@ public class SmsVerServiceImpl implements SmsVerService {
      * 删除用户短信验证码信息
      */
     @Override
-    public Boolean deleteSmsVerification(String mobile){
+    public Boolean deleteSmsVerification(String mobile) {
         final byte[] redis_key = getUserSmsKey(mobile);
         Long l = (Long) redisForSms.execute(new RedisCallback<Long>() {
             @Override

user-service/src/main/java/com/diagbot/service/impl/UserOrganizationServiceImpl.java

@@ -23,6 +23,7 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
 
     /**
      * 根据参数获取机构信息
+     *
      * @param map 参数
      * @return 机构列表
      */
@@ -30,9 +31,10 @@ public class UserOrganizationServiceImpl extends ServiceImpl<UserOrganizationMap
     public List<UserOrganization> selectByMap(Map map) {
         return userOrganizationMapper.selectByMap(map);
     }
+
     @Override
-    public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG){
-    	return userOrganizationMapper.getAgencyPersonnel(userORG);
-    	
+    public List<UserOrganization> getAgencyPersonnel(UserOrganization userORG) {
+        return userOrganizationMapper.getAgencyPersonnel(userORG);
+
     }
 }

user-service/src/main/java/com/diagbot/service/impl/UserServiceImpl.java

@@ -17,7 +17,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author gaodm
@@ -31,15 +31,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     /**
      * 根据用户查找信息
+     *
      * @param username 用户名
      * @return 用户信息
      */
-    public User findByName(String username){
+    public User findByName(String username) {
         return baseMapper.findByName(username);
     }
 
     /**
      * 根据用户id获取用户信息(示例)
+     *
      * @param page 翻页信息
      * @param user 用户输入信息
      * @return 翻页用户信息
@@ -48,22 +50,24 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public IPage<User> selectUserListPage(Page<User> page, User user) {
         return baseMapper.selectUserListPage(page, user);
     }
+
     @Override
-    public IPage<UserInfoDTO>  selectUserInfoListPage(Page<UserInfoDTO> page,UserInfoDTO userInfo){
-    	return baseMapper.selectUserInfoListPage(page, userInfo);
-    	
+    public IPage<UserInfoDTO> selectUserInfoListPage(Page<UserInfoDTO> page, UserInfoDTO userInfo) {
+        return baseMapper.selectUserInfoListPage(page, userInfo);
+
     }
 
-	@Override
-	public boolean  updateUserInfoAll(Map<String, Object> userMap) {
-		return baseMapper.updateUserInfoAll(userMap);
-		
-	}
-	@Override
-	public boolean updateDeleted(Map<String,Object> map){
-		return baseMapper.updateDeleted(map);
-		
-	}
+    @Override
+    public boolean updateUserInfoAll(Map<String, Object> userMap) {
+        return baseMapper.updateUserInfoAll(userMap);
+
+    }
+
+    @Override
+    public boolean updateDeleted(Map<String, Object> map) {
+        return baseMapper.updateDeleted(map);
+
+    }
 
     @Override
     public IPage<User> indexPage(Page<User> page, User user) {
@@ -78,6 +82,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 
     /**
      * 获取用户和机构信息
+     *
      * @param userIds 用户ids
      * @return 用户和机构信息
      */
@@ -87,16 +92,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     }
 
     @Override
-    public boolean auditUserInfoAll(Map<String,Object> auditMap) {
-	    // TODO Auto-generated method stub
-	    return baseMapper.auditUserInfoAll(auditMap);
+    public boolean auditUserInfoAll(Map<String, Object> auditMap) {
+        // TODO Auto-generated method stub
+        return baseMapper.auditUserInfoAll(auditMap);
     }
 
-	@Override
-	public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
+    @Override
+    public List<UserInfoDTO> dependentuserInfoByTime(Map<String, Object> map) {
 
-		return baseMapper.dependentuserInfoByTime(map);
-	}
+        return baseMapper.dependentuserInfoByTime(map);
+    }
 
     @Override
     public List<User> getUserByOrgName(String orgName) {

user-service/src/main/java/com/diagbot/web/UserInfoController.java

@@ -119,7 +119,7 @@ public class UserInfoController {
     @SysLogger("addUserInfo")
     @Transactional
     public RespDTO<UserAndOrganizationVO> addUserInfo(@Valid @RequestBody UserAndOrganizationVO userAndOrganizationVO) {
-       
+
         return userFacade.addUserInfos(userAndOrganizationVO);
     }
 

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

@@ -3,13 +3,13 @@ spring:
     name: user-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:

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

@@ -1,19 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 项目名称 -->
-    <property name="APPDIR" value="user-service" />
+    <property name="APPDIR" value="user-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,81 +192,81 @@
 
     <!--&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" >
-        <customFields>{"appname":"user-service"}</customFields>
+        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">
+            <customFields>{"appname":"user-service"}</customFields>
         </encoder>
     </appender>
 
     <!-- 本地环境下的日志配置 -->
     <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>

user-service/src/main/resources/mapper/MenuMapper.xml

@@ -1,19 +1,20 @@
 <?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.MenuMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.wrapper.MenuWrapper">
-        <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="name" property="name" />
-        <result column="parent_id" property="parentId" />
-        <result column="code" property="code" />
-        <result column="order_no" property="orderNo" />
-        <result column="remark" property="remark" />
+        <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="name" property="name"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="code" property="code"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
     <select id="getByRole" resultMap="BaseResultMap">

user-service/src/main/resources/mapper/OrganizationMapper.xml

@@ -1,22 +1,23 @@
 <?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.OrganizationMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Organization">
-        <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="name" property="name" />
-        <result column="type" property="type" />
-        <result column="principal" property="principal" />
-        <result column="address" property="address" />
-        <result column="parent_id" property="parentId" />
-        <result column="sub_num" property="subNum" />
-        <result column="remark" property="remark" />
+        <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="name" property="name"/>
+        <result column="type" property="type"/>
+        <result column="principal" property="principal"/>
+        <result column="address" property="address"/>
+        <result column="parent_id" property="parentId"/>
+        <result column="sub_num" property="subNum"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
     <select id="getByUserId" resultMap="BaseResultMap">
@@ -24,7 +25,8 @@
         where a.id = b.organization_id and b.user_id = #{userId} and a.is_deleted = 'N' and b.is_deleted = 'N'
     </select>
 
-	<select id="findOrganization" parameterType="java.lang.String" resultType="com.diagbot.entity.Organization" >
+    <select id="findOrganization" parameterType="java.lang.String"
+            resultType="com.diagbot.entity.Organization">
 		SELECT id,NAME FROM sys_organization WHERE is_deleted = "N" AND NAME LIKE
 		CONCAT('%',  #{organizationName}, '%')
 	</select>

user-service/src/main/resources/mapper/PermissionMapper.xml

@@ -1,19 +1,20 @@
 <?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.PermissionMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.Permission">
-        <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="name" property="name" />
-        <result column="permission_url" property="permissionUrl" />
-        <result column="method" property="method" />
-        <result column="descritpion" property="descritpion" />
-        <result column="remark" property="remark" />
+        <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="name" property="name"/>
+        <result column="permission_url" property="permissionUrl"/>
+        <result column="method" property="method"/>
+        <result column="descritpion" property="descritpion"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
     <select id="getByRole" resultMap="BaseResultMap">
@@ -24,7 +25,8 @@
     </select>
 
 
-    <select id="getByUserId" parameterType="java.lang.Long" resultType="com.diagbot.entity.Permission">
+    <select id="getByUserId" parameterType="java.lang.Long"
+            resultType="com.diagbot.entity.Permission">
         select p.*
         from sys_user u
         LEFT JOIN sys_user_role sru on u.id= sru.user_id and sru.is_deleted = 'N'

user-service/src/main/resources/mapper/UserAuthenticationMapper.xml

@@ -1,22 +1,23 @@
 <?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.UserAuthenticationMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.UserAuthentication">
-        <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="user_id" property="userId" />
-        <result column="position" property="position" />
-        <result column="is_reject" property="isReject" />
-        <result column="reject_type" property="rejectType" />
-        <result column="reject_comment" property="rejectComment" />
-        <result column="status" property="status" />
-        <result column="remark" property="remark" />
+        <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="user_id" property="userId"/>
+        <result column="position" property="position"/>
+        <result column="is_reject" property="isReject"/>
+        <result column="reject_type" property="rejectType"/>
+        <result column="reject_comment" property="rejectComment"/>
+        <result column="status" property="status"/>
+        <result column="remark" property="remark"/>
     </resultMap>
 
     <select id="getAllWaitAuthCou" resultType="int">

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

@@ -1,33 +1,34 @@
 <?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.UserMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.User">
-        <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="password" property="password" />
-        <result column="username" property="username" />
-        <result column="linkman" property="linkman" />
-        <result column="email" property="email" />
-        <result column="type" property="type" />
+        <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="password" property="password"/>
+        <result column="username" property="username"/>
+        <result column="linkman" property="linkman"/>
+        <result column="email" property="email"/>
+        <result column="type" property="type"/>
     </resultMap>
 
-	<resultMap id="UserOrgDTO" type="com.diagbot.dto.UserOrgDTO">
-		<id column="user_id" property="userId" />
-		<result column="username" property="username" />
-		<result column="linkman" property="linkman" />
-		<result column="email" property="email" />
-		<result column="org_id" property="orgId" />
-		<result column="org_name" property="orgName" />
-		<result column="is_reject" property="isReject" />
-		<result column="au_status" property="auStatus" />
-		<result column="sub_num" property="subNum" />
-	</resultMap>
+    <resultMap id="UserOrgDTO" type="com.diagbot.dto.UserOrgDTO">
+        <id column="user_id" property="userId"/>
+        <result column="username" property="username"/>
+        <result column="linkman" property="linkman"/>
+        <result column="email" property="email"/>
+        <result column="org_id" property="orgId"/>
+        <result column="org_name" property="orgName"/>
+        <result column="is_reject" property="isReject"/>
+        <result column="au_status" property="auStatus"/>
+        <result column="sub_num" property="subNum"/>
+    </resultMap>
 
 
     <select id="findByName" resultMap="BaseResultMap" parameterType="java.lang.String">
@@ -36,8 +37,8 @@
     </select>
 
     <select id="selectUserListPage" resultMap="BaseResultMap">
-		select u.*
-		from sys_user u
+        select u.*
+        from sys_user u
         LEFT JOIN sys_user_role ur on u.id= ur.user_id
         LEFT JOIN sys_role r on ur.role_id=r.id
         where u.is_deleted = 'N'
@@ -47,47 +48,46 @@
     </select>
 
 
-	<select id="indexPage" resultMap="BaseResultMap">
-		select u.* from sys_user u where u.is_deleted = 'N'
-		<if test="user.id != null">
-			and u.id = #{user.id}
-		</if>
-		<if test="user.username != null and user.username != '' ">
-			and u.username like concat('%',#{user.username},'%')
-		</if>
-	</select>
+    <select id="indexPage" resultMap="BaseResultMap">
+        select u.* from sys_user u where u.is_deleted = 'N'
+        <if test="user.id != null">
+            and u.id = #{user.id}
+        </if>
+        <if test="user.username != null and user.username != '' ">
+            and u.username like concat('%',#{user.username},'%')
+        </if>
+    </select>
 
-	<select id="getByIds" resultMap="BaseResultMap">
-		select u.* from sys_user u where u.is_deleted = 'N'
-		and u.id in
-		<foreach collection="list" item="ids" open="(" close=")" separator=",">
-			#{ids}
-		</foreach>
-	</select>
+    <select id="getByIds" resultMap="BaseResultMap">
+        select u.* from sys_user u where u.is_deleted = 'N'
+        and u.id in
+        <foreach collection="list" item="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
+    </select>
 
 
-	<select id="getUserOrgDTOByIds" resultMap="UserOrgDTO">
-		select u.id user_id ,u.username username, u.email email, u.linkman linkman , org.id org_id, org.name  org_name, ua.is_reject is_reject, ua.status au_status,org.sub_num
-		from sys_user u, sys_user_organization uo, sys_organization org , sys_user_authentication ua
-		where u.is_deleted = 'N' and uo.is_deleted = 'N' and org.is_deleted = 'N'
-		and u.id = uo.user_id and uo.organization_id = org.id and u.id = ua.user_id
-		and u.id in
-		<foreach collection="list" item="ids" open="(" close=")" separator=",">
-			#{ids}
-		</foreach>
-	</select>
+    <select id="getUserOrgDTOByIds" resultMap="UserOrgDTO">
+        select u.id user_id ,u.username username, u.email email, u.linkman linkman , org.id org_id,
+        org.name org_name, ua.is_reject is_reject, ua.status au_status,org.sub_num
+        from sys_user u, sys_user_organization uo, sys_organization org , sys_user_authentication ua
+        where u.is_deleted = 'N' and uo.is_deleted = 'N' and org.is_deleted = 'N'
+        and u.id = uo.user_id and uo.organization_id = org.id and u.id = ua.user_id
+        and u.id in
+        <foreach collection="list" item="ids" open="(" close=")" separator=",">
+            #{ids}
+        </foreach>
+    </select>
 
 
-	<select id="getUserByOrgName" resultMap="BaseResultMap">
+    <select id="getUserByOrgName" resultMap="BaseResultMap">
 		select a.* from sys_user a, sys_organization org, sys_user_organization uo
 		where a.is_deleted = 'N' and org.is_deleted = 'N' and uo.is_deleted = 'N'
 		and a.id = uo.user_id and uo.organization_id = org.id and org.`name` like concat('%' ,#{orgName}, '%')
 	</select>
 
 
-
-
-	<!-- 	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
+    <!-- 	<select id="selectUserInfoListPage" resultMap="BaseResultMap">
             select u.*
             LEFT JOIN sys_user_role ur on u.id= ur.user_id
             LEFT JOIN
@@ -95,188 +95,190 @@
             where u.is_deleted = 'N' and type = "0"
             ORDER BY gmt_create DESC
         </select> -->
-	
-   <!--  <select id="selectUserInfoPage"  parameterType="com.diagbot.dto.UserInfoDTO" resultType="com.diagbot.dto.UserInfoDTO">
-		SELECT
-		u.id AS userId,
-		u.gmt_create as userGmtCreate,
-		u.username as userName,
-		u.linkman as linKman,
-		u.email as email,
-		org.id AS orgId,
-		org.gmt_create as orgGmtCreate,
-		org.name as orgName
-		FROM sys_user u
-		LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
-		LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-		WHERE u.is_deleted = 'N' AND u.TYPE = 0 ORDER BY u.gmt_create DESC
-	</select> -->
-	<select id="selectUserInfoListPage"  resultType="com.diagbot.dto.UserInfoDTO">
-	 SELECT
-		u.id AS userId,
-		u.gmt_create AS userGmtCreate,
-		u.username AS userName,
-		u.linkman AS linKman,
-		u.email AS email,
-		org.id AS orgId,
-		org.gmt_create AS orgGmtCreate,
-		org.name AS orgName,
-		org.type as orgType,
-		org.principal AS orgPrincipal,
-		org.address as orgAddress,
-		org.parent_id as orgParent_id,
-		org.sub_num as orgSub_num,
-		aut.position as autPosition,
-		aut.is_reject as autIsReject,
-		aut.status as autStatus
-		FROM sys_user u
-		LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
-		LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-	        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
-		WHERE u.is_deleted = 'N' AND u.TYPE = 0
-		<if test="userInfo.orgName != null">
-		 AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%') 
-		 </if>
-		 <if test="userInfo.autStatus != null">
-	     AND aut.status = #{userInfo.autStatus}  
-	     </if>
-	     ORDER BY  u.gmt_create DESC
-	</select>
-	
-<update id="updateUserInfoAll" parameterType="java.util.Map" >
-	UPDATE sys_user u ,sys_user_organization a ,
-	sys_organization b ,sys_user_authentication c
-	SET  u.remark = "0" 
-	<if test="userMap.email != null">
-	    <if test="userMap.gmtModified !=null"> 
-	      ,u.gmt_modified=#{userMap.gmtModified}
-	   </if>
-	   <if test="userMap.modifier != null">
-	      ,u.modifier=#{userMap.modifier}
-	   </if>
-	  ,u.email=#{userMap.email}
-	</if>
-	<if test="userMap.principal != null || userMap.address != null || userMap.type != null">
-	     <if test="userMap.gmtModified !=null"> 
-	       ,b.gmt_modified=#{userMap.gmtModified}
-	     </if>
-	     <if test="userMap.modifier != null">
-	      ,b.modifier=#{userMap.modifier}
-	     </if>
-		<if test="userMap.principal != null">
-		  ,b.principal=#{userMap.principal}
-		</if>
-		<if test="userMap.address != null">
-		  ,b.address=#{userMap.address}
-		</if>
-		<if test="userMap.type != null">
-		  ,b.type=#{userMap.type}
-		</if>
-	</if>
-	
-	<!-- <if test="position != null || isReject != null || rejectType !=null || rejectComment !=null || status != null"> -->
-	   <if test="userMap.position != null">
-	    <if test="userMap.gmtModified !=null">
-		  ,c.gmt_modified=#{userMap.gmtModified}
-		</if>
-		<if test="userMap.modifier != null">
-		  ,c.modifier=#{userMap.modifier}
-		</if>
-		  ,c.position=#{userMap.position}
-		</if>
-		<!-- <if test="isReject != null">
-		 ,c.is_reject=#{isReject}
-		</if>
-		<if test="rejectType !=null">
-		  ,c.reject_type=#{rejectType}
-		</if>
-		<if test="rejectComment !=null">
-		  ,c.reject_comment=#{rejectComment}
-		</if>
-		<if test="status != null">
-		  ,c.status = #{status}
-		</if> -->
-	<!-- </if> -->
-	WHERE 
-	u.is_deleted = "N"
-	AND u.id = #{userMap.userId} 
-	AND c.user_id= #{userMap.userId} 
-	AND a.user_id = #{userMap.userId} 
-	AND a.organization_id =b.id
-	
-</update>
-	
 
-	 <update id="updateDeleted" parameterType="java.util.Map">
-		UPDATE sys_user u ,sys_user_organization a ,
-		 sys_organization b,sys_user_authentication c
-		SET u.is_deleted = "Y",a.is_deleted= "Y",b.is_deleted= "Y",c.is_deleted="Y"
-		<if test="map.gmtModified !=null">
-		,u.gmt_modified=#{map.gmtModified}
-		,b.gmt_modified=#{map.gmtModified}
-		,c.gmt_modified=#{map.gmtModified}
-		</if>
-		<if test="map.modifier != null">
-		,u.modifier=#{map.modifier}
-		,b.modifier=#{map.modifier}
-		,c.modifier=#{map.modifier}
-		</if>
-		WHERE u.id = #{map.userId}
-		AND c.user_id= #{map.userId}
-		AND a.user_id = #{map.userId}
-		AND a.organization_id =b.id
-	</update>
-<update id="auditUserInfoAll" parameterType="java.util.Map">
-	UPDATE sys_user_authentication
-	<trim prefix="set" suffixOverrides=",">
-		<if test="auditMap.gmtModified !=null">gmt_modified=#{auditMap.gmtModified},</if>
-		<if test="auditMap.modifier != null">modifier=#{auditMap.modifier},</if>
-		<if test="auditMap.isReject != null">is_reject = #{auditMap.isReject} ,</if>
-		<if test="auditMap.rejectType != null">reject_type =#{auditMap.rejectType},</if>
-		<if test="auditMap.rejectComment != null">reject_comment= #{auditMap.rejectComment},</if>
-		<if test="auditMap.status != null">STATUS= #{auditMap.status}</if>
-	</trim>
-	WHERE
-	user_id = #{auditMap.userId}
-	AND is_deleted = "N"
+    <!--  <select id="selectUserInfoPage"  parameterType="com.diagbot.dto.UserInfoDTO" resultType="com.diagbot.dto.UserInfoDTO">
+         SELECT
+         u.id AS userId,
+         u.gmt_create as userGmtCreate,
+         u.username as userName,
+         u.linkman as linKman,
+         u.email as email,
+         org.id AS orgId,
+         org.gmt_create as orgGmtCreate,
+         org.name as orgName
+         FROM sys_user u
+         LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+         LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+         WHERE u.is_deleted = 'N' AND u.TYPE = 0 ORDER BY u.gmt_create DESC
+     </select> -->
+    <select id="selectUserInfoListPage" resultType="com.diagbot.dto.UserInfoDTO">
+        SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.username AS userName,
+        u.linkman AS linKman,
+        u.email AS email,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type as orgType,
+        org.principal AS orgPrincipal,
+        org.address as orgAddress,
+        org.parent_id as orgParent_id,
+        org.sub_num as orgSub_num,
+        aut.position as autPosition,
+        aut.is_reject as autIsReject,
+        aut.status as autStatus
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE u.is_deleted = 'N' AND u.TYPE = 0
+        <if test="userInfo.orgName != null">
+            AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%')
+        </if>
+        <if test="userInfo.autStatus != null">
+            AND aut.status = #{userInfo.autStatus}
+        </if>
+        ORDER BY u.gmt_create DESC
+    </select>
+
+    <update id="updateUserInfoAll" parameterType="java.util.Map">
+        UPDATE sys_user u ,sys_user_organization a ,
+        sys_organization b ,sys_user_authentication c
+        SET u.remark = "0"
+        <if test="userMap.email != null">
+            <if test="userMap.gmtModified !=null">
+                ,u.gmt_modified=#{userMap.gmtModified}
+            </if>
+            <if test="userMap.modifier != null">
+                ,u.modifier=#{userMap.modifier}
+            </if>
+            ,u.email=#{userMap.email}
+        </if>
+        <if test="userMap.principal != null || userMap.address != null || userMap.type != null">
+            <if test="userMap.gmtModified !=null">
+                ,b.gmt_modified=#{userMap.gmtModified}
+            </if>
+            <if test="userMap.modifier != null">
+                ,b.modifier=#{userMap.modifier}
+            </if>
+            <if test="userMap.principal != null">
+                ,b.principal=#{userMap.principal}
+            </if>
+            <if test="userMap.address != null">
+                ,b.address=#{userMap.address}
+            </if>
+            <if test="userMap.type != null">
+                ,b.type=#{userMap.type}
+            </if>
+        </if>
 
-</update>
+        <!-- <if test="position != null || isReject != null || rejectType !=null || rejectComment !=null || status != null"> -->
+        <if test="userMap.position != null">
+            <if test="userMap.gmtModified !=null">
+                ,c.gmt_modified=#{userMap.gmtModified}
+            </if>
+            <if test="userMap.modifier != null">
+                ,c.modifier=#{userMap.modifier}
+            </if>
+            ,c.position=#{userMap.position}
+        </if>
+        <!-- <if test="isReject != null">
+         ,c.is_reject=#{isReject}
+        </if>
+        <if test="rejectType !=null">
+          ,c.reject_type=#{rejectType}
+        </if>
+        <if test="rejectComment !=null">
+          ,c.reject_comment=#{rejectComment}
+        </if>
+        <if test="status != null">
+          ,c.status = #{status}
+        </if> -->
+        <!-- </if> -->
+        WHERE
+        u.is_deleted = "N"
+        AND u.id = #{userMap.userId}
+        AND c.user_id= #{userMap.userId}
+        AND a.user_id = #{userMap.userId}
+        AND a.organization_id =b.id
 
-<select id="dependentuserInfoByTime" parameterType="java.util.Map" resultType="com.diagbot.dto.UserInfoDTO" >
+    </update>
 
-	SELECT
-	u.id AS userId,
-	u.gmt_create AS userGmtCreate,
-	u.username AS userName,
-	u.linkman AS linKman,
-	u.email AS email,
-	org.id AS orgId,
-	org.gmt_create AS orgGmtCreate,
-	org.name AS orgName,
-	org.type as orgType,
-	org.principal AS orgPrincipal,
-	org.address as orgAddress,
-	org.parent_id as orgParent_id,
-	org.sub_num as orgSub_num,
-	aut.position as autPosition,
-	aut.is_reject as autIsReject,
-	aut.status as autStatus
-	FROM sys_user u
-	LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
-	LEFT JOIN sys_organization org ON uorg.organization_id = org.id
-	LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
-	WHERE 
-	u.is_deleted = 'N' 
-	AND u.TYPE = "0" 
-    <if test="userExport.orgName != null">
-	   AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%') 
-	</if>
-	<if test="userExport.autStatus != null">
-	   AND aut.status = #{userInfo.autStatus}  
-	</if> 
-	<if test="userExport.startTime != null and userExport.endTime != null">
-	AND u.gmt_create BETWEEN #{userExport.startTime} and #{userExport.endTime}
-	</if>
-	ORDER BY u.gmt_create DESC
-</select>
+
+    <update id="updateDeleted" parameterType="java.util.Map">
+        UPDATE sys_user u ,sys_user_organization a ,
+        sys_organization b,sys_user_authentication c
+        SET u.is_deleted = "Y",a.is_deleted= "Y",b.is_deleted= "Y",c.is_deleted="Y"
+        <if test="map.gmtModified !=null">
+            ,u.gmt_modified=#{map.gmtModified}
+            ,b.gmt_modified=#{map.gmtModified}
+            ,c.gmt_modified=#{map.gmtModified}
+        </if>
+        <if test="map.modifier != null">
+            ,u.modifier=#{map.modifier}
+            ,b.modifier=#{map.modifier}
+            ,c.modifier=#{map.modifier}
+        </if>
+        WHERE u.id = #{map.userId}
+        AND c.user_id= #{map.userId}
+        AND a.user_id = #{map.userId}
+        AND a.organization_id =b.id
+    </update>
+    <update id="auditUserInfoAll" parameterType="java.util.Map">
+        UPDATE sys_user_authentication
+        <trim prefix="set" suffixOverrides=",">
+            <if test="auditMap.gmtModified !=null">gmt_modified=#{auditMap.gmtModified},</if>
+            <if test="auditMap.modifier != null">modifier=#{auditMap.modifier},</if>
+            <if test="auditMap.isReject != null">is_reject = #{auditMap.isReject} ,</if>
+            <if test="auditMap.rejectType != null">reject_type =#{auditMap.rejectType},</if>
+            <if test="auditMap.rejectComment != null">reject_comment= #{auditMap.rejectComment},
+            </if>
+            <if test="auditMap.status != null">STATUS= #{auditMap.status}</if>
+        </trim>
+        WHERE
+        user_id = #{auditMap.userId}
+        AND is_deleted = "N"
+
+    </update>
+
+    <select id="dependentuserInfoByTime" parameterType="java.util.Map"
+            resultType="com.diagbot.dto.UserInfoDTO">
+
+        SELECT
+        u.id AS userId,
+        u.gmt_create AS userGmtCreate,
+        u.username AS userName,
+        u.linkman AS linKman,
+        u.email AS email,
+        org.id AS orgId,
+        org.gmt_create AS orgGmtCreate,
+        org.name AS orgName,
+        org.type as orgType,
+        org.principal AS orgPrincipal,
+        org.address as orgAddress,
+        org.parent_id as orgParent_id,
+        org.sub_num as orgSub_num,
+        aut.position as autPosition,
+        aut.is_reject as autIsReject,
+        aut.status as autStatus
+        FROM sys_user u
+        LEFT JOIN sys_user_organization uorg ON u.id = uorg.user_id
+        LEFT JOIN sys_organization org ON uorg.organization_id = org.id
+        LEFT JOIN sys_user_authentication aut ON u.id = aut.user_id
+        WHERE
+        u.is_deleted = 'N'
+        AND u.TYPE = "0"
+        <if test="userExport.orgName != null">
+            AND org.name LIKE CONCAT('%', #{userInfo.orgName}, '%')
+        </if>
+        <if test="userExport.autStatus != null">
+            AND aut.status = #{userInfo.autStatus}
+        </if>
+        <if test="userExport.startTime != null and userExport.endTime != null">
+            AND u.gmt_create BETWEEN #{userExport.startTime} and #{userExport.endTime}
+        </if>
+        ORDER BY u.gmt_create DESC
+    </select>
 </mapper>

user-service/src/main/resources/mapper/UserOrganizationMapper.xml

@@ -1,20 +1,21 @@
 <?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.UserOrganizationMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.UserOrganization">
-        <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="user_id" property="userId" />
-        <result column="organization_id" property="organizationId" />
+        <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="user_id" property="userId"/>
+        <result column="organization_id" property="organizationId"/>
     </resultMap>
 
-	<select id="getAgencyPersonnel"  resultType="com.diagbot.entity.UserOrganization">
+    <select id="getAgencyPersonnel" resultType="com.diagbot.entity.UserOrganization">
 		SELECT * FROM 
 		sys_user_organization 
 		WHERE 

user-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -1,16 +1,17 @@
 <?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.UserRoleMapper">
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.diagbot.entity.UserRole">
-        <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="user_id" property="userId" />
-        <result column="role_id" property="roleId" />
+        <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="user_id" property="userId"/>
+        <result column="role_id" property="roleId"/>
     </resultMap>
 </mapper>