libushang преди 8 месеца
родител
ревизия
17c24c8e50
променени са 2 файла, в които са добавени 19 реда и са изтрити 16 реда
  1. 3 0
      common/YzyApi.py
  2. 16 16
      config.py

+ 3 - 0
common/YzyApi.py

@@ -203,5 +203,8 @@ def format_redirect_url(redirect_url: str) -> str:
         yzy_callback_url, 
         YZY_AGENTID,
         state)
+    
+    logger.info("detail_url: {}", detail_url)
+
     return detail_url
     

+ 16 - 16
config.py

@@ -35,6 +35,13 @@ class Settings(BaseSettings):
     IS_STAGE: bool = False
     IS_PROD: bool = False
 
+    REDIS_DB_URL = {
+        'host': '127.0.0.1',
+        'port': 6379,
+        'password': 'c0b0Info@)!%',
+        'db': 0
+    }
+
     class Config:
         env_file = ".env"
 
@@ -51,16 +58,9 @@ class DevConfig(Settings):
     MYSQL_DB_NAME: Optional[str] = Field(..., env="DEV_MYSQL_DB_NAME")
     MYSQL_PORT: Optional[int] = Field(..., env="DEV_MYSQL_PORT")
 
-    YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_MYSQL_SERVER")
-    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_MYSQL_SERVER")
-    YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="DEV_MYSQL_SERVER")
-
-    REDIS_DB_URL = {
-        'host': '127.0.0.1',
-        'port': 6379,
-        'password': 'c0b0Info@)!%',
-        'db': 0
-    }
+    YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_YJHTGL_WEB_ROOT_PATH")
+    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_YJXP_WEB_ROOT_PATH")
+    YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="DEV_YJXP_CALLBACK_WEB_PATH")
 
 class ProdConfig(Settings):
 
@@ -74,9 +74,9 @@ class ProdConfig(Settings):
     MYSQL_DB_NAME: Optional[str] = Field(..., env="PROD_MYSQL_DB_NAME")
     MYSQL_PORT: Optional[int] = Field(..., env="PROD_MYSQL_PORT")
 
-    YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="PROD_MYSQL_SERVER")
-    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="PROD_MYSQL_SERVER")
-    YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="PROD_MYSQL_SERVER")
+    YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="PROD_YJHTGL_WEB_ROOT_PATH")
+    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="PROD_YJXP_WEB_ROOT_PATH")
+    YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="PROD_YJXP_CALLBACK_WEB_PATH")
 
 
     REDIS_DB_URL = {
@@ -98,9 +98,9 @@ class StageConfig(Settings):
     MYSQL_DB_NAME: Optional[str] = Field(..., env="STAGE_MYSQL_DB_NAME")
     MYSQL_PORT: Optional[int] = Field(..., env="STAGE_MYSQL_PORT")
 
-    YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="STAGE_MYSQL_SERVER")
-    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="STAGE_MYSQL_SERVER")
-    YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="STAGE_MYSQL_SERVER")
+    YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="STAGE_YJHTGL_WEB_ROOT_PATH")
+    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="STAGE_YJXP_WEB_ROOT_PATH")
+    YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="STAGE_YJXP_CALLBACK_WEB_PATH")
 
     REDIS_DB_URL = {
         'host': '127.0.0.1',