优化nacos初始化问题

core/config/env.py

@@ -56,8 +56,8 @@ class TestingEnv(Env):
     LOGIN_URL = YAML_DATA.get('login_url')
     NACOS_URL = YAML_DATA.get('config_url')
     NACOSCONFIG = "show=all&dataId=fj-finance-test&group=DEFAULT_GROUP&tenant=cw-test&namespaceId=cw-test"
-    NAME = YAML_DATA.get('name')
-    PWD = YAML_DATA.get('pwd')
+    NACOS_NAME = YAML_DATA.get('name')
+    NACOS_PWD = YAML_DATA.get('pwd')
     DB_HISTORY = apo.get('history')
     DB_3YV2 = apo.get('business')
     Redis = apo.get('redis')
@@ -79,8 +79,8 @@ class ProdEnv(Env):
     LOG_ERROR_PATH = os.path.join(SITE_ROOT_TOO, "bin", "runtime", "logs", "error", "")
     PEM_PATH = os.path.join(SITE_ROOT_YAML, "config", "")
     YAML_DATA = apo.get('yaml')
-    NAME = YAML_DATA.get('name')
-    PWD = YAML_DATA.get('pwd')
+    NACOS_NAME = YAML_DATA.get('name')
+    NACOS_PWD = YAML_DATA.get('password')
     LOGIN_URL = YAML_DATA.get('login_url')
     NACOS_URL = YAML_DATA.get('config_url')
     NACOSCONFIG = "dataId=fj-finance&group=DEFAULT_GROUP&namespaceId=cw-pro&tenant=cw-pro&show=all&username=fj_finance"

libs/yaml_file.py

@@ -8,8 +8,8 @@ from libs.log_utils import Logger
 def get_yaml_token():
     url = env.LOGIN_URL
     data = {
-        "username": env.NAME,
-        "password": env.PWD
+        "username": env.NACOS_NAME,
+        "password": env.NACOS_PWD
     }
     response = requests.post(url=url, data=data)
     if response.status_code == 200: