From 2d0d1d34619724e00c466167ec5d354deedea0ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=93=AD=E5=9D=A4?= <10372463+ming-kun@user.noreply.gitee.com> Date: Fri, 10 Apr 2026 16:51:52 +0800 Subject: [PATCH] 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/__pycache__/approve.cpython-39.pyc | Bin 23960 -> 26270 bytes .../__pycache__/del_brand.cpython-39.pyc | Bin 16832 -> 17460 bytes app/amazon/__pycache__/main.cpython-39.pyc | Bin 16348 -> 16993 bytes .../__pycache__/match_action.cpython-39.pyc | Bin 0 -> 16804 bytes app/amazon/__pycache__/tool.cpython-39.pyc | Bin 0 -> 2926 bytes app/amazon/approve - 副本.py | 999 ++++++++++++++++++ app/amazon/approve.py | 482 +++++---- app/amazon/del_brand.py | 46 +- app/amazon/main.py | 52 +- app/amazon/match_action.py | 656 ++++++++++++ app/amazon/tool.py | 77 ++ app/main.py | 51 +- app/web_source/brand.html | 1 + 13 files changed, 2125 insertions(+), 239 deletions(-) create mode 100644 app/amazon/__pycache__/match_action.cpython-39.pyc create mode 100644 app/amazon/__pycache__/tool.cpython-39.pyc create mode 100644 app/amazon/approve - 副本.py create mode 100644 app/amazon/match_action.py create mode 100644 app/amazon/tool.py diff --git a/app/amazon/__pycache__/approve.cpython-39.pyc b/app/amazon/__pycache__/approve.cpython-39.pyc index d43ad6eebf9f377bb450ae5f9543199412e10b16..fb67c0155ef6ffc129729ffc47d9af3ee5449551 100644 GIT binary patch delta 9077 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 delta 6793 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 G<9`94Lr>HI diff --git a/app/amazon/__pycache__/del_brand.cpython-39.pyc b/app/amazon/__pycache__/del_brand.cpython-39.pyc index 34d421208ad9d10e39249c24006283b24427220f..7f3c49bad65cfdd0dda0e2641ebb0887112ebb76 100644 GIT binary patch delta 2558 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 diff --git a/app/amazon/__pycache__/main.cpython-39.pyc b/app/amazon/__pycache__/main.cpython-39.pyc index 8f24b088d713d551cd76c376848b611c88720f0a..7e85b187afbc2b7090094c38afc93fc0e785abd3 100644 GIT binary patch delta 5001 zcmb7IYj6|S72dnMl2(!>%a&}*?8#lRh;A>Jd` zyGkaUw3L?dr{r2!c*0G~X$5~rZd_kE;hcAgt2|_bK-fbp^bi<4frCB`^1vKD{ zGMMVE=T**Seiyu=A2-0y_&(p|jO3_F9n?7?XXSA+dW$9XtK)>N8-3Mu^gF4GYSevN z&MKBN>7*X&oszSvrP2a$=@XVTDN)}PArh=oCS8Doddi- zv@+dD4G!zAER!7d8-1yC>k!5@zVkjU&HthOXcfjnghW-EO6n0gFSoVl$-%{8;^`br z7-mmuDBX2G|CRgKC9SZEp>E8HP=ipx-}NMGU91jXqOOA(GXwia{bt-4h?yg4J(frw zO!1Z8h7F5?&;g;z%;m7mxC=m%LyDiMicI8xIaQTtL{|Jtfvm|M5+L@ol%MggCU;-@ z#Cx99b;6qNh?AjGc{xGz1>l7q-7sRfH@l0E`KlZ1V3OU9unFNt71(;9LALvD%|&Fv zm3QyDbLZCBt_OGA-J`(d+`k*r}F|jOJ`dx>*rUV9*Jd zvMo5OM7S3L&xmbB*ai@>58QU`eL#rXp4-yBX?s)?PTa6T6M^wf5UUaN^cW1Aj z)Q_ZD*I8V(j$a6VNy_-?P%T-?-v~93UHsEfQz_cb_5$QxhM7vIbs8b;e(ovhyY+sg zI&{WTEKJM04wLaA{ib1y=W&#GmKsZXaT^`rhG-1|Apk#7)Vo#w+tNwT zINASf77F8N2Olll>J3|NS~j3S6$|rE%Sv+cp^juJ#2TUHmRpoVH%1rrWHn2h^iD}x zpXCGYyx?(J3IuwE9kaAD>j$0!3u<|`&?*G3PZn@h&8CAk3Dq4q+?E?SUZ3Cpb>z*_ zun<{2mj*-{zphfvVwIBE4+yo@sD*wouPh|cw;_RiCGdDR4Q7ih$3|)Yd)Z=3Hj9SAIQF(#garb62DJ6u6pDIVh-$WE z5YjSd6?j59v|waqIa+s8HUeAq9y!1;>l1P7_?UejqQcVOF{JL#2nbR^Hrsx$L{ zsH2WF{TFpMe53u=oI3Y>lR8jsJy31i`EbQE&L}42ceuZjmWjFrJ+`1H!{G z@Dr88C1uFA58#>upl;^JQxO*8p{gypT717cG4|D~kN)NCN7Ela_w|)iGjF^!J#oQ) zZEI^|Yk((%jkC_C%^V+}KKX-r#;Z@Bo_YT5nG<~a%GmVf7q0TluqcDKyjlL~@iQ6h z;`VBIyUtt1FHgVx&R6ffvaT-UTd+dV_`a$N(#a23b&sH_Rxr2ua)@#IKM6w{r&y(ZEmdK!aShAk)R z6FbI?Ob=cj?1EdxX-!@EqT2!m?vLSTT;S(w>hZF|e^FCjrz#q8l47F5MFpRDT>+Gf ziBk>{P2r!{3{)J(?XVq-YR!gmBvh}u6tCT?da(nt6vB4?eq%LxkpHf+iS+Y-Hr53O zkUSqTY>+Q&T2DH7e^cBkT3DKY)^u_S21VX)q%y2W-;@~Cg~2;;DYiH^1dyrapH(%; zY$<!?$SY?2p}dRf2f?L%%s{${VD~p(*xW^Wcz1L8J#|R^ zW&?3nn1`*79RY~?jl&7JkalK7per5so8NUHWOuHHUKy$7}e9t!=CNarh|0V)r8LVFU|dHjCL9 z54Ta$#_NBeA`@B3Cv-Ym?;SY?Fczgfj@= zLl{SRipy)Z&0btxwsYc07hZGYh$GBj#UehtTHI7I!UR&=i!(~|DAzfcv+Z0{}!%Y!2ul5_MWYpEC$EnT?wwnKW zZ9n94_iYuX;8?uqGFHMQR)kql&%XO;oI-1BtbrK$JetFr!ic@P`7;1R(<55RGiT*NfW*o zGHKHeN3olTzpcnCzL`kgHIzywpnWaS169bYL-9oNj0`&9y^#CvJdoEqhv5GY k2K6oi97Yp>2H)QrY#xGU)`Z{Rq(JfKq`5z*=GVx-0Tc+qbN~PV delta 4378 zcmbtXYiu0V6`nh@J3IUI`n6u$u|0NdC*wHA4+?o0CxJ9+NH7#aTvmi-@g2wO$F6f{ z)``t*HpMA{&_Kck6^awtDoD_#Et2~K(X{-i)K;ogR1p2K^hc?%0jUpBi9c-xJ?D;D zlVGGubu{1Jd+xdCp7*_Z?+p1;6YU!ofIpOL74 zPEN#WfCkS*)sATWN;ZcGCvf+en*$UImhLIJcR$z^s~X zq^+P*jJAO}o0hgJhY8X7Bc6Uzw)BSQ0O@K1Ls%<98$i)-rzcIzPEAfR9f<;(aYdQP z9@F_vYDYwcDf-|x_^iixMl}i-$ZVG*jd?B*)-k(ad&gAjp}q2LZ(!yUMWyMXL*!4`Iu z7bF_Fq|mZOnMgy@@eUfLTmnu5SXXx~^Eyis#rSPScM zVO{5!cu#&6Z#NtV;j86AZO*d+yv|p&DSlO}<462I>d}E<5Xic0#x&%j+|^wqBiBbS z&_9v3?BVR>)W99QH}Gb4C+uPFJ@^GaGW~JP_0F&8$JQ<1=Y#E(LmGeX- z9HfyO1aLR8i9_ZHWQFIFg47`?vllYJJ97@=uR#3WP^|HJZFRx7C_%(MR4ql^msd_H znE(~P7;x%?plG>S(1PDyHY>BQ^S8?SNF7(BiGpjnCM;+BfQ6MK)FJFg*oE*7gaZJE zM|ho~8xo<^6u4>Hbe*)GQwD%74WAVOkW`t(gRB;i zwex>g9_iT$Lqlda!cW3ujb^`8<^KL-X2v`@#Ri_jT{rWYs`p8ZKTzF7Ht|!{E#xk~ zSlt>!>)2s{qR+CkQ&T222pi<@R*zNnFoSStE3MUrXC4)S+mO||Q}0UbHR!!=ghFbYcn3@ZSi|DnsH@ZnzTvcg}g zSx}Fz<{Ytr=IKOsk+635{d#xFowdLZl1i_@n$6@pu6eX7_5#n1GZC zL&~&^4Rz2O!kAjn8tO4oXdtf*Nzfhw`S7VQB#ZdPWO0H{fL6w(afw~F!wV4_#bb_N zb~HGC-toH#>c}v9T}bzdR<^+@1R!@CEy&}W7P=8SbW{jzb)q1!tz^H)RSwte@`Z{;$(^t73vleOhp_B4Q1E3TuYJw+ zjJ9M_4Khros4)eDg$H;wrpy}TIRjXx-vhGKa5#0L45jNnWm!&etOt+zx0U_bf zPMH~37q`Co-6K~G2E6z!2ZFGBM80fmwwxP&=VX(!Z^Y~-q_wi?&baMtz?9!+V$u$ zB$s^7M)}3|U8Ilyp*^LF7CFJUZ93Q13tYvBmCdnXb6#-HcwJIMq;)pJM9J;0R<0W3eZ@X_-xx~0HQ z^1t*LZQlg)E3#_{-eoW@x#JZ-n*kD=<=wqo$RU1zZ!>gxB=Op|rdm@?6Q1c{1T}8N7!-LDJHJ(dOSnO{8 zbl=yibmR~q!g3m>S^jR{+tnre+zMDt{$Jggl=lmBF@G68bC^h4f+GvP@1j3^{eeu@?HB3_WB!Zj1Ffzh!maeN9a$c7&BBg{z;?*L$ zgN}RxgtY|;o{s+}eA~7uHHAx0E&XI$pS%?lD;Eb?e)ZCaKYe!jh0E_>UHIVVeC6`I zzWIYISM+PjJF>Gi-UZD23{TNBW@R%8->8|QCbL*KzkTOeb03N;M{#E#U4HTGM`zE2 z(5|j7eKXq%R5roi*|}>g_6EWA;j42WJoECNyAG7P@mW|hf-H#4SnKe3+S6Z^?toz; z2+wXiXC;TTaN;^SWoWM3T>D^0QOU81wWKI&&@ZO48OvPvrHwJ@nrXFMftET=7sYD(Q^P9>ghLGYq>4JB@%h94jD*>=D)X98UFXLFifm zG^}_FPP{?V;D0Mxc|}0$jfG>;*p9dvBGJ!6Lm{FO_0v#63P(xgv(UD9XC%Zb_*=XF z5y6-Zf`?HM+sohFU9(*%FHRJhTe|8DQuIw`GikW#zMzZiipf+ubDTHrsok&uf{I!) ziIim0sCOeOggng;?|J@+dla&<=MnU4LCDkkC$ls+VGa;jw2(ss6EqScRdCC-!WU8^ M14DFNC1wjsO4v diff --git a/app/amazon/__pycache__/match_action.cpython-39.pyc b/app/amazon/__pycache__/match_action.cpython-39.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a9709a9254dc99927db160298f3cae76456ab039 GIT binary patch literal 16804 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 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + + drop_down = self.tab.ele('xpath://div[contains(@class,"VolusListingStatusDropDown-module__verticalContainer")]//kat-dropdown') + drop_down.wait.displayed(raise_err=False) + drop_down.wait.enabled(raise_err=False) + time.sleep(0.6) + drop_down.click() + # //kat-option[@value="SearchSuppressed"] + xp = f'xpath://kat-option[@value="{filter_type}"]' + print(f"正在寻找筛选条件 {filter_type}，xpath: {xp}") + approval_required = self.tab.eles(xp,timeout=5) + if len(approval_required) == 0: + print(f"【没有需要{filter_type}选项】没有需要{filter_type}的商品了") + return sku_ls # "没有需要审批的商品了" + else: + approval_required = approval_required[0] + approval_required.wait.displayed(raise_err=False) + approval_required.click() + + approval_required_text = approval_required.text + print(f"已选择筛选条件: {approval_required_text}") + + count = re.findall(r'\d+', approval_required_text) + if count: + count = int(count[0]) + print(f"待审批的商品数量: {count}") + if count <= 0: + print(f"没有需要{filter_type}的商品了") + return sku_ls #"没有需要审批的商品了" + asin = "B0C7KT6ZZN" + search_input = self.tab.ele("xpath://kat-input[contains(@class,'SearchBox-module__searchInput')]").sr( + 'xpath://span[@class="container"]//input[@part="input"]') + search_input.input(asin, clear=True) + search_btn = self.tab.ele("xpath://kat-icon[@name='search']") + search_btn.click() + + for _ in range(3): + # 等待加载完成 + load_ele = self.tab.ele("xpath://div[contains(@class,'Loader-module__loader')]") + load_ele.wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + search_input = self.tab.ele("xpath://kat-input[contains(@class,'SearchBox-module__searchInput')]").sr( + 'xpath://span[@class="container"]//input[@part="input"]') + search_input.input(asin, clear=True) + search_btn = self.tab.ele("xpath://kat-icon[@name='search']") + search_btn.click() + + load_ele = self.tab.ele("xpath://div[contains(@class,'Loader-module__loader')]") + load_ele.wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + + sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=3) + if len(sku_ls) > 0: + break + approval_required.click() + + return sku_ls + + def wait_loaded(self): + # 等待加载完成 + try: + load_ele = self.tab.ele( + 'xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[contains(@class,"Loader-module__loader")]|//kat-panel[@data-testid="kat-panel-ActionPanelContent"]/div[@data-f1-component]//div[contains(@class,"==")]/div[contains(@class,"==")]/span', + timeout=3) + load_ele.wait.deleted(timeout=5, raise_err=False) + except Exception as e: + print("等待加载中消失出错", e) + + def clear_tab(self): + all_tab = self.browser.get_tabs(title="亚马逊") + close_tab = [] + for tab in all_tab: + tab_id = tab if isinstance(tab,str) else tab.tab_id + if self.tab.tab_id == tab: + continue + close_tab.append(tab) + print("需要关闭的标签页",close_tab) + print("当前操作的tab_id",self.tab.tab_id) + self.browser.close_tabs(close_tab) + + def handle_repair_product(self,tab:ChromiumTab): + def wait_loaded(): + # 等待加载完成 + try: + load_ele = tab.ele( + 'xpath://div[@class="contentWrapper"]//div[contains(@class,"==")]/span[not(node())]', + timeout=3) + load_ele.wait.deleted(timeout=5, raise_err=False) + except Exception as e: + print("等待加载中消失出错", e) + + tab.wait.doc_loaded(timeout=30) + submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10) + if len(submit_btn_ls) == 0: + print("未找到提交按钮，可能页面未加载完成或者页面结构发生变化") + return + # todo 遍历 + for index in range(len(submit_btn_ls)): + if index > len(submit_btn_ls)-1: + print("提交按钮数量发生变化，停止处理") + break + + submit_btn = submit_btn_ls[index] + + # 关闭按钮 + close_x_btn = tab.eles('xpath://div[@class="flyoutPanelContent"]/span',timeout=5) + if len(close_x_btn) > 0: + close_x_btn[0].wait.displayed(timeout=5, raise_err=False) + close_x_btn[0].click() + + submit_btn.wait.enabled(timeout=5, raise_err=False) + submit_btn.click() + time.sleep(0.5) + self.wait_loaded() + + wait_loaded() + + need_input = tab.eles('xpath://div[@class="contentWrapper"]//kat-input[@data-testid="kat-input-dew:ump_epr_resgitration_number_title"]',timeout=5) + if len(need_input) > 0: + print("需要输入注册号，不符合操作要求，跳过...") + continue + + target_title = tab.eles('xpath://div[@class="contentWrapper"]//section//h4[text()="警告和安全信息"]') + if len(target_title) > 0: + not_start = tab.eles('xpath://div[@class="contentWrapper"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]') + if len(not_start) == 0: + print("安全证明-不是未开始状态，不需要操作") + continue + + not_start.wait.displayed(timeout=5, raise_err=False) + not_start.click() + + wait_loaded() + + check = tab.ele('xpath://div[@class="contentWrapper"]//kat-checkbox[@name="value"]') + check.wait.displayed(timeout=5, raise_err=False) + check.click() + + save_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]') + save_btn.wait.enabled(timeout=5, raise_err=False) + save_btn.click() + + wait_loaded() + + close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10) + close_btn.wait.displayed(timeout=5, raise_err=False) + close_btn.click() + + save_btn_ls = tab.eles('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]',timeout=5) + if len(save_btn_ls) > 0: + option_selection_ls = tab.eles('xpath://div[@class="contentWrapper"]//div[@role="option"]',timeout=5) + for option in option_selection_ls: + option.click() + time.sleep(0.5) + + save_btn_ls[0].wait.enabled(timeout=5, raise_err=False) + save_btn_ls[0].click() + + wait_loaded() + + close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10) + close_btn.wait.displayed(timeout=5, raise_err=False) + close_btn.wait.enabled(timeout=5, raise_err=False) + close_btn.click() + + submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10) + + print("修复商品信息处理完成！") + tab.close() + + def run_page_action(self): + print("开始执行") + num = 0 + retry_num = 0 + already_asin = set() + + while retry_num < 3: # 最多重试3次 + # if num > 3: #测试 + # return + # 等待加载完成 + try: + load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5) + if len(load_ele) > 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + + # 获取当前页码 + try: + page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) + if len(page_pamel) > 0: + current_page = page_pamel[0].sr('xpath:.//ul[@class="pages"]//li[@aria-current="true"]').text + + # 总页数 + total_page = page_pamel[0].sr.eles('xpath:.//ul[@class="pages"]//span[@class="page__inner"][last()]') + if len(total_page) > 0: + total_page = total_page[-1].text + else: + total_page = 0 + print(f"当前页码: {current_page} / 总页数: {total_page}") + except Exception as e: + print("获取页码失败", e) + + + sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=10) + print(f"获取到 {len(sku_ls)}") + # for sku_ele in sku_ls[0:2]: + for sku_ele in sku_ls: + # solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]') + + asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]').text + print(f"ASIN {asin} 存在问题，正在点击解决...") + if asin in already_asin: + print(f"{asin} 已经处理过了，跳过") + continue + solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]|.//kat-link[@label="修复被禁止显示的商品"]|.//kat-link[@label="解决商品移除风险"]') + if len(solve_problem) == 0: + print(f"{asin},没有处理入口，不处理") + yield (asin,"没有处理入口，不处理") + already_asin.add(asin) + continue + + solve_problem[0].click() + + action_panel = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]') + action_panel.wait.displayed(timeout=5, raise_err=False) + + self.wait_loaded() + + try: + # 如果存在“请求批准”按钮，则直接返回跳过 + request_approval_btn = self.tab.eles('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="section-header" and contains(string(.),"移除")]',timeout=5) + if len(request_approval_btn) > 0: + print(f"ASIN {asin} 存在请求批准按钮，不需要处理,跳过...") + panel_close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]', + timeout=5).sr('xpath:.//button[@class="close"]') + panel_close_btn.click() + + action_panel.wait.deleted(timeout=3, raise_err=False) + yield (asin,"请求批准") + + # 无需采取任何操作 + not_operate = self.tab.eles('xpath://kat-alert[contains(@description,"如果您之前已提交更改，则这些更改当前正在处理中") and not(@dismissed)]',timeout=3) + if len(not_operate) > 0: + print(f"ASIN {asin} 无需采取任何操作,跳过...") + yield (asin,"无需操作") + already_asin.add(asin) + continue + + # 解决商品信息违规问题 按钮 + kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]',timeout=5) + # if len(kat_box_ls) == 0: + # print(f"ASIN {asin} 的操作面板中未找到选项，跳过...") + # continue + print(f"ASIN {asin}需要处理的有：{len(kat_box_ls)}个问题.") + # 解决商品信息违规问题 按钮，有多少个都要处理 + for i in range(len(kat_box_ls)): + print(f"开始处理第{i}个问题") + if len(kat_box_ls) <= i: + print(f"ASIN {asin} 的操作面板中选项数量发生变化，停止处理...") + break + kat_box_ls[i].click() + time.sleep(0.5) + self.wait_loaded() + + # TODO 增加 “出现警告和安全信息时候下滑” 的情况 + safe_handle_ls = self.tab.eles('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]', + timeout=5) + if len(safe_handle_ls) > 0: + print("存在安全证明，正在处理...") + safe_handle_ls[0].click() + time.sleep(0.5) + self.wait_loaded() + check_box = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-checkbox') + check_box.click() + else: + problem_selection_ls = self.tab.eles( + 'xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="registry-list"]//div[@data-testid="registry"]', + timeout=10) + print("待选择数量",len(problem_selection_ls)) + for problem_selection in problem_selection_ls: + problem_selection.click() + print("点击选择完成") + time.sleep(0.5) + + # 点击保存 + confirm_btn = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//kat-button[@variant="primary"]') + confirm_btn.wait.displayed(timeout=3, raise_err=False) + confirm_btn.click() + + self.wait_loaded() + + # 等待关闭按钮出现 + try: + close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-button[@label="关闭"]', + timeout=10) + close_btn.click() + except Exception as e: + print("点击关闭按钮失败",e) + + kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]', timeout=5) + + # 修复商品信息 + repair_product = action_panel.eles('xpath:.//kat-button[@class="action-button"]',timeout=5) + if len(repair_product) > 0: + print(f"ASIN {asin} 存在修复商品信息按钮，正在点击...") + self.clear_tab() + repair_product[0].click() + time.sleep(1) + # 获取最新的tab + new_tab = self.browser.latest_tab + if isinstance(new_tab, str): + new_tab = self.browser.get_tab(id_or_num=new_tab) + + self.handle_repair_product(new_tab) + except Exception as e: + print("【asin】：",asin,"处理失败",traceback.format_exc()) + yield (asin,"处理失败") + already_asin.add(asin) + continue + + yield (asin,"处理完成") + already_asin.add(asin) + + try: + # 全部操作完成，关闭 + panel_close_btn= self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]', + timeout=5).sr('xpath:.//button[@class="close"]') + panel_close_btn.click() + + action_panel.wait.deleted(timeout=3, raise_err=False) + + except Exception as e: + print("关闭操作面板失败", e) + + # 判断是否存在需要翻页的情况 + page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) + if len(page_pamel) == 0: + break + next_page_btn = page_pamel[0].sr('xpath:.//span[@part="pagination-nav-right"]') + class_str = next_page_btn.attr('class') + if "end" in class_str: + break + next_page_btn.click() + num += 1 + print(f"【程序计算】正在翻页，已翻 {num} 页...") + + already_asin = set() + + except Exception as e: + print("处理审批操作异常", e) + traceback.print_exc() + retry_num += 1 + self.tab.refresh() + self.tab.wait.doc_loaded(raise_err=False,timeout=120) + + + + +class ApproveTask: + """审批任务处理类：负责处理产品风险审批任务""" + + country_info = { + "DE": "德国", + "FR": "法国", + "ES": "西班牙", + "IT": "意大利", + "UK": "英国" + } + + @staticmethod + def show_notification(message: str, message_type: str = "error"): + """显示 pywebview 顶层通知（5秒后自动消失） + + Args: + message: 通知消息 + message_type: 消息类型 (success/warning/error/info) + """ + if webview and webview.windows: + try: + # 转义单引号，防止 JavaScript 语法错误 + safe_message = message.replace("'", "\\'").replace('"', '\\"').replace('\n', '\\n') + + # 设置通知样式颜色 + color_map = { + 'success': '#67C23A', + 'warning': '#E6A23C', + 'error': '#F56C6C', + 'info': '#909399' + } + bg_color = color_map.get(message_type, '#F56C6C') + + # 构建前端通知的 JavaScript 代码 - 创建原生 HTML 通知 + js_code = f""" + (function() {{ + // 移除已存在的通知 + var existingNotif = document.getElementById('pywebview-notification'); + if (existingNotif) {{ + existingNotif.remove(); + }} + + // 创建通知容器 + var notif = document.createElement('div'); + notif.id = 'pywebview-notification'; + notif.style.cssText = 'position: fixed; top: 20px; left: 50%; transform: translateX(-50%); ' + + 'background: {bg_color}; color: white; padding: 12px 20px; border-radius: 4px; ' + + 'box-shadow: 0 2px 12px rgba(0,0,0,0.3); z-index: 99999; font-size: 14px; ' + + 'max-width: 600px; word-wrap: break-word; display: flex; align-items: center; gap: 10px;'; + + // 添加消息内容 + var msgSpan = document.createElement('span'); + msgSpan.textContent = '{safe_message}'; + notif.appendChild(msgSpan); + + // 添加关闭按钮 + var closeBtn = document.createElement('span'); + closeBtn.innerHTML = '×'; + closeBtn.style.cssText = 'cursor: pointer; font-size: 18px; font-weight: bold; margin-left: 10px;'; + closeBtn.onclick = function() {{ notif.remove(); }}; + notif.appendChild(closeBtn); + + // 添加到页面 + document.body.appendChild(notif); + + // 5秒后自动消失 + setTimeout(function() {{ + if (notif && notif.parentNode) {{ + notif.style.transition = 'opacity 0.3s'; + notif.style.opacity = '0'; + setTimeout(function() {{ notif.remove(); }}, 300); + }} + }}, 5000); + }})(); + """ + # 在第一个窗口中执行 JavaScript + webview.windows[0].evaluate_js(js_code) + except Exception as e: + print(f"显示通知失败: {str(e)}") + + """ + 处理流程： + 1、解析任务json,提取对应的companyName 组组装user_info实例化 AmzoneApprove + 2、打开对应的店铺、遍历所有的国家站点处理 + 3、切换至指定国家，切换至 管理所有库存页面 + 4、调用search方法，查询出是否存在需要审批的商品，如果没有则结束；如果有则进入处理流程 + 5、进入处理流程后，调用run_page_action方法(注意是通过yield 返回数据的) + + 任务json示例： + { + "type": "product-risk-resolve-run", + "ts": 1775395996876, + "data": { + "taskId": 925, + "items": [ + { + "matched": true, + "platform": "亚马逊", + "shopName": "魏振峰", + "shopId": "27543917795757", + "companyName": "rongchuang123", + "openStoreUrl": null, + "matchedUserId": 17543915345493, + "matchStatus": "MATCHED", + "matchMessage": null + } + ], + "country_codes": [ + "UK", + "DE", + "FR", + "ES" + ] + } + } + """ + + def __init__(self, user_info: dict = None): + """初始化审批任务处理器 + + Args: + user_info: 用户信息字典，包含 company, username, password + """ + self.user_info = user_info or {} + self.running = True + + def log(self, message: str, level: str = "INFO"): + """日志输出 + + Args: + message: 日志消息 + level: 日志级别 + """ + from datetime import datetime + timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + if level == "ERROR": + self.show_notification(message, "error") + print(f"[{timestamp}] [ApproveTask] [{level}] {message}") + + def process_task(self, task_data: dict): + """处理审批任务主入口 + + Args: + task_data: 任务数据 + """ + try: + data = task_data.get("data", {}) + task_id = data.get("taskId") + items = data.get("items", []) + country_codes = data.get("country_codes", []) + risk_listing_filter = data.get("risk_listing_filter", "") + + if not task_id: + self.log("任务ID为空，跳过", "WARNING") + return + + if not items: + self.log("店铺列表为空，跳过", "WARNING") + return + + if not country_codes: + self.log("国家列表为空，跳过", "WARNING") + return + + self.log(f"开始处理审批任务 {task_id}，共 {len(items)} 个店铺，{len(country_codes)} 个国家") + + from config import runing_task + runing_task[task_id] = { + "status": "running", + "start_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "total_shops": len(items), + "processed_shops": 0, + "total_countries": len(country_codes) * len(items), + "processed_countries": 0, + "total_asins": 0, + "processed_asins": 0, + "success_count": 0, + "failed_count": 0, + "stop_requested": False + } + + # 遍历处理每个店铺 + for idx, shop_item in enumerate(items, 1): + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理", "WARNING") + runing_task[task_id]["status"] = "stopped" + return + + shop_name = shop_item.get("shopName", "未知店铺") + self.log(f"[{idx}/{len(items)}] 开始处理店铺: {shop_name}") + self.show_notification(f"开始处理店铺: {shop_name}", "info") + + try: + self.process_shop(shop_item, country_codes, task_id,risk_listing_filter) + # 更新已处理店铺数 + if task_id in runing_task: + runing_task[task_id]["processed_shops"] += 1 + except Exception as e: + import traceback + self.log(f"处理店铺 {shop_name} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + + # 更新任务状态 + if task_id in runing_task: + if runing_task[task_id].get("stop_requested", False): + runing_task[task_id]["status"] = "stopped" + self.log(f"任务 {task_id} 已被暂停！") + else: + runing_task[task_id]["status"] = "completed" + self.log(f"任务 {task_id} 处理完成！") + + except Exception as e: + import traceback + self.log(f"任务处理失败: {traceback.format_exc()}", "ERROR") + if task_id: + from config import runing_task + if task_id in runing_task: + runing_task[task_id]["status"] = "failed" + runing_task[task_id]["error"] = str(e) + + def process_shop(self, shop_item: dict, country_codes: list, task_id: int, risk_listing_filter: str): + """处理单个店铺 + + Args: + shop_item: 店铺信息 + country_codes: 国家代码列表 + task_id: 任务ID + risk_listing_filter: 风险商品筛选条件 + """ + shop_name = shop_item.get("shopName", "未知店铺") + company_name = shop_item.get("companyName", "") + + if not company_name: + self.log(f"店铺 {shop_name} 的公司名称为空，跳过", "WARNING") + return + + + if task_id in runing_task: + runing_task[task_id]["current_shop"] = shop_name + + # 将店铺添加到正在执行中的店铺列表 + start_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + runing_shop[shop_name] = start_time + self.log(f"店铺 {shop_name} 已添加到执行列表，账号: {company_name}，开始时间: {start_time}") + + # 店铺打开重试最多3次 + driver = None + max_retries = 3 + + error_info = "" + for retry in range(max_retries): + try: + self.log(f"尝试打开店铺 {shop_name} (第 {retry + 1}/{max_retries} 次)") + + # 如果不是第一次尝试，先杀进程 + # if retry > 0: + # self.log("重试前先杀掉浏览器进程...") + # kill_process("v6") + # kill_process("v5") + # time.sleep(2) + + # 组装用户信息并创建驱动 + user_info = { + **self.user_info, + "company": company_name + } + driver = AmzoneApprove(user_info) + browser = driver.open_shop(shop_name) + + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name}") + break + else: + self.log(f"打开店铺失败: {browser}", "WARNING") + driver = None + + # 判断是否需要登录 + need_login = driver.need_login() + if need_login: + self.log(f"店铺 {shop_name} 需要登录，正在登录...") + password = "" + + login_success = driver.login(password) + if login_success: + self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") + browser = driver.open_shop(shop_name) + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name} 登录后") + break + else: + self.log(f"登录后打开店铺失败: {browser}", "WARNING") + driver = None + else: + self.log(f"店铺 {shop_name} 登录失败", "WARNING") + driver = None + + except Exception as e: + import traceback + self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") + driver = None + error_info = str(e) + time.sleep(10) + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(3) + + # 检查是否成功打开 + if not driver or not browser or browser == "店铺不存在": + error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" + self.log(error_msg, "ERROR") + # 从执行列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + return + + try: + # 处理每个国家 + for country_code in country_codes: + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理国家", "WARNING") + break + + try: + self.process_country(driver, country_code, task_id, shop_name,risk_listing_filter) + except Exception as e: + import traceback + self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + # 最后回传，标记完成 + try: + self.post_result(task_id, shop_name, country_code, "", "", is_done=True) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") + finally: + # 关闭店铺 + try: + if driver: + self.log(f"关闭店铺 {shop_name}") + driver.close_store() + time.sleep(2) + except Exception as e: + self.log(f"关闭店铺失败: {str(e)}", "WARNING") + + # 从正在执行中的店铺列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + self.log(f"店铺 {shop_name} 已从执行列表中移除") + + def process_country(self, driver: AmzoneApprove, country_code: str, task_id: int, shop_name: str, risk_listing_filter: str): + """处理单个国家的审批任务 + + Args: + driver: AmzoneApprove驱动实例 + country_code: 国家代码（如 UK, DE, FR 等） + task_id: 任务ID + shop_name: 店铺名称 + risk_listing_filter: 风险商品筛选条件 + """ + from config import runing_task + + # 转换国家代码为中文名称 + country_name = self.country_info.get(country_code, country_code) + info_mes = f"开始处理国家: {country_name} ({country_code})" + self.log(info_mes) + self.show_notification(info_mes, "info") + + # 更新当前处理的国家 + if task_id in runing_task: + runing_task[task_id]["current_country"] = country_name + + # 切换国家，最多重试3次 + max_retries = 3 + switch_success = False + + for retry in range(max_retries): + try: + self.log(f"尝试切换到国家 {country_name} (第 {retry + 1}/{max_retries} 次)") + + # 如果不是第一次尝试，先刷新页面 + if retry > 0: + self.log("重试前刷新页面...") + try: + driver.tab.refresh() + time.sleep(3) + except Exception as e: + self.log(f"刷新页面失败: {str(e)}", "WARNING") + + switch_success = driver.SwitchingCountries(country_name) + if switch_success: + self.log(f"成功切换到国家 {country_name}") + break + else: + self.log(f"切换到国家 {country_name} 失败", "WARNING") + + except Exception as e: + import traceback + self.log(f"切换国家 {country_name} 异常: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(2) + + # 如果切换失败，直接返回 + if not switch_success: + error_message = f"切换到国家 {country_name} 失败，已重试 {max_retries} 次，跳过该国家" + self.log(error_message, "ERROR") + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + return + + # 切换到库存管理页面 + try: + driver.SwitchPage() + self.log(f"已切换到库存管理页面") + except Exception as e: + import traceback + self.log(f"切换页面失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + return + + # 搜索需要审批的商品，最多重试3次 + sku_ls = [] + for retry in range(max_retries): + try: + self.log(f"尝试搜索需要审批的商品 (第 {retry + 1}/{max_retries} 次)") + sku_ls = driver.search(filter_type=risk_listing_filter) + break + except Exception as e: + self.log(f"搜索商品异常: {str(e)}", "ERROR") + if retry < max_retries - 1: + try: + driver.tab.refresh() + time.sleep(3) + except Exception as refresh_error: + self.log(f"刷新页面失败: {str(refresh_error)}", "WARNING") + + # 如果没有需要审批的商品，直接返回 + if len(sku_ls) == 0: + self.log(f"国家 {country_name} 没有需要审批的商品") + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + return + + self.log(f"国家 {country_name} 有 {len(sku_ls)} 个需要审批的商品，开始处理...") + + # 处理所有需要审批的商品（通过yield获取结果） + try: + for asin, status in driver.run_page_action(): + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理ASIN", "WARNING") + break + + self.log(f"ASIN {asin} 处理结果: {status}") + + # 更新任务状态 + if task_id in runing_task: + runing_task[task_id]["current_asin"] = asin + runing_task[task_id]["processed_asins"] += 1 + + if status == "处理完成": + runing_task[task_id]["success_count"] += 1 + elif status == "请求批准": + # 请求批准的商品也算作成功（因为不需要处理） + runing_task[task_id]["success_count"] += 1 + else: + runing_task[task_id]["failed_count"] += 1 + + # 回传结果到API + try: + self.post_result(task_id, shop_name, country_code, asin, status) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") + + except Exception as e: + import traceback + self.log(f"处理审批商品异常: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + + # 更新已处理国家数 + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + + self.log(f"国家 {country_name} 处理完成") + + def post_result(self, task_id: int, shop_name: str, country_code: str, asin: str, status: str,is_done: bool = False): + """回传处理结果到API + + Args: + task_id: 任务ID + shop_name: 店铺名称 + country_code: 国家代码 + asin: ASIN + status: 处理状态 + """ + import requests + from config import DELETE_BRAND_API_BASE + + url = f"{DELETE_BRAND_API_BASE}/api/product-risk-resolve/tasks/{task_id}/result" + if status == "请求批准": + country_data = { + "status": "", + "shopName": shop_name, + "productAsinSku": "", + "done": is_done, + "removeAsin": asin, + "removeStatus": status + } + else: + country_data = { + "status": status, + "shopName": shop_name, + "productAsinSku": asin, + "done": is_done, + "removeAsin": "", + "removeStatus": "" + } + + payload = { + "shops": [ + { + "error": "", + "countries": { + country_code : [ country_data ] + }, + "shopName": shop_name + } + ] + } + + max_retries = 3 + for retry in range(max_retries): + try: + print("=====================================") + self.log(f"尝试回传结果 (第 {retry + 1}/{max_retries} 次)") + self.log(f"回传URL: {url}") + self.log(f"回传数据: {payload}") + response = requests.post( + url, + json=payload, + headers={"Content-Type": "application/json"}, + timeout=30, + verify=False + ) + self.log(f"回传结果: {response.text}") + + if response.status_code == 200: + self.log(f"结果回传成功: {asin} - {status}") + return + else: + self.log(f"结果回传失败，状态码: {response.status_code}", "WARNING") + print("=====================================") + + except Exception as e: + self.log(f"调用API异常: {str(e)}", "ERROR") + print("=====================================") + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(2) + + self.log(f"已达到最大重试次数，结果回传最终失败", "ERROR") + + + +if __name__ == '__main__': + user_info = { + "company": "rongchuang123", + "username": "自动化_Robot", + "password": "#20zsg25" + } + shop_name = "魏振峰" + country = "西班牙" + kill_process('v6') + driver = AmzoneApprove(user_info) + browser = driver.open_shop(shop_name) + sw_suc = driver.SwitchingCountries(country) + driver.SwitchPage() + risk_listing_filter = "Active" + for _ in range(3): + try: + sku_ls = driver.search(filter_type=risk_listing_filter) + break + except Exception as e: + print(e) + driver.tab.refresh() + if len(sku_ls) > 0: + print("有数据，开始操作") + for asin, status in driver.run_page_action(): + print(f"ASIN {asin} 的处理结果: {status}") + print("已完成操作") + + # for i in range(0): + # print(i) \ No newline at end of file diff --git a/app/amazon/approve.py b/app/amazon/approve.py index 5efc458..7615a80 100644 --- a/app/amazon/approve.py +++ b/app/amazon/approve.py @@ -14,6 +14,7 @@ except ImportError: webview = None class AmzoneApprove(AmamzonBase): + mark_name = "产品风险审批" def SwitchPage(self): """ @@ -32,7 +33,6 @@ class AmzoneApprove(AmamzonBase): search_region = self.tab.ele('xpath://div[@id="searchBoxContainer"]//kat-input-group') search_region.wait.displayed(raise_err=False) - def search(self,filter_type="ApprovalRequired"): sku_ls = [] @@ -70,8 +70,9 @@ class AmzoneApprove(AmamzonBase): return sku_ls #"没有需要审批的商品了" for _ in range(3): # 等待加载完成 - load_ele = self.tab.ele("xpath://div[contains(@class,'Loader-module__loader')]") - load_ele.wait.deleted(timeout=3, raise_err=False) + load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]") + if len(load_ele) > 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) time.sleep(0.5) sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=3) @@ -91,9 +92,10 @@ class AmzoneApprove(AmamzonBase): print("等待加载中消失出错", e) def clear_tab(self): - all_tab = self.browser.get_tabs(title="亚马逊",as_id=True) + all_tab = self.browser.get_tabs(title="亚马逊") close_tab = [] for tab in all_tab: + tab_id = tab if isinstance(tab,str) else tab.tab_id if self.tab.tab_id == tab: continue close_tab.append(tab) @@ -112,81 +114,89 @@ class AmzoneApprove(AmamzonBase): except Exception as e: print("等待加载中消失出错", e) - tab.wait.doc_loaded(timeout=30) + tab.wait.doc_loaded(timeout=60,raise_err=False) submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10) if len(submit_btn_ls) == 0: print("未找到提交按钮，可能页面未加载完成或者页面结构发生变化") return - # todo 遍历 - for index in range(len(submit_btn_ls)): - if index > len(submit_btn_ls)-1: - print("提交按钮数量发生变化，停止处理") - break - - submit_btn = submit_btn_ls[index] + for _ in range(3): + try: + # todo 遍历 + for index in range(len(submit_btn_ls)): + if index > len(submit_btn_ls)-1: + print("提交按钮数量发生变化，停止处理") + break + + submit_btn = submit_btn_ls[index] - # 关闭按钮 - close_x_btn = tab.eles('xpath://div[@class="flyoutPanelContent"]/span',timeout=5) - if len(close_x_btn) > 0: - close_x_btn[0].wait.displayed(timeout=5, raise_err=False) - close_x_btn[0].click() + # 关闭按钮 + close_x_btn = tab.eles('xpath://div[@class="flyoutPanelContent"]/span',timeout=5) + if len(close_x_btn) > 0: + close_x_btn[0].wait.displayed(timeout=5, raise_err=False) + close_x_btn[0].click() - submit_btn.wait.enabled(timeout=5, raise_err=False) - submit_btn.click() - time.sleep(0.5) - self.wait_loaded() - - wait_loaded() - - need_input = tab.eles('xpath://div[@class="contentWrapper"]//kat-input[@data-testid="kat-input-dew:ump_epr_resgitration_number_title"]',timeout=5) - if len(need_input) > 0: - print("需要输入注册号，不符合操作要求，跳过...") - continue - - target_title = tab.eles('xpath://div[@class="contentWrapper"]//section//h4[text()="警告和安全信息"]') - if len(target_title) > 0: - not_start = tab.eles('xpath://div[@class="contentWrapper"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]') - if len(not_start) == 0: - print("安全证明-不是未开始状态，不需要操作") - continue - - not_start.wait.displayed(timeout=5, raise_err=False) - not_start.click() - - wait_loaded() - - check = tab.ele('xpath://div[@class="contentWrapper"]//kat-checkbox[@name="value"]') - check.wait.displayed(timeout=5, raise_err=False) - check.click() - - save_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]') - save_btn.wait.enabled(timeout=5, raise_err=False) - save_btn.click() - - wait_loaded() - - close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10) - close_btn.wait.displayed(timeout=5, raise_err=False) - close_btn.click() - - save_btn_ls = tab.eles('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]',timeout=5) - if len(save_btn_ls) > 0: - option_selection_ls = tab.eles('xpath://div[@class="contentWrapper"]//div[@role="option"]',timeout=5) - for option in option_selection_ls: - option.click() + submit_btn.wait.enabled(timeout=5, raise_err=False) + submit_btn.click() time.sleep(0.5) + self.wait_loaded() - save_btn_ls[0].wait.enabled(timeout=5, raise_err=False) - save_btn_ls[0].click() + wait_loaded() - wait_loaded() + need_input = tab.eles('xpath://div[@class="contentWrapper"]//kat-input[@data-testid="kat-input-dew:ump_epr_resgitration_number_title"]',timeout=5) + if len(need_input) > 0: + print("需要输入注册号，不符合操作要求，跳过...") + continue - close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10) - close_btn.wait.displayed(timeout=5, raise_err=False) - close_btn.wait.enabled(timeout=5, raise_err=False) - close_btn.click() + target_title = tab.eles('xpath://div[@class="contentWrapper"]//section//h4[text()="警告和安全信息"]') + if len(target_title) > 0: + not_start = tab.eles('xpath://div[@class="contentWrapper"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]') + if len(not_start) == 0: + print("安全证明-不是未开始状态，不需要操作") + continue - submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10) + not_start.wait.displayed(timeout=5, raise_err=False) + not_start.click() + + wait_loaded() + + check = tab.ele('xpath://div[@class="contentWrapper"]//kat-checkbox[@name="value"]') + check.wait.displayed(timeout=5, raise_err=False) + check.click() + + save_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]') + save_btn.wait.enabled(timeout=5, raise_err=False) + save_btn.click() + + wait_loaded() + + close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10) + close_btn.wait.displayed(timeout=5, raise_err=False) + close_btn.click() + + save_btn_ls = tab.eles('xpath://div[@class="contentWrapper"]//kat-button[@variant="primary"]',timeout=5) + if len(save_btn_ls) > 0: + option_selection_ls = tab.eles('xpath://div[@class="contentWrapper"]//div[@role="option"]',timeout=5) + for option in option_selection_ls: + option.click() + time.sleep(0.5) + + save_btn_ls[0].wait.enabled(timeout=5, raise_err=False) + save_btn_ls[0].click() + + wait_loaded() + + close_btn = tab.ele('xpath://div[@class="contentWrapper"]//kat-button[@label="关闭"]',timeout=10) + close_btn.wait.displayed(timeout=5, raise_err=False) + close_btn.wait.enabled(timeout=5, raise_err=False) + close_btn.click() + + submit_btn_ls = tab.eles('xpath://div[@id="ahd-product-policies-table"]/div//div[@data-testid="nextStepsMetricWrapper"]//kat-button[@label="提交"]',timeout=10) + break + except Exception as e: + print(f"【handle_repair_product】处理修复商品信息异常", traceback.format_exc()) + tab.refresh() + tab.wait.doc_loaded(timeout=60,raise_err=False) + time.sleep(2) print("修复商品信息处理完成！") tab.close() @@ -194,142 +204,205 @@ class AmzoneApprove(AmamzonBase): def run_page_action(self): print("开始执行") num = 0 + retry_num = 0 + already_asin = set() - while 1: + while retry_num < 3: # 最多重试3次 # if num > 3: #测试 # return # 等待加载完成 - load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5) - if len(load_ele) > 0: - load_ele[0].wait.deleted(timeout=3, raise_err=False) + try: + load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5) + if len(load_ele) > 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) time.sleep(0.5) - # 获取当前页码 - page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) - if len(page_pamel) > 0: - current_page = page_pamel[0].sr('xpath:.//ul[@class="pages"]//li[@aria-current="true"]').text - print(f"【current_page】开始处理，当前页码: {current_page}") + # 获取当前页码 + try: + page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) + if len(page_pamel) > 0: + current_page = page_pamel[0].sr('xpath:.//ul[@class="pages"]//li[@aria-current="true"]').text - sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=10) - print(f"获取到 {len(sku_ls)}") - # for sku_ele in sku_ls[0:2]: - for sku_ele in sku_ls: - # solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]') - solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]|.//kat-link[@label="修复被禁止显示的商品"]|.//kat-link[@label="解决商品移除风险"]') - if len(solve_problem) == 0: - print(f"{asin},没有处理入口，不处理") - yield (asin,"没有处理入口，不处理") - continue - asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]').text - print(f"ASIN {asin} 存在问题，正在点击解决...") - solve_problem[0].click() + # 总页数 + total_page = page_pamel[0].sr.eles('xpath:.//ul[@class="pages"]//span[@class="page__inner"][last()]') + if len(total_page) > 0: + total_page = total_page[-1].text + else: + total_page = 0 + print(f"当前页码: {current_page} / 总页数: {total_page}") + except Exception as e: + print("获取页码失败", e) - action_panel = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]') - action_panel.wait.displayed(timeout=5, raise_err=False) - - self.wait_loaded() - - # 如果存在“请求批准”按钮，则直接返回跳过 - request_approval_btn = self.tab.eles('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="section-header" and contains(string(.),"移除")]',timeout=5) - if len(request_approval_btn) > 0: - print(f"ASIN {asin} 存在请求批准按钮，不需要处理,跳过...") - panel_close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]', - timeout=5).sr('xpath:.//button[@class="close"]') - panel_close_btn.click() - - action_panel.wait.deleted(timeout=3, raise_err=False) - yield (asin,"请求批准") - - - # 解决商品信息违规问题 按钮 - kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]',timeout=5) - # if len(kat_box_ls) == 0: - # print(f"ASIN {asin} 的操作面板中未找到选项，跳过...") - # continue - print(f"ASIN {asin}需要处理的有：{len(kat_box_ls)}个问题.") - # 解决商品信息违规问题 按钮，有多少个都要处理 - for i in range(len(kat_box_ls)): - print(f"开始处理第{i}个问题") - kat_box_ls[i].click() - time.sleep(0.5) - self.wait_loaded() - - # TODO 增加 “出现警告和安全信息时候下滑” 的情况 - safe_handle_ls = self.tab.eles('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]', - timeout=5) - if len(safe_handle_ls) > 0: - print("存在安全证明，正在处理...") - safe_handle_ls[0].click() - time.sleep(0.5) - self.wait_loaded() - check_box = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-checkbox') - check_box.click() - else: - problem_selection_ls = self.tab.eles( - 'xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="registry-list"]//div[@data-testid="registry"]', - timeout=10) - print("待选择数量",len(problem_selection_ls)) - for problem_selection in problem_selection_ls: - problem_selection.click() - print("点击选择完成") - time.sleep(0.5) - - # 点击保存 - confirm_btn = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//kat-button[@variant="primary"]') - confirm_btn.wait.displayed(timeout=3, raise_err=False) - confirm_btn.click() - - self.wait_loaded() - - # 等待关闭按钮出现 - try: - close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-button[@label="关闭"]', - timeout=10) - close_btn.click() - except Exception as e: - print("点击关闭按钮失败",e) - - kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]', timeout=5) - - # 修复商品信息 - repair_product = action_panel.eles('xpath:.//kat-button[@class="action-button"]',timeout=5) - if len(repair_product) > 0: - print(f"ASIN {asin} 存在修复商品信息按钮，正在点击...") - self.clear_tab() - repair_product[0].click() - time.sleep(1) - # 获取最新的tab - new_tab = self.browser.latest_tab - if isinstance(new_tab, str): - new_tab = self.browser.get_tab(id_or_num=new_tab) - - self.handle_repair_product(new_tab) + sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=10) + print(f"获取到 {len(sku_ls)}") + # for sku_ele in sku_ls[0:2]: + for sku_ele in sku_ls: + # solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]') - yield (asin,"处理完成") - # 全部操作完成，关闭 - panel_close_btn= self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]', - timeout=5).sr('xpath:.//button[@class="close"]') - panel_close_btn.click() + asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]').text + print(f"ASIN {asin} 存在问题，正在点击解决...") + if asin in already_asin: + print(f"{asin} 已经处理过了，跳过") + continue + solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]|.//kat-link[@label="修复被禁止显示的商品"]|.//kat-link[@label="解决商品移除风险"]') + if len(solve_problem) == 0: + # //a[text0=”添加缺失的商品详情”] + lack_info = sku_ele.eles('xpath:.//a[text()="添加缺失的商品详情"]') + if len(lack_info) > 0: + print(f"{asin} 需要添加缺失的商品详情，跳过...") + yield (asin,"添加缺失的商品详情") + continue - action_panel.wait.deleted(timeout=3, raise_err=False) + print(f"{asin},没有处理入口，不处理") + yield (asin,"没有处理入口，不处理") + already_asin.add(asin) + continue + + solve_problem[0].click() + + action_panel = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]') + action_panel.wait.displayed(timeout=5, raise_err=False) + + self.wait_loaded() + + try: + # 如果存在“请求批准”按钮，则直接返回跳过 + request_approval_btn = self.tab.eles('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="section-header" and contains(string(.),"移除")]',timeout=5) + if len(request_approval_btn) > 0: + print(f"ASIN {asin} 存在请求批准按钮，不需要处理,跳过...") + panel_close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]', + timeout=5).sr('xpath:.//button[@class="close"]') + panel_close_btn.click() + + action_panel.wait.deleted(timeout=3, raise_err=False) + yield (asin,"请求批准") + already_asin.add(asin) + continue + + # 无需采取任何操作 + not_operate = self.tab.eles('xpath://kat-alert[contains(@description,"如果您之前已提交更改，则这些更改当前正在处理中") and not(@dismissed)]',timeout=3) + if len(not_operate) > 0: + print(f"ASIN {asin} 无需采取任何操作,跳过...") + yield (asin,"无需操作") + already_asin.add(asin) + continue + + # 解决商品信息违规问题 按钮 + kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]',timeout=5) + # if len(kat_box_ls) == 0: + # print(f"ASIN {asin} 的操作面板中未找到选项，跳过...") + # continue + print(f"ASIN {asin}需要处理的有：{len(kat_box_ls)}个问题.") + # 解决商品信息违规问题 按钮，有多少个都要处理 + for i in range(len(kat_box_ls)): + print(f"开始处理第{i}个问题") + if len(kat_box_ls) <= i: + print(f"ASIN {asin} 的操作面板中选项数量发生变化，停止处理...") + break + kat_box_ls[i].click() + time.sleep(0.5) + self.wait_loaded() + + # TODO 增加 “出现警告和安全信息时候下滑” 的情况 + safe_handle_ls = self.tab.eles('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[@aria-label="安全证明"]//kat-label[@text="未开始"]', + timeout=5) + if len(safe_handle_ls) > 0: + print("存在安全证明，正在处理...") + safe_handle_ls[0].click() + time.sleep(0.5) + self.wait_loaded() + check_box = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-checkbox') + check_box.click() + else: + problem_selection_ls = self.tab.eles( + 'xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//div[@data-testid="registry-list"]//div[@data-testid="registry"]', + timeout=10) + print("待选择数量",len(problem_selection_ls)) + for problem_selection in problem_selection_ls: + problem_selection.click() + print("点击选择完成") + time.sleep(0.5) + + # 点击保存 + confirm_btn = self.tab.ele('xpath://kat-panel-wrapper[@data-testid="kat-panel-wrapper-ActionPanelContent"]//kat-button[@variant="primary"]') + confirm_btn.wait.displayed(timeout=3, raise_err=False) + confirm_btn.click() + + self.wait_loaded() + + # 等待关闭按钮出现 + try: + close_btn = self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//kat-button[@label="关闭"]', + timeout=10) + close_btn.click() + except Exception as e: + print("点击关闭按钮失败",e) + + kat_box_ls = action_panel.eles('xpath:.//kat-box[@variant="white"]', timeout=5) + + # 修复商品信息 + repair_product = action_panel.eles('xpath:.//kat-button[@class="action-button"]',timeout=5) + if len(repair_product) > 0: + print(f"ASIN {asin} 存在修复商品信息按钮，正在点击...") + self.clear_tab() + repair_product[0].click() + time.sleep(1) + # 获取最新的tab + new_tab = self.browser.latest_tab + if isinstance(new_tab, str): + new_tab = self.browser.get_tab(id_or_num=new_tab) + + self.handle_repair_product(new_tab) + except Exception as e: + print("【asin】：",asin,"处理失败",traceback.format_exc()) + yield (asin,"处理失败") + already_asin.add(asin) + continue + + yield (asin,"处理完成") + already_asin.add(asin) + + try: + # 全部操作完成，关闭 + panel_close_btn= self.tab.ele('xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]', + timeout=5).sr('xpath:.//button[@class="close"]') + panel_close_btn.click() + + action_panel.wait.deleted(timeout=3, raise_err=False) + + self.clear_tab() + + except Exception as e: + print("关闭操作面板失败", e) - - # 判断是否存在需要翻页的情况 - page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) - if len(page_pamel) == 0: - break - next_page_btn = page_pamel[0].sr('xpath:.//span[@part="pagination-nav-right"]') - class_str = next_page_btn.attr('class') - if "end" in class_str: - break - next_page_btn.click() - num += 1 - # print(f"正在翻页，已翻 {num} 页...") + # 判断是否存在需要翻页的情况 + page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) + if len(page_pamel) == 0: + break + next_page_btn = page_pamel[0].sr('xpath:.//span[@part="pagination-nav-right"]') + class_str = next_page_btn.attr('class') + if "end" in class_str: + break + next_page_btn.click() + num += 1 + print(f"【程序计算】正在翻页，已翻 {num} 页...") + + already_asin = set() + + except Exception as e: + print("处理审批操作异常", e) + traceback.print_exc() + retry_num += 1 + self.tab.refresh() + self.tab.wait.doc_loaded(raise_err=False,timeout=120) + + class ApproveTask: """审批任务处理类：负责处理产品风险审批任务""" + mark_name = "产品风险审批" country_info = { "DE": "德国", @@ -578,6 +651,7 @@ class ApproveTask: driver = None max_retries = 3 + error_info = "" for retry in range(max_retries): try: self.log(f"尝试打开店铺 {shop_name} (第 {retry + 1}/{max_retries} 次)") @@ -603,13 +677,33 @@ class ApproveTask: else: self.log(f"打开店铺失败: {browser}", "WARNING") driver = None + # 判断是否需要登录 - + need_login = driver.need_login() + if need_login: + self.log(f"店铺 {shop_name} 需要登录，正在登录...") + password = "" + + login_success = driver.login(password) + if login_success: + self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") + browser = driver.open_shop(shop_name) + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name} 登录后") + break + else: + self.log(f"登录后打开店铺失败: {browser}", "WARNING") + driver = None + else: + self.log(f"店铺 {shop_name} 登录失败", "WARNING") + driver = None + except Exception as e: import traceback - self.log(f"打开店铺异常: {str(e)}", "ERROR") - self.log(traceback.format_exc(), "ERROR") + self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") driver = None + error_info = str(e) + time.sleep(10) # 如果还有重试机会，等待后继续 if retry < max_retries - 1: @@ -617,7 +711,7 @@ class ApproveTask: # 检查是否成功打开 if not driver or not browser or browser == "店铺不存在": - error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺" + error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" self.log(error_msg, "ERROR") # 从执行列表中移除 if shop_name in runing_shop: @@ -775,7 +869,7 @@ class ApproveTask: if status == "处理完成": runing_task[task_id]["success_count"] += 1 - elif status == "请求批准": + elif status in ["请求批准", "添加缺失的商品详情"]: # 请求批准的商品也算作成功（因为不需要处理） runing_task[task_id]["success_count"] += 1 else: @@ -812,7 +906,7 @@ class ApproveTask: from config import DELETE_BRAND_API_BASE url = f"{DELETE_BRAND_API_BASE}/api/product-risk-resolve/tasks/{task_id}/result" - if status == "请求批准": + if status in ["请求批准","添加缺失的商品详情"]: country_data = { "status": "", "shopName": shop_name, diff --git a/app/amazon/del_brand.py b/app/amazon/del_brand.py index 0ff25f6..d0f60f2 100644 --- a/app/amazon/del_brand.py +++ b/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}") diff --git a/app/amazon/main.py b/app/amazon/main.py index af45cf2..1f7d6f7 100644 --- a/app/amazon/main.py +++ b/app/amazon/main.py @@ -7,6 +7,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from config import JSON_TASK_QUEUE, runing_task, runing_shop, DELETE_BRAND_API_BASE, ZN_COMPANY, ZN_USERNAME, ZN_PASSWORD from amazon.del_brand import AmazoneDriver, kill_process from amazon.approve import ApproveTask +from amazon.match_action import MatchTak class TaskMonitor: @@ -47,6 +48,10 @@ class TaskMonitor: self.executor = ThreadPoolExecutor(max_workers=self.max_workers) futures = [] # 保存所有提交的任务Future对象 + task_type_info = { + "product-risk-resolve-run" : "产品风险审批", + "shop-match-run" : "匹配价格" + } try: while self.running: try: @@ -63,10 +68,10 @@ class TaskMonitor: future = self.executor.submit(self._process_task_wrapper, task_data) futures.append(future) - elif task_type == "product-risk-resolve-run": + elif task_type in task_type_info: # 提交产品风险审批任务到线程池 self.log(f"接收到产品风险审批任务，提交到线程池处理...") - future = self.executor.submit(self._process_approve_task_wrapper, task_data) + future = self.executor.submit(self._process_approve_task_wrapper, task_data, task_type_info[task_type]) futures.append(future) else: @@ -102,16 +107,21 @@ class TaskMonitor: except Exception as e: self.log(f"线程 {id(task_data)} 删除品牌任务处理异常: {traceback.format_exc()}", "ERROR") - def _process_approve_task_wrapper(self, task_data: Dict[str, Any]): + def _process_approve_task_wrapper(self, task_data: Dict[str, Any],TASK_TYPE:str): """审批任务处理包装器（用于线程池调用） Args: task_data: 任务数据 """ try: + TASK_INFO = { + "产品风险审批" : ApproveTask, + "匹配价格" : MatchTak + } self.log(f"线程 {id(task_data)} 开始处理产品风险审批任务...") # 创建ApproveTask实例并处理任务 - approve_task = ApproveTask(user_info=self.user_info) + TASK_CLS = TASK_INFO[TASK_TYPE] # 根据任务类型选择处理类，默认为ApproveTask + approve_task = TASK_CLS(user_info=self.user_info) approve_task.process_task(task_data) self.log(f"线程 {id(task_data)} 产品风险审批任务处理完成") except Exception as e: @@ -232,24 +242,24 @@ class TaskMonitor: driver = None # 判断是否需要登录 - # need_login = driver.need_login() - # if need_login: - # self.log(f"店铺 {shop_name} 需要登录，正在登录...") - # password = "" + need_login = driver.need_login() + if need_login: + self.log(f"店铺 {shop_name} 需要登录，正在登录...") + password = "" - # login_success = driver.login(password) - # if login_success: - # self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") - # browser = driver.open_shop(shop_name) - # if browser and browser != "店铺不存在": - # self.log(f"成功打开店铺 {shop_name} 登录后") - # break - # else: - # self.log(f"登录后打开店铺失败: {browser}", "WARNING") - # driver = None - # else: - # self.log(f"店铺 {shop_name} 登录失败", "WARNING") - # driver = None + login_success = driver.login(password) + if login_success: + self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") + browser = driver.open_shop(shop_name) + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name} 登录后") + break + else: + self.log(f"登录后打开店铺失败: {browser}", "WARNING") + driver = None + else: + self.log(f"店铺 {shop_name} 登录失败", "WARNING") + driver = None except Exception as e: diff --git a/app/amazon/match_action.py b/app/amazon/match_action.py new file mode 100644 index 0000000..260ff27 --- /dev/null +++ b/app/amazon/match_action.py @@ -0,0 +1,656 @@ +import time +import re +import traceback +from DrissionPage._pages.chromium_tab import ChromiumTab + +from config import runing_task, runing_shop +from datetime import datetime +from amazon.del_brand import AmamzonBase, kill_process + +from amazon.tool import show_notification + + +class AmzoneMatchAction(AmamzonBase): + mark_name = "匹配价格" + + def SwitchPage(self): + """ + 切换至 管理所有库存页面 + 1、等待 //navigation-favorites-bar[@class="hydrated"] 出现 + """ + navigation = self.tab.ele('xpath://navigation-favorites-bar[@class="hydrated"]') + navigation.wait.displayed(raise_err=False) + page_btn = navigation.sr('xpath://internal-fav-bar-links[@data-internal="navigation"]').sr( + 'xpath://a[@data-page-id="ezdpc-gui-inventory-mons"]') + page_btn.wait.displayed(raise_err=False) + page_btn.click(timeout=5) + + self.tab.wait.doc_loaded() + # 等待搜索框出现 + search_region = self.tab.ele('xpath://div[@id="searchBoxContainer"]//kat-input-group') + search_region.wait.displayed(raise_err=False) + + def search(self,filter_type="ApprovalRequired"): + sku_ls = [] + + load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5) + if len(load_ele) > 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + + drop_down = self.tab.ele('xpath://div[contains(@class,"VolusListingStatusDropDown-module__verticalContainer")]//kat-dropdown') + drop_down.wait.displayed(raise_err=False) + drop_down.wait.enabled(raise_err=False) + time.sleep(0.6) + drop_down.click() + # //kat-option[@value="SearchSuppressed"] + xp = f'xpath://kat-option[@value="{filter_type}"]' + print(f"【{self.mark_name}】正在寻找筛选条件 {filter_type}，xpath: {xp}") + approval_required = self.tab.eles(xp,timeout=5) + if len(approval_required) == 0: + print(f"【{self.mark_name}】没有需要{filter_type}选项】没有需要{filter_type}的商品了") + return sku_ls # "没有需要审批的商品了" + else: + approval_required = approval_required[0] + approval_required.wait.displayed(raise_err=False) + approval_required.click() + + approval_required_text = approval_required.text + print(f"【{self.mark_name}】已选择筛选条件: {approval_required_text}") + + count = re.findall(r'\d+', approval_required_text) + if count: + count = int(count[0]) + print(f"【{self.mark_name}】待审批的商品数量: {count}") + if count <= 0: + print(f"【{self.mark_name}】没有需要{filter_type}的商品了") + return sku_ls #"没有需要审批的商品了" + for _ in range(3): + # 等待加载完成 + load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]") + if len(load_ele) > 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + + sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=3) + if len(sku_ls) > 0: + break + approval_required.click() + return sku_ls + + def wait_loaded(self): + # 等待加载完成 + try: + load_ele = self.tab.ele( + 'xpath://kat-panel[@data-testid="kat-panel-ActionPanelContent"]//div[contains(@class,"Loader-module__loader")]|//kat-panel[@data-testid="kat-panel-ActionPanelContent"]/div[@data-f1-component]//div[contains(@class,"==")]/div[contains(@class,"==")]/span', + timeout=3) + load_ele.wait.deleted(timeout=5, raise_err=False) + except Exception as e: + print(f"【{self.mark_name}】等待加载中消失出错", e) + + def run_page_action(self): + print(f"【{self.mark_name}】开始执行") + num = 0 + retry_num = 0 + already_asin = set() + + while retry_num < 3: # 最多重试3次 + # if num > 3: #测试 + # return + # 等待加载完成 + try: + load_ele = self.tab.eles("xpath://div[contains(@class,'Loader-module__loader')]",timeout=5) + if len(load_ele) > 0: + load_ele[0].wait.deleted(timeout=3, raise_err=False) + time.sleep(0.5) + + # 获取当前页码 + try: + page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) + if len(page_pamel) > 0: + current_page = page_pamel[0].sr('xpath:.//ul[@class="pages"]//li[@aria-current="true"]').text + + # 总页数 + total_page = page_pamel[0].sr.eles('xpath:.//ul[@class="pages"]//span[@class="page__inner"][last()]') + if len(total_page) > 0: + total_page = total_page[-1].text + else: + total_page = 0 + print(f"【{self.mark_name}】当前页码: {current_page} / 总页数: {total_page}") + except Exception as e: + print(f"【{self.mark_name}】获取页码失败", e) + + + sku_ls = self.tab.eles("xpath://div[@data-sku]",timeout=10) + print(f"【{self.mark_name}】获取到 {len(sku_ls)}") + # for sku_ele in sku_ls[0:2]: + for sku_ele in sku_ls: + # solve_problem = sku_ele.eles('xpath:.//kat-link[@label="解决商品信息问题"]') + + asin = sku_ele.ele('xpath:.//div[contains(@class,"JanusSplitBox-module__container")]//div[contains(@class,"JanusSplitBox-module__panel--") and contains(string(.),"ASIN")]/..//div[last()]').text + print(f"【{self.mark_name}】ASIN {asin} 找到....") + if asin in already_asin: + print(f"【{self.mark_name}】{asin} 已经处理过了，跳过") + continue + + price_match = sku_ele.eles('xpath:.//div[@data-test-id="FeaturedOfferPrice"]//a[text()="匹配"]') + if len(price_match) == 0: + print(f"【{self.mark_name}】{asin},没有推荐价格匹配按钮") + yield (asin,"无需处理") + already_asin.add(asin) + continue + try: + price_match[0].click() + + save_all_btn = self.tab.ele('xpath://kat-button[@label="保存所有"]',timeout=10) + save_all_btn.wait.displayed(timeout=10, raise_err=False) + save_all_btn.click() + + save_all_btn.wait.deleted(timeout=10, raise_err=False) + + yield (asin,"处理完成") + already_asin.add(asin) + except Exception as e: + print(f"{asin} 处理失败", e) + yield (asin,"处理失败") + already_asin.add(asin) + continue + + + # 判断是否存在需要翻页的情况 + page_pamel = self.tab.eles('xpath://kat-pagination',timeout=5) + if len(page_pamel) == 0: + break + next_page_btn = page_pamel[0].sr('xpath:.//span[@part="pagination-nav-right"]') + class_str = next_page_btn.attr('class') + if "end" in class_str: + break + next_page_btn.click() + num += 1 + print(f"【{self.mark_name}】【程序计算】正在翻页，已翻 {num} 页...") + + already_asin = set() + + except Exception as e: + print(f"【{self.mark_name}】处理匹配操作异常", e) + traceback.print_exc() + retry_num += 1 + self.tab.refresh() + self.tab.wait.doc_loaded(raise_err=False,timeout=120) + + + +class MatchTak: + + country_info = { + "DE": "德国", + "FR": "法国", + "ES": "西班牙", + "IT": "意大利", + "UK": "英国" + } + + + def __init__(self, user_info: dict = None): + """初始化审批任务处理器 + + Args: + user_info: 用户信息字典，包含 company, username, password + """ + self.user_info = user_info or {} + self.running = True + + def log(self, message: str, level: str = "INFO"): + """日志输出 + + Args: + message: 日志消息 + level: 日志级别 + """ + from datetime import datetime + timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + if level == "ERROR": + show_notification(message, "error") + print(f"[{timestamp}] [MatchTak] [{level}] {message}") + + + def process_task(self, task_data: dict): + """处理审批任务主入口 + + Args: + task_data: 任务数据 + """ + try: + data = task_data.get("data", {}) + task_id = data.get("taskId") + items = data.get("items", []) + country_codes = data.get("country_codes", []) + risk_listing_filter = data.get("risk_listing_filter", "All") + + if not task_id: + self.log("任务ID为空，跳过", "WARNING") + return + + if not items: + self.log("店铺列表为空，跳过", "WARNING") + return + + if not country_codes: + self.log("国家列表为空，跳过", "WARNING") + return + + self.log(f"开始处理审批任务 {task_id}，共 {len(items)} 个店铺，{len(country_codes)} 个国家") + + from config import runing_task + runing_task[task_id] = { + "status": "running", + "start_time": datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + "total_shops": len(items), + "processed_shops": 0, + "total_countries": len(country_codes) * len(items), + "processed_countries": 0, + "total_asins": 0, + "processed_asins": 0, + "success_count": 0, + "failed_count": 0, + "stop_requested": False + } + + # 遍历处理每个店铺 + for idx, shop_item in enumerate(items, 1): + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理", "WARNING") + runing_task[task_id]["status"] = "stopped" + return + + shop_name = shop_item.get("shopName", "未知店铺") + self.log(f"[{idx}/{len(items)}] 开始处理店铺: {shop_name}") + show_notification(f"开始处理店铺: {shop_name}", "info") + + try: + self.process_shop(shop_item, country_codes, task_id,risk_listing_filter) + # 更新已处理店铺数 + if task_id in runing_task: + runing_task[task_id]["processed_shops"] += 1 + except Exception as e: + import traceback + self.log(f"处理店铺 {shop_name} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + + # 更新任务状态 + if task_id in runing_task: + if runing_task[task_id].get("stop_requested", False): + runing_task[task_id]["status"] = "stopped" + self.log(f"任务 {task_id} 已被暂停！") + else: + runing_task[task_id]["status"] = "completed" + self.log(f"任务 {task_id} 处理完成！") + + except Exception as e: + import traceback + self.log(f"任务处理失败: {traceback.format_exc()}", "ERROR") + if task_id: + from config import runing_task + if task_id in runing_task: + runing_task[task_id]["status"] = "failed" + runing_task[task_id]["error"] = str(e) + + def process_shop(self, shop_item: dict, country_codes: list, task_id: int, risk_listing_filter: str): + """处理单个店铺 + + Args: + shop_item: 店铺信息 + country_codes: 国家代码列表 + task_id: 任务ID + risk_listing_filter: 风险商品筛选条件 + """ + shop_name = shop_item.get("shopName", "未知店铺") + company_name = shop_item.get("companyName", "") + + if not company_name: + self.log(f"店铺 {shop_name} 的公司名称为空，跳过", "WARNING") + return + + + if task_id in runing_task: + runing_task[task_id]["current_shop"] = shop_name + + # 将店铺添加到正在执行中的店铺列表 + start_time = datetime.now().strftime("%Y-%m-%d %H:%M:%S") + runing_shop[shop_name] = start_time + self.log(f"店铺 {shop_name} 已添加到执行列表，账号: {company_name}，开始时间: {start_time}") + + # 店铺打开重试最多3次 + driver = None + max_retries = 3 + + error_info = "" + for retry in range(max_retries): + try: + self.log(f"尝试打开店铺 {shop_name} (第 {retry + 1}/{max_retries} 次)") + + # 如果不是第一次尝试，先杀进程 + # if retry > 0: + # self.log("重试前先杀掉浏览器进程...") + # kill_process("v6") + # kill_process("v5") + # time.sleep(2) + + # 组装用户信息并创建驱动 + user_info = { + **self.user_info, + "company": company_name + } + driver = AmzoneMatchAction(user_info) + browser = driver.open_shop(shop_name) + + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name}") + break + else: + self.log(f"打开店铺失败: {browser}", "WARNING") + driver = None + + # 判断是否需要登录 + need_login = driver.need_login() + if need_login: + self.log(f"店铺 {shop_name} 需要登录，正在登录...") + password = "" + + login_success = driver.login(password) + if login_success: + self.log(f"店铺 {shop_name} 登录成功，正在重新打开店铺...") + browser = driver.open_shop(shop_name) + if browser and browser != "店铺不存在": + self.log(f"成功打开店铺 {shop_name} 登录后") + break + else: + self.log(f"登录后打开店铺失败: {browser}", "WARNING") + driver = None + else: + self.log(f"店铺 {shop_name} 登录失败", "WARNING") + driver = None + + except Exception as e: + import traceback + self.log(f"打开店铺异常: {traceback.format_exc()}", "INFO") + driver = None + error_info = str(e) + time.sleep(10) + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(3) + + # 检查是否成功打开 + if not driver or not browser or browser == "店铺不存在": + error_msg = f"店铺 {shop_name} 打开失败，已重试 {max_retries} 次，跳过该店铺,{error_info}" + self.log(error_msg, "ERROR") + # 从执行列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + return + + try: + # 处理每个国家 + for country_code in country_codes: + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理国家", "WARNING") + break + + try: + self.process_country(driver, country_code, task_id, shop_name,risk_listing_filter) + except Exception as e: + import traceback + self.log(f"处理国家 {country_code} 失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + # 最后回传，标记完成 + try: + self.post_result(task_id, shop_name, country_code, "", "", is_done=True) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") + finally: + # 关闭店铺 + try: + if driver: + self.log(f"关闭店铺 {shop_name}") + driver.close_store() + time.sleep(2) + except Exception as e: + self.log(f"关闭店铺失败: {str(e)}", "WARNING") + + # 从正在执行中的店铺列表中移除 + if shop_name in runing_shop: + del runing_shop[shop_name] + self.log(f"店铺 {shop_name} 已从执行列表中移除") + + def process_country(self, driver: AmzoneMatchAction, country_code: str, task_id: int, shop_name: str, risk_listing_filter: str): + """处理单个国家的审批任务 + + Args: + driver: AmzoneApprove驱动实例 + country_code: 国家代码（如 UK, DE, FR 等） + task_id: 任务ID + shop_name: 店铺名称 + risk_listing_filter: 风险商品筛选条件 + """ + from config import runing_task + + # 转换国家代码为中文名称 + country_name = self.country_info.get(country_code, country_code) + info_mes = f"开始处理国家: {country_name} ({country_code})" + self.log(info_mes) + show_notification(info_mes, "info") + + # 更新当前处理的国家 + if task_id in runing_task: + runing_task[task_id]["current_country"] = country_name + + # 切换国家，最多重试3次 + max_retries = 3 + switch_success = False + + for retry in range(max_retries): + try: + self.log(f"尝试切换到国家 {country_name} (第 {retry + 1}/{max_retries} 次)") + + # 如果不是第一次尝试，先刷新页面 + if retry > 0: + self.log("重试前刷新页面...") + try: + driver.tab.refresh() + time.sleep(3) + except Exception as e: + self.log(f"刷新页面失败: {str(e)}", "WARNING") + + switch_success = driver.SwitchingCountries(country_name) + if switch_success: + self.log(f"成功切换到国家 {country_name}") + break + else: + self.log(f"切换到国家 {country_name} 失败", "WARNING") + + except Exception as e: + import traceback + self.log(f"切换国家 {country_name} 异常: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(2) + + # 如果切换失败，直接返回 + if not switch_success: + error_message = f"切换到国家 {country_name} 失败，已重试 {max_retries} 次，跳过该国家" + self.log(error_message, "ERROR") + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + return + + # 切换到库存管理页面 + try: + driver.SwitchPage() + self.log(f"已切换到库存管理页面") + except Exception as e: + import traceback + self.log(f"切换页面失败: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + return + + # 搜索需要审批的商品，最多重试3次 + sku_ls = [] + for retry in range(max_retries): + try: + self.log(f"尝试搜索匹配操作商品 (第 {retry + 1}/{max_retries} 次)") + sku_ls = driver.search(filter_type=risk_listing_filter) + break + except Exception as e: + self.log(f"搜索商品异常: {str(e)}", "ERROR") + if retry < max_retries - 1: + try: + driver.tab.refresh() + time.sleep(3) + except Exception as refresh_error: + self.log(f"刷新页面失败: {str(refresh_error)}", "WARNING") + + # 如果没有需要审批的商品，直接返回 + if len(sku_ls) == 0: + self.log(f"国家 {country_name} 没有搜索出的商品") + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + return + + self.log(f"国家 {country_name} 搜索出 {len(sku_ls)} 商品，开始处理...") + + # 处理所有需要审批的商品（通过yield获取结果） + try: + for asin, status in driver.run_page_action(): + # 检查是否收到暂停请求 + if task_id in runing_task and runing_task[task_id].get("stop_requested", False): + self.log(f"检测到任务 {task_id} 的暂停请求，停止处理ASIN", "WARNING") + break + + self.log(f"ASIN {asin} 处理结果: {status}") + + # 更新任务状态 + if task_id in runing_task: + runing_task[task_id]["current_asin"] = asin + runing_task[task_id]["processed_asins"] += 1 + + runing_task[task_id]["failed_count"] += 1 + + # 回传结果到API + try: + self.post_result(task_id, shop_name, country_code, asin, status) + except Exception as e: + self.log(f"回传结果失败: {str(e)}", "ERROR") + + except Exception as e: + import traceback + self.log(f"处理审批商品异常: {str(e)}", "ERROR") + self.log(traceback.format_exc(), "ERROR") + + # 更新已处理国家数 + if task_id in runing_task: + runing_task[task_id]["processed_countries"] += 1 + + self.log(f"国家 {country_name} 处理完成") + + def post_result(self, task_id: int, shop_name: str, country_code: str, asin: str, status: str,is_done: bool = False): + """回传处理结果到API + + Args: + task_id: 任务ID + shop_name: 店铺名称 + country_code: 国家代码 + asin: ASIN + status: 处理状态 + """ + import requests + from config import DELETE_BRAND_API_BASE + + url = f"{DELETE_BRAND_API_BASE}/api/shop-match/tasks/{task_id}/result" + + payload = { + "shops": [ + { + "error": "", + "countries": { + country_code: [ + { + "asin": asin, + "status": status, + "done": is_done + } + ] + }, + "shopName": shop_name + } + ] + } + + max_retries = 3 + for retry in range(max_retries): + try: + print("================【匹配】=====================") + self.log(f"尝试回传结果 (第 {retry + 1}/{max_retries} 次)") + self.log(f"回传URL: {url}") + self.log(f"回传数据: {payload}") + response = requests.post( + url, + json=payload, + headers={"Content-Type": "application/json"}, + timeout=30, + verify=False + ) + self.log(f"回传结果: {response.text}") + + if response.status_code == 200: + self.log(f"结果回传成功: {asin} - {status}") + return + else: + self.log(f"结果回传失败，状态码: {response.status_code}", "WARNING") + print("=====================================") + + except Exception as e: + self.log(f"调用API异常: {str(e)}", "ERROR") + print("=====================================") + + # 如果还有重试机会，等待后继续 + if retry < max_retries - 1: + time.sleep(2) + + self.log(f"已达到最大重试次数，结果回传最终失败", "ERROR") + + + +if __name__ == "__main__": + user_info = { + "company": "rongchuang123", + "username": "自动化_Robot", + "password": "#20zsg25" + } + shop_name = "魏振峰" + country = "德国" + kill_process('v6') + driver = AmzoneMatchAction(user_info) + browser = driver.open_shop(shop_name) + sw_suc = driver.SwitchingCountries(country) + driver.SwitchPage() + risk_listing_filter = "All" + for _ in range(3): + try: + sku_ls = driver.search(filter_type=risk_listing_filter) + break + except Exception as e: + print(e) + driver.tab.refresh() + if len(sku_ls) > 0: + print("有数据，开始操作") + for asin, status in driver.run_page_action(): + print(f"ASIN {asin} 的处理结果: {status}") + print("已完成操作") \ No newline at end of file diff --git a/app/amazon/tool.py b/app/amazon/tool.py new file mode 100644 index 0000000..4f688cc --- /dev/null +++ b/app/amazon/tool.py @@ -0,0 +1,77 @@ +# 导入 webview 用于前端通知 +try: + import webview +except ImportError: + webview = None + + + +def show_notification(message: str, message_type: str = "error"): + """显示 pywebview 顶层通知（5秒后自动消失） + + Args: + message: 通知消息 + message_type: 消息类型 (success/warning/error/info) + """ + if webview and webview.windows: + try: + # 转义单引号，防止 JavaScript 语法错误 + safe_message = message.replace("'", "\\'").replace('"', '\\"').replace('\n', '\\n') + + # 设置通知样式颜色 + color_map = { + 'success': '#67C23A', + 'warning': '#E6A23C', + 'error': '#F56C6C', + 'info': '#909399' + } + bg_color = color_map.get(message_type, '#F56C6C') + + # 构建前端通知的 JavaScript 代码 - 创建原生 HTML 通知 + js_code = f""" + (function() {{ + // 移除已存在的通知 + var existingNotif = document.getElementById('pywebview-notification'); + if (existingNotif) {{ + existingNotif.remove(); + }} + + // 创建通知容器 + var notif = document.createElement('div'); + notif.id = 'pywebview-notification'; + notif.style.cssText = 'position: fixed; top: 20px; left: 50%; transform: translateX(-50%); ' + + 'background: {bg_color}; color: white; padding: 12px 20px; border-radius: 4px; ' + + 'box-shadow: 0 2px 12px rgba(0,0,0,0.3); z-index: 99999; font-size: 14px; ' + + 'max-width: 600px; word-wrap: break-word; display: flex; align-items: center; gap: 10px;'; + + // 添加消息内容 + var msgSpan = document.createElement('span'); + msgSpan.textContent = '{safe_message}'; + notif.appendChild(msgSpan); + + // 添加关闭按钮 + var closeBtn = document.createElement('span'); + closeBtn.innerHTML = '×'; + closeBtn.style.cssText = 'cursor: pointer; font-size: 18px; font-weight: bold; margin-left: 10px;'; + closeBtn.onclick = function() {{ notif.remove(); }}; + notif.appendChild(closeBtn); + + // 添加到页面 + document.body.appendChild(notif); + + // 5秒后自动消失 + setTimeout(function() {{ + if (notif && notif.parentNode) {{ + notif.style.transition = 'opacity 0.3s'; + notif.style.opacity = '0'; + setTimeout(function() {{ notif.remove(); }}, 300); + }} + }}, 5000); + }})(); + """ + # 在第一个窗口中执行 JavaScript + webview.windows[0].evaluate_js(js_code) + except Exception as e: + print(f"显示通知失败: {str(e)}") + + diff --git a/app/main.py b/app/main.py index 7a76502..08586b0 100644 --- a/app/main.py +++ b/app/main.py @@ -57,15 +57,26 @@ class WindowAPI: window.events.restored += lambda _: setattr(self, '_is_maximized', False) def close(self): - try: - kill_process('v6') - except Exception as e: - print(f"【退出前】关闭紫鸟浏览器进程异常: {str(e)}") + """关闭窗口，异步执行清理逻辑""" + def cleanup_and_exit(): + """后台清理线程""" + try: + kill_process('v6') + except Exception as e: + print(f"【退出前】关闭紫鸟浏览器进程异常: {str(e)}") + finally: + time.sleep(0.5) + os._exit(0) + + # 先销毁窗口，让用户看到立即响应 try: self._window.destroy() except: pass - os._exit(0) # 强制退出整个进程，包括所有线程 + + # 在后台线程执行清理，不阻塞 + cleanup_thread = threading.Thread(target=cleanup_and_exit, daemon=True) + cleanup_thread.start() def minimize(self): self._window.minimize() @@ -369,20 +380,24 @@ def start_task_monitor(): def on_window_closing(): - """窗口关闭事件处理器，执行与 close() 方法相同的清理逻辑""" - # 先关闭窗口，避免看起来卡着 - try: - if webview.windows: - webview.windows[0].destroy() - except: - pass + """窗口关闭事件处理器，异步执行清理逻辑，避免阻塞UI""" + def cleanup_and_exit(): + """后台清理线程""" + try: + kill_process('v6') + except Exception as e: + print(f"【退出前】关闭紫鸟浏览器进程异常: {str(e)}") + finally: + # 给一点时间让清理完成，然后强制退出 + time.sleep(0.5) + os._exit(0) - # 然后执行清理逻辑 - try: - kill_process('v6') - except Exception as e: - print(f"【退出前】关闭紫鸟浏览器进程异常: {str(e)}") - os._exit(0) # 强制退出整个进程，包括所有线程 + # 立即在后台线程执行清理，不阻塞窗口关闭 + cleanup_thread = threading.Thread(target=cleanup_and_exit, daemon=True) + cleanup_thread.start() + + # 立即返回，让窗口快速关闭，用户不会感觉卡顿 + return True def main(): diff --git a/app/web_source/brand.html b/app/web_source/brand.html index ab887ac..5d0f34d 100644 --- a/app/web_source/brand.html +++ b/app/web_source/brand.html @@ -417,6 +417,7 @@
删除指定ASIN和品牌 商品风险解决 + 匹配店铺