增加authcode节点

tax-token/token-common/src/main/java/com/tax/token/model/TkToken.java

@@ -91,6 +91,8 @@ public class TkToken {
 
     private String target;
 
+    private String authCode;
+
     @Override
     public String toString() {
         return "TkToken{" +

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

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

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

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

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

@@ -190,6 +190,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                             json.put("proxyIp", tkToken.getProxyIp());
                             json.put("session", tkToken.getSecretMd5());
                             json.put("requestId", tkToken.getRequestId());
+                            json.put("authCode", tkToken.getAuthCode());
                             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"))) {
@@ -296,6 +297,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                     json.put("proxyIp", tkToken.getProxyIp());
                     json.put("session", tkToken.getSecretMd5());
                     json.put("requestId", tkToken.getRequestId());
+                    json.put("authCode", tkToken.getAuthCode());
                     json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):""));
                     json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():""));
                     if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
@@ -304,10 +306,17 @@ public class TkTokenServiceImpl implements TkTokenService {
                         result.setData(json);
                     }
                 } else {
-                    if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
-                        result.setData(EncryptUtil.encryptAesCk(token));
+                    if(tkToken.getFunctionNo().equals("01")) {
+                        JSONObject json = new JSONObject();
+                        json.put("cookie", token);
+                        json.put("authCode", tkToken.getAuthCode());
+                        result.setData(json);
                     } else {
-                        result.setData(token);
+                        if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
+                            result.setData(EncryptUtil.encryptAesCk(token));
+                        } else {
+                            result.setData(token);
+                        }
                     }
                 }
             }
@@ -417,6 +426,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                     tkToken.setResContext(TokenThirdServiceFactory.getResContext(data));
                     tkToken.setProxyIp(TokenThirdServiceFactory.getProxyIp(data));
                     tkToken.setSecretMd5(TokenThirdServiceFactory.getSession(data));
+                    tkToken.setAuthCode(TokenThirdServiceFactory.getAuthCode(data));
 
                     taxLoginName = TokenThirdServiceFactory.getUserName(data);
                     tkToken.setTaxLoginName(taxLoginName);