Java：MultiDataSource 支持代理转发 HTTP PATCH 请求；APIAuto：分组数量悬浮显示完整 名称 URL；解决不显示 HTTP Error，解决场景串联用例有时错用参数配置

Author: TommyLemon

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/pom.xml

@@ -286,6 +286,13 @@
             </exclusions>
         </dependency>
 
+        <!-- DemoController /delegate 代理转发请求 HTTP PATCH 方法需要，使用 PATCH 可以取消注释 -->
+        <!--        <dependency>-->
+        <!--            <groupId>org.apache.httpcomponents.client5</groupId>-->
+        <!--            <artifactId>httpclient5</artifactId>-->
+        <!--            <version>5.3</version>-->
+        <!--        </dependency>-->
+
 <!--        &lt;!&ndash; 需要用的 HikariCP 数据库连接池库，3.1.0 以上 &ndash;&gt;-->
 <!--        <dependency>-->
 <!--            <groupId>com.zaxxer</groupId>-->

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/java/apijson/boot/DemoController.java

@@ -25,14 +25,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.*;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 import org.springframework.web.client.RestClientResponseException;
 import org.springframework.web.client.RestTemplate;
@@ -1869,6 +1864,14 @@ protected String sendRequest(HttpSession session, HttpMethod method, String url,
         String rspBody = null;
         try {
             RestTemplate client = new RestTemplate();
+            try { // 支持 PATCH 方法，需要 Maven 依赖 org.apache.httpcomponents.client5:httpclient5
+                HttpComponentsClientHttpRequestFactory requestFactory = new HttpComponentsClientHttpRequestFactory();
+                client.setRequestFactory(requestFactory);
+            }
+            catch (Throwable e) {
+                e.printStackTrace();
+            }
+
             HttpEntity<String> requestEntity = new HttpEntity<>(method == HttpMethod.GET ? null : body, headers);
             ResponseEntity<String> entity = client.exchange(url, method, requestEntity, String.class);
 

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/index.html

@@ -203,7 +203,7 @@
                         <li v-for="(item, index) in caseGroups" :id="'caseGroup' + index" >
                             <div style="display: inline-table; width: 100%">
                                 <input v-show="isCaseGroupEditable" style="min-width: 60px; width: 40%; margin-right: 6px" v-model="item.groupName" @keyup="doOnKeyUp(event, 'caseGroup', false, item)" />
-                                <a href="javascript:void(0)" @click="selectCaseGroup(index, item)" > {{(isCaseGroupEditable ? '' : (StringUtil.isEmpty(item.groupName) ? '-' : item.groupName) + ' ') + item.groupUrl}}</a><a style="right: 0px; position: absolute; z-index: 100; width: fit-content; background-color: white">{{' (' + item.count + ')  '}}</a>
+                                <a href="javascript:void(0)" @click="selectCaseGroup(index, item)" > {{(isCaseGroupEditable ? '' : (StringUtil.isEmpty(item.groupName) ? '-' : item.groupName) + ' ') + item.groupUrl}}</a><a style="right: 0px; position: absolute; z-index: 100; width: fit-content; background-color: white" class="hint--left" :data-hint="(StringUtil.isEmpty(item.groupName) ? '-' : item.groupName) + ' ' + item.groupUrl">{{' (' + item.count + ')  '}}</a>
                                 <!--                            <div v-show="isStatisticsEnabled" style="position: absolute; right: 36px; top: 8px; display: inline-flex">-->
     <!--                                <div v-show="(item.totalCount || 0) > 0" style="background: lightgray; padding: 1px; margin-right: 2px; display: inline-block; position: relative" @click="restoreRemote(index, item, null, true)" >-->
     <!--                                    &lt;!&ndash; 只能写成一行来消除间隙，不能换行、空格 &ndash;&gt;-->
@@ -231,13 +231,13 @@
                 </div>
 
                 <div v-show="isChainShow && isChainGroupShow() && ! isLocalShow" :style="{width: chainShowType == 0 ? '40%' : '100%', 'border-right': chainShowType != 0 ? 'none' : '#DDD 1px solid' }" style="float: left; min-width: 30px; width: 40%; height: 100%;">
-                    <input id="vChainGroupAdd" style="width: 100%"  @keyup="doOnKeyUp(event, 'chainGroupAdd', false, {'groupName': vChainGroupAdd.value})" placeholder="输入名称，回车来添加" />
+                    <input id="vChainGroupAdd" style="width: 100%; text-align: center"  @keyup="doOnKeyUp(event, 'chainGroupAdd', false, {'groupName': vChainGroupAdd.value})" placeholder="输入名称，回车来添加" />
 
                     <ul class="historys" style="width: 100%; height: 100%;overflow: hidden;overflow-y: scroll;padding-bottom: 50px">
                         <li v-for="(item, index) in chainGroups" :id="'chainGroup' + index" >
                             <div style="display: inline-table; width: 100%">
                                 <input v-show="isCaseGroupEditable" style="min-width: 60px; width: 40%; margin-right: 6px" v-model="item.Chain.groupName" @keyup="doOnKeyUp(event, 'chainGroup', false, item)" />
-                                <a href="javascript:void(0)" @click="selectChainGroup(index, item.Chain)" :style="{ color: index == currentChainGroupIndex ? 'black' : 'gray' }" >{{ isCaseGroupEditable ? '' : item.Chain.groupName }}</a><a style="right: 0px; position: absolute; z-index: 100; width: fit-content; background-color: white; margin-right: 24px">{{' (' + (item.Chain.count - 1) + ')  '}}</a>
+                                <a href="javascript:void(0)" @click="selectChainGroup(index, item.Chain)" :style="{ color: index == currentChainGroupIndex ? 'black' : 'gray' }" >{{ isCaseGroupEditable ? '' : item.Chain.groupName }}</a><a style="right: 0px; position: absolute; z-index: 100; width: fit-content; background-color: white; margin-right: 24px" class="hint--left" :data-hint="item.Chain.groupName">{{' (' + (item.Chain.count - 1) + ')  '}}</a>
                                 <svg class="icon" @click="remove(item, index, true, false, false, true)" style="background-color: white; width: 27px; height: 18px; right: -2px; top: 10px; padding-left: 3px; padding-right: 4px; padding-top: 2px; padding-bottom: 2px;" >
                                     <use xlink:href="svg/icon.svg#trash"></use>
                                 </svg>
@@ -256,7 +256,7 @@
 
 
                 <div v-show="isLocalShow || isCaseItemShow()" :style="{width: isCaseGroupShow() && ! isLocalShow ? '60%' : '100%'}" style="float: right; flex-grow: 1; height: 100%;">
-                    <input id="vChainAdd" v-show="isChainShow && currentChainGroupIndex >= 0" style="width: 100%"  @keyup="doOnKeyUp(event, 'chainAdd', false, {'groupName': vChainAdd.value})" placeholder="输入名称，回车来搜索及添加" />
+                    <input id="vChainAdd" v-show="isChainShow && currentChainGroupIndex >= 0" style="width: 100%; text-align: center"  @keyup="doOnKeyUp(event, 'chainAdd', false, {'groupName': vChainAdd.value})" placeholder="输入名称，回车来搜索及添加" />
 
                     <ul class="historys" style="width: 100%; height: 100%;overflow: hidden;overflow-y: scroll;padding-bottom: 50px">
                         <li v-for="(item, index) in testCases" :id="'docItem' + index" >

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js

@@ -2700,6 +2700,7 @@ https://github.com/Tencent/APIJSON/issues
         vUrl.value = item.host + bu
         this.showUrl(false, bu)
 
+        this.saveCache('', 'URL_BASE', baseUrl)
         this.saveCache('', 'projectHost', this.projectHost)
       },
 
@@ -3136,7 +3137,6 @@ https://github.com/Tencent/APIJSON/issues
             commentObj = JSONResponse.updateStandard({}, mapReq2);
           }
 
-
           var callback = function (randomName, constConfig, constJson) {
             // 用现成的测试过的更好，Response 与 Request 严格对应
             // var mapReq = {};
@@ -3169,6 +3169,7 @@ https://github.com/Tencent/APIJSON/issues
             //   commentObj = JSONResponse.updateStandard({}, mapReq2);
             // }
 
+            const userId = App.User.id;
             const methods = App.methods;
             const method = App.isShowMethod() ? App.method : null;
             const extName = App.exTxt.name;
@@ -3178,6 +3179,7 @@ https://github.com/Tencent/APIJSON/issues
             const req = isExportRandom && btnIndex <= 0 ? {
               format: false,
               'Random': {
+                userId: userId,
                 toId: 0,
                 chainGroupId: cgId,
                 chainId: cId,
@@ -3187,6 +3189,8 @@ https://github.com/Tencent/APIJSON/issues
                 config: config
               },
               'TestRecord': {
+                'userId': userId,
+                'documentId': documentId,
                 'host': StringUtil.isEmpty(baseUrl, true) ? null : baseUrl,
                 'chainGroupId': cgId,
                 'chainId': cId,
@@ -3198,6 +3202,7 @@ https://github.com/Tencent/APIJSON/issues
               format: false,
               'Document': isEditResponse ? null : {
                 'id': did == null ? undefined : did,
+                'userId': userId,
                 'project': StringUtil.isEmpty(project, true) ? null : project,
 //                'testAccountId': currentAccountId,
 //                'chainGroupId': cgId,
@@ -3213,6 +3218,7 @@ https://github.com/Tencent/APIJSON/issues
                 'detail': App.getExtraComment() || ((App.currentRemoteItem || {}).Document || {}).detail,
               },
               'TestRecord': isEditResponse != true && did != null ? null : {
+                'userId': userId,
 //                'chainGroupId': cgId,
                 'documentId': isEditResponse ? did : undefined,
                 'randomId': 0,
@@ -7184,12 +7190,12 @@ https://github.com/Tencent/APIJSON/issues
         if (res == null) {
           res = {}
         } else {
-          var time = res.config == null || res.config.metadata == null ? 0 : (res.config.metadata.startTime || 0)
-          if (time < this.lastReqTime) {
+          var time = res.config == null || res.config.metadata == null ? null : res.config.metadata.startTime;
+          if (time != null && time > 0 && time < this.lastReqTime) {
             return
           }
 
-          this.lastReqTime = time
+          this.lastReqTime = time == null || time <= 0 ? 0 : time;
         }
 
         if (DEBUG) {
@@ -7514,8 +7520,9 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
 
         var project = (this.projectHost || {}).project
 
-        if (isFilter && type == 'caseGroup') {
+        if (isFilter && (type == 'caseGroup' || type == 'chainGroup')) {
           this.isCaseGroupEditable = true
+//          this.isChainGroupEditable = true
         }
 
         var obj = event.srcElement ? event.srcElement : event.target;