20191025 完善修改密码接口

server/src/main/java/com/pica/cloud/account/account/server/controller/PasswordController.java

@@ -44,15 +44,15 @@ public class PasswordController extends AccountBaseController {
     @PostMapping(value = "/modify")
     public PicaResponse modifyPassword(@RequestBody EncryptEntity entity) throws Exception {
         PicaUser picaUser = super.getPicaUser();
-        String mobile = picaUser.getMobile();
-        AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(AESUtil.encryptV0(mobile));
+        String mobile = AESUtil.encryptV0(picaUser.getMobile());
+        AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(mobile);
         if (accountInfoEntity != null) {
             BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
             String oldPwd = request.getOldPwd();
             String password = request.getPassword();
             if (!StringUtils.isEmpty(password) && !StringUtils.isEmpty(oldPwd)) {
                 if (!password.equals(oldPwd)) {
-                    passwordService.modifyPassword(accountInfoEntity.getId(), oldPwd, password);
+                    passwordService.modifyPassword(mobile, oldPwd, password);
                     return PicaResponse.toResponse();
                 } else {
                     throw new AccountException(AccountExceptionEnum.PICA_PASSWORD_EQUAL);

server/src/main/java/com/pica/cloud/account/account/server/mapper/DoctorMapper.java

@@ -48,6 +48,8 @@ public interface DoctorMapper {
      */
     void updateByAcctId(Doctor doctor);
 
+    void updateByMobile(Doctor doctor);
+
     int deleteByPrimaryKey(Integer id);
 
     int insert(Doctor record);
@@ -75,6 +77,8 @@ public interface DoctorMapper {
 
     void updateDeleteByPrimaryKey(Integer id);
 
+
+
     /**
      * 通过手机号获取用户id
      * @param mobile

server/src/main/java/com/pica/cloud/account/account/server/service/PasswordService.java

@@ -7,11 +7,11 @@ public interface PasswordService {
     /**
      * 修改密码
      *
-     * @param acctId 账户id
+     * @param mobile 账户id
      * @param oldPwd 旧密码
      * @param pwd    新密码
      */
-    void modifyPassword(Integer acctId, String oldPwd, String pwd);
+    void modifyPassword(String mobile, String oldPwd, String pwd);
 
     /**
      * 忘记密码

server/src/main/java/com/pica/cloud/account/account/server/service/impl/PasswordServiceImpl.java

@@ -37,19 +37,19 @@ public class PasswordServiceImpl implements PasswordService {
 
     @Override
     @Transactional
-    public void modifyPassword(Integer acctId, String oldPwd, String pwd) {
-        AccountInfoEntity entity = accountInfoDetailMapper.selectByPrimaryKey(acctId);
+    public void modifyPassword(String mobile, String oldPwd, String pwd) {
+        AccountInfoEntity entity = accountInfoDetailMapper.selectByMobile(mobile);
         if (entity != null) {
             if (entity.getPassword().equals(oldPwd)) {
                 Date currentTime = new Date();
                 AccountInfoEntity accountInfoEntity = new AccountInfoEntity();
-                accountInfoEntity.setId(acctId);
-                accountInfoEntity.setModifiedId(acctId);
+                accountInfoEntity.setId(entity.getId());
+                accountInfoEntity.setModifiedId(entity.getId());
                 accountInfoEntity.setModifiedTime(currentTime);
                 accountInfoEntity.setPassword(pwd);
                 accountInfoDetailMapper.updatePasswordByPrimaryKey(accountInfoEntity);
                 if (doubleWritingMode) {
-                    processDoubleWrite(acctId, pwd);
+                    processDoubleWrite(mobile, pwd);
                 }
                 //密码修改日志
                 LogPWDModifyEntity logPWDModifyEntity = AccountLogEntityUtils.getLogPWDModifyEntity(acctId, entity.getMobilePhone(),
@@ -78,7 +78,7 @@ public class PasswordServiceImpl implements PasswordService {
             accountInfoEntity.setPassword(password);
             accountInfoDetailMapper.updatePasswordByPrimaryKey(accountInfoEntity);
             if (doubleWritingMode) {
-                processDoubleWrite(accId, password);
+                processDoubleWrite(AESUtil.encryptV0(request.getMobile()), password);
             }
             //密码修改日志
             LogPWDModifyEntity logPWDModifyEntity = AccountLogEntityUtils.getLogPWDModifyEntity(accId, entity.getMobilePhone(),
@@ -93,16 +93,16 @@ public class PasswordServiceImpl implements PasswordService {
     /**
      * 双写模式，把密码存储到p_doctor表
      *
-     * @param accId
+     * @param mobile
      * @param password
      */
-    private void processDoubleWrite(Integer accId, String password) {
+    private void processDoubleWrite(String mobile, String password) {
         Date currentTime = new Date();
         Doctor doctor = new Doctor();
         doctor.setPassword(password);
-        doctor.setAcctId(accId);
+        doctor.setMobilePhone(mobile);
         doctor.setModifyTime(currentTime);
-        doctor.setModifyId(accId);
-        doctorMapper.updateByAcctId(doctor);
+        doctor.setModifyId(0);
+        doctorMapper.updateByMobile(doctor);
     }
 }

server/src/main/java/com/pica/cloud/account/account/server/util/AESUtil.java

@@ -157,7 +157,7 @@ public class AESUtil {
      */
     public static void main(String[] args) throws Exception {
         String KEY="zJJ$c5md3$yuuhWW";
-        String content = "12322222222";
+        String content = "15607241351";
         System.out.println("加密前：" + content);
         System.out.println("加密密钥和解密密钥：" + KEY);
         String encrypt = aesEncrypt(content, KEY);

server/src/main/resources/mybatis/DoctorMapper.xml

@@ -143,6 +143,12 @@
     <!--limit 0,1-->
     <!--</select>-->
 
+
+    <update id="updateByMobile" parameterType="com.pica.cloud.account.account.server.entity.Doctor">
+      update p_doctor set password=#{password},modify_time=now(), modify_id=#{id} where mobile_phone=#{mobilePhone} and delete_flag=1 limit 1
+    </update>
+
+
     <!--通过账户id更新用户信息-->
     <update id="updateByAcctId" parameterType="com.pica.cloud.account.account.server.entity.Doctor">
         update p_doctor