From abb91124a4372b0efe5ab1b7aa25859c635d30eb Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 10 四月 2025 13:49:37 +0800
Subject: [PATCH] merge
---
app/init_config/init_run_data.py | 2 +-
app/service/v2/initialize_data.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/init_config/init_run_data.py b/app/init_config/init_run_data.py
index 59c5856..2d2b9db 100644
--- a/app/init_config/init_run_data.py
+++ b/app/init_config/init_run_data.py
@@ -14,7 +14,7 @@
await admin_account_sync(db) # 绠＄悊鍛樿处鍙�
await sync_rg_api_token(db) # rg token
await sync_token() # 璐﹀彿token鐧诲綍
- await sync_complex_api_token(db) # 璐﹀彿token鐧诲綍
+ await sync_complex_api_token(db) # 璐﹀彿token鍚屾
await system_license_sync(db) # 鍚屾绯荤粺license
except Exception as e:
print(e)
diff --git a/app/service/v2/initialize_data.py b/app/service/v2/initialize_data.py
index c8e6a1e..270978c 100644
--- a/app/service/v2/initialize_data.py
+++ b/app/service/v2/initialize_data.py
@@ -435,11 +435,11 @@
with open(os.path.join(ENV_CONF_PATH, "system.yaml") , 'r', encoding='utf-8') as file:
# 鍔犺浇JSON鏁版嵁
config = yaml.safe_load(file)
-
try:
system = db.query(SystemDataModel).filter_by(id=SYSTEM_ID).first()
if system:
system.version = config["smart_system"].get("version")
+ system.machine_id = get_machine_id()
else:
system = SystemDataModel(id=SYSTEM_ID, version=config["smart_system"].get("version"), title=config["smart_system"].get("title"), desc=config["smart_system"].get("desc"), machine_id=get_machine_id())
db.add(system)
--
Gitblit v1.8.0