1

src/main/java/com/fdkankan/manage/config/ManageConfig.java

@@ -18,6 +18,8 @@ public class ManageConfig {
     @Value("${manage.share.scene:xx}")
     private String shareScenes;
 
+    @Value("${manage.default.password:afdd0b4ad2ec172c586e2150770fbf9e}")
+    private String defaultPassword;
     public List<String> getNumList(){
         if(StringUtils.isNotBlank(this.shareScenes)){
             String[] split = shareScenes.split(",");

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.util.Base64Converter;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.*;
+import com.fdkankan.manage.config.ManageConfig;
 import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.httpClient.service.LaserService;
@@ -71,6 +72,8 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     IJyPlatformService jyPlatformService;
     @Autowired
     IJyUserPlatformService jyUserPlatformService;
+    @Autowired
+    ManageConfig manageConfig;
 
     @Override
     public PageInfo pageList(UserParam param) {
@@ -172,20 +175,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
 
     @Autowired
     IJyPlatformUserWaitService platformUserWaitService;
+    @Autowired
+    ManageConfig manageConfig;
     @Override
     @Transactional(rollbackFor = Exception.class)
     public synchronized void addUcenterUser(UserParam param) {
-        if(  StringUtils.isBlank(param.getPassword())
-            || StringUtils.isBlank(param.getRyId()) || StringUtils.isBlank(param.getRyNo())){
+        if (StringUtils.isBlank(param.getRyId()) || StringUtils.isBlank(param.getRyNo())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        String  password = AesUtil.desEncrypt(param.getPassword());
-        if(StringUtils.isBlank(password)){
-            throw new BusinessException(ResultCode.PASSWORD_ERROR_G);
-        }
-
-        String passwordMd5 = SecurityUtil.MD5(password);
-        String passwordMd52 = SecurityUtil.MD52(password);
 
         JyUser jyUser = jyUserService.getByRyId(param.getRyId());
 
@@ -209,12 +206,13 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         if(jyUser == null){
             jyUser = new JyUser();
             param.setIsJm(param.getIsJm() ==null?1:param.getIsJm());
+            param.setPassword(StringUtils.isBlank(param.getPassword()) ? manageConfig.getDefaultPassword() :param.getPassword());
         }
 
-        User user = this.addUser(jyUser.getUserId(),passwordMd5, param.getRyNo(), param.getNickName());
-        SysUser sysUser = this.addSysUser(jyUser.getSysUserId(),passwordMd52, param.getRyNo(), param.getNickName());
+        User user = this.addUser(jyUser.getUserId(),param.getPassword(), param.getRyNo(), param.getNickName());
+        SysUser sysUser = this.addSysUser(jyUser.getSysUserId(),param.getPassword(), param.getRyNo(), param.getNickName());
         jyUser.setRyId(param.getRyId());
-        jyUser.setRyPassword(passwordMd52);
+        jyUser.setRyPassword(param.getPassword());
         jyUser.setRyNo(param.getRyNo());
         jyUser.setRyNickName(param.getNickName());
         jyUser.setUserId(user.getId());
@@ -267,7 +265,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         User user = new User();
         user.setId(userId);
         user.setHead(host + OssPath.default_head);
-        user.setPassword(passwordMd5);
+        user.setPassword(userId == null && StringUtils.isBlank(passwordMd5) ? manageConfig.getDefaultPassword() : passwordMd5);
         user.setStatus(1);
         user.setIsNotice(1);
         user.setUserName(userName);
@@ -287,7 +285,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         SysUser sysUser = new SysUser();
         sysUser.setId(sysUserId);
         sysUser.setUserName(ryNo);
-        sysUser.setPassword(passwordMd5);
+        sysUser.setPassword(sysUserId == null && StringUtils.isBlank(passwordMd5) ? manageConfig.getDefaultPassword() : passwordMd5);
         sysUser.setNickName(nickName);
         if(sysUserId == null){
             sysUser.setRoleId(47L);