koko
28a752265c
fix: brand html
2026-04-28 22:14:41 +08:00
koko
1d9d138423
fix: update frontend
2026-04-28 21:42:30 +08:00
koko
cd2b437be5
Stop tracking generated Python bytecode
...
Generated __pycache__ files were already ignored in some paths but remained tracked in the repository, which caused merge noise and binary conflicts. This removes the tracked bytecode from the index and adds an explicit recursive ignore rule so future Python runs do not reintroduce them.
Constraint: Existing repository history already tracked pycache files across app, backend, and source_code
Rejected: Delete local pycache directories from disk | only repository tracking needed to be removed
Confidence: high
Scope-risk: narrow
Directive: Do not force-add __pycache__ or *.pyc files unless there is a documented runtime packaging reason
Tested: git ls-files shows no remaining paths containing __pycache__/
Not-tested: Application runtime; change only affects tracked generated artifacts and ignore rules
2026-04-28 20:57:53 +08:00
koko
a504e7a13b
Merge master into dev/koko after patrol delete fixes
...
The merge keeps dev/koko patrol-delete asset fallback behavior while accepting the latest master feature work. Conflicts were limited to ignore rules, local environment/config artifacts, tracked pycache binaries, and the Flask main blueprint.
Constraint: master and dev/koko both edited app/blueprints/main.py around brand and asset serving
Rejected: Drop dev/koko asset fallback logic | patrol delete and rebuilt Vite assets still need hashed asset resolution across app/new_web_source locations
Confidence: medium
Scope-risk: broad
Directive: app/.env remains a tracked local-config file in this repository; do not print or normalize secrets during conflict handling
Tested: uv run python -m py_compile blueprints\\main.py amazon\\base.py amazon\\main.py
Tested: uv run --group dev pytest tests\\test_amazon_base.py tests\\test_patrol_delete.py
Not-tested: Full backend-java/frontend-vue test suites
2026-04-28 20:55:27 +08:00
super
9760d1171c
提交跟新
2026-04-28 17:16:04 +08:00
super
d42ed57119
提交暂存
2026-04-28 16:57:05 +08:00
super
18208f691c
更新内容
2026-04-28 16:56:53 +08:00
super
c06a4d0e06
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-28 15:33:42 +08:00
super
f21934e55b
合并错误信息
2026-04-28 15:25:34 +08:00
铭坤
515135c120
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-28 15:23:55 +08:00
铭坤
42bdd59c71
modified: .env
...
modified: amazon/__pycache__/approve.cpython-39.pyc
modified: amazon/__pycache__/detail_spider.cpython-39.pyc
modified: amazon/__pycache__/price_match.cpython-39.pyc
modified: amazon/approve.py
modified: amazon/detail_spider.py
modified: amazon/price_match.py
modified: assets/convert.js
modified: assets/dedupe.js
modified: assets/delete-brand.js
modified: assets/split.js
modified: blueprints/__pycache__/admin.cpython-39.pyc
modified: blueprints/__pycache__/brand.cpython-39.pyc
modified: blueprints/__pycache__/main.cpython-39.pyc
modified: blueprints/main.py
modified: brand_spider/__pycache__/main.cpython-39.pyc
modified: new_web_source/convert.html
modified: new_web_source/dedupe.html
modified: new_web_source/delete-brand.html
modified: new_web_source/split.html
modified: tool/__pycache__/devices.cpython-39.pyc
2026-04-28 15:21:57 +08:00
super
5105bf7049
增加rufts
2026-04-27 18:45:33 +08:00
koko
1aca3d6152
Bring Amazon collection tasks into dev/koko
...
Merge origin/master into dev/koko while preserving the patrol delete task added on dev/koko. The task dispatcher now recognizes both patrol deletion and appearance patent collection, and the master-side SpiderTask implementation is included.
Constraint: origin fetch and push over SSH are blocked in this environment by Gitee publickey authentication
Rejected: Overwrite dev/koko with master | would drop the patrol delete branch work
Confidence: medium
Scope-risk: moderate
Directive: Do not remove either patrol-delete-run or appearance-patent-run without checking queued task producers
Tested: python -m py_compile app/amazon/approve.py app/amazon/asin_status.py app/amazon/detail_spider.py app/amazon/main.py app/amazon/match_action.py app/amazon/price_match.py
Not-tested: Remote push, blocked by SSH publickey authentication
2026-04-27 17:36:30 +08:00
super
052bb31aea
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-27 09:20:04 +08:00
super
225b525ba1
后端架构更新
2026-04-27 09:18:10 +08:00
koko
e1543416e3
feat: patrol delete
2026-04-27 00:23:44 +08:00
铭坤
0b57aea5f6
modified: amazon/__pycache__/approve.cpython-39.pyc
...
modified: amazon/__pycache__/asin_status.cpython-39.pyc
new file: amazon/__pycache__/detail_spider.cpython-39.pyc
modified: amazon/__pycache__/main.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
new file: amazon/detail_spider.py
modified: amazon/main.py
modified: amazon/match_action.py
modified: amazon/price_match.py
modified: assets/convert.js
modified: assets/dedupe.js
modified: assets/delete-brand.js
modified: assets/split.js
modified: new_web_source/convert.html
modified: new_web_source/dedupe.html
modified: new_web_source/delete-brand.html
modified: new_web_source/split.html
modified: web_source/brand.html
2026-04-27 00:21:37 +08:00
铭坤
d272afae1c
modified: amazon/__pycache__/approve.cpython-39.pyc
...
new file: amazon/__pycache__/asin_status.cpython-39.pyc
modified: amazon/__pycache__/main.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/main.py
modified: amazon/match_action.py
modified: amazon/price_match.py
modified: web_source/brand.html
modified: web_source/templates_backup/brand.html
2026-04-24 23:00:59 +08:00
super
c502afb588
完成查询asin开发
2026-04-23 20:48:57 +08:00
super
c0fdea6570
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-23 15:25:49 +08:00
super
0391cb223f
完成后端架构重构等
2026-04-23 15:25:41 +08:00
铭坤
2f2db4986e
modified: app/amazon/__pycache__/approve.cpython-39.pyc
...
modified: app/amazon/__pycache__/del_brand.cpython-39.pyc
modified: app/amazon/__pycache__/match_action.cpython-39.pyc
modified: app/amazon/__pycache__/price_match.cpython-39.pyc
modified: app/amazon/approve.py
modified: app/amazon/del_brand.py
modified: app/amazon/match_action.py
modified: app/amazon/price_match.py
modified: app/assets/convert.js
modified: app/assets/dedupe.js
modified: app/assets/delete-brand.js
modified: app/assets/split.js
modified: app/new_web_source/convert.html
modified: app/new_web_source/dedupe.html
modified: app/new_web_source/delete-brand.html
modified: app/new_web_source/split.html
2026-04-23 10:41:07 +08:00
super
6894f9cc57
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-22 01:09:51 +08:00
super
1e845a1510
处理后台管理系统、修复BUG、处理权限
2026-04-22 01:09:28 +08:00
铭坤
0341838d19
modified: amazon/__pycache__/approve.cpython-39.pyc
...
modified: amazon/__pycache__/main.cpython-39.pyc
modified: amazon/__pycache__/match_action.cpython-39.pyc
new file: amazon/__pycache__/price_match.cpython-39.pyc
modified: amazon/__pycache__/tool.cpython-39.pyc
modified: amazon/approve.py
new file: amazon/asin_status.py
modified: amazon/main.py
modified: amazon/price_match.py
new file: "amazon/price_match_\346\227\247.py"
modified: amazon/tool.py
modified: assets/convert.js
modified: assets/dedupe.js
modified: assets/delete-brand.js
modified: assets/split.js
modified: new_web_source/convert.html
modified: new_web_source/dedupe.html
modified: new_web_source/delete-brand.html
modified: new_web_source/split.html
deleted: web_source/admin.html
deleted: "web_source/brand - \345\211\257\346\234\254.html"
deleted: "web_source/brand-\346\227\247.html"
deleted: web_source/brand.html
deleted: web_source/home.html
deleted: web_source/index.html
deleted: web_source/login.html
2026-04-22 00:51:41 +08:00
super
dc5e23892f
提交改造app权限
2026-04-19 15:47:20 +08:00
铭坤
ac07416352
modified: amazon/__pycache__/approve.cpython-39.pyc
...
modified: amazon/__pycache__/del_brand.cpython-39.pyc
modified: amazon/__pycache__/match_action.cpython-39.pyc
modified: amazon/approve.py
modified: amazon/del_brand.py
modified: amazon/match_action.py
new file: amazon/price_match.py
modified: main.py
2026-04-17 10:04:24 +08:00
super
025ca6d4fd
后台管理跳过asin、后台相关数据做数据隔离
2026-04-14 10:04:50 +08:00
super
eb04caccf1
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-13 13:02:45 +08:00
super
cd84def61d
提交工作更新
2026-04-13 13:02:41 +08:00
铭坤
d8098b0378
modified: app/amazon/__pycache__/del_brand.cpython-39.pyc
...
modified: app/amazon/__pycache__/match_action.cpython-39.pyc
modified: app/amazon/del_brand.py
modified: app/amazon/match_action.py
modified: app/assets/delete-brand.js
modified: app/new_web_source/delete-brand.html
new file: "app/web_source/brand - \345\211\257\346\234\254.html"
2026-04-12 20:52:26 +08:00
铭坤
21b6b5b270
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
modified: app/amazon/__pycache__/match_action.cpython-39.pyc
modified: app/amazon/__pycache__/tool.cpython-39.pyc
modified: app/amazon/approve.py
modified: app/amazon/del_brand.py
modified: app/amazon/main.py
modified: app/amazon/match_action.py
modified: app/amazon/tool.py
modified: app/assets/delete-brand.js
modified: app/new_web_source/delete-brand.html
2026-04-11 23:00:55 +08:00
super
365050b890
提交bug修复 后台权限管理
2026-04-11 22:25:14 +08:00
super
73392a9b83
修复BUG,完善匹配店铺
2026-04-11 00:57:34 +08:00
super
c47c03fde4
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-10 19:35:08 +08:00
super
86fd9475e4
匹配回收,bug修复
2026-04-10 19:33:58 +08:00
铭坤
2d0d1d3461
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
2026-04-10 16:51:52 +08:00
super
ccaec4a984
完善后台管理店铺搜索
2026-04-08 21:08:52 +08:00
铭坤
e02ddab599
modified: amazon/__pycache__/approve.cpython-39.pyc
...
modified: amazon/__pycache__/del_brand.cpython-39.pyc
modified: amazon/__pycache__/main.cpython-39.pyc
modified: amazon/approve.py
new file: amazon/backend_api.py
modified: amazon/del_brand.py
modified: amazon/main.py
modified: blueprints/main.py
modified: main.py
2026-04-08 16:03:48 +08:00
super
336338cff5
完善后台接口字段
2026-04-07 17:57:03 +08:00
铭坤
13b0ffb5d8
new file: amazon/__pycache__/approve.cpython-39.pyc
...
modified: amazon/__pycache__/del_brand.cpython-39.pyc
modified: amazon/__pycache__/main.cpython-39.pyc
new file: amazon/approve.py
modified: amazon/del_brand.py
modified: amazon/main.py
modified: main.py
2026-04-07 14:09:42 +08:00
super
46d91fd8ca
提交接口进度完善
2026-04-03 00:53:52 +08:00
super
a24db2f73c
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-02 23:29:19 +08:00
super
ca9537f862
测试多任务暂存
2026-04-02 23:29:15 +08:00
铭坤
94ae7e68ff
modified: app/amazon/__pycache__/del_brand.cpython-39.pyc
...
modified: app/amazon/__pycache__/main.cpython-39.pyc
modified: app/amazon/main.py
modified: app/main.py
2026-04-02 23:03:13 +08:00
铭坤
5a294e5c85
new file: app/amazon/__pycache__/del_brand.cpython-39.pyc
...
new file: app/amazon/__pycache__/main.cpython-39.pyc
modified: app/amazon/del_brand.py
modified: app/amazon/main.py
modified: app/blueprints/__pycache__/main.cpython-39.pyc
modified: app/blueprints/main.py
modified: app/config.py
modified: app/main.py
new file: "app/web_source/brand-\346\227\247.html"
modified: app/web_source/brand.html
2026-04-02 00:03:16 +08:00