Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/RSAUtils.java

@@ -261,7 +261,7 @@ public class RSAUtils {
		try {
			byte[] en_data = Hex.decodeHex(encrypttext.toCharArray());
			byte[] data = decrypt((RSAPrivateKey) getKeyPair().getPrivate(), en_data);
			return new StringBuffer(new String(data)).reverse().toString() ;
			return new String(data) ;
		} catch (NullPointerException ex) {
			LOGGER.error("keyPair cannot be null.");
		} catch (Exception ex) {

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -158,6 +158,7 @@ public class LoginController extends BaseController {
            //身份证登录
            if(StringUtils.isNoneEmpty(mobile)&&StringUtils.isNoneEmpty(password)){
                password = RSAUtils.getInstance(doctorService).decryptString(password);
                password=StringUtils.reverse(password);
                Doctor doctor=doctorService.findDoctorByMobile(mobile);
                loginLog.setUserCode(doctor.getCode());
                loginLog.setLoginType("2");
@@ -316,6 +317,7 @@ public class LoginController extends BaseController {
                    return error(-1, "操作失败：此用户未注册");
                } else {
                    String password = RSAUtils.getInstance(doctorService).decryptString(newpwd);
                    password=StringUtils.reverse(password);
                    password=MD5.GetMD5Code(password+doctor.getSalt());
                    doctor.setPassword(password);
                    doctorService.updateDoctorPwd(doctor);
@@ -328,6 +330,7 @@ public class LoginController extends BaseController {
                    return error(-1, "操作失败：此用户未注册");
                } else {
                    String password = RSAUtils.getInstance(doctorService).decryptString(newpwd);
                    password=StringUtils.reverse(password);
                    password=MD5.GetMD5Code(password+patient.getSalt());
                    patient.setPassword(password);
                    patientService.updatePatientPwd(patient);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -300,6 +300,7 @@ public class WechatController extends WeixinBaseController {
            String salt= UUID.randomUUID().toString().replace("-","");
            patient.setSalt(salt);
            password = RSAUtils.getInstance(patientService).decryptString(password);
            password=StringUtils.reverse(password);
            patient.setPassword(MD5.GetMD5Code(password+salt));
			patient.setSsc(ssc);
@@ -368,6 +369,7 @@ public class WechatController extends WeixinBaseController {
                }
                //解密
                password = RSAUtils.getInstance(patientService).decryptString(password);
                password=StringUtils.reverse(password);
                //生成MD5
                String loginPassword= MD5.GetMD5Code(password+patient.getSalt());
                //判断d登录密码是否正确

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/account/DoctorController.java

@@ -1516,6 +1516,10 @@ public class DoctorController extends BaseController {
            newPassword1=RSAUtils.getInstance(doctorInfoService).decryptString(newPassword1);
            newPassword2=RSAUtils.getInstance(doctorInfoService).decryptString(newPassword2);
            oldPassword=RSAUtils.getInstance(doctorInfoService).decryptString(oldPassword);
            newPassword1=StringUtils.reverse(newPassword1);
            newPassword2=StringUtils.reverse(newPassword2);
            oldPassword=StringUtils.reverse(oldPassword);
            doctorInfoService.updatePassword(newPassword1, newPassword2, oldPassword, doctorCode);
            return write(200, "更新成功");
        } catch (Exception e) {

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -697,6 +697,9 @@ public class PatientController extends WeixinBaseController {
            newPassword1= RSAUtils.getInstance(doctorService).decryptString(newPassword1);
            newPassword2=RSAUtils.getInstance(doctorService).decryptString(newPassword2);
            oldPassword=RSAUtils.getInstance(doctorService).decryptString(oldPassword);
            newPassword1=StringUtils.reverse(newPassword1);
            newPassword2=StringUtils.reverse(newPassword2);
            oldPassword=StringUtils.reverse(oldPassword);
            patientInfoService.updatePassword(newPassword1, newPassword2, oldPassword,patientCode);
            return write(200, "更新成功");
        } catch (Exception e) {