From 41bc3167f408c47fe1c53127c5fdc118c3edb32c Mon Sep 17 00:00:00 2001
From: pandolia <pandolia@yeah.net>
Date: Mon, 20 Feb 2017 22:13:39 +0800
Subject: [PATCH] =?UTF-8?q?2.0.7=E7=89=88=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 qqbot/qconf.py         | 2 +-
 qqbot/qrcodemanager.py | 3 +--
 qqbot/qterm.py         | 6 +++---
 setup.py               | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/qqbot/qconf.py b/qqbot/qconf.py
index 11300f5..d6c836b 100644
--- a/qqbot/qconf.py
+++ b/qqbot/qconf.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-version = 'v2.0.6'
+version = 'v2.0.7'
 
 sampleConfStr = '''{
 
diff --git a/qqbot/qrcodemanager.py b/qqbot/qrcodemanager.py
index d10d757..10f974c 100644
--- a/qqbot/qrcodemanager.py
+++ b/qqbot/qrcodemanager.py
@@ -91,6 +91,7 @@ def sendEmail(self):
                     else:
                         lastSubject = self.qrcodeMail['subject']
             else:
+                time.sleep(30)
                 try:
                     DEBUG('开始查询邮箱 %s 中的最近的邮件', self.mailAgent.account)
                     with self.mailAgent.IMAP() as imap:
@@ -99,8 +100,6 @@ def sendEmail(self):
                     WARN('查询邮箱 %s 中的邮件失败 %s', self.mailAgent.account, e)
                 else:
                     DEBUG('最近的邮件： %s', lastSubject)
-            
-            time.sleep(20)
     
     def Destroy(self):
         if self.mailAgent:
diff --git a/qqbot/qterm.py b/qqbot/qterm.py
index 0cb23a6..6c3e3da 100644
--- a/qqbot/qterm.py
+++ b/qqbot/qterm.py
@@ -37,14 +37,14 @@ def Run(self):
                 except socket.error:
                     WARN('QQBot-Term 服务器出现 accept 错误')
                 else:
-                    name = 'QTerm 客户端<%s:%s>' % addr
+                    name = 'QTerm客户端"%s:%s"' % addr
                     sock.settimeout(5.0)
                     try:
                         data = sock.recv(1024)
                     except socket.error:
                         sock.close()
                     else:
-                        INFO('来自 %s 的消息：%s', name, data)
+                        INFO('QTerm 命令：%s', repr(data))
                         yield TermMessage(name, sock, data)
     
     def processMsg(self, factory, msg):
@@ -71,7 +71,7 @@ def __init__(self, name, sock, content):
     def Reply(self, rep):
         try:
             self.sock.sendall(rep and str(rep) or '\r\n')
-            INFO('已向 %s 回复消息', self.name)
+            # INFO('已向 %s 回复消息', self.name)
         except socket.error:
             WARN('回复 %s 失败', self.name)
         finally:
diff --git a/setup.py b/setup.py
index 8a52fa7..23550ba 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 from setuptools import setup
 
-version = '2.0.6'
+version = '2.0.7'
 
 setup(
     name = 'qqbot',