Merge remote-tracking branch 'origin/dev' into sit

.env

@@ -0,0 +1,22 @@
+SECRET_KEY="your-super-secret-key-change-me"
+ALGORITHM="HS256"
+ACCESS_TOKEN_EXPIRE_MINUTES=60*24*7# 7天
+ # 数据库配置
+DB_USER="root"
+DB_PASSWORD="Alien123456"
+DB_HOST="192.168.2.253"
+DB_PORT=40001
+DB_NAME="alien_sit"
+
+# redis配置
+# REDIS_URL= "redis://:Alien123456@172.31.154.180:30002/0"
+REDIS_URL:="redis://:Alien123456@192.168.2.253:40002/0"
+
+# 下游服务地址
+STORE_BASE_URL"=http://127.0.0.1:8001"# alien_store 服务地址
+
+# 阿里云短信配置
+ALIYUN_SMS_SIGN_NAME_CONTRACT="爱丽恩严大连商务科技"
+ALIYUN_SMS_TEMPLATE_CODE_CONTRACT="SMS_501820309"
+ALIYUN_ACCESS_KEY_ID="LTAI5t77CS9gD7JMkMAjD2vF"
+ALIYUN_ACCESS_KEY_SECRET="jLYGPpaJuc7NqmRdLvu1ObAS9CJFB8"

alien_gateway/config.py

@@ -1,5 +1,8 @@
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing import List
+from dotenv import load_dotenv
+import os
+load_dotenv()
 
 class Settings(BaseSettings):
     # 基础配置
@@ -7,28 +10,29 @@ class Settings(BaseSettings):
     API_V1_STR: str = "/api/v1"
     
     # 鉴权配置 (原 alien-gateway 职责)
-    SECRET_KEY: str = "your-super-secret-key-change-me"
-    ALGORITHM: str = "HS256"
-    ACCESS_TOKEN_EXPIRE_MINUTES: int = 60 * 24 * 7  # 7天
+    SECRET_KEY: str = os.getenv("SECRET_KEY")
+    ALGORITHM: str = os.getenv("ALGORITHM")
+    ACCESS_TOKEN_EXPIRE_MINUTES: int = os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES")  # 7天
     
     # 数据库配置
-    DB_USER: str = "root"
-    DB_PASSWORD: str = "Alien123456"
-    DB_HOST: str = "120.26.186.130"
-    DB_PORT: int = 30001
-    DB_NAME: str = "alien_sit"
+    DB_USER: str = os.getenv("DB_USER")
+    DB_PASSWORD: str = os.getenv("DB_PASSWORD")
+    DB_HOST: str = os.getenv("DB_HOST")
+    DB_PORT: int = os.getenv("DB_PORT")
+    DB_NAME: str = os.getenv("DB_NAME")
 
     # redis配置
-    REDIS_URL: str = "redis://:Alien123456@172.31.154.180:30002/0"
+    # REDIS_URL: str = "redis://:Alien123456@172.31.154.180:30002/0"
+    REDIS_URL: str = os.getenv("REDIS_URL")
 
     # 下游服务地址
-    STORE_BASE_URL: str = "http://127.0.0.1:8001"  # alien_store 服务地址
+    STORE_BASE_URL: str = os.getenv("STORE_BASE_URL")  # alien_store 服务地址
 
     # 阿里云短信配置
-    ALIYUN_SMS_SIGN_NAME_CONTRACT: str = "爱丽恩严大连商务科技"
-    ALIYUN_SMS_TEMPLATE_CODE_CONTRACT: str = "SMS_501820309"
-    ALIYUN_ACCESS_KEY_ID: str = "LTAI5t77CS9gD7JMkMAjD2vF"
-    ALIYUN_ACCESS_KEY_SECRET: str = "jLYGPpaJuc7NqmRdLvu1ObAS9CJFB8"
+    ALIYUN_SMS_SIGN_NAME_CONTRACT: str = os.getenv("ALIYUN_SMS_SIGN_NAME_CONTRACT")
+    ALIYUN_SMS_TEMPLATE_CODE_CONTRACT: str = os.getenv("ALIYUN_SMS_TEMPLATE_CODE_CONTRACT")
+    ALIYUN_ACCESS_KEY_ID: str = os.getenv("ALIYUN_ACCESS_KEY_ID")
+    ALIYUN_ACCESS_KEY_SECRET: str = os.getenv("ALIYUN_ACCESS_KEY_SECRET")
 
 
 

poetry.lock

@@ -3046,4 +3046,4 @@ testing = ["coverage[toml]", "zope.event", "zope.testing"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.12"
-content-hash = "692b00cb776b855d3fd2cdfc854a89fa19f4677b440888728c4c810bbc099334"
+content-hash = "1c1d2bde66224c00e197aeacf34ca161a6a457c458f5df8951ca3c33670e793b"

pyproject.toml

@@ -25,6 +25,7 @@ aiomysql = "^0.3.2"
 datetime = "^6.0"
 celery = "^5.6.2"
 alibabacloud-dysmsapi20170525 = "^4.4.0"
+python-dotenv = "1.2.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]