Merge remote-tracking branch 'origin/main'

@@ -52,7 +52,7 @@ def run_script():
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     scheduler = BackgroundScheduler(timezone=utc)
     scheduler = BackgroundScheduler(timezone=utc)
-    scheduler.add_job(run_script, 'interval', minutes=1)
+    scheduler.add_job(run_script, 'interval', hours=5)
     scheduler.start()
     scheduler.start()
 
 
     try:
     try:

@@ -2,7 +2,7 @@ import os
 from sqlalchemy import create_engine
 from sqlalchemy import create_engine
 import pandas as pd
 import pandas as pd
 from spiderDataPackage.settings import articleAddr,commentsAddr
 from spiderDataPackage.settings import articleAddr,commentsAddr
-from model.topicDefine import *
+# from ..model.topicDefine import *
 
 
 engine = create_engine('mysql+pymysql://XiaoXueQi:XiaoXueQi@47.92.235.6/Weibo_PublicOpinion_AnalysisSystem?charset=utf8mb4')
 engine = create_engine('mysql+pymysql://XiaoXueQi:XiaoXueQi@47.92.235.6/Weibo_PublicOpinion_AnalysisSystem?charset=utf8mb4')
 
 
@@ -29,7 +29,7 @@ def saveData():
 
 
     os.remove(articleAddr)
     os.remove(articleAddr)
     os.remove(commentsAddr)
     os.remove(commentsAddr)
-    update_data()
+    # update_data()
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     saveData()
     saveData()

@@ -9,7 +9,7 @@ def spiderData():
         print('正在爬取导航栏数据')
         print('正在爬取导航栏数据')
         spiderNav()
         spiderNav()
     print('正在爬取文章数据')
     print('正在爬取文章数据')
-    spiderContent(1,1)
+    spiderContent(9,1)
     print('正在爬取文章评论数据')
     print('正在爬取文章评论数据')
     spiderComments()
     spiderComments()
 
 

@@ -90,7 +90,7 @@ def readJson(response,type):
             isVip
             isVip
         ])
         ])
 
 
-def start(typeNum=1,pageNum=1):
+def start(typeNum=14,pageNum=3):
     articleUrl = 'https://weibo.com/ajax/feed/hottimeline'
     articleUrl = 'https://weibo.com/ajax/feed/hottimeline'
     init()
     init()
     typeList = getTypeList()
     typeList = getTypeList()

@@ -112,7 +112,7 @@
                           </a>
                           </a>
                       </li>
                       </li>
                       <li class="px-3 pt-3 pb-2">
                       <li class="px-3 pt-3 pb-2">
-                          <span class="text-uppercase small font-weight-bold">词云图</span>
+                          <span class="text-uppercase small font-weight-bold">机器学习预测</span>
                       </li>
                       </li>
                       <li class=" sidebar-layout">
                       <li class=" sidebar-layout">
                           <a href="/page/articleCloud" class="svg-icon">
                           <a href="/page/articleCloud" class="svg-icon">