Merge branch 'dev/20220228_v3.0.1通用版_渠道管理第一期' into debug

daqe-center/src/main/java/com/lantone/daqe/facade/ColumnVerifyManagementFacade.java

@@ -227,7 +227,9 @@ public class ColumnVerifyManagementFacade {
                 regularMapping.setColumnId(columnId);
                 regularMapping.setGmtCreate(new Date());
                 regularMapping.setGmtModified(new Date());
-                regularMapping.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    regularMapping.setCreator(principleId.toString());
+                }
                 regularMapping.setRegularId(addColumnVerifyVO.getRegularId());
                 try {
                     regularMappingFacade.getBaseMapper().insert(regularMapping);
@@ -242,7 +244,9 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
-                columnVerify.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    columnVerify.setCreator(principleId.toString());
+                }
                 try {
                     columnVerifyFacade.getBaseMapper().insert(columnVerify);
                 } catch (Exception e) {
@@ -263,7 +267,9 @@ public class ColumnVerifyManagementFacade {
                 nonnullInfo.setColumnId(columnId);
                 nonnullInfo.setGmtCreate(new Date());
                 nonnullInfo.setGmtModified(new Date());
-                nonnullInfo.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    nonnullInfo.setCreator(principleId.toString());
+                }
                 nonnullInfo.setIsRequired(addColumnVerifyVO.getIsRequired());
                 try {
                     nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
@@ -278,7 +284,9 @@ public class ColumnVerifyManagementFacade {
                 columnVerify.setDescription(addColumnVerifyVO.getDescription());
                 columnVerify.setGmtCreate(new Date());
                 columnVerify.setGmtModified(new Date());
-                columnVerify.setCreator(principleId.toString());
+                if(principleId!=null) {
+                    columnVerify.setCreator(principleId.toString());
+                }
                 try {
                     columnVerifyFacade.getBaseMapper().insert(columnVerify);
                 } catch (Exception e) {
@@ -293,7 +301,9 @@ public class ColumnVerifyManagementFacade {
                     standardvalueInfo.setColumnId(columnId);
                     standardvalueInfo.setGmtCreate(new Date());
                     standardvalueInfo.setGmtModified(new Date());
-                    standardvalueInfo.setCreator(principleId.toString());
+                    if(principleId!=null) {
+                        standardvalueInfo.setCreator(principleId.toString());
+                    }
                     standardvalueInfo.setVal(standardValue);
                     try {
                         standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
@@ -308,7 +318,9 @@ public class ColumnVerifyManagementFacade {
                     columnVerify.setDescription(addColumnVerifyVO.getDescription());
                     columnVerify.setGmtCreate(new Date());
                     columnVerify.setGmtModified(new Date());
-                    columnVerify.setCreator(principleId.toString());
+                    if(principleId!=null) {
+                        columnVerify.setCreator(principleId.toString());
+                    }
                     try {
                         columnVerifyFacade.getBaseMapper().insert(columnVerify);
                     } catch (Exception e) {
@@ -481,7 +493,9 @@ public class ColumnVerifyManagementFacade {
                         RegularMapping regularMapping = new RegularMapping();
                         regularMapping.setColumnId(columnId);
                         regularMapping.setGmtCreate(new Date());
-                        regularMapping.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            regularMapping.setCreator(principleId.toString());
+                        }
                         regularMapping.setRegularId(updateColumnVerifyVO.getRegularId());
                         try {
                             regularMappingFacade.getBaseMapper().insert(regularMapping);
@@ -495,7 +509,9 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getRegularName());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
-                        columnVerify.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            columnVerify.setCreator(principleId.toString());
+                        }
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {
@@ -534,7 +550,9 @@ public class ColumnVerifyManagementFacade {
                         NonnullInfo nonnullInfo = new NonnullInfo();
                         nonnullInfo.setColumnId(columnId);
                         nonnullInfo.setGmtCreate(new Date());
-                        nonnullInfo.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            nonnullInfo.setCreator(principleId.toString());
+                        }
                         nonnullInfo.setIsRequired(updateColumnVerifyVO.getIsRequired());
                         try {
                             nonnullInfoFacade.getBaseMapper().insert(nonnullInfo);
@@ -548,7 +566,9 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setVerifyVal(updateColumnVerifyVO.getIsRequired());
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
-                        columnVerify.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            columnVerify.setCreator(principleId.toString());
+                        }
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {
@@ -573,7 +593,9 @@ public class ColumnVerifyManagementFacade {
                         standardvalueInfo.setGmtCreate(new Date());
                         standardvalueInfo.setGmtModified(new Date());
                         standardvalueInfo.setVal(standardValue);
-                        standardvalueInfo.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            standardvalueInfo.setCreator(principleId.toString());
+                        }
                         try {
                             standardvalueInfoFacade.getBaseMapper().insert(standardvalueInfo);
                         } catch (Exception e) {
@@ -587,7 +609,9 @@ public class ColumnVerifyManagementFacade {
                         columnVerify.setDescription(updateColumnVerifyVO.getDescription());
                         columnVerify.setGmtCreate(new Date());
                         columnVerify.setGmtModified(new Date());
-                        columnVerify.setCreator(principleId.toString());
+                        if(principleId!=null) {
+                            columnVerify.setCreator(principleId.toString());
+                        }
                         try {
                             columnVerifyFacade.getBaseMapper().insert(columnVerify);
                         } catch (Exception e) {

security-center/src/main/java/com/lantone/security/facade/UserManagementFacade.java

@@ -66,6 +66,7 @@ import com.lantone.security.enums.ReturnTypeEnum;
 import com.lantone.security.client.AuthService;
 import com.lantone.security.client.MessageService;
 import eu.bitwalker.useragentutils.UserAgent;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -86,6 +87,7 @@ import java.util.stream.Collectors;
  * @time: 2021/7/20 12:39
  */
 @Component
+@Slf4j
 public class UserManagementFacade {
 
     @Autowired
@@ -150,13 +152,23 @@ public class UserManagementFacade {
                     sendToTopicDTO.setType("login");
                     sendToTopicDTO.setTopic(userId);
                     sendToTopics.add(sendToTopicDTO);
-                    messageService.sendToTopic(sendToTopics);
+                    try {
+                        messageService.sendToTopic(sendToTopics);
+                    }catch (Exception e){
+                        e.printStackTrace();
+                        log.error(e.getMessage());
+                    }
                 }
                 JwtStore jwtStore = new JwtStore();
                 jwtStore.setAccessToken(map.get(AuthConstant.ASSESS_TOKEN).toString());
                 jwtStore.setRefreshToken(map.get(AuthConstant.REFRESH_TOKEN).toString());
                 jwtStore.setIp(HttpUtils.getIpAddress());
-                sysTokenService.createToken(jwtStore);
+                try {
+                    sysTokenService.createToken(jwtStore);
+                }catch (Exception e){
+                    e.printStackTrace();
+                    log.error(e.getMessage());
+                }
             }
         }
     }
@@ -856,7 +868,12 @@ public class UserManagementFacade {
                 // 获取客户端浏览器
                 String browser = userAgent.getBrowser().getName();
                 loginLog.setLoginBrowser(browser);
-                messageService.loginLogHandle(loginLog);
+                try {
+                    messageService.loginLogHandle(loginLog);
+                }catch (Exception e){
+                    e.printStackTrace();
+                    log.error(e.getMessage());
+                }
             }
         }
     }