20191129 web登录返回未加密doctor

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

@@ -60,11 +60,17 @@ public class LoginController extends AccountBaseController {
     public PicaResponse<LoginResult> loginByPassword(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
         request.setProductType(super.getProductType());
-        request.setSourceType(super.getSourceType());
+        Integer sourceType = super.getSourceType();
+        request.setSourceType(sourceType);
         request.setLoginIp(super.getIpAddr());
         AccountUtils.checkMobilePhone(request.getMobile());
         AccountUtils.checkPassword(request.getPassword());
         LoginResult login = loginService.login(request);
+        if (sourceType == 3) {
+            login.setDoctorId("");
+        } else {
+            login.setUserId(null);
+        }
         return PicaResponse.toResponse(login);
     }
 
@@ -79,11 +85,17 @@ public class LoginController extends AccountBaseController {
     @PostMapping(value = "/login-register")
     public PicaResponse<LoginResult> loginAndRegister(@RequestBody EncryptEntity entity) throws Exception {
         BaseRequest request = CryptoUtil.decrypt(entity, BaseRequest.class);
-        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_LOGIN.getCode() + "",request.getAuthCode());
+        accountUtils.checkMobilePhoneAndAuthCode(request.getMobile(), AccountTypeEnum.SYSCODE_TYPE_LOGIN.getCode() + "", request.getAuthCode());
         request.setProductType(super.getProductType());
-        request.setSourceType(super.getSourceType());
+        Integer sourceType = super.getSourceType();
+        request.setSourceType(sourceType);
         request.setLoginIp(super.getIpAddr());
-        LoginResult login =loginService.loginAndRegister(request);
+        LoginResult login = loginService.loginAndRegister(request);
+        if (sourceType == 3) {
+            login.setDoctorId("");
+        } else {
+            login.setUserId(null);
+        }
         return PicaResponse.toResponse(login);
     }
 

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

@@ -54,9 +54,13 @@ public class RegisterController extends AccountBaseController {
         LoginResult result = null;
         request.setFlag(AccountTypeEnum.SYSCODE_TYPE_REGISTER.getCode());
         request.setProductType(super.getProductType());
-        request.setSourceType(super.getSourceType());
+        Integer sourceType = super.getSourceType();
+        request.setSourceType(sourceType);
         request.setLoginIp(super.getIpAddr());
         result = registerService.register(request);
+        if (sourceType==3){
+            result.setDoctorId("");
+        }
         return PicaResponse.toResponse(result);
     }
 

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

@@ -124,6 +124,7 @@ public class LoginServiceImpl implements LoginService {
                 result.setToken(newToken);
                 result.setUserId(userId.longValue());
                 result.setMobile(mobile);
+                result.setDoctorId(AESUtil.encryptV0(userId+""));
                 if (productType == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
                     result.setEntireFlag(doctorInfo.getEntireFlag());
                 }
@@ -173,6 +174,7 @@ public class LoginServiceImpl implements LoginService {
         result.setToken(newToken);
         result.setUserId(userId);
         result.setMobile(baseRequest.getMobile());
+        result.setDoctorId(AESUtil.encryptV0(userId+""));
         //是否完善过个人信息（云鹊医app才需要）
         if (baseRequest.getProductType() == AccountTypeEnum.PRODUCT_TYPE_DOCTOR.getCode()) {
             Doctor doctorEntity = doctorInfoMapper.selectByPrimaryKey(userId.intValue());
@@ -215,6 +217,7 @@ public class LoginServiceImpl implements LoginService {
             result.setToken(newToken);
             result.setUserId(userId);
             result.setBindFlag(AccountTypeEnum.BIND_STATUS_SUCCESS.getCode()+"");
+            result.setDoctorId(AESUtil.encryptV0(userId+""));
             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

@@ -149,6 +149,7 @@ public class RegisterServiceImpl implements RegisterService {
                     result.setToken(newToken);
                     result.setUserId(userId);
                     result.setEntireFlag(1);
+                    result.setDoctorId(AESUtil.encryptV0(userId+""));
                     result.setMobile(mobile);
                   /*  ByteArrayOutputStream bos = new ByteArrayOutputStream();
                     DataOutputStream dos = new DataOutputStream(bos);