confilct

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

@@ -5,13 +5,9 @@ import com.pica.cloud.account.account.server.entity.AesBean.AesAuthCodeReq;
 import com.pica.cloud.account.account.server.entity.EncryptEntity;
 import com.pica.cloud.account.account.server.entity.LogLoginAes;
 import com.pica.cloud.account.account.server.entity.LoginResult;
+import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.req.OneClickLoginReq;
 import com.pica.cloud.account.account.server.service.LoginService;
-import com.alibaba.fastjson.JSONObject;
-import com.pica.cloud.account.account.server.entity.AesBean.AesAuthCodeReq;
-import com.pica.cloud.account.account.server.entity.EncryptEntity;
-import com.pica.cloud.account.account.server.entity.LogLoginAes;
-import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.LoginV1Service;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
@@ -39,16 +35,9 @@ public class LoginV1Controller extends AccountBaseController {
     @Autowired
     private LoginService loginService;
 
-
     @ApiOperation(value = "app端手机号码一键登录 v1")
     @PostMapping("one-click")
     public PicaResponse<LoginResult> oneClickLogin(@RequestBody AesAuthCodeReq aesReq) throws Exception {
-    private LoginV1Service loginV1Service;
-
-    @ApiOperation(value = "统一校验(传空则不会校验)")
-    @PostMapping("/unifiedVerification")
-    public PicaResponse unifiedVerification(@RequestBody AesAuthCodeReq req) throws Exception {
-
         //added by joy begin
         EncryptEntity entity = new EncryptEntity();
         if(StringUtils.isEmpty(aesReq.getKey()) && StringUtils.isEmpty(aesReq.getContent())){
@@ -81,6 +70,10 @@ public class LoginV1Controller extends AccountBaseController {
         LoginResult oneClickLoginResultVo = loginV1Service.oneClickLogin(req);
         return PicaResponse.toResponse(oneClickLoginResultVo);
     }
+
+    @ApiOperation(value = "统一校验(传空则不会校验)")
+    @PostMapping("/unifiedVerification")
+    public PicaResponse unifiedVerification(@RequestBody AesAuthCodeReq req) throws Exception {
         EncryptEntity entity = new EncryptEntity();
         entity.setKey(req.getKey());
         entity.setContent(req.getContent());

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

@@ -4,7 +4,9 @@ package com.pica.cloud.account.account.server.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.pica.cloud.account.account.server.entity.*;
+import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
 import com.pica.cloud.account.account.server.enums.AccountTypeEnum;
+import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
 import com.pica.cloud.account.account.server.log.AccountLogEntityUtils;
 import com.pica.cloud.account.account.server.log.AccountLogUtils;
 import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
@@ -12,11 +14,6 @@ import com.pica.cloud.account.account.server.mapper.DoctorMapper;
 import com.pica.cloud.account.account.server.model.OneClickProcessor;
 import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.req.OneClickLoginReq;
-import com.pica.cloud.account.account.server.entity.AccountInfoEntity;
-import com.pica.cloud.account.account.server.enums.AccountExceptionEnum;
-import com.pica.cloud.account.account.server.enums.SourceTypeEnum;
-import com.pica.cloud.account.account.server.mapper.AccountInfoDetailMapper;
-import com.pica.cloud.account.account.server.req.BaseRequest;
 import com.pica.cloud.account.account.server.service.LoginV1Service;
 import com.pica.cloud.account.account.server.service.RegisterService;
 import com.pica.cloud.account.account.server.util.AESUtil;
@@ -28,10 +25,6 @@ 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.entity.PicaResultCode;
-import com.pica.cloud.foundation.utils.utils.ValidateUtils;
-import org.apache.commons.lang3.StringUtils;
-import com.pica.cloud.account.account.server.util.AESUtil;
-import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.utils.utils.ValidateUtils;
 import org.apache.commons.lang3.StringUtils;