Merge pull request #13 from Chave0v0/dev

修复已知bug

Author: Chave0v0

src/main/java/com/chave/Main.java

@@ -21,7 +21,7 @@ public void initialize(MontoyaApi montoyaApi) {
         Logging log = API.logging();
 
         API.extension().setName("API Highlighter");
-        log.logToOutput("API Highlighter v2.1.1\n\n" +
+        log.logToOutput("API Highlighter v2.1.2\n\n" +
                 "Rebuild: Chave\n" +
                 "GitHub: https://github.com/Chave0v0/API-Highlighter\n");
 

src/main/java/com/chave/service/APIMatchService.java

@@ -94,11 +94,11 @@ public HashMap<String, Object> semiFuzzMatch(HttpRequest request) {
 
             try {
                 // 声明没有 PathVariable 情况下的正则
-                pattern = Pattern.compile("^(/[^/]+)?" + apiItem.getPath() + "(/.*)?$", Pattern.CASE_INSENSITIVE);
+                pattern = Pattern.compile("^(/[^/]+)*" + apiItem.getPath() + "(/.*)?$", Pattern.CASE_INSENSITIVE);
             } catch (Exception e) {
                 // 如果正则编译捕获异常,并且有"{",认为是有PathVariable的情况，重新生成正则。
                 if (apiItem.getPath().contains("{")) {
-                    pattern = Pattern.compile("^(/[^/]+)?" + Util.convertPathToRegex(apiItem.getPath()) + "(/.*)?$", Pattern.CASE_INSENSITIVE);
+                    pattern = Pattern.compile("^(/[^/]+)*" + Util.convertPathToRegex(apiItem.getPath()) + "(/.*)?$", Pattern.CASE_INSENSITIVE);
                 } else {
                     // 其他情况认为是预期外的异常，直接输出log
                     log.logToError("半精确匹配出现异常" + e.getCause());

src/main/java/com/chave/ui/HighlighterMainUI.java

@@ -406,8 +406,10 @@ public void actionPerformed(ActionEvent e) {
                 List<ProxyHttpRequestResponse> historyList = Main.API.proxy().history();
                 // 检查history先清空所有result和found状态  重新记录
                 for (APIItem apiItem : APIConfig.TARGET_API) {
-                    apiItem.setResult(null);
-                    apiItem.setIsFound(null);
+                    if (apiItem.getState().equals(Boolean.FALSE)) {  // 仅重置未测试完成的接口result、IsFound信息
+                        apiItem.setResult(null);
+                        apiItem.setIsFound(null);
+                    }
                 }
                 for (ProxyHttpRequestResponse proxyHttpRequestResponse : historyList) {
                     // 获取要检查的request和response