jack 1 년 전
부모
커밋
02e7eb802c

+ 1 - 1
utils/utils_daily_logs_generate.py → base/base_daily_logs_generate.py

@@ -5,7 +5,7 @@
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 import time
 from datetime import datetime

+ 1 - 1
utils/utils_daily_logs_send.py → base/base_daily_logs_send.py

@@ -6,7 +6,7 @@ import time
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 import pymongo
 import smtplib

+ 4 - 4
utils/utils_load_config.py → base/base_load_config.py

@@ -8,12 +8,12 @@ import json
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 def load_config():
     try:
-        sys.path.append(os.path.join(os.getcwd().split('auto_message')[0], 'auto_message'))
-        base_project = os.path.join(os.getcwd().split('auto_message')[0], 'auto_message')
+        sys.path.append(os.path.join(os.getcwd().split('auto')[0], 'auto'))
+        base_project = os.path.join(os.getcwd().split('auto')[0], 'auto')
 
         config_path = os.path.join(base_project, 'config.json')
         config_json = {}
@@ -31,4 +31,4 @@ def load_config():
 
 
 def get_base_path():
-    return os.path.join(os.getcwd().split('auto_message')[0], 'auto_message')
+    return os.path.join(os.getcwd().split('auto')[0], 'auto')

+ 2 - 2
utils/utils_timing_remove_data.py → base/base_timing_remove_data.py

@@ -12,8 +12,8 @@ import smtplib
 from email.mime.text import MIMEText
 from email.header import Header
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
-base_project = os.path.join(os.getcwd().split('auto_message')[0], 'auto_message')
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
+base_project = os.path.join(os.getcwd().split('auto')[0], 'auto')
 import json
 
 config_path = os.path.join(base_project, 'config.json')

+ 1 - 1
message/message_check_base.py

@@ -9,7 +9,7 @@ import sys
 import os
 import time
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_logs_handle import LogsHandle
 

+ 1 - 1
message/message_coinmarketcap.py

@@ -6,7 +6,7 @@ import sys
 import os
 from datetime import datetime
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_load_config import load_config, get_base_path
 

+ 1 - 1
message/message_dlt.py

@@ -6,7 +6,7 @@
 import sys
 import os
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_send_gotify import *
 from utils.utils_send_serverchan import *

+ 1 - 1
message/message_get_one_week_weather.py

@@ -8,7 +8,7 @@ import time
 from datetime import datetime
 from bs4 import BeautifulSoup
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_logs_handle import LogsHandle
 from utils.utils_send_gotify import *

+ 1 - 1
message/message_maizi_gas.py

@@ -5,7 +5,7 @@
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 import httpx
 

+ 1 - 1
message/message_vix.py

@@ -7,7 +7,7 @@ import os
 import re
 from datetime import datetime
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from message_check_base import *
 from utils.utils_send_gotify import *

+ 1 - 1
remind/auto_remind.py

@@ -5,7 +5,7 @@ import json
 import sys
 import os
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 from datetime import datetime
 
 from utils.utils_send_gotify import GotifyNotifier

+ 1 - 1
routes/any_news/news_get_news.py

@@ -5,7 +5,7 @@ from datetime import datetime
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_logs_handle import LogsHandle

+ 1 - 1
routes/apprcn/news_get_apprcn.py

@@ -12,7 +12,7 @@ import httpx
 import sys
 import os
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_logs_handle import LogsHandle

+ 1 - 1
routes/caipiao-dlt/spider_get_and_check_dlt.py

@@ -7,7 +7,7 @@ from datetime import datetime
 import time
 import httpx
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_logs_handle import LogsHandle

+ 1 - 1
routes/chiphell/news_get_chiphell.py

@@ -11,7 +11,7 @@ import time
 from datetime import datetime
 import httpx
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_logs_handle import LogsHandle

+ 1 - 1
routes/hello_github/news_get_hello_github.py

@@ -8,7 +8,7 @@ import time
 from datetime import datetime
 import httpx
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_logs_handle import LogsHandle

+ 1 - 1
routes/web3/spider_web3_coin_world.py

@@ -10,7 +10,7 @@ import re
 import time
 from datetime import datetime
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_logs_handle import LogsHandle

+ 1 - 1
routes/web3/spider_web3_news.py

@@ -10,7 +10,7 @@ import time
 
 import httpx
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_news')[0] + 'auto_news'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 from html import unescape
 from datetime import datetime
 import re

+ 1 - 1
test/message_coin_current_price.py

@@ -8,7 +8,7 @@ import os
 import time
 from playwright.sync_api import sync_playwright
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_load_config import load_config, get_base_path
 

+ 1 - 2
test/test_connent_mongo.py

@@ -3,8 +3,7 @@
 from pymongo import MongoClient
 
 # 连接到MongoDB,这里假设MongoDB运行在默认端口上的本地机器
-client = MongoClient('mongodb://root:aaaAAA111!!!@192.168.100.122:38000/')
-# client = MongoClient('mongodb://root:aaaAAA111!!!@erhe.top:38000/')
+client = MongoClient('mongodb://root:aaaAAA111!!!@erhe.top:38000/')
 
 # 获取数据库列表
 db_list = client.list_database_names()

+ 1 - 1
utils/utils_logs_handle.py

@@ -8,7 +8,7 @@ from datetime import datetime
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_mongo_handle import MongoHandle
 from utils.utils_send_email import SendEmail

+ 1 - 1
utils/utils_mongo_handle.py

@@ -5,7 +5,7 @@ import time
 import sys
 import os
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_load_config import load_config, get_base_path
 

+ 1 - 1
utils/utils_news_data_collation.py

@@ -4,7 +4,7 @@
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from pymongo import MongoClient
 from datetime import datetime, timedelta

+ 4 - 4
utils/utils_ql_create_tasks.py

@@ -73,7 +73,7 @@ def main():
             else:
                 print("Tasks list is empty")
 
-            project_path = '/ql/data/scripts/auto_message/'
+            project_path = '/ql/data/scripts/auto/'
             spider_common_path = os.path.join(project_path, 'spider_common')
             spider_news_path = os.path.join(project_path, 'spider_news')
             spider_rsshub_path = os.path.join(project_path, 'spider_rsshub')
@@ -84,19 +84,19 @@ def main():
                 'base_tasks': [
                     {
                         "name": "每天开始自动创建日志",
-                        "command": "python3 {}/utils_daily_logs_generate.py".format(utils_path),
+                        "command": "python3 {}/base_daily_logs_generate.py".format(utils_path),
                         "schedule": "0 0 * * *",
                         "labels": ["base"]
                     },
                     {
                         "name": "每天结束自动发送日志",
-                        "command": "python3 {}/utils_daily_logs_send.py".format(utils_path),
+                        "command": "python3 {}/base_daily_logs_send.py".format(utils_path),
                         "schedule": "58 23 * * *",
                         "labels": ["base"]
                     },
                     {
                         "name": "每天自动删除旧数据",
-                        "command": "python3 {}/utils_timing_remove_data.py".format(utils_path),
+                        "command": "python3 {}/base_timing_remove_data.py".format(utils_path),
                         "schedule": "1 0 * * *",
                         "labels": ["base"]
                     },

+ 1 - 1
utils/utils_send_email.py

@@ -5,7 +5,7 @@ from email.header import Header
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.abspath(__file__).split('auto_message')[0] + 'auto_message'))
+sys.path.append(os.path.join(os.path.abspath(__file__).split('auto')[0] + 'auto'))
 
 from utils.utils_load_config import load_config, get_base_path
 

+ 1 - 1
utils/utils_sync_psql.py

@@ -5,7 +5,7 @@ from pymongo import MongoClient
 import psycopg2
 from psycopg2 import sql
 
-MONGOLINK = 'mongodb://root:aaaAAA111!!!@192.168.31.177:38000/'
+MONGOLINK = 'mongodb://root:aaaAAA111!!!@erhe.top:38000/'
 PGSQLPARAMS = {
     # 'database': 'postgres',  # 默认连接到postgres数据库,超级用户数据库
     'user': 'toor',