[task-4070]信息科要求整改接口

ibps-oauth-root/modules/oauth-server2-default/src/main/java/com/lc/ibps/cloud/oauth/server/provider/RegisterProvider.java

@@ -2,6 +2,7 @@ package com.lc.ibps.cloud.oauth.server.provider;
 
 import java.util.concurrent.TimeUnit;
 
+import com.lc.ibps.cloud.util.AESUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -131,8 +132,11 @@ public class RegisterProvider extends BaseProvider implements IRegService {
 		try {
 			String[] userIds = changePasswdVo.getUserIds();
 			String primitivePassword = changePasswdVo.getPrimitivePassword();
-			String newPassword = changePasswdVo.getNewPassword();
-			String repeatPassword = changePasswdVo.getRepeatPassword();
+			String newPassword = AESUtil.decryptUser(changePasswdVo.getNewPassword());
+			String repeatPassword = AESUtil.decryptUser(changePasswdVo.getRepeatPassword());
+			if(BeanUtils.isNotEmpty(primitivePassword)){
+				primitivePassword = AESUtil.decryptUser(primitivePassword);
+			}
 			String enPassword = EncryptUtil.encryptSha256(primitivePassword);
 			
 			RegDataPo regPo = regDataRepository.get(userIds[0]);

ibps-provider-root/modules/provider-platform-default/src/main/java/com/lc/ibps/org/provider/PartyUserProvider.java

@@ -11,6 +11,7 @@ import java.util.Map.Entry;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 
+import com.lc.ibps.cloud.util.AESUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -711,8 +712,11 @@ public class PartyUserProvider extends GenericProvider implements IPartyUserServ
 		try {
 			String[] userIds = changePasswdVo.getUserIds();
 			String primitivePassword = changePasswdVo.getPrimitivePassword();
-			String newPassword = changePasswdVo.getNewPassword();
-			String repeatPassword = changePasswdVo.getRepeatPassword();
+			String newPassword = AESUtil.decryptUser(changePasswdVo.getNewPassword());
+			String repeatPassword = AESUtil.decryptUser(changePasswdVo.getRepeatPassword());
+			if(BeanUtils.isNotEmpty(primitivePassword)){
+				primitivePassword = AESUtil.decryptUser(primitivePassword);
+			}
 			String enPassword = EncryptUtil.encryptSha256(primitivePassword);
 
 			for (String userId : userIds) {