Merge branch 'dev-login0218' of...

Merge branch 'dev-login0218' of 192.168.110.53:com.pica.cloud.account/pica-cloud-account into dev-login0218

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

server/src/main/java/com/pica/cloud/account/account/server/model/OneClickProcessor.java

@@ -45,7 +45,6 @@ public class OneClickProcessor {
     @Value("${shanyan.ios.appKey}")
     private String iosAppKey;
 
-    @Autowired
 
 
     public String tokenExchangeMobile(String token, Integer type) {

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

@@ -495,11 +495,9 @@ public class LoginServiceImpl implements LoginService {
         BaseRequest baseRequest = new BaseRequest();
         if (accountInfoEntity == null) {
             //说明是注册功能
-            accountUtils.checkRegisterMobilePhoneAndAuthCode(mobile, 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());
         }
     }