Java：MultiDataSource 调整代理相关的请求头，同步 APIAuto 代码

TommyLemon · TommyLemon · commit 6e9005625473 · 2021-10-12T02:35:54.000+08:00
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoController.java b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoController.java
@@ -1090,7 +1090,7 @@ public void remove(String key) {
 	public static final SessionMap SESSION_MAP;
 
 	public static final String ADD_COOKIE = "Add-Cookie";
-	public static final String APIJSON_DELEGATE_ID = "APIJSON-DELEGATE-ID";
+	public static final String APIJSON_DELEGATE_ID = "Apijson-Delegate-Id";  // 有些 Web 框架会强制把全大写改为全小写或大驼峰
 	public static final List<String> EXCEPT_HEADER_LIST;
 	static {
 		SESSION_MAP = new SessionMap();
@@ -1191,7 +1191,7 @@ else if (APIJSON_DELEGATE_ID.toLowerCase().equals(name.toLowerCase())) {
 			if (sessionId != null) {
 				HttpSession s = SESSION_MAP.get(sessionId);
 				if (s != null) {
-					s = session;
+					session = s;
 				}
 			}
 
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/index.html b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>APIAuto-机器学习测试、自动生成代码、自动静态检查、自动生成文档与注释等，做最先进的 HTTP 接口管理平台。</title>
+    <title>APIAuto-机器学习零代码测试、生成代码与静态检查、生成文档与光标悬浮注释</title>
     <meta charset="utf-8" />
-    <meta name="keywords" content="apijson,api,json,auto,apiauto,自动生成接口文档,自动化接口回归测试,机器学习接口回归测试,回归测试,机器学习,接口测试,自动化,fastjson,json在线解析,json格式化验证"/>
-    <meta name="description" content="APIAuto-机器学习测试、自动生成代码、自动静态检查、自动生成文档与注释等，做最先进的 HTTP 接口管理平台。"/>
+    <meta name="keywords" content="apijson,api,json,auto,apiauto,自动生成接口文档,自动化接口回归测试,机器学习接口回归测试,回归测试,机器学习,接口测试,API测试,自动化,API自动化,接口自动化,fastjson,json在线解析,json格式化验证"/>
+    <meta name="description" content="APIAuto-敏捷开发最强大易用的 HTTP 接口工具，机器学习零代码测试、生成代码与静态检查、生成文档与光标悬浮注释"/>
 
     <!-- 登录 <<<<<<<<<<<<<<<<<<<< -->
     <link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css">
diff --git a/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/js/main.js b/APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/js/main.js
@@ -3506,9 +3506,10 @@
       //请求
       request: function (isAdminOperation, type, url, req, header, callback) {
         type = type || REQUEST_TYPE_JSON
+        var isDelegate = (isAdminOperation == false && this.isDelegateEnabled) || (isAdminOperation && url.indexOf('://apijson.cn') > 0)
 
         if (header != null && header.Cookie != null) {
-          if (this.isDelegateEnabled) {
+          if (isDelegate) {
             header['Set-Cookie'] = header.Cookie
             delete header.Cookie
           }
@@ -3517,11 +3518,24 @@
           }
         }
 
+        if (isDelegate && this.delegateId != null && (header == null || header['Apijson-Delegate-Id'] == null)) {
+          if (header == null) {
+            header = {};
+          }
+          header['Apijson-Delegate-Id'] = this.delegateId
+        }
+
         // axios.defaults.withcredentials = true
         axios({
           method: (type == REQUEST_TYPE_PARAM ? 'get' : 'post'),
-          url: (isAdminOperation == false && this.isDelegateEnabled ? (this.server + '/delegate?' + (type == REQUEST_TYPE_GRPC ? '$_type=GRPC&' : '') + '$_delegate_url=') : '' )
-          + (this.isEncodeEnabled ? encodeURI(StringUtil.noBlank(url)) : StringUtil.noBlank(url)),
+          url: (isDelegate
+              ? (
+                this.server + '/delegate?' + (type == REQUEST_TYPE_GRPC ? '$_type=GRPC&' : '')
+                + (StringUtil.isEmpty(this.delegateId, true) ? '' : '$_delegate_id=' + this.delegateId + '&') + '$_delegate_url=' + encodeURIComponent(url)
+              ) : (
+                this.isEncodeEnabled ? encodeURI(url) : url
+              )
+          ),
           params: (type == REQUEST_TYPE_PARAM || type == REQUEST_TYPE_FORM ? req : null),
           data: (type == REQUEST_TYPE_JSON || type == REQUEST_TYPE_GRPC ? req : (type == REQUEST_TYPE_DATA ? toFormData(req) : null)),
           headers: header,  //Accept-Encoding（HTTP Header 大小写不敏感，SpringBoot 接收后自动转小写）可能导致 Response 乱码
@@ -3530,6 +3544,16 @@
         })
           .then(function (res) {
             res = res || {}
+
+            if (isDelegate) {
+              var hs = res.headers || {}
+              var delegateId = hs['Apijson-Delegate-Id'] || hs['apijson-delegate-id']
+              if (delegateId != null && delegateId != App.delegateId) {
+                App.delegateId = delegateId;
+                App.saveCache(App.server, 'delegateId', delegateId)
+              }
+            }
+
 	    //any one of then callback throw error will cause it calls then(null)
             // if ((res.config || {}).method == 'options') {
             //   return
