20191105 修改doctorId加密策略

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

@@ -15,6 +15,8 @@ import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.TokenUtils;
 import com.pica.cloud.account.account.server.util.WeChatUtils;
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import org.apache.commons.lang3.StringUtils;
@@ -124,7 +126,7 @@ public class LoginServiceImpl implements LoginService {
                 result.setToken(newToken);
                 result.setUserId(userId.longValue());
                 result.setMobile(mobile);
-                result.setDoctorId(AESUtil.encryptV0(userId+""));
+                result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     result.setEntireFlag(doctorInfo.getEntireFlag());
                 }
@@ -174,7 +176,7 @@ public class LoginServiceImpl implements LoginService {
         result.setToken(newToken);
         result.setUserId(userId);
         result.setMobile(baseRequest.getMobile());
-        result.setDoctorId(AESUtil.encryptV0(userId+""));
+        result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
         //是否完善过个人信息（云鹊医app才需要）
         if (baseRequest.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
             Doctor doctorEntity = doctorInfoMapper.selectByPrimaryKey(userId.intValue());
@@ -217,7 +219,7 @@ public class LoginServiceImpl implements LoginService {
             result.setToken(newToken);
             result.setUserId(userId);
             result.setBindFlag(AccountTypeEnum.BIND_STATUS_SUCCESS.getCode()+"");
-            result.setDoctorId(AESUtil.encryptV0(userId+""));
+            result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
             if (request.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                 PICAPDoctor doctor = doctorInfoMapper.queryDoctor(userId);
                 result.setEntireFlag(doctor.getEntire_flag());

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

@@ -15,6 +15,8 @@ import com.pica.cloud.account.account.server.util.AESUtil;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.ExecutorServiceUtils;
 import com.pica.cloud.account.account.server.util.TokenUtils;
+import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
+import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -149,7 +151,7 @@ public class RegisterServiceImpl implements RegisterService {
                     result.setToken(newToken);
                     result.setUserId(userId);
                     result.setEntireFlag(1);
-                    result.setDoctorId(AESUtil.encryptV0(userId+""));
+                    result.setDoctorId(EncryptUtils.encryptContent(userId+"", EncryptConstants.ENCRYPT_TYPE_ID));
                     result.setMobile(mobile);
                   /*  ByteArrayOutputStream bos = new ByteArrayOutputStream();
                     DataOutputStream dos = new DataOutputStream(bos);