From ed66700d957bc6c2238f09abcc2d51c939200300 Mon Sep 17 00:00:00 2001 From: sbilly Date: Thu, 25 Feb 2016 08:44:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AA=20bug=20?= =?UTF-8?q?1.=20=E8=AF=86=E5=88=AB=E7=BA=A2=E5=8C=85=E6=B6=88=E6=81=AF=202?= =?UTF-8?q?.=20=E5=B0=86=E7=89=B9=E6=AE=8A=E8=B4=A6=E5=8F=B7=E5=92=8C?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=88=B7=E6=96=B0=E6=97=B6=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E9=98=88=E5=80=BC=E5=8F=98=E6=88=90=E7=B1=BB=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=203.=20=E8=B4=A6=E5=8F=B7=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=97=B6=E6=9F=A5=E8=AF=A2=E5=85=AC=E4=BC=97=E5=8F=B7=E3=80=81?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=B7=E5=92=8C=E7=89=B9=E6=AE=8A=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=20Changes=20to=20be=20committed:=20=09modified:=20=20?= =?UTF-8?q?=20weixin.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- weixin.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/weixin.py b/weixin.py index fd5a36d..298225d 100755 --- a/weixin.py +++ b/weixin.py @@ -95,6 +95,8 @@ class WebWeixin(object): self.lang = 'zh_CN' self.lastCheckTs = time.time() self.memberCount = 0 + self.SpecialUsers = ['newsapp', 'fmessage', 'filehelper', 'weibo', 'qqmail', 'fmessage', 'tmessage', 'qmessage', 'qqsync', 'floatbottle', 'lbsapp', 'shakeapp', 'medianote', 'qqfriend', 'readerapp', 'blogapp', 'facebookapp', 'masssendapp', 'meishiapp', 'feedsapp', 'voip', 'blogappweixin', 'weixin', 'brandsessionholder', 'weixinreminder', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'officialaccounts', 'notification_messages', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'wxitil', 'userexperience_alarm', 'notification_messages'] + self.TimeOut = 20 # 同步最短时间间隔（单位：秒） opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(cookielib.CookieJar())) @@ -215,7 +217,7 @@ class WebWeixin(object): return dic['BaseResponse']['Ret'] == 0 def webwxgetcontact(self): - SpecialUsers = ['newsapp', 'fmessage', 'filehelper', 'weibo', 'qqmail', 'fmessage', 'tmessage', 'qmessage', 'qqsync', 'floatbottle', 'lbsapp', 'shakeapp', 'medianote', 'qqfriend', 'readerapp', 'blogapp', 'facebookapp', 'masssendapp', 'meishiapp', 'feedsapp', 'voip', 'blogappweixin', 'weixin', 'brandsessionholder', 'weixinreminder', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'officialaccounts', 'notification_messages', 'wxid_novlwrv3lqwv11', 'gh_22b87fa7cb3c', 'wxitil', 'userexperience_alarm', 'notification_messages'] + SpecialUsers = self.SpecialUsers url = self.base_uri + '/webwxgetcontact?pass_ticket=%s&skey=%s&r=%s' % (self.pass_ticket, self.skey, int(time.time())) dic = self._post(url, {}) @@ -413,10 +415,20 @@ class WebWeixin(object): # 群 name = self.getGroupName(id) else: + # 特殊账号 + for member in self.SpecialUsersList: + if member['UserName'] == id: + name = member['RemarkName'] if member['RemarkName'] else member['NickName'] + + # 公众号或服务号 + for member in self.PublicUsersList: + if member['UserName'] == id: + name = member['RemarkName'] if member['RemarkName'] else member['NickName'] + # 直接联系人 for member in self.ContactList: if member['UserName'] == id: - name = member['RemarkName'] if member['RemarkName'] else member['NickName'] + name = member['RemarkName'] if member['RemarkName'] else member['NickName'] # 群友 for member in self.GroupMemeberList: if member['UserName'] == id: @@ -478,8 +490,12 @@ class WebWeixin(object): groupName = dstName dstName = 'GROUP' + # 收到了红包 + if content == '收到红包，请在手机上查看': msg['message'] = content + # 指定了消息内容 if 'message' in msg.keys(): content = msg['message'] + if groupName != None: print '%s |%s| %s -> %s: %s' % (message_id, groupName.strip(), srcName.strip(), dstName.strip(), content.replace('
','\n')) From 24af2e477734096cb48f9d66a5fc3bae6d7666f0 Mon Sep 17 00:00:00 2001 From: sbilly Date: Thu, 25 Feb 2016 08:48:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20requirements.txt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes to be committed: new file: genReq.sh new file: requirements.txt --- genReq.sh | 2 ++ requirements.txt | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 genReq.sh create mode 100644 requirements.txt diff --git a/genReq.sh b/genReq.sh new file mode 100644 index 0000000..051bf6b --- /dev/null +++ b/genReq.sh @@ -0,0 +1,2 @@ +#!/bin/sh +pip freeze |grep -v wheel | gawk -F"==" ' { print $1 } ' > requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..6d2a7c5 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,7 @@ +colorama +coloredlogs +humanfriendly +lxml +qrcode +requests +six