Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

portal-manager/src/main/java/com/mortals/xhx/module/user/service/impl/UserServiceImpl.java

@@ -445,6 +445,10 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
             throw new AppException("帐号错误！");
         }
         try {
+            if(StringUtils.isEmpty(sysUser.getSaltKey())) {
+                String saltKey = SecurityCode.getSecurityCode(6,SecurityCode.SecurityCodeLevel.Medium,false);
+                sysUser.setSaltKey(saltKey);
+            }
             sysUser.setLoginPwd(SecurityUtil.md5DoubleEncoding(newPwd + sysUser.getSaltKey()));
         } catch (Exception e) {
             throw new AppException("密码转换异常！", e);
@@ -522,4 +526,5 @@ public class UserServiceImpl extends AbstractCRUDServiceImpl<UserDao, UserEntity
         return successMsg.toString();
 
     }
+
 }
\ No newline at end of file