Merge remote-tracking branch 'origin/dev-login0218' into dev-login0218

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

@@ -10,7 +10,6 @@ import com.pica.cloud.account.account.server.util.HttpUtil;
 import com.pica.cloud.account.account.server.util.MD5;
 import com.pica.cloud.account.account.server.util.RSAUtil;
 import com.pica.cloud.account.account.server.util.SignUtils;
-import com.pica.cloud.foundation.entity.PicaException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,8 +36,11 @@ public class OneClickProcessor {
     private String aesEncryptType = DEFAULT_ENCRYPT_TYPE;
     private String rsaEncryptType = "1";
     private String encryptType = DEFAULT_ENCRYPT_TYPE;
+    private static final String SHANYAN_SUCCESS_CODE = "200000";
     //创建应用时填入的rsa公钥对应的私钥字符串
     public static final String privateKey = "";
+    public static final Integer TYPE_IOS = 2;
+    public static final Integer TYPE_ANDROID = 1;
     @Value("${shanyan.url.mobilequery}")
     private String mobileQueryUrl;
     @Value("${shanyan.android.appId}")
@@ -59,10 +61,10 @@ public class OneClickProcessor {
         }
         String appId;
         String appKey;
-        if (type.equals(1)) {
+        if (type.equals(TYPE_ANDROID)) {
             appId = androidAppId;
             appKey = androidAppKey;
-        } else if (type.equals(2)) {
+        } else if (type.equals(TYPE_IOS)) {
             appId = iosAppId;
             appKey = iosAppKey;
         } else {
@@ -80,7 +82,7 @@ public class OneClickProcessor {
             if (null != queryMobileEntity) {
                 logger.info("一键登录token换取手机号结果：{}", queryMobileEntity);
                 String code = queryMobileEntity.getCode();     //返回码 200000为成功
-                if ("200000".equals(code)) {
+                if (SHANYAN_SUCCESS_CODE.equals(code)) {
                     MobileDataEntity mobileDataEntity = queryMobileEntity.getData();
                     String mobile = mobileDataEntity.getMobileName();
                     if (aesEncryptType.equals(encryptType)) {