update tax zoneCode config url

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

 package com.tax.token.model;
 package com.tax.token.model;
 
 
+import com.yxcheng.token.utils.StringUtil;
 import lombok.Getter;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.Setter;
 
 
@@ -29,4 +30,20 @@ public class TkUser {
 
 
     private String jsonFlag;
     private String jsonFlag;
 
 
+    private String toServerNo;
+
+    public String getLastServerNo(String zoneCode) {
+        String serverNo = getServerNo();
+        if(StringUtil.isNotEmpty(getToServerNo())) {
+            String[] serverNoConfigArr = getToServerNo().split(";");
+            for(String serverNoConfig:serverNoConfigArr) {
+                if(serverNoConfig.contains(zoneCode)) {
+                    serverNo = serverNoConfig.split("=")[1];
+                    break;
+                }
+            }
+        }
+        return serverNo;
+    }
+
 }
 }
\ No newline at end of file

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

@@ -18,6 +18,7 @@
     <result column="function_no" jdbcType="VARCHAR" property="functionNo" />
     <result column="function_no" jdbcType="VARCHAR" property="functionNo" />
     <result column="zone_flag" jdbcType="VARCHAR" property="zoneFlag" />
     <result column="zone_flag" jdbcType="VARCHAR" property="zoneFlag" />
     <result column="json_flag" jdbcType="VARCHAR" property="jsonFlag" />
     <result column="json_flag" jdbcType="VARCHAR" property="jsonFlag" />
+    <result column="to_server_no" jdbcType="VARCHAR" property="toServerNo" />
   </resultMap>
   </resultMap>
   <sql id="Example_Where_Clause">
   <sql id="Example_Where_Clause">
     <!--
     <!--
@@ -93,7 +94,7 @@
       This element is automatically generated by MyBatis Generator, do not modify.
       This element is automatically generated by MyBatis Generator, do not modify.
       This element was generated on Fri Sep 18 14:23:47 CST 2020.
       This element was generated on Fri Sep 18 14:23:47 CST 2020.
     -->
     -->
-    id, user_name, server_no, force_get_token, is_syn, is_check_token, default_clean_type, show_flag, function_no, zone_flag, json_flag
+    id, user_name, server_no, force_get_token, is_syn, is_check_token, default_clean_type, show_flag, function_no, zone_flag, json_flag, to_server_no
   </sql>
   </sql>
   <select id="selectByExample" parameterType="com.tax.token.model.TkUserExample" resultMap="BaseResultMap">
   <select id="selectByExample" parameterType="com.tax.token.model.TkUserExample" resultMap="BaseResultMap">
     <!--
     <!--

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

@@ -247,7 +247,7 @@ public class TkTokenServiceImpl implements TkTokenService {
         TkToken tkToken = new TkToken();
         TkToken tkToken = new TkToken();
         tkToken.setZoneFlag(tkUser.getZoneFlag());
         tkToken.setZoneFlag(tkUser.getZoneFlag());
         tkToken.setTaxno(taxno);
         tkToken.setTaxno(taxno);
-        tkToken.setServerNo(tkUser.getServerNo());
+        tkToken.setServerNo(tkUser.getLastServerNo(zoneCode));
         tkToken.setReqDate(DateUtils.getDate());
         tkToken.setReqDate(DateUtils.getDate());
         tkToken.setZoneCode(zoneCode);
         tkToken.setZoneCode(zoneCode);
         tkToken.setUserCode(userCode);
         tkToken.setUserCode(userCode);
@@ -301,6 +301,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                     json.put("session", tkToken.getSecretMd5());
                     json.put("session", tkToken.getSecretMd5());
                     json.put("requestId", tkToken.getRequestId());
                     json.put("requestId", tkToken.getRequestId());
                     json.put("authCode", tkToken.getAuthCode());
                     json.put("authCode", tkToken.getAuthCode());
+                    json.put("loginType", tkToken.getLoginType());
                     json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):""));
                     json.put("userGroupId", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?MD5Util.MD5Encode(tkToken.getTaxLoginName()):""));
                     json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():""));
                     json.put("userGroupName", (StringUtil.isNotEmpty(tkToken.getTaxLoginName())?tkToken.getTaxLoginName():""));
                     if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
                     if(null!=tkUser.getShowFlag() && tkUser.getShowFlag().equals("1")) {
@@ -705,7 +706,7 @@ public class TkTokenServiceImpl implements TkTokenService {
                 entity.setTaxno(tkToken.getTaxno());
                 entity.setTaxno(tkToken.getTaxno());
                 entity.setZoneCode(tkToken.getZoneCode());
                 entity.setZoneCode(tkToken.getZoneCode());
                 entity.setUserCode(userCode);
                 entity.setUserCode(userCode);
-                entity.setServerNo(tkUser.getServerNo());
+                entity.setServerNo(tkUser.getLastServerNo(tkToken.getZoneCode()));
                 entity.setReqDate(curDate);
                 entity.setReqDate(curDate);
                 entity.setCreateDate(curDate);
                 entity.setCreateDate(curDate);
                 entity.setUpdateDate(curDate);
                 entity.setUpdateDate(curDate);