diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index f467a2cb..ea7eb2ef 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -3,8 +3,8 @@ spring: import: # - classpath:nacos.yml # - classpath:sdk.yml - - classpath:nacos-prod.yml - - classpath:sdk-prod.yml -# - classpath:nacos-prod2.yml -# - classpath:sdk-prod2.yml +# - classpath:nacos-prod.yml +# - classpath:sdk-prod.yml + - classpath:nacos-prod2.yml + - classpath:sdk-prod2.yml - classpath:swagger.yml diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java index 6500dd23..d5274dcf 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserImportExe.java @@ -415,7 +415,10 @@ public class UserImportExe { user.setPostId(postId); user.setCorpinfoId(corpinfoId); user.setName(importEntity.getName()); - + user.setUserIdCard(encodeBase64IdCard(importEntity.getUserIdCard())); + user.setPersonnelType(importEntity.getPersonnelType()); + user.setPersonnelTypeName(importEntity.getPersonnelTypeName()); + user.resetPassword(corpInfoDO.getType()); userGateway.add(user); String corpName = null; if(corpInfoDO != null && !ObjectUtils.isEmpty(corpInfoDO.getCorpName())){ @@ -431,5 +434,15 @@ public class UserImportExe { allUsers.add(userDO); userDOTempList.add(userDO); } + private static String encodeBase64IdCard(String userIdCard) { + if (StringUtils.isEmpty(userIdCard)) { + return null; + } + try { + return Base64.getEncoder().encodeToString(userIdCard.trim().getBytes("UTF-8")); + } catch (Exception ex) { + return userIdCard.trim(); + } + } }