增加cookie返回参数

tax-token/token-common/src/main/java/com/tax/token/thirdService/TokenThirdServiceFactory.java

@@ -123,6 +123,15 @@ public  class TokenThirdServiceFactory{
         }
     }
 
+    public static String getLoginType(Map<String, Object> result){
+        if(result!=null && null!=result.get("loginType")){
+            String loginType = String.valueOf(result.get("loginType"));
+            return loginType;
+        }else {
+            return null;
+        }
+    }
+
     public static String getAuthCode(Map<String, Object> result){
         if(result!=null && null!=result.get("authCode")){
             String authCode = String.valueOf(result.get("authCode"));

tax-token/token-common/src/main/java/com/tax/token/thirdService/impl/GetTokenFromEleJsonTax.java

@@ -61,6 +61,8 @@ public class GetTokenFromEleJsonTax implements TokenThirdServiceI {
             resultMap.put("userName", ObjectUtil.fixNull(resultStrMap.get("userName")));
             resultMap.put("session", ObjectUtil.fixNull(resultStrMap.get("session")));
             resultMap.put("authCode", ObjectUtil.fixNull(resultStrMap.get("authCode")));
+            resultMap.put("loginType", ObjectUtil.fixNull(resultStrMap.get("loginType")));
+            resultMap.put("site", ObjectUtil.fixNull(resultStrMap.get("site")));
             if("0".equals(resultStrMap.get("code"))){
                 resultMap.put("token",resultStrMap.get("token"));
             }

tax-token/token-dao/src/main/java/com/tax/token/mapper/TkTokenMapper.xml

@@ -467,6 +467,9 @@
       <if test="secretMd5 != null">
           secret_md5 = #{secretMd5,jdbcType=VARCHAR},
       </if>
+      <if test="loginType != null">
+          login_type = #{loginType,jdbcType=VARCHAR},
+      </if>
       <if test="updateErrorFlag != null and updateErrorFlag !='' and updateErrorFlag =='1'.toString()">
           error_code = #{errorCode,jdbcType=VARCHAR},
           error_message = #{errorMessage,jdbcType=VARCHAR},

tax-token/token-service/src/main/java/com/tax/token/service/impl/TkTokenServiceImpl.java

@@ -191,6 +191,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                             json.put("session", tkToken.getSecretMd5());
                             json.put("requestId", tkToken.getRequestId());
                             json.put("authCode", tkToken.getAuthCode());
+                            json.put("loginType", tkToken.getLoginType());
                             json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):""));
                             json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():""));
                             if(isEncrypt && (null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1"))) {
@@ -453,6 +454,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                     tkToken.setProxyIp(TokenThirdServiceFactory.getProxyIp(data));
                     tkToken.setSecretMd5(TokenThirdServiceFactory.getSession(data));
                     tkToken.setAuthCode(TokenThirdServiceFactory.getAuthCode(data));
+                    tkToken.setLoginType(TokenThirdServiceFactory.getLoginType(data));
 
                     taxLoginName = TokenThirdServiceFactory.getUserName(data);
                     tkToken.setTaxLoginName(taxLoginName);
@@ -789,6 +791,7 @@ public class TkTokenServiceImpl implements TkTokenService {
         updateToken.setProxyIp(tkToken.getProxyIp());
         updateToken.setTaxLoginName(tkToken.getTaxLoginName());
         updateToken.setSecretMd5(tkToken.getSecretMd5());
+        updateToken.setLoginType(tkToken.getLoginType());
 
         if(tkToken.getTokenStatus().equals(TokenConstants.TOKEN_VALID)) {
             updateToken.setIsValid("1");