From cf3a17a8c55fdc57eb5cec5313b72e5b5761e62d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E7=BA=A2=E9=9D=99?= Date: Mon, 17 Apr 2017 19:39:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BE=A4=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant/config.py | 11 +++++++++++ assistant/main.py | 23 +++++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 assistant/config.py diff --git a/assistant/config.py b/assistant/config.py new file mode 100644 index 0000000..5f5e5f1 --- /dev/null +++ b/assistant/config.py @@ -0,0 +1,11 @@ +class global_var: + ''' + 全局变量，需要定义的全局变量都放在这里 + ''' + # 定义同步消息的groups + groupNames=[""] + + commonName = '算法' + learnGroup = '每日一题算法6群' + transferGroup = '每日一题中转站' + gossipGroup = '每日一题灌水群' diff --git a/assistant/main.py b/assistant/main.py index d8a7fc8..f488f93 100644 --- a/assistant/main.py +++ b/assistant/main.py @@ -3,6 +3,7 @@ import json from wxpy import * import threading +from config import global_var import time @@ -14,11 +15,25 @@ global group global group2 global group3 -groups = bot.groups().search('算法') -group = bot.groups().search("每日一题算法6群")[0] -group2 = bot.groups().search("每日一题中转站")[0] -group3 = bot.groups().search("每日一题灌水群")[0] +groups = bot.groups().search(global_var.commonName) +#加入安全检测 +res = bot.groups().search(global_var.learnGroup)#刷题群 +if len(res)>0: + group = res[0] + +res = bot.groups().search(global_var.transferGroup)#中转站 +if len(res)>0: + group2 = res[0] + +res = bot.groups().search(global_var.gossipGroup)#灌水群 +if len(res)>0: + group3 = res[0] +# group = bot.groups().search("每日一题算法6群")[0] +# group2 = bot.groups().search("每日一题中转站")[0] +# group3 = bot.groups().search("每日一题灌水群")[0] + +# # logger = get_wechat_logger() # logger.warning('這是一條WARNING等級的日志，你收到了嗎？') From ad9dbe82f96690e293f3b8e4f0cd025418e95389 Mon Sep 17 00:00:00 2001 From: XudongHe Date: Mon, 1 May 2017 22:16:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=BE=A4=E7=9A=84=E9=82=80=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant/main.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assistant/main.py b/assistant/main.py index d8a7fc8..d6208aa 100644 --- a/assistant/main.py +++ b/assistant/main.py @@ -14,10 +14,12 @@ global group global group2 global group3 +global group4 groups = bot.groups().search('算法') -group = bot.groups().search("每日一题算法6群")[0] +group = bot.groups().search("每日一题算法7群")[0] group2 = bot.groups().search("每日一题中转站")[0] group3 = bot.groups().search("每日一题灌水群")[0] +group4 = bot.groups().search("清单")[0] # logger = get_wechat_logger() # logger.warning('這是一條WARNING等級的日志，你收到了嗎？') @@ -65,6 +67,8 @@ def add_group_member(msg): group.add_members(msg.sender, use_invitation=True) if '灌水' in msg.text.lower(): group3.add_members(msg.sender, use_invitation=True) + if '清单' in msg.text.lower(): + group4.add_members(msg.sender, use_invitation=True) def send_message_to_group(): message = '''@所有人: @@ -75,7 +79,7 @@ def send_message_to_group(): ''' group2.send(message) global timer - timer = threading.Timer(10800, send_message_to_group) + timer = threading.Timer(20800, send_message_to_group) timer.start() timer = threading.Timer(7200, send_message_to_group) From f2f8b98e96d44e0bc6793d41a378dfef168ce7b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=9D=E7=BA=A2=E9=9D=99?= Date: Thu, 4 May 2017 18:20:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BE=A4=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assistant/config.py | 3 ++- assistant/main.py | 17 +++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/assistant/config.py b/assistant/config.py index 5f5e5f1..3ebe7c6 100644 --- a/assistant/config.py +++ b/assistant/config.py @@ -6,6 +6,7 @@ class global_var: groupNames=[""] commonName = '算法' - learnGroup = '每日一题算法6群' + learnGroup = '每日一题算法7群' transferGroup = '每日一题中转站' gossipGroup = '每日一题灌水群' + listGroup = '清单' diff --git a/assistant/main.py b/assistant/main.py index f96ad48..29ba443 100644 --- a/assistant/main.py +++ b/assistant/main.py @@ -16,11 +16,11 @@ global group2 global group3 global group4 -groups = bot.groups().search('算法') -group = bot.groups().search("每日一题算法7群")[0] -group2 = bot.groups().search("每日一题中转站")[0] -group3 = bot.groups().search("每日一题灌水群")[0] -group4 = bot.groups().search("清单")[0] +# groups = bot.groups().search('算法') +# group = bot.groups().search("每日一题算法7群")[0] +# group2 = bot.groups().search("每日一题中转站")[0] +# group3 = bot.groups().search("每日一题灌水群")[0] +# group4 = bot.groups().search("清单")[0] groups = bot.groups().search(global_var.commonName) @@ -36,9 +36,10 @@ res = bot.groups().search(global_var.gossipGroup)#灌水群 if len(res)>0: group3 = res[0] -# group = bot.groups().search("每日一题算法6群")[0] -# group2 = bot.groups().search("每日一题中转站")[0] -# group3 = bot.groups().search("每日一题灌水群")[0] + +res = bot.groups().search(global_var.listGroup)#清单群 +if len(res)>0: + group4 = res[0] # # logger = get_wechat_logger()