Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修正代理相关的逻辑，升级一部分依赖 #203

Merged
merged 4 commits into from
Oct 17, 2021
Merged

修正代理相关的逻辑，升级一部分依赖 #203

merged 4 commits into from
Oct 17, 2021

Conversation

NekoAria
Copy link
Collaborator

最近把 ELF_RSS 和 RSSHub 都搬到国内的服务器上了，结果才发现代理相关的逻辑不对。顺便升级一部分依赖。

@NekoAria
🐛 修复 BUG
de2003b 
- 修正代理相关的逻辑
@NekoAria
⬆️ 依赖升级
eb245c8
Quan666
Quan666 requested changes Oct 16, 2021
View reviewed changes
Copy link
Owner

@Quan666 Quan666 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

httpx的proxies这个属性，在Win下要设置为{}才行，不然在开启了代理软件的情况下会报错
不过我没试过设置为None

@NekoAria
Copy link
Collaborator Author

httpx的proxies这个属性，在Win下要设置为{}才行，不然在开启了代理软件的情况下会报错 不过我没试过设置为None

我试了下，None 也没报错。
而且 proxies 本来默认值就是 None 。

@NekoAria
🐛 修复 BUG
0638e61 
- 修正所有涉及到重试的逻辑
@NekoAria
🎨 改进结构和代码格式
e5a2aa1
@Quan666 Quan666 merged commit bf8e6c8 into Quan666:2.0 Oct 17, 2021
Quan666 pushed a commit that referenced this pull request Oct 21, 2021
Merge pull request #206 from NekoAria/2.0
dc3bc30 
PR(#203) 中意外地动了一处缩进，导致逻辑错误
@NekoAria NekoAria mentioned this pull request Oct 27, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Quan666 Quan666 Quan666 requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@NekoAria @Quan666