From 847bb0f4303da4fbf343d7995fa7aff0de7c5f5d Mon Sep 17 00:00:00 2001 From: satori Date: Mon, 4 Nov 2024 05:46:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- configs/config.py | 35 +++++++++++++++++++++++++++++++---- models/mysql.py | 12 ++++++++++-- models/oss.py | 5 ++--- 4 files changed, 45 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ed8ebf5..6d17870 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -__pycache__ \ No newline at end of file +__pycache__ +.env \ No newline at end of file diff --git a/configs/config.py b/configs/config.py index 28de64e..a50fa26 100644 --- a/configs/config.py +++ b/configs/config.py @@ -8,13 +8,30 @@ from apscheduler.schedulers.background import BackgroundScheduler # 以 .env 文件中的环境变量为准, 检查是否存在 .env 文件, 没有则创建 if not os.path.exists('.env'): print('请输入环境变量参数, 将会写入 .env 文件中') - OSS_HOST = input('OSS_HOST: ') MYSQL_HOST = input('MYSQL_HOST: ') + MYSQL_PORT = input('MYSQL_PORT: ') + MYSQL_USER = input('MYSQL_USER: ') + MYSQL_PASS = input('MYSQL_PASS: ') + MYSQL_NAME = input('MYSQL_NAME: ') + MILVUS_HOST = input('MILVUS_HOST: ') + MILVUS_PORT = input('MILVUS_PORT: ') + + OSS_HOST = input('OSS_HOST: ') + OSS_ACCESS_KEY_ID = input('OSS_ACCESS_KEY_ID: ') + OSS_ACCESS_KEY_SECRET = input('OSS_ACCESS_KEY_SECRET: ') + with open('.env', 'w') as f: - f.write(f'OSS_HOST={OSS_HOST}\n') f.write(f'MYSQL_HOST={MYSQL_HOST}\n') + f.write(f'MYSQL_PORT={MYSQL_PORT}\n') + f.write(f'MYSQL_USER={MYSQL_USER}\n') + f.write(f'MYSQL_PASS={MYSQL_PASS}\n') + f.write(f'MYSQL_NAME={MYSQL_NAME}\n') f.write(f'MILVUS_HOST={MILVUS_HOST}\n') + f.write(f'MILVUS_PORT={MILVUS_PORT}\n') + f.write(f'OSS_HOST={OSS_HOST}\n') + f.write(f'OSS_ACCESS_KEY_ID={OSS_ACCESS_KEY_ID}\n') + f.write(f'OSS_ACCESS_KEY_SECRET={OSS_ACCESS_KEY_SECRET}\n') # 读取 .env 文件中的环境变量 @@ -24,9 +41,19 @@ with open('.env', 'r') as f: env = list(map(lambda x: x.replace('\n', '').split('='), env)) env = {k: v for k, v in env} print(json.dumps(env, indent=4, ensure_ascii=False)) - OSS_HOST = env.get('OSS_HOST') - MYSQL_HOST = env.get('MYSQL_HOST') + + MYSQL_HOST = env.get('MYSQL_HOST', 'localhost') + MYSQL_PORT = env.get('MYSQL_PORT', 3306) + MYSQL_USER = env.get('MYSQL_USER') + MYSQL_PASS = env.get('MYSQL_PASS') + MYSQL_NAME = env.get('MYSQL_NAME') + MILVUS_HOST = env.get('MILVUS_HOST') + MILVUS_PORT = env.get('MILVUS_PORT') + + OSS_HOST = env.get('OSS_HOST') + OSS_ACCESS_KEY_ID = env.get('OSS_ACCESS_KEY_ID') + OSS_ACCESS_KEY_SECRET = env.get('OSS_ACCESS_KEY_SECRET') # 创建上传图片的临时目录 diff --git a/models/mysql.py b/models/mysql.py index b95bedc..607d194 100644 --- a/models/mysql.py +++ b/models/mysql.py @@ -1,9 +1,17 @@ import pymysql -from configs.config import MYSQL_HOST +from configs.config import MYSQL_HOST, MYSQL_PORT, MYSQL_NAME, MYSQL_USER, MYSQL_PASS # 连接 MySQL (开启 MySQL 服务) -conn = pymysql.connect(host=MYSQL_HOST, user="gameui", port=3306, password="gameui@2022", database='gameui', local_infile=True, cursorclass=pymysql.cursors.DictCursor) +conn = pymysql.connect( + host=MYSQL_HOST, + user=MYSQL_USER, + port=MYSQL_HOST, + password=MYSQL_PASS, + database=MYSQL_NAME, + local_infile=True, + cursorclass=pymysql.cursors.DictCursor +) # 获取 MySQL 连接 diff --git a/models/oss.py b/models/oss.py index e94a300..5daf916 100644 --- a/models/oss.py +++ b/models/oss.py @@ -1,9 +1,8 @@ import oss2 -from configs.config import OSS_HOST - +from configs.config import OSS_HOST, OSS_ACCESS_KEY_ID, OSS_ACCESS_KEY_SECRET # 连接 OSS oss2.defaults.connection_pool_size = 100 -auth = oss2.Auth('LTAI4GH3qP6VA3QpmTYCgXEW', 'r2wz4bJty8iYfGIcFmEqlY1yon2Ruy') +auth = oss2.Auth(OSS_ACCESS_KEY_ID, OSS_ACCESS_KEY_SECRET) bucket_image2 = oss2.Bucket(auth, f'http://{OSS_HOST}', 'gameui-image2') bucket_webp = oss2.Bucket(auth, f'http://{OSS_HOST}', 'gameui-webp')