From 0aff2bfa9ed02be9fb1911a3ee42a6248cfff9cf Mon Sep 17 00:00:00 2001 From: Chandler-top Date: Mon, 24 Jul 2017 13:43:41 +0800 Subject: [PATCH 1/2] first commit --- .idea/misc.xml | 12 +----------- .idea/web_wx.iml | 2 +- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5bfd229..12f37ed 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,14 +1,4 @@ - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/web_wx.iml b/.idea/web_wx.iml index a1d57e8..7118278 100644 --- a/.idea/web_wx.iml +++ b/.idea/web_wx.iml @@ -2,7 +2,7 @@ - + From 9c012cd3049e4e1c9898b4bc64376611e2002cf0 Mon Sep 17 00:00:00 2001 From: Chandler-top Date: Tue, 25 Jul 2017 13:50:45 +0800 Subject: [PATCH 2/2] run ok! --- .idea/misc.xml | 2 +- .idea/web_wx.iml | 4 ++-- core/__init__.py | 0 core/cache/__init__.py | 0 core/cache/basecache.py | 1 + core/cache/tokencache.py | 1 + core/log/all.log | 6 ++++++ core/logger_helper.py | 9 +++++---- core/server/__init__.py | 0 core/server/page_handler.py | 1 + core/server/wx_handler.py | 9 +++++---- core/server/wxauthorize.py | 13 ++++++++----- core/server/wxconfig.py | 2 +- core/server/wxmenu.py | 13 ++++++++----- core/server/wxshedule.py | 8 +++++--- core/server/wxsign.py | 13 ++++++++----- core/url.py | 8 ++++---- run.py | 2 ++ 18 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 core/__init__.py create mode 100644 core/cache/__init__.py create mode 100644 core/server/__init__.py diff --git a/.idea/misc.xml b/.idea/misc.xml index 12f37ed..5bbe586 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/.idea/web_wx.iml b/.idea/web_wx.iml index 7118278..44a029e 100644 --- a/.idea/web_wx.iml +++ b/.idea/web_wx.iml @@ -1,8 +1,8 @@ - - + + diff --git a/core/__init__.py b/core/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/cache/__init__.py b/core/cache/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/cache/basecache.py b/core/cache/basecache.py index a303332..e86c1dd 100644 --- a/core/cache/basecache.py +++ b/core/cache/basecache.py @@ -1,3 +1,4 @@ +#coding:utf-8 import redis """缓存服务器""" diff --git a/core/cache/tokencache.py b/core/cache/tokencache.py index 1b1c186..0125a5d 100644 --- a/core/cache/tokencache.py +++ b/core/cache/tokencache.py @@ -1,3 +1,4 @@ +#coding:utf-8 from core.cache.basecache import BaseCache from core.logger_helper import logger diff --git a/core/log/all.log b/core/log/all.log index e69de29..d4973f9 100644 --- a/core/log/all.log +++ b/core/log/all.log @@ -0,0 +1,6 @@ +[2017-07-25 09:01:47]: runtime-log INFO 24 【获取微信全局唯一票据access_token】>>>执行定时器任务 +[2017-07-25 09:01:47]: runtime-log INFO 33 【获取微信全局唯一票据access_token】Response[200] +[2017-07-25 09:07:09]: runtime-log INFO 24 【获取微信全局唯一票据access_token】>>>执行定时器任务 +[2017-07-25 09:07:12]: runtime-log INFO 33 【获取微信全局唯一票据access_token】Response[200] +[2017-07-25 09:24:19]: runtime-log INFO 24 【获取微信全局唯一票据access_token】>>>执行定时器任务 +[2017-07-25 09:24:19]: runtime-log INFO 33 【获取微信全局唯一票据access_token】Response[200] diff --git a/core/logger_helper.py b/core/logger_helper.py index 9ce5bc4..6c86942 100644 --- a/core/logger_helper.py +++ b/core/logger_helper.py @@ -1,3 +1,4 @@ +#coding:utf-8 import logging from logging import Logger from logging.handlers import TimedRotatingFileHandler @@ -15,17 +16,17 @@ def init_logger(logger_name): formatter = logging.Formatter(format_str, df) # handler all try: - handler1 = TimedRotatingFileHandler('/usr/web_wx/log/all.log', when='D', interval=1, backupCount=7) + handler1 = TimedRotatingFileHandler('/home/z640/PycharmProjects/weixin/core/log/all.log', when='D', interval=1, backupCount=7) except Exception: - handler1 = TimedRotatingFileHandler('F:\program\web_wx\core\log\/all.log', when='D', interval=1, backupCount=7) + handler1 = TimedRotatingFileHandler('/home/z640/PycharmProjects/weixin/core/log/all.log', when='D', interval=1, backupCount=7) handler1.setFormatter(formatter) handler1.setLevel(logging.DEBUG) logger1.addHandler(handler1) # handler error try: - handler2 = TimedRotatingFileHandler('/usr/web_wx/log/error.log', when='D', interval=1, backupCount=7) + handler2 = TimedRotatingFileHandler('/home/z640/PycharmProjects/weixin/core/log/error.log', when='D', interval=1, backupCount=7) except Exception: - handler2 = TimedRotatingFileHandler('F:\program\web_wx\core\log\error.log', when='D', interval=1, backupCount=7) + handler2 = TimedRotatingFileHandler('/home/z640/PycharmProjects/weixin/core/log/error.log', when='D', interval=1, backupCount=7) handler2.setFormatter(formatter) handler2.setLevel(logging.ERROR) logger1.addHandler(handler2) diff --git a/core/server/__init__.py b/core/server/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/core/server/page_handler.py b/core/server/page_handler.py index 055dd86..d8fcd2b 100644 --- a/core/server/page_handler.py +++ b/core/server/page_handler.py @@ -1,3 +1,4 @@ +#coding:utf-8 import tornado.web diff --git a/core/server/wx_handler.py b/core/server/wx_handler.py index ba612b8..c5ec3c6 100644 --- a/core/server/wx_handler.py +++ b/core/server/wx_handler.py @@ -1,8 +1,9 @@ +#coding:utf-8 import tornado.web -from core.logger_helper import logger -from core.server.wxauthorize import WxConfig -from core.server.wxauthorize import WxAuthorServer -from core.cache.tokencache import TokenCache +from logger_helper import logger +from wxshedule import WxConfig +from wxauthorize import WxAuthorServer +from cache.tokencache import TokenCache class WxHandler(tornado.web.RequestHandler): diff --git a/core/server/wxauthorize.py b/core/server/wxauthorize.py index d9da8e0..c2b1dd5 100644 --- a/core/server/wxauthorize.py +++ b/core/server/wxauthorize.py @@ -1,12 +1,15 @@ -from core.logger_helper import logger +#coding:utf-8 import hashlib -import tornado.web +import json import time import urllib + import requests -import json -from urllib import parse -from core.server.wxconfig import WxConfig +import tornado.web +from server.wxconfig import WxConfig + +from logger_helper import logger + try: import xml.etree.cElementTree as ET except ImportError: diff --git a/core/server/wxconfig.py b/core/server/wxconfig.py index 36df9e2..ebddf98 100644 --- a/core/server/wxconfig.py +++ b/core/server/wxconfig.py @@ -1,4 +1,4 @@ - +#coding:utf-8 class WxConfig(object): """ diff --git a/core/server/wxmenu.py b/core/server/wxmenu.py index a20f87a..7c4fb9e 100644 --- a/core/server/wxmenu.py +++ b/core/server/wxmenu.py @@ -1,9 +1,12 @@ -import requests +#coding:utf-8 import json -from core.server.wxconfig import WxConfig -from core.cache.tokencache import TokenCache -from core.logger_helper import logger -from core.server.wxauthorize import WxAuthorServer + +import requests +from cache.tokencache import TokenCache +from server.wxauthorize import WxAuthorServer +from server.wxconfig import WxConfig + +from logger_helper import logger class WxMenuServer(object): diff --git a/core/server/wxshedule.py b/core/server/wxshedule.py index 57304e5..17b3020 100644 --- a/core/server/wxshedule.py +++ b/core/server/wxshedule.py @@ -1,9 +1,10 @@ -from core.logger_helper import logger +#coding:utf-8 +from logger_helper import logger import tornado.ioloop import requests import json -from core.server.wxconfig import WxConfig -from core.cache.tokencache import TokenCache +from wxconfig import WxConfig +from cache.tokencache import TokenCache class WxShedule(object): @@ -17,6 +18,7 @@ class WxShedule(object): _token_cache = TokenCache() # 微信token缓存实例 _expire_time_access_token = 7000 * 1000 # token过期时间 + def excute(self): """执行定时器任务""" logger.info('【获取微信全局唯一票据access_token】>>>执行定时器任务') diff --git a/core/server/wxsign.py b/core/server/wxsign.py index 61e9a59..1501aa1 100644 --- a/core/server/wxsign.py +++ b/core/server/wxsign.py @@ -1,10 +1,13 @@ -import time +#coding:utf-8 +import hashlib import random import string -import hashlib -from core.server.wxconfig import WxConfig -from core.cache.tokencache import TokenCache -from core.logger_helper import logger +import time + +from cache.tokencache import TokenCache +from server.wxconfig import WxConfig + +from logger_helper import logger class WxSign: diff --git a/core/url.py b/core/url.py index 9d6c9bb..850b404 100644 --- a/core/url.py +++ b/core/url.py @@ -1,7 +1,7 @@ -from core.server.wxauthorize import WxSignatureHandler -from core.server.page_handler import PageHandler -from core.server.wx_handler import WxHandler - +#coding:utf-8 +from server.page_handler import PageHandler +from server.wx_handler import WxHandler +from server.wxauthorize import WxSignatureHandler '''web解析规则''' diff --git a/run.py b/run.py index 689d688..0b5da80 100644 --- a/run.py +++ b/run.py @@ -1,3 +1,4 @@ +#coding:utf-8 import os import tornado.httpserver import tornado.ioloop @@ -6,6 +7,7 @@ from core.url import urlpatterns from core.server.wxshedule import WxShedule + define('port', default=8000, help='run on the given port', type=int)