修正验收设备与看板数据库连接
This commit is contained in:
@@ -56,6 +56,7 @@ class Config:
|
|||||||
CRAWLER_DATABASE_USER = os.getenv("CRAWLER_DATABASE_USER", "")
|
CRAWLER_DATABASE_USER = os.getenv("CRAWLER_DATABASE_USER", "")
|
||||||
CRAWLER_DATABASE_PASSWORD = os.getenv("CRAWLER_DATABASE_PASSWORD", "")
|
CRAWLER_DATABASE_PASSWORD = os.getenv("CRAWLER_DATABASE_PASSWORD", "")
|
||||||
CRAWLER_DATABASE_NAME = os.getenv("CRAWLER_DATABASE_NAME", "")
|
CRAWLER_DATABASE_NAME = os.getenv("CRAWLER_DATABASE_NAME", "")
|
||||||
|
FRAMEWORK_DATABASE_NAME = os.getenv("FRAMEWORK_DATABASE_NAME", "framework-db")
|
||||||
DINGTALK_AUTH_URL = os.getenv("DINGTALK_AUTH_URL", "https://login.dingtalk.com/oauth2/auth")
|
DINGTALK_AUTH_URL = os.getenv("DINGTALK_AUTH_URL", "https://login.dingtalk.com/oauth2/auth")
|
||||||
DINGTALK_TOKEN_URL = os.getenv("DINGTALK_TOKEN_URL", "https://api.dingtalk.com/v1.0/oauth2/userAccessToken")
|
DINGTALK_TOKEN_URL = os.getenv("DINGTALK_TOKEN_URL", "https://api.dingtalk.com/v1.0/oauth2/userAccessToken")
|
||||||
DINGTALK_USER_URL = os.getenv("DINGTALK_USER_URL", "https://api.dingtalk.com/v1.0/contact/users/me")
|
DINGTALK_USER_URL = os.getenv("DINGTALK_USER_URL", "https://api.dingtalk.com/v1.0/contact/users/me")
|
||||||
|
|||||||
@@ -364,7 +364,7 @@ def create_xapi_device(data: dict[str, Any]) -> dict[str, Any]:
|
|||||||
db = pymysql.connect(
|
db = pymysql.connect(
|
||||||
host=Config.CRAWLER_DATABASE_HOST, port=Config.CRAWLER_DATABASE_PORT,
|
host=Config.CRAWLER_DATABASE_HOST, port=Config.CRAWLER_DATABASE_PORT,
|
||||||
user=Config.CRAWLER_DATABASE_USER, password=Config.CRAWLER_DATABASE_PASSWORD,
|
user=Config.CRAWLER_DATABASE_USER, password=Config.CRAWLER_DATABASE_PASSWORD,
|
||||||
database=Config.CRAWLER_DATABASE_NAME, charset="utf8mb4",
|
database=Config.FRAMEWORK_DATABASE_NAME, charset="utf8mb4",
|
||||||
cursorclass=pymysql.cursors.DictCursor, autocommit=True,
|
cursorclass=pymysql.cursors.DictCursor, autocommit=True,
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
@@ -398,7 +398,7 @@ def delete_xapi_device(account_id: str) -> dict[str, Any]:
|
|||||||
db = pymysql.connect(
|
db = pymysql.connect(
|
||||||
host=Config.CRAWLER_DATABASE_HOST, port=Config.CRAWLER_DATABASE_PORT,
|
host=Config.CRAWLER_DATABASE_HOST, port=Config.CRAWLER_DATABASE_PORT,
|
||||||
user=Config.CRAWLER_DATABASE_USER, password=Config.CRAWLER_DATABASE_PASSWORD,
|
user=Config.CRAWLER_DATABASE_USER, password=Config.CRAWLER_DATABASE_PASSWORD,
|
||||||
database=Config.CRAWLER_DATABASE_NAME, charset="utf8mb4", autocommit=True,
|
database=Config.FRAMEWORK_DATABASE_NAME, charset="utf8mb4", autocommit=True,
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
with db.cursor() as cursor:
|
with db.cursor() as cursor:
|
||||||
@@ -424,7 +424,7 @@ def sync_dashboard_acceptance_project(
|
|||||||
db = pymysql.connect(
|
db = pymysql.connect(
|
||||||
host=Config.CRAWLER_DATABASE_HOST, port=Config.CRAWLER_DATABASE_PORT,
|
host=Config.CRAWLER_DATABASE_HOST, port=Config.CRAWLER_DATABASE_PORT,
|
||||||
user=Config.CRAWLER_DATABASE_USER, password=Config.CRAWLER_DATABASE_PASSWORD,
|
user=Config.CRAWLER_DATABASE_USER, password=Config.CRAWLER_DATABASE_PASSWORD,
|
||||||
database=Config.CRAWLER_DATABASE_NAME, charset="utf8mb4",
|
database=Config.FRAMEWORK_DATABASE_NAME, charset="utf8mb4",
|
||||||
cursorclass=pymysql.cursors.DictCursor, autocommit=False,
|
cursorclass=pymysql.cursors.DictCursor, autocommit=False,
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user