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

docs/002.数据库设计/sys-log.sql

@@ -35,7 +35,7 @@ CREATE TABLE `sys_log` (
   `sys_type` int(11) NOT NULL DEFAULT '0' COMMENT '访问的系统类型 1:user-service,2:diagbotman-service,3:uaa-service,4:log-service,5:bi-service,6:knowledge-service,7:feedback-service,8:icss-web',
   `method` varchar(255) NOT NULL DEFAULT '' COMMENT '方法',
   `operation` varchar(255) NOT NULL DEFAULT '' COMMENT '操作名',
-  `params` varchar(255) NOT NULL DEFAULT '' COMMENT '参数',
+  `params` text COMMENT '参数',
   `username` varchar(255) NOT NULL DEFAULT '' COMMENT '用户名',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='系统操作日志表';

log-service/src/main/java/com/diagbot/rabbit/MyReceiver.java

@@ -3,6 +3,7 @@ package com.diagbot.rabbit;
 import com.diagbot.entity.SysLog;
 import com.diagbot.facade.SysLogFacade;
 import com.diagbot.util.GsonUtil;
+import com.diagbot.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.StreamListener;

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

@@ -151,20 +151,12 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
      * @return
      */
     public AuthStatusDTO getUserAuthenticationStatus() {
-        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
-        qw.eq("user_id", userId).
-                eq("is_deleted", IsDeleteEnum.N.getKey());
-        UserAuthentication userAuthentication = this.getOne(qw);
+        UserAuthentication userAuthentication = this.getUserAuthentication();
         AuthStatusDTO authStatusDTO = new AuthStatusDTO();
-        if (userAuthentication == null) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "当前用户没有认证信息");
-        } else {
-            Integer status = userAuthentication.getStatus();
-            String statusName = AuthStatusEnum.getName(status);
-            authStatusDTO.setAuthStatus(status);
-            authStatusDTO.setAuthStatusName(statusName);
-        }
+        Integer status = userAuthentication.getStatus();
+        String statusName = AuthStatusEnum.getName(status);
+        authStatusDTO.setAuthStatus(status);
+        authStatusDTO.setAuthStatusName(statusName);
         return authStatusDTO;
     }
 
@@ -174,11 +166,7 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
      * @return 包含当前账号的认证状态
      */
     public QueryAuthProgressDTO queryAuthProgress() {
-        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
-        QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
-        qw.eq("user_id", userId).
-                eq("is_deleted", IsDeleteEnum.N.getKey());
-        UserAuthentication userAuthentication = this.getOne(qw);
+        UserAuthentication userAuthentication = this.getUserAuthentication();
 
         QueryAuthProgressDTO queryAuthProgressDTO = new QueryAuthProgressDTO();
         queryAuthProgressDTO.setUserStatus(userAuthentication.getStatus());
@@ -188,6 +176,23 @@ public class UserAuthenticationFacade extends UserAuthenticationServiceImpl {
         return queryAuthProgressDTO;
     }
 
+    /**
+     * 获取用户认证信息
+     *
+     * @return 用户认证信息
+     */
+    private UserAuthentication getUserAuthentication() {
+        Long userId = Long.parseLong(UserUtils.getCurrentPrincipleID());
+        QueryWrapper<UserAuthentication> qw = new QueryWrapper<>();
+        qw.eq("user_id", userId).
+                eq("is_deleted", IsDeleteEnum.N.getKey());
+        UserAuthentication userAuthentication = this.getOne(qw);
+        if (userAuthentication == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "当前用户没有认证信息");
+        }
+        return userAuthentication;
+    }
+
     /**
      * 控制台-获取待认证的账号数量
      *