update code

README.md

@@ -2,11 +2,12 @@
 1. 首先安装Python。linux自带了python，windows请自行下载python。推荐Centos7/Python2.7
 2. 这时候，pip应该可以用了。如果不行，linux请按下面的命令安装pip：
     `wget https://bootstrap.pypa.io/get-pip.py && python get-pip.py`
-3. 安装依赖库：`pip install -r requirement.txt`
-4. 创建一个`logs`目录: `mkdir logs`
-4. 创建数据库：`python rebuildDB.py`
-5. 安装`redis`：建议先安装宝塔，然后直接用宝塔安装redis
-6. 网站目录下运行：`gunicorn -w4 -b 0.0.0.0:5000 run:app`
+3. `/root`目录下解压/git clone下源码:`git clone https://github.com/tangrela/ojbk_jiexi.git`
+4. 安装依赖库：`cd ojbk_jiexi && pip install -r requirement.txt`
+5. 创建一个`logs`目录: `mkdir logs`
+6. 创建数据库：`mv config.sample.py config.py && python rebuildDB.py`
+7. 安装`redis`：建议先安装宝塔，然后直接用宝塔安装redis(ps.必须安装redis)
+8. 网站目录下运行：`gunicorn -w4 -b 0.0.0.0:5000 run:app`
 
 然后访问 ip:5000 试试
 如果不能访问，看看防火墙是否开了5000端口？

app/__init__.py

@@ -6,6 +6,7 @@
 from flask_pagedown import PageDown
 import logging
 import datetime
+from redis import Redis
 
 # 日志记录
 logger = logging.getLogger("ojbk")
@@ -18,10 +19,10 @@
 ch.setFormatter(formatter)
 logger.addHandler(ch)
 
+rd = Redis(host='localhost', port=6379, db=0)
 
 app = Flask(__name__)
 app.config.from_object('config')
-
 # Celery configuration
 #celery = Celery(__name__, broker=app.config['CELERY_BROKER_URL'])
 db = SQLAlchemy(app, use_native_unicode='utf8')

app/views.py

@@ -19,7 +19,7 @@
 from app import db
 from app.models import Context
 import parser
-from . import logger
+from . import logger,rd
 from config import *
 from captcha import *
 
@@ -71,16 +71,22 @@ def getmd5():
 
 
 def getipwhois(ip):
-    url='http://tool.chinaz.com/ipwhois?q={}'.format(ip)
-    try:
-        r=requests.get(url,headers=headers,timeout=8)
+    if rd.exists(ip) and rd.get(ip)!='home':
+        netname=rd.get(ip)
+        print '{} exists in redis,netname {}'.format(ip,netname)
+    else:
+        print '{} exists doesn\' exists in redis'.format(ip)
+        url='http://tool.chinaz.com/ipwhois?q={}'.format(ip)
         try:
-            netname=re.findall('netname:(.*?)<br/>',r.content)[0].replace(' ','')
-        except:
-            netname=re.findall('<p>Name : (.*?)</p>',r.content)[0].replace(' ','')
-    except Exception,e:
-        print e
-        netname='home'
+            r=requests.get(url,headers=headers,timeout=8)
+            try:
+                netname=re.findall('netname:(.*?)<br/>',r.content)[0].replace(' ','')
+            except:
+                netname=re.findall('<p>Name : (.*?)</p>',r.content)[0].replace(' ','')
+            rd.set(ip,netname)
+        except Exception,e:
+            print e
+            netname='home'
     return netname
 
 

config.py

@@ -2,8 +2,8 @@
 basedir=os.path.abspath(os.path.dirname(__file__))
 
 SECRET_KEY='SSDFDSFDFD'
-#SQLALCHEMY_DATABASE_URI='mysql+pymysql://user:passwd@localhost/db'
-SQLALCHEMY_DATABASE_URI='sqlite:///'+os.path.join(basedir,'data.sqlite')
+SQLALCHEMY_DATABASE_URI='mysql+pymysql://jx:cyx210210@localhost/jx'
+#SQLALCHEMY_DATABASE_URI='sqlite:///'+os.path.join(basedir,'data.sqlite')
 SQLALCHEMY_TRACK_MODIFICATIONS=True
 debug=True
 domain='http://ojbk.us'

config.sample.py

@@ -0,0 +1,13 @@
+import os
+basedir=os.path.abspath(os.path.dirname(__file__))
+
+SECRET_KEY='SSDFDSFDFD'
+#SQLALCHEMY_DATABASE_URI='mysql+pymysql://user:passwd@localhost/db'
+SQLALCHEMY_DATABASE_URI='sqlite:///'+os.path.join(basedir,'data.sqlite')
+SQLALCHEMY_TRACK_MODIFICATIONS=True
+debug=True
+domain='http://ojbk.us'
+mm2='http://v.33k.im'
+porn91='http://91porn.com'
+#CELERY_BROKER_URL = 'redis://localhost:6379/0'
+#CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'