Commit Graph

436 Commits

Author SHA1 Message Date
super a4223ada4f 提交更新 2026-05-02 09:28:26 +08:00
koko 93b85ff194 chore: serve bundled assets from app directory 2026-05-02 02:12:14 +08:00
koko ecee43bf09 chore: serve bundled assets from app directory 2026-05-02 02:12:14 +08:00
koko 4db6e23731 chore: remove stale web assets 2026-05-02 02:07:13 +08:00
koko 4b83f176d6 chore: remove stale web assets 2026-05-02 02:07:13 +08:00
koko a2f3267fcd fix: update patrol delete progress handling 2026-05-02 02:03:49 +08:00
koko 253d85def9 fix: update patrol delete progress handling 2026-05-02 02:03:49 +08:00
koko 1be69c0e13 Merge patrol delete tests and remove pycache artifacts 2026-05-01 22:46:11 +08:00
koko bcecffb3c6 Merge patrol delete tests and remove pycache artifacts 2026-05-01 22:46:11 +08:00
koko af1d0416df Merge branch 'dev/koko'
# Conflicts:
#	app/amazon/patrol_delete.py
2026-05-01 22:41:09 +08:00
koko 5aa3ac2d2d Merge branch 'dev/koko'
# Conflicts:
#	app/amazon/patrol_delete.py
2026-05-01 22:41:09 +08:00
koko 37fe66ce27 Fix patrol delete condition handling 2026-05-01 22:36:37 +08:00
koko 734c5758d1 Fix patrol delete condition handling 2026-05-01 22:36:37 +08:00
super 0b352924e4 完善多店铺开启多窗口、外观进度条等 2026-05-01 21:09:54 +08:00
super 0f33bdcab6 完善多店铺开启多窗口、外观进度条等 2026-05-01 21:09:54 +08:00
super 8c6b804151 更新处理这个外观部分 2026-05-01 00:09:14 +08:00
super f8d867f47e 更新处理这个外观部分 2026-05-01 00:09:14 +08:00
铭坤 b6ece174ca modified: amazon/__pycache__/price_match.cpython-39.pyc
modified:   amazon/price_match.py
	modified:   assets/appearance-patent.js
	modified:   assets/delete-brand.js
	modified:   assets/patrol-delete.js
	modified:   assets/price-track.js
	modified:   assets/product-risk.js
	modified:   assets/query-asin.js
	modified:   assets/shop-match.js
	modified:   new_web_source/delete-brand.html
2026-04-30 21:57:37 +08:00
铭坤 d4d2a1a724 modified: amazon/__pycache__/price_match.cpython-39.pyc
modified:   amazon/price_match.py
	modified:   assets/appearance-patent.js
	modified:   assets/delete-brand.js
	modified:   assets/patrol-delete.js
	modified:   assets/price-track.js
	modified:   assets/product-risk.js
	modified:   assets/query-asin.js
	modified:   assets/shop-match.js
	modified:   new_web_source/delete-brand.html
2026-04-30 21:57:37 +08:00
koko b45c447453 Merge origin master into local master 2026-04-30 21:46:00 +08:00
koko 78e58504fb Merge origin master into local master 2026-04-30 21:46:00 +08:00
koko ef09a4b31a Harden patrol delete logging 2026-04-30 21:43:15 +08:00
koko e6eef38c37 Harden patrol delete logging 2026-04-30 21:43:15 +08:00
koko 1fd46a2ca0 Merge patrol delete changes into master 2026-04-30 21:40:35 +08:00
koko 7507f49903 Merge patrol delete changes into master 2026-04-30 21:40:35 +08:00
super af280928b0 修复商品风险多店铺问题 2026-04-30 21:31:11 +08:00
super ebfebaf174 修复商品风险多店铺问题 2026-04-30 21:31:11 +08:00
super 1040976d87 Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin 2026-04-30 11:38:13 +08:00
super 8c9eb104ea Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin 2026-04-30 11:38:13 +08:00
super fff3b6e889 优化后台业务 2026-04-30 11:36:58 +08:00
super b776faff4b 优化后台业务 2026-04-30 11:36:58 +08:00
铭坤 08d9b2960f Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
app/amazon/__pycache__/approve.cpython-39.pyc
	app/amazon/__pycache__/asin_status.cpython-39.pyc
	app/amazon/__pycache__/del_brand.cpython-39.pyc
	app/amazon/__pycache__/match_action.cpython-39.pyc
	app/amazon/__pycache__/price_match.cpython-39.pyc
2026-04-30 11:00:02 +08:00
铭坤 dde382fc36 Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
app/amazon/__pycache__/approve.cpython-39.pyc
	app/amazon/__pycache__/asin_status.cpython-39.pyc
	app/amazon/__pycache__/del_brand.cpython-39.pyc
	app/amazon/__pycache__/match_action.cpython-39.pyc
	app/amazon/__pycache__/price_match.cpython-39.pyc
2026-04-30 11:00:02 +08:00
铭坤 bf6951bcd1 modified: amazon/__pycache__/approve.cpython-39.pyc
modified:   amazon/__pycache__/asin_status.cpython-39.pyc
	modified:   amazon/__pycache__/del_brand.cpython-39.pyc
	modified:   amazon/__pycache__/match_action.cpython-39.pyc
	modified:   amazon/__pycache__/price_match.cpython-39.pyc
	modified:   amazon/approve.py
	modified:   amazon/asin_status.py
	modified:   amazon/del_brand.py
	modified:   amazon/match_action.py
	modified:   amazon/price_match.py
	modified:   main.py
2026-04-30 10:52:52 +08:00
铭坤 7c590356a6 modified: amazon/__pycache__/approve.cpython-39.pyc
modified:   amazon/__pycache__/asin_status.cpython-39.pyc
	modified:   amazon/__pycache__/del_brand.cpython-39.pyc
	modified:   amazon/__pycache__/match_action.cpython-39.pyc
	modified:   amazon/__pycache__/price_match.cpython-39.pyc
	modified:   amazon/approve.py
	modified:   amazon/asin_status.py
	modified:   amazon/del_brand.py
	modified:   amazon/match_action.py
	modified:   amazon/price_match.py
	modified:   main.py
2026-04-30 10:52:52 +08:00
koko 0901fad6db Remove ts script 2026-04-28 22:41:56 +08:00
koko b92324957b Remove ts script 2026-04-28 22:41:56 +08:00
koko b1821e7881 chore: update env 2026-04-28 22:40:39 +08:00
koko bd584f9796 chore: update env 2026-04-28 22:40:39 +08:00
koko afa6c676ce Remove README from master 2026-04-28 22:39:38 +08:00
koko 1f0a7dacaf Remove README from master 2026-04-28 22:39:38 +08:00
koko dd7ed8e196 Remove tracked .rtk config 2026-04-28 22:38:17 +08:00
koko 4cc17f79a7 Remove tracked .rtk config 2026-04-28 22:38:17 +08:00
koko 2acdb53c93 Stop tracking remaining Python bytecode on master
Master still tracked a small set of generated __pycache__ artifacts after merging dev/koko. The ignore rules already match dev/koko, so this commit only removes the remaining bytecode files from the Git index while leaving local files on disk.

Constraint: dev/koko .gitignore already contains recursive __pycache__ ignore coverage

Rejected: Delete local cache directories | repository tracking cleanup only requires --cached removal

Confidence: high

Scope-risk: narrow

Tested: git ls-files shows no remaining paths containing __pycache__/

Not-tested: Application runtime; generated bytecode tracking only
2026-04-28 22:33:27 +08:00
koko 101cec6048 Stop tracking remaining Python bytecode on master
Master still tracked a small set of generated __pycache__ artifacts after merging dev/koko. The ignore rules already match dev/koko, so this commit only removes the remaining bytecode files from the Git index while leaving local files on disk.

Constraint: dev/koko .gitignore already contains recursive __pycache__ ignore coverage

Rejected: Delete local cache directories | repository tracking cleanup only requires --cached removal

Confidence: high

Scope-risk: narrow

Tested: git ls-files shows no remaining paths containing __pycache__/

Not-tested: Application runtime; generated bytecode tracking only
2026-04-28 22:33:27 +08:00
koko a8111ce31b Merge dev/koko into master preserving master conflict behavior
Conflict resolution kept master-side changes for non-patrol-delete files as requested. No app/amazon/patrol_delete.py conflict was present. Existing dev/koko assets were retained so /assets resources required by new_web_source pages resolve in the Flask app.

Constraint: User requested authentication-requiring git operations be reported as commands only

Rejected: Rework non-conflicting dev/koko changes during merge | scope was conflict resolution, not feature review

Confidence: high

Scope-risk: moderate

Tested: uv run python -c Flask test client returned 200 for /new_web_source/patrol-delete.html, /assets/patrol-delete.js, /assets/pywebview-C66x_2Dh.js

Tested: uv run python -m py_compile amazon\\patrol_delete.py amazon\\detail_spider.py amazon\\price_match.py main.py

Tested: uv run --group dev pytest tests\\test_patrol_delete.py tests\\test_amazon_base.py

Not-tested: authenticated Git push/pull; Java backend build
2026-04-28 22:31:38 +08:00
koko 54820f0959 Merge dev/koko into master preserving master conflict behavior
Conflict resolution kept master-side changes for non-patrol-delete files as requested. No app/amazon/patrol_delete.py conflict was present. Existing dev/koko assets were retained so /assets resources required by new_web_source pages resolve in the Flask app.

Constraint: User requested authentication-requiring git operations be reported as commands only

Rejected: Rework non-conflicting dev/koko changes during merge | scope was conflict resolution, not feature review

Confidence: high

Scope-risk: moderate

Tested: uv run python -c Flask test client returned 200 for /new_web_source/patrol-delete.html, /assets/patrol-delete.js, /assets/pywebview-C66x_2Dh.js

Tested: uv run python -m py_compile amazon\\patrol_delete.py amazon\\detail_spider.py amazon\\price_match.py main.py

Tested: uv run --group dev pytest tests\\test_patrol_delete.py tests\\test_amazon_base.py

Not-tested: authenticated Git push/pull; Java backend build
2026-04-28 22:31:38 +08:00
koko 8c6eba0d50 fix: brand html 2026-04-28 22:14:41 +08:00
koko 16d45e0fd2 fix: brand html 2026-04-28 22:14:41 +08:00
koko a8b416a7b4 fix: update frontend 2026-04-28 21:42:30 +08:00