获取登录验证码

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

@@ -600,7 +600,7 @@ public class LoginController extends AccountBaseController {
         request.setSourceType(4);
         request.setLoginIp(super.getIpAddr());
         request.setUserTokenTourist(super.getUserTokenTourist());
-        LoginResult login = loginService.loginAndRegister(request);
+        LoginResult login = loginService.loginAndRegisterV2(request);
         if (StringUtil.isNotNull(login)) {
             int expiredSeconds = 24 * 60 * 60 * 30;
             cacheClient.set("token-doctor-unionid-"+appletModel.getUnionId(),login.getToken(),expiredSeconds);

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

@@ -27,6 +27,7 @@ public interface LoginService {
      * @return
      */
     LoginResult loginAndRegister(BaseRequest request);
+    LoginResult loginAndRegisterV2(BaseRequest request);
 
     /**
      * 微信登录

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

@@ -331,6 +331,22 @@ public class LoginServiceImpl implements LoginService {
         }
     }
 
+    @Override
+    public LoginResult loginAndRegisterV2(BaseRequest baseRequest) {
+        String mobile = baseRequest.getMobile();
+        AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(AESUtil.encryptV0(mobile));
+        logger.info("loginAndRegister-accountInfoEntity is null {}, clientIp:{}", (accountInfoEntity == null), baseRequest.getLoginIp());
+        if (accountInfoEntity == null) {
+            //说明是注册功能
+            accountUtils.checkMobilePhoneAndAuthCode(baseRequest.getMobile(), baseRequest.getFlag() + "", baseRequest.getAuthCode());
+            return registerService.register(baseRequest);
+        } else {
+            //登录功能
+            accountUtils.checkMobilePhoneAndAuthCode(baseRequest.getMobile(), AccountTypeEnum.SYSCODE_TYPE_LOGIN.getCode() + "", baseRequest.getAuthCode());
+            return processLogin(baseRequest, accountInfoEntity.getId(), AccountTypeEnum.LOGIN_CODE.getCode());
+        }
+    }
+
     /**
      * 登录逻辑处理
      * 登录逻辑处理