koko
735234f7bc
fix: update frontend
2026-04-28 21:42:30 +08:00
koko
46e55fa623
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
a92d1af4f2
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
9c16c9c589
提交跟新
2026-04-28 17:16:04 +08:00
super
8711b205cf
提交暂存
2026-04-28 16:57:05 +08:00
super
e316adca1f
更新内容
2026-04-28 16:56:53 +08:00
super
0457fbfac0
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-28 15:33:42 +08:00
super
58df800685
合并错误信息
2026-04-28 15:25:34 +08:00
铭坤
7c198f7d6f
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-28 15:23:55 +08:00
铭坤
ec4d1b2567
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
b96b136fa3
增加rufts
2026-04-27 18:45:33 +08:00
koko
13c3a04a48
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
60a6494260
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-27 09:20:04 +08:00
super
995e2ee65a
后端架构更新
2026-04-27 09:18:10 +08:00
koko
7f83bceba1
feat: patrol delete
2026-04-27 00:23:44 +08:00
铭坤
1eb622d33f
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
铭坤
e695fd5184
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
326f78705d
完成查询asin开发
2026-04-23 20:48:57 +08:00
super
72fdb1841c
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-23 15:25:49 +08:00
super
34bc980eea
完成后端架构重构等
2026-04-23 15:25:41 +08:00
铭坤
d537924aa9
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
46f46039ea
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-22 01:09:51 +08:00
super
236b73755c
处理后台管理系统、修复BUG、处理权限
2026-04-22 01:09:28 +08:00
铭坤
b04b05e4da
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
9d75d673f8
提交改造app权限
2026-04-19 15:47:20 +08:00
铭坤
4e5ed76cb6
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
ecc8b6ce6c
后台管理跳过asin、后台相关数据做数据隔离
2026-04-14 10:04:50 +08:00
super
4a58b366b6
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-13 13:02:45 +08:00
super
bbc833f2c9
提交工作更新
2026-04-13 13:02:41 +08:00
铭坤
325c2f7c82
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
铭坤
ad2bb0a6ea
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
7589b4e418
提交bug修复 后台权限管理
2026-04-11 22:25:14 +08:00
super
b400b494ad
修复BUG,完善匹配店铺
2026-04-11 00:57:34 +08:00
super
9a59dac6d0
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-10 19:35:08 +08:00
super
03a85d5523
匹配回收,bug修复
2026-04-10 19:33:58 +08:00
铭坤
33186911f3
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
144d03965e
完善后台管理店铺搜索
2026-04-08 21:08:52 +08:00
铭坤
7151f6b5e0
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
3149d80456
完善后台接口字段
2026-04-07 17:57:03 +08:00
铭坤
489e7e8269
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
fba85ca365
提交接口进度完善
2026-04-03 00:53:52 +08:00
super
99236c9feb
Merge branch 'master' of https://gitee.com/TeaCodeNice/crawler-plugin
2026-04-02 23:29:19 +08:00
super
0cad577d7c
测试多任务暂存
2026-04-02 23:29:15 +08:00
铭坤
274d294b2e
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
铭坤
a0624221de
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