修改模型

RonnieNiu · May 3, 2020 · 0d3a47d · 0d3a47d
1 parent 9d452d9
commit 0d3a47d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 13 deletions.
diff --git a/ImportToRedis.py b/ImportToRedis.py
@@ -1,8 +1,8 @@
 import redis
 
-PASSWORD = "123456"
-# PASSWORD = ""
-HOST = "192.168.88.128"
+# PASSWORD = "123456"
+PASSWORD = ""
+HOST = "127.0.0.1"
 # HOST = ""
 
 '''

diff --git a/__pycache__/ImportToRedis.cpython-37.pyc b/__pycache__/ImportToRedis.cpython-37.pyc
diff --git a/__pycache__/core.cpython-37.pyc b/__pycache__/core.cpython-37.pyc
diff --git a/__pycache__/get_message.cpython-37.pyc b/__pycache__/get_message.cpython-37.pyc
diff --git a/__pycache__/models.cpython-37.pyc b/__pycache__/models.cpython-37.pyc
diff --git a/get_message.py b/get_message.py
@@ -388,8 +388,5 @@ def FindIpAdd(ip):
     # print(FindIpAdd('202.202.157.110'))
     # SubDomainBurst('baidu.com')
     # print(CScanConsole('202.202.157.110'))
-<<<<<<< HEAD
     # print(SenFileScan("www.baidu.com"))
-=======
     print(SenFileScan("www.baidu.com"))
->>>>>>> 3d9597ebd8053b715e06ac594f97a63ff9b8bdc8
diff --git a/index.py b/index.py
@@ -5,13 +5,10 @@
 from models import User, Log,BaseInfo
 from exts import db
 from decorators import login_required
-<<<<<<< HEAD
 import ImportToRedis
-=======
 from BaseMessage import GetBaseMessage
 import json
 from concurrent.futures import ThreadPoolExecutor
->>>>>>> 3d9597ebd8053b715e06ac594f97a63ff9b8bdc8
 
 app = Flask(__name__)
 app.config.from_object(config)
@@ -42,7 +39,7 @@ def testmysql():
 
 @app.route('/user')
 def user():
-    return render_template('uesr-center.html')
+    return render_template('user-center.html')
 
 @app.route('/testnav')
 def test_home():
@@ -167,10 +164,7 @@ def page_not_found(e):
 def test500():
     return render_template('500.html')
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 3d9597ebd8053b715e06ac594f97a63ff9b8bdc8
 @app.errorhandler(500)
 def internal_server_error(e):
     return render_template('500.html'), 500

diff --git a/models.py b/models.py
@@ -11,9 +11,12 @@ class User(db.Model):
     username=db.Column(db.String(50),nullable=False)
     password=db.Column(db.String(100),nullable=False)
 
+#boolcheck  ->true 即 ip ->false 即 domain
 class BaseInfo(db.Model):
     __tablename__='baseinfo'
     id=db.Column(db.Integer,primary_key=True,autoincrement=True)
+    deepinfoid=db.Column(db.Integer,nullable=True)
+    boolcheck=db.Column(db.Boolean,nullable=True)
     url=db.Column(db.String(50),nullable=False)
     status=db.Column(db.String(3),nullable=False)
     title=db.Column(db.String(50),nullable=True)
@@ -24,6 +27,7 @@ class BaseInfo(db.Model):
     senmessage = db.Column(db.Text,nullable=True)
     sendir = db.Column(db.Text,nullable=True)
 
+
 class IPInfo(db.Model):
     __tablename__='ipinfo'
     id=db.Column(db.Integer,primary_key=True,autoincrement=True)