Skip to content

[pull] main from yqchilde:main#5

Open
pull[bot] wants to merge 148 commits into
a131656:mainfrom
yqchilde:main
Open

[pull] main from yqchilde:main#5
pull[bot] wants to merge 148 commits into
a131656:mainfrom
yqchilde:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Jun 17, 2021 •
edited
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull Bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Jun 17, 2021
yqchilde and others added 25 commits June 18, 2021 00:59
@yqchilde
Init building with github action config about logo.ico.
166b7e8
@yqchilde
为了actions能构建win包快一点，从requirements里移除国内镜像地址
a37fae8
@yqchilde
优化Cookie带空格时无法绑定问题
3b7995a
@yqchilde
增加sms_captcha.jd_wstool配置，默认为true
8041625
@yqchilde
增加sms_captcha.jd_wstool配置，默认为true (#70)
09bd228
@yqchilde
Add actions workflows about jd_wstool.
4fc2928
@yqchilde
修复内置websocket监听未提交
b11c267
@yqchilde
Merge branch 'main' into dev
c2b2ec8
@yqchilde
no message
a9567de
@yqchilde
Init actions wordflows about jd_wstool.
a5a605e
@AntonVanke
尝试修复短信验证码监听问题 (#72)
b8e8e61 
* 尝试修复内置`listener`监听验证码的问题

* 尝试修复内置监听问题
@yqchilde
Update test_main.py.
c55b729
@yqchilde
Merge branch 'main' into dev
3ea8959 
# Conflicts:
#	.github/workflows/build.yml
@dd178
添加基于yolov4深度学习的验证码识别方式 (#74)
d98aa33 
* 添加深度学习识别方式

* 优化代码，以及微调了配置，小幅提升识别率
@yqchilde
Merge branch 'main' into dev
b2efd61
@yqchilde
修复websockets库在用pyinstaller打包时报错
a0c423a
@yqchilde
Fixed jd_wstool packaging issues on intel mac.
11f0e2c
@dd178
优化代码，修改readme (#77)
813a17c 
* 添加深度学习识别方式

* 优化代码，以及微调了配置，小幅提升识别率

* 优化识别代码，权重文件替换为tiny，修改readme
@dd178
Update jd_yolo_captcha.py (#78)
74b3745
@yqchilde
调整目录结构
793db4a
@yqchilde
Modify jd_wstool workflows.
3a11e11
@yqchilde
调整目录结构 (#79)
32f0d83 
* 调整目录结构

* Modify jd_wstool workflows.
@lowking
优化退会校验 (#83)
f149ee9 
* update config.json

* optimize first time to get sms code

* update config.json

* update config.json

* optimize

* delete config.json
@yqchilde
Merge branch 'main' into dev
372a7ec
@dd178
修复因图形验证码图形过多导致识别未果 (#85)
fd77bbf 
* 尝试修复权重路径问题

* 修复识别未果

* 更新权重文件

Co-authored-by: ice <66549247+1786178749@users.noreply.github.com>
yqchilde and others added 30 commits December 13, 2021 12:40
@yqchilde
feat: 增加店铺名匹配
d2498fd
@yqchilde
no message
b0bc935
@yqchilde
Merge pull request #129 from yqchilde/dev
21df3f3 
feat: 优化captcha代码，抽离正则匹配规则，增加店铺名匹配
@actions-user
Automatically write version information
0bd3945
@yqchilde @xieshang
feat: 多账号 (#131)
6271b32 
* !1 同步多账号退会和退会辅助工具
* 删除main2.py
* 增加 工具ui文件；
* 判断python3，防止电脑python2 3都有的情况；
* update;
* update;
* update;
* update;
* 修改 config关键字
* 删除 key类型参数设置，自动通过识别key值是否包含wskey来判断是wskey还是cookie；
* 整理代码，测试通过；
* 修复 当短信推送过迟导致失败后，后续的验证码一直都错乱的问题；
* update;
* update;
* update;
* update;
* update;
* update;
* update;
* update;
* update;
* update;
* log打印信息增加 pin名字；
* log打印信息增加 pin名字；
* log打印信息增加 pin名字；
* log打印信息增加 pin名字；
* log打印信息增加 pin名字；
* update;
* update;
* update;
* update;
* update;
* update;
* test;
* 增加 定时器控制
* 修复 报错：
* 修改 定时架构；
* update
* update
* 增加 linux下自动关闭浏览器
* docker 重构
* docker 中无法使用yolov4，自动修改 local；
* docker file update;
* docker file update;
* docker file update;
* docker file update;
* docker file update;
* docker file update;
* docker file update;
* 增加docker环境
* Merge branch '同时退多号' into multi_account
* 更新退多号说明；
* 更新 config.yaml配置文件内容；
* 多账号同退支持cookie和wskey设置，有multi.type设置决定；
* 修改  config的wskey和port的配置方法；
* 修复  不小心把云id功能注释掉了
* 跟踪 多账号同时退卡脚本；
* 多账号退会初版，启动正常，未测试同时退会情况；

* fix: format

Co-authored-by: 川 <3001385@qq.com>
@actions-user
Automatically write version information
25e7719
@idiomaticrefactoring
Update getiOSMessages.py (#132)
8ed76a9 
refactoring code with truth value test which is more pythonic, concise, readable and efficient
@actions-user
Automatically write version information
77ee47e
@wenfxl
Update config.yaml (#135)
40ee257 
增加轨迹验证为手动验证识别标志
@wenfxl
Update main.py (#136)
219c367 
增加轨迹验证为手动验证
@actions-user
Automatically write version information
fd5663c
@wenfxl
Update main.py (#138)
616ca17 
* Update main.py

修复ws_conn函数参数报错问题

* Update main.py
@actions-user
Automatically write version information
065c5c7
@yqchilde
fix: 更新版本依赖；修复短信验证码没有自动填充
bb841b4
@actions-user
Automatically write version information
ea8ef52
@yqchilde
fix: 修复检测更新
92f04ca
@yqchilde
fix: 修复jd_wstool工具编译
123bdf4
@yqchilde
fix: 兼容python3.10
5fc8d06
@yqchilde
fix: update gitignore
5c4cb3a
@actions-user
Automatically write version information
3e3c484
@yqchilde
fix: 更新jd_wstool，支持多端口，缩小体积
ade41bb
@actions-user
Automatically write version information
576a2d8
@wenfxl
Update main.py (#143)
ed048fe 
变更手动提示，以免造认为是需要手填验证码
@actions-user
Automatically write version information
d566a19
@yqchilde
fix: 修复获取卡包列表接口失败问题
b516a9d
@actions-user
Automatically write version information
a93bc5a
@yqchilde
fix: 更新退会脚本，可用图鉴实现全自动
13d6254
@actions-user
Automatically write version information
8906853
@yqchilde
fix: 修改验证版本方法
b4844c7
@actions-user
Automatically write version information
1661085
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull merge-conflict Resolve conflicts manually

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@yqchilde @AntonVanke @dd178 @lowking @tofuliang @xieshang @actions-user @idiomaticrefactoring @wenfxl