diff --git a/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java b/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java index bc87519..49ffa2e 100644 --- a/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java +++ b/erp_client_sb/src/main/java/com/tashow/erp/controller/TrademarkController.java @@ -21,7 +21,7 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; /** - * 商标检查控制器 - 极速版（浏览器内并发） + * 商标检查控制器 */ @RestController @RequestMapping("/api/trademark") @@ -63,12 +63,9 @@ public class TrademarkController { .filter(b -> b != null && !b.trim().isEmpty()) .map(String::trim) .collect(Collectors.toList()); - long start = System.currentTimeMillis(); - // 1. 先从全局缓存获取 Map cached = cacheService.getCached(list); - // 2. 找出缓存未命中的品牌 List toQuery = list.stream() .filter(b -> !cached.containsKey(b)) diff --git a/erp_client_sb/src/main/java/com/tashow/erp/utils/TrademarkCheckUtil.java b/erp_client_sb/src/main/java/com/tashow/erp/utils/TrademarkCheckUtil.java index 675cbce..e96ab38 100644 --- a/erp_client_sb/src/main/java/com/tashow/erp/utils/TrademarkCheckUtil.java +++ b/erp_client_sb/src/main/java/com/tashow/erp/utils/TrademarkCheckUtil.java @@ -28,7 +28,7 @@ public class TrademarkCheckUtil { Thread.sleep(6000); return; // 成功则返回 } catch (Exception e) { - System.err.println("初始化失败（尝试" + (i+1) + "/3）: " + e.getMessage()); + System.err.println("初始化失败（尝试" + (i+1) + "/5）: " + e.getMessage()); if (driver != null) { try { driver.quit(); } catch (Exception ex) {} driver = null; @@ -40,106 +40,99 @@ public class TrademarkCheckUtil { } public synchronized Map batchCheck(List brands, Map alreadyQueried) { - ensureInit(); - - // 构建批量查询脚本（带错误诊断） - String script = """ - const brands = arguments[0]; - const callback = arguments[arguments.length - 1]; - - Promise.all(brands.map(brand => - fetch('https://tmsearch.uspto.gov/prod-stage-v1-0-0/tmsearch', { - method: 'POST', - headers: {'Content-Type': 'application/json'}, - body: JSON.stringify({ - query: {bool: {must: [{bool: {should: [ - {match_phrase: {WM: {query: brand, boost: 5}}}, - {match: {WM: {query: brand, boost: 2}}}, - {match_phrase: {PM: {query: brand, boost: 2}}} - ]}}]}}, - size: 1, _source: ['alive'] - }) - }) - .then(r => { - if (!r.ok) { - return {brand, alive: false, error: `HTTP ${r.status}: ${r.statusText}`}; - } - return r.json().then(d => ({ - brand, - alive: d?.hits?.hits?.[0]?.source?.alive || false, - error: null - })); - }) - .catch(e => ({ - brand, - alive: false, - error: e.name + ': ' + e.message - })) - )).then(callback); - """; - - try { - @SuppressWarnings("unchecked") - List> results = (List>) - ((JavascriptExecutor) driver).executeAsyncScript(script, brands); - - // 检测是否有网络错误（包括403、Failed to fetch等） - boolean hasNetworkError = results.stream() - .anyMatch(item -> { + Map resultMap = new HashMap<>(); + int maxRetries = 5; + + for (String brand : brands) { + int retryCount = 0; + boolean success = false; + + while (retryCount < maxRetries && !success) { + try { + ensureInit(); + + String script = "const brands = ['" + brand.replace("'", "\\'") + "'];\n" + + "const callback = arguments[arguments.length - 1];\n" + + "Promise.all(brands.map(b => \n" + + " fetch('https://tmsearch.uspto.gov/prod-stage-v1-0-0/tmsearch', {\n" + + " method: 'POST',\n" + + " headers: {'Content-Type': 'application/json'},\n" + + " body: JSON.stringify({\n" + + " query: {bool: {must: [{bool: {should: [\n" + + " {match_phrase: {WM: {query: b, boost: 5}}},\n" + + " {match: {WM: {query: b, boost: 2}}},\n" + + " {match_phrase: {PM: {query: b, boost: 2}}}\n" + + " ]}}]}},\n" + + " size: 1, _source: ['alive']\n" + + " })\n" + + " })\n" + + " .then(r => {\n" + + " if (!r.ok) {\n" + + " return {brand: b, alive: false, error: 'HTTP ' + r.status + ': ' + r.statusText};\n" + + " }\n" + + " return r.json().then(d => ({\n" + + " brand: b,\n" + + " alive: d?.hits?.hits?.[0]?.source?.alive || false,\n" + + " error: null\n" + + " }));\n" + + " })\n" + + " .catch(e => ({\n" + + " brand: b,\n" + + " alive: false,\n" + + " error: e.name + ': ' + e.message\n" + + " }))\n" + + ")).then(callback);"; + + @SuppressWarnings("unchecked") + List> results = (List>) + ((JavascriptExecutor) driver).executeAsyncScript(script); + + Map item = results.get(0); String error = (String) item.get("error"); - return error != null && ( - error.contains("HTTP 403") || + + if (error != null && ( + error.contains("HTTP 403") || error.contains("Failed to fetch") || error.contains("NetworkError") || - error.contains("TypeError") - ); - }); - - // 如果有网络错误，切换代理并重试 - if (hasNetworkError) { - System.err.println("检测到网络错误，切换代理并重试..."); - - // 切换代理前保存已查询的品牌 - if (alreadyQueried != null && !alreadyQueried.isEmpty()) { - try { - cacheService.saveResults(alreadyQueried); - System.out.println("代理切换，已保存 " + alreadyQueried.size() + " 个品牌到缓存"); - } catch (Exception e) { - System.err.println("保存缓存失败: " + e.getMessage()); + error.contains("TypeError") || + error.contains("script timeout"))) { + + System.err.println(brand + " 查询失败(" + (retryCount + 1) + "/" + maxRetries + "): " + error + "，切换代理..."); + + // 切换代理 + try { driver.quit(); } catch (Exception e) {} + driver = null; + retryCount++; + continue; } - } - - try { driver.quit(); } catch (Exception e) {} - driver = null; - ensureInit(); - - // 重新执行查询 - @SuppressWarnings("unchecked") - List> retryResults = (List>) - ((JavascriptExecutor) driver).executeAsyncScript(script, brands); - results = retryResults; - } - - Map resultMap = new HashMap<>(); - for (Map item : results) { - String brand = (String) item.get("brand"); - Boolean alive = (Boolean) item.get("alive"); - String error = (String) item.get("error"); - - if (error != null) { - // 查询失败，不放入结果，只打印错误 - System.err.println(brand + " -> [查询失败: " + error + "]"); - } else { - // 查询成功，放入结果 - resultMap.put(brand, alive); - System.out.println(brand + " -> " + (alive ? "✓ 已注册" : "✗ 未注册")); + + // 成功或非网络错误 + if (error == null) { + Boolean alive = (Boolean) item.get("alive"); + resultMap.put(brand, alive); + System.out.println(brand + " -> " + (alive ? "✓ 已注册" : "✗ 未注册")); + success = true; + } else { + System.err.println(brand + " -> [查询失败: " + error + "]"); + resultMap.put(brand, false); // 失败也记录为未注册 + success = true; + } + + } catch (Exception e) { + System.err.println(brand + " 查询异常(" + (retryCount + 1) + "/" + maxRetries + "): " + e.getMessage()); + try { driver.quit(); } catch (Exception ex) {} + driver = null; + retryCount++; } } - return resultMap; - } catch (Exception e) { - System.err.println("批量查询失败: " + e.getMessage()); - return new HashMap<>(); + + if (!success) { + System.err.println(brand + " -> [查询失败: 已重试" + maxRetries + "次]"); + resultMap.put(brand, false); // 失败也记录为未注册 + } } + + return resultMap; } public synchronized void closeDriver() {