modified: app/amazon/__pycache__/approve.cpython-39.pyc

modified:   app/amazon/__pycache__/del_brand.cpython-39.pyc
	modified:   app/amazon/__pycache__/main.cpython-39.pyc
	new file:   app/amazon/__pycache__/match_action.cpython-39.pyc
	new file:   app/amazon/__pycache__/tool.cpython-39.pyc
	new file:   "app/amazon/approve - \345\211\257\346\234\254.py"
	modified:   app/amazon/approve.py
	modified:   app/amazon/del_brand.py
	modified:   app/amazon/main.py
	new file:   app/amazon/match_action.py
	new file:   app/amazon/tool.py
	modified:   app/main.py
	modified:   app/web_source/brand.html

app/amazon/del_brand.py

@@ -220,14 +220,48 @@ class ZiniaoDriver:
         except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
             # 端口未启动，继续执行启动操作
             print(f"端口 {self.socket_port} 未启动，开始启动客户端")
-        
+
+        self.kill_process('v6')
+        time.sleep(5)
         self.client_path = self.get_zinaio_exe("superbrowserv6").strip('"')
         print(self.client_path)
         cmd = [self.client_path, '--run_type=web_driver', '--ipc_type=http',
                '--port=' + str(self.socket_port)]
         print(" ".join(cmd))
-        subprocess.Popen(cmd)
-        time.sleep(5)
+        
+        # 最大重试次数
+        max_retries = 3
+        
+        for retry_count in range(max_retries):
+            print(f"第 {retry_count + 1} 次尝试启动客户端...")
+            
+            # 启动进程
+            subprocess.Popen(cmd)
+            
+            # 循环检测10秒，每0.5秒检测一次
+            start_check_time = time.time()
+            client_started = False
+            
+            while time.time() - start_check_time < 10:
+                try:
+                    response = requests.get(url, timeout=2)
+                    print(f"客户端启动成功！(第 {retry_count + 1} 次尝试)")
+                    client_started = True
+                    break
+                except (requests.exceptions.ConnectionError, requests.exceptions.Timeout):
+                    # 端口还未启动，继续等待
+                    time.sleep(0.5)
+            
+            if client_started:
+                time.sleep(5)  # 等待客户端完全启动
+                # 更新内核
+                self.update_core()
+                return
+            else:
+                print(f"第 {retry_count + 1} 次尝试启动失败，10秒内未检测到客户端启动")
+        
+        # 超过最大重试次数，抛出异常
+        raise RuntimeError(f"客户端启动失败：重试 {max_retries} 次后仍未成功启动")
 
     def open_shop(self, shop_name: str):
         """
@@ -242,8 +276,7 @@ class ZiniaoDriver:
         # 启动客户端
         self.start_client()
 
-        # 更新内核
-        self.update_core()
+
 
         # 获取店铺列表
         shop_ls = self.get_browser_list()
@@ -381,11 +414,12 @@ class AmamzonBase(ZiniaoDriver):
 
             # 获取当前标签页
             tab = self.tab
+            tab.wait.doc_loaded(timeout=120,raise_err=False)
 
             # 步骤1：获取当前国家名称
             print(f"正在检查当前国家...")
             current_country_ele = tab.ele('xpath://div[@class="dropdown-account-switcher-header-label"]/span[last()]',
-                                          timeout=10)
+                                          timeout=20)
             if current_country_ele:
                 current_country = current_country_ele.text.strip()
                 print(f"当前国家：{current_country}")