Skip to content

Commit 4e74f21

Browse files
committed
热启动还存在一些问题,先不使用
1 parent 8d2d5fa commit 4e74f21

File tree

3 files changed

+4
-56
lines changed

3 files changed

+4
-56
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ Web微信协议参考资料:
4141

4242
[qwx: WeChat Qt frontend 微信Qt前端](https://github.com/xiangzhai/qwx)
4343

44-
**master-dev 分支为开发版本,用于测试新特性,欢迎使用后提出建议!**
44+
**dev 分支为开发版本,用于测试新特性,欢迎使用后提出建议!**
4545

4646

4747
## 1 环境与依赖
4848

4949
此版本能运行于Python 2及Python 3环境 。
5050

51-
**wxBot** 用到了Python **jsonpickle**, **requests** , **pypng** , **Pillow** 以及 **pyqrcode** 库。
51+
**wxBot** 用到了Python **requests** , **pypng** , **Pillow** 以及 **pyqrcode** 库。
5252

5353
安装:
5454

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
classifiers=[],
1313
packages=['wxbot'],
1414
install_requires=[
15-
'jsonpickle',
1615
'Pillow',
1716
'pyqrcode',
1817
'pypng',

wxbot/wxbot.py

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,18 @@
33
from __future__ import print_function
44

55
import os
6-
import sys
76
import tempfile
8-
import traceback
97
import webbrowser
108

119
import binascii
12-
import jsonpickle
1310
import pyqrcode
1411
import requests
1512
import mimetypes
1613
import json
1714
import xml.dom.minidom
18-
import urllib
1915
import time
2016
import re
2117
import random
22-
from traceback import format_exc
2318
from requests.exceptions import ConnectionError, ReadTimeout
2419

2520
import sys
@@ -1149,51 +1144,6 @@ def search_content(key, content, fmat='attr'):
11491144
return pm.group(1)
11501145
return 'unknown'
11511146

1152-
def save_to_file(self):
1153-
with open(os.path.join(self.temp_pwd, 'session_state.json'), 'w') as fp:
1154-
json.dump({
1155-
'uuid': self.uuid,
1156-
'base_uri': self.base_uri,
1157-
'base_host': self.base_host,
1158-
'redirect_uri': self.redirect_uri,
1159-
'uin': self.uin,
1160-
'sid': self.sid,
1161-
'skey': self.skey,
1162-
'pass_ticket': self.pass_ticket,
1163-
'device_id': self.device_id,
1164-
'base_request': self.base_request,
1165-
'session': jsonpickle.encode(self.session),
1166-
}, fp)
1167-
1168-
def load_from_file(self):
1169-
if not os.path.exists(self.state_file):
1170-
return False
1171-
1172-
try:
1173-
with open(self.state_file) as fp:
1174-
state = json.load(fp)
1175-
self.uuid = state['uuid']
1176-
self.base_uri = state['base_uri']
1177-
self.base_host = state['base_host']
1178-
self.redirect_uri = state['redirect_uri']
1179-
self.uin = state['uin']
1180-
self.sid = state['sid']
1181-
self.skey = state['skey']
1182-
self.pass_ticket = state['pass_ticket']
1183-
self.device_id = state['device_id']
1184-
self.base_request = state['base_request']
1185-
self.session = jsonpickle.decode(state['session'])
1186-
except:
1187-
log.info("Failed to load from local file")
1188-
return False
1189-
1190-
if self.init():
1191-
log.info('Web WeChat init succeed .')
1192-
return True
1193-
else:
1194-
log.info('Web WeChat init failed')
1195-
return False
1196-
11971147
def login(self):
11981148
self.get_uuid()
11991149
self.gen_qr_code(os.path.join(self.temp_pwd,'wxqr.png'))
@@ -1212,15 +1162,14 @@ def login(self):
12121162

12131163
if self.init():
12141164
log.info('Web WeChat init succeed .')
1215-
self.save_to_file()
12161165
return True
12171166
else:
12181167
log.error('Web WeChat init failed')
12191168
return False
12201169

12211170
def run(self):
1222-
if not self.load_from_file() and not self.login():
1223-
log.error('Both recovered login status and fresh login are failed.')
1171+
if not self.login():
1172+
log.error('login failed.')
12241173
return False
12251174

12261175
self.status_notify()

0 commit comments

Comments
 (0)