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

Merge develop into master #71

Merged
merged 12 commits into from
Feb 5, 2020
Merged

Merge develop into master #71

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
13ad344
Improve check stock state
tychxn Feb 3, 2020
b675c75
Enable to config timeout
tychxn Feb 3, 2020
c85753c
Fix: gbk encoding bug on Windows
tychxn Feb 4, 2020
12644e6
Feat: add message push
tychxn Feb 5, 2020
957a37b
Add git ignore
tychxn Feb 5, 2020
27d77ab
Feat: get eid and fp automatically
tychxn Feb 5, 2020
24f9e3d
Feat: use random user-agent
tychxn Feb 5, 2020
00445f3
Feat: add config
tychxn Feb 5, 2020
a0e8746
Refactor: message push
tychxn Feb 5, 2020
bf3de06
Feat: add js
tychxn Feb 5, 2020
efddc45
Docs: update README
tychxn Feb 5, 2020
dd13fa9
Merge branch 'master' into develop
tychxn Feb 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into develop
  • Loading branch information
@tychxn
tychxn authored Feb 5, 2020
commit dd13fa9be82c68f3a8bf0691dc34e281cbaa4afd
2 changes: 1 addition & 1 deletion log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def set_logger():
logger.addHandler(console_handler)

file_handler = logging.handlers.RotatingFileHandler(
LOG_FILENAME, maxBytes=10485760, backupCount=5, encoding='utf-8')
LOG_FILENAME, maxBytes=10485760, backupCount=5, encoding="utf-8")
file_handler.setFormatter(formatter)
logger.addHandler(file_handler)

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.