Merge branch 'dev-1110' into release

# Conflicts:
#	client/pom.xml
#	server/src/main/java/com/pica/cloud/account/account/server/controller/LoginController.java

client/pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.pica.cloud.account</groupId>
     <artifactId>pica-cloud-account-client</artifactId>
-    <version>1.0.4.1</version>
+    <version>1.0.4.3</version>
     <name>pica-cloud-account-client</name>
     <packaging>jar</packaging>
 

client/src/main/java/com/pica/cloud/account/account/client/LoginClient.java

+package com.pica.cloud.account.account.client;
+
+import com.pica.cloud.foundation.entity.PicaResponse;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author andong
+ * @create 2019/7/19
+ */
+@FeignClient(name = "13201-pica-cloud-account")
+public interface LoginClient {
+
+    @PostMapping("/account/login/QRCode")
+    PicaResponse<String> loginQRCode(@RequestHeader(value = "token") String token,@RequestHeader(value = "user_token_tourist") String user_token_tourist);
+
+}

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

 package com.pica.cloud.account.account.server.controller;
 
+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.entity.AesBean.AesAuthCodeReq;
@@ -18,12 +19,17 @@ import com.pica.cloud.account.account.server.service.TokenService;
 import com.pica.cloud.account.account.server.util.AccountUtils;
 import com.pica.cloud.account.account.server.util.CryptoUtil;
 import com.pica.cloud.account.account.server.util.RSAUtil;
+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.PicaResponse;
 import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.entity.PicaWarnException;
 import com.pica.cloud.foundation.redis.CacheClient;
 import com.pica.cloud.foundation.redis.ICacheClient;
+import com.pica.cloud.foundation.utils.annotation.LoginPermission;
+import com.pica.cloud.foundation.utils.entity.PicaUser;
+import com.pica.cloud.foundation.utils.utils.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.catalina.servlet4preview.http.HttpServletRequest;
@@ -418,4 +424,19 @@ public class LoginController extends AccountBaseController {
         return PicaResponse.toResponse(login);
     }
 
+    @ApiOperation(value = "二维码扫码登录")
+    @PostMapping("/login/QRCode")
+    @LoginPermission
+    public PicaResponse<String> loginQRCode() {
+        BaseRequest request = new BaseRequest();
+        request.setProductType(1);
+        request.setSourceType(6);
+        request.setLoginIp(super.getIpAddr());
+        request.setUserTokenTourist(super.getUserTokenTourist());
+        request.setMobile(this.fetchPicaUser().getMobile());
+        LoginResult login = loginService.loginQRCode(request);
+
+        return PicaResponse.toResponse(login.getToken());
+    }
+
 }

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

@@ -98,4 +98,6 @@ public interface LoginService {
     LoginResult appleSkipRegister(BaseRequest request);
 
     int insertLoginAesLog(LogLoginAes aes);
+
+    LoginResult loginQRCode(BaseRequest request);
 }

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

@@ -337,6 +337,13 @@ public class LoginServiceImpl implements LoginService {
         return processLogin(baseRequest, acctId, loginType, null);
     }
 
+    @Override
+    public LoginResult loginQRCode(BaseRequest request){
+        AccountInfoEntity accountInfoEntity = accountInfoDetailMapper.selectByMobile(request.getMobile());
+        request.setMobile(EncryptUtils.decryptContent(request.getMobile(), EncryptConstants.ENCRYPT_TYPE_MOBILE, EncryptConstants.ENCRYPT_DECRYPT_KEY));
+        return processLogin(request, accountInfoEntity.getId(), 8);
+    }
+
     private LoginResult processLogin(BaseRequest baseRequest, Integer acctId, Integer loginType, QueryMobileEntity queryMobileEntity) {
         //接入新旭事务一致性
         String batchNo = IntactUtils.getUUID();

server/src/main/java/com/pica/cloud/account/account/server/util/AccountUtils.java

@@ -112,6 +112,9 @@ public class AccountUtils {
             case 5:
                 sourceType = "admin";
                 break;
+            case 6:
+                sourceType = "pcc";
+                break;
             default:
                 sourceType = "app";
         }