소스 검색

fix 添加新账号安全码处理

zoujiajian 3 년 전
부모
커밋
0017505dbe

+ 6 - 4
netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -129,9 +129,11 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
         String msg = String.format(Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
         //配置midJourney安全码
         String verifyCodes = groupsTrips.getVerifyCodes();
-        String[] verifyCodeArray = null;
+        List<String> verifyCodeList = null;
         if (StrUtil.isNotBlank(verifyCodes)) {
-            verifyCodeArray = verifyCodes.split(",");
+            verifyCodes = verifyCodes.replaceAll("\n", "");
+            String[] verifyCodesArray = verifyCodes.split("\\*");
+            verifyCodeList = Arrays.stream(verifyCodesArray).filter(str -> StrUtil.isNotBlank(str)).map(str -> str.trim()).collect(Collectors.toList());
         }
         Boolean isPrdEnv = envCommonService.isPrdEnv();
         for (int i = 0; i < groupsRelations.size(); i++) {
@@ -157,8 +159,8 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
                 //发送短信
                 smsService.sendSmsToRelationUser(relation.getUserId(), msg);
             }
-            if (verifyCodeArray != null && verifyCodeArray.length > 0 && i < verifyCodeArray.length) {
-                relation.setVerifyCode(verifyCodeArray[i]);
+            if (verifyCodeList != null && verifyCodeList.size() > 0 && i < verifyCodeList.size()) {
+                relation.setVerifyCode(verifyCodeList.get(i));
                 relationMapper.updateById(relation);
             }
         }

+ 1 - 0
netflix-web/src/main/java/com/cyksj/web/controller/manage/account/CmsAccountController.java

@@ -367,6 +367,7 @@ public class CmsAccountController {
 	    }
 	    String verifyCodes = account.getVerifyCodes();
 	    if (StrUtil.isNotBlank(verifyCodes) && !StrUtil.equals(verifyCodes, db.getVerifyCodes())) {
+		    verifyCodes = verifyCodes.replaceAll("\n", "");
 		    String[] verifyCodesArray = verifyCodes.split("\\*");
 		    List<String> verifyCodeList = Arrays.stream(verifyCodesArray).filter(str -> StrUtil.isNotBlank(str)).map(str -> str.trim()).collect(Collectors.toList());
 		    List<GroupsRelationView> relationViews = beanSearcher.searchAll(GroupsRelationView.class, MapUtils.builder()