Merge branch 'zx_saas_0810' of http://git.dayaedu.com/yonge/mec into master_saas

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -119,8 +119,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
         if (StringUtils.equalsIgnoreCase(clientId, "TEACHER")) {
             SysUser sysUser = new SysUser();
             sysUser.setPhone(phone);
-            int phoneStrLen = phone.length();
-            sysUser.setPassword(new BCryptPasswordEncoder().encode("gym" + phone.substring(phoneStrLen - 4, phoneStrLen)));
             sysUser.setUserType("TEACHER");
             sysUser.setTenantId(tenantId);
             sysUserDao.insert(sysUser);
@@ -135,8 +133,6 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
         } else if (StringUtils.equalsIgnoreCase(clientId, "STUDENT")) {
             SysUser sysUser = new SysUser();
             sysUser.setPhone(phone);
-            int phoneStrLen = phone.length();
-            sysUser.setPassword(new BCryptPasswordEncoder().encode("gym" + phone.substring(phoneStrLen - 4, phoneStrLen)));
             sysUser.setUserType("STUDENT");
             if (StringUtils.isBlank(organId)) {
                 sysUser.setOrganId(lesseeOrganId);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServiceImpl.java

@@ -145,8 +145,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             user.setOrganId(studentPreRegistration.getOrganId());
             user.setRealName(studentPreRegistration.getParentName());
             user.setUsername(studentPreRegistration.getUserName());
-            int phoneStrLen = user.getPhone().length();
-            user.setPassword(new BCryptPasswordEncoder().encode("gym" + user.getPhone().substring(phoneStrLen - 4, phoneStrLen)));
             user.setUserType("STUDENT");
             user.setCreateTime(date);
             user.setUpdateTime(date);
@@ -1296,8 +1294,6 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         if (user == null || user.getId() == null) {
             user = new SysUser();
             BeanUtils.copyProperties(baseStudent,user);
-            int phoneStrLen = user.getPhone().length();
-            user.setPassword(new BCryptPasswordEncoder().encode("gym" + user.getPhone().substring(phoneStrLen - 4, phoneStrLen)));
             user.setUsername(baseStudent.getUserName());
             user.setUserType("STUDENT");
             // 注册账户信息