Bläddra i källkod

优化系统配置

nifangxu 5 dagar sedan
förälder
incheckning
9a6fd0e5a9
9 ändrade filer med 220 tillägg och 192 borttagningar
  1. 19 63
      LAS.py
  2. 0 31
      common/sys_comm.py
  3. 2 30
      conf.ini
  4. 10 10
      core/alarm_plan.py
  5. 22 35
      db/db_process.py
  6. 37 0
      demos/tree.py
  7. 110 0
      g_config.py
  8. 10 13
      mqtt/mqtt_process.py
  9. 10 10
      mqtt/mqtt_send.py

+ 19 - 63
LAS.py

@@ -8,6 +8,7 @@ import traceback
 import sys
 import json
 
+import g_config
 import common.sys_comm as sys_comm
 from common.sys_comm import (
     LOGDBG, LOGINFO, LOGWARN, LOGERR, EC,
@@ -55,85 +56,39 @@ def sys_init():
             os.makedirs("./log/")
         print("create log dir succeed !")
 
-        LOGDBG(f" ================ system init ...")
-        print(f" ================ system init ...")
-
         # 读取配置文件
         config = configparser.ConfigParser()
         with open('./conf.ini', 'r', encoding='utf-8') as f:
             config.read_file(f)
             if not (config.has_option('conf', 'module_name') and
-                    config.has_option('conf', 'platform') and
-                    config.has_option('conf', 'db_host') and
-                    config.has_option('conf', 'log_lvl') and
-                    config.has_option('conf', 'max_log_files') and
-                    config.has_option('conf', 'max_log_files')):
+                    config.has_option('conf', 'server_ip')):
                 LOGDBG("sys_init failed, invalid conf.ini param")
                 return 0
-
-            if not (config.has_option('conf', 'db_host')):
-                LOGDBG("sys_init failed, invalid db param")
-                return 0
-
-            if not (config.has_option('linux', 'host_ip') and 
-                    config.has_option('windows', 'host_ip') and 
-                    config.has_option('windows', 'server_ip') and 
-                    config.has_option('windows', 'ssh_host') and 
-                    config.has_option('windows', 'ssh_port')):
-                LOGDBG("sys_init failed, invalid host_ip param")
-                return 0
         LOGDBG("read conf.ini succeed !")
 
-
-        # 初始化日志配置
-        with sys_comm.g_log_conf_mtx:
-            sys_comm.g_log_conf["module_name"]     = str(config["conf"]["module_name"])
-            sys_comm.g_log_conf["log_lvl"]         = int(config["conf"]["log_lvl"])
-            sys_comm.g_log_conf["max_log_size"]    = int(config["conf"]["max_log_size"]) * 1024 * 1024
-            sys_comm.g_log_conf["max_log_files"]   = int(config["conf"]["max_log_files"])
-        LOGDBG("log init succeed")
-
-        # 初始化系统配置
-        with sys_comm.g_sys_conf_mtx:
-            sys_comm.g_sys_conf["module_name"]     = str(config["conf"]["module_name"])
-            sys_comm.g_sys_conf["platform"]        = int(config["conf"]["platform"])
-            sys_comm.g_sys_conf["db_host"]         = str(config["conf"]["db_host"])
-            sys_comm.g_sys_conf["log_lvl"]         = int(config["conf"]["log_lvl"])
-            sys_comm.g_sys_conf["max_log_size"]    = int(config["conf"]["max_log_size"]) * 1024 * 1024
-            sys_comm.g_sys_conf["max_log_files"]   = int(config["conf"]["max_log_files"])
-
-            # windows 本地
-            if sys_comm.g_sys_conf["platform"] == 0:
-                sys_comm.g_sys_conf["host_ip"]     = str(config["windows"]["host_ip"])
-                sys_comm.g_sys_conf["server_ip"]   = str(config["windows"]["server_ip"])
-                sys_comm.g_sys_conf["ssh_host"]    = str(config["windows"]["ssh_host"])
-                sys_comm.g_sys_conf["ssh_port"]    = int(config["windows"]["ssh_port"])
-                mp.MQTT_BROKER = sys_comm.g_sys_conf["server_ip"]
-
-            # linux 服务器
-            elif sys_comm.g_sys_conf["platform"] == 1:
-                sys_comm.g_sys_conf["host_ip"]     = str(config["linux"]["host_ip"])
-                mp.MQTT_BROKER = sys_comm.g_sys_conf["host_ip"]
-
-        sys_comm.g_sys_conf["sp_id"] = sys_comm.g_sys_conf["module_name"] + "_" + str(get_utc_time_ms())
-
-
-        # 报警配置
-        sys_comm.g_sys_conf["alarm_conf"] = sys_comm.alarm_conf
+        server_ip = config["conf"]["server_ip"].strip()
+        module_name = config["conf"]["module_name"].strip()
+        sp_id = module_name + "_" + str(get_utc_time_ms())
+        if g_config.init_g_sys_conf(server_ip, module_name, sp_id):
+            print(f" ================ system init failed, invalid server_ip: {server_ip}")
+            LOGERR(f" ================ system init failed, invalid server_ip: {server_ip}")
+            return -1
 
         # 启动成功,打印系统信息
-        module_name     = sys_comm.g_sys_conf["module_name"]
-        platform        = sys_comm.g_sys_conf["platform"]
-        host_ip         = sys_comm.g_sys_conf["host_ip"]
-        max_log_files   = sys_comm.g_sys_conf["max_log_files"]
-        max_log_size    = sys_comm.g_sys_conf["max_log_size"]
-        log_lvl         = sys_comm.g_sys_conf["log_lvl"]
-        sp_id           = sys_comm.g_sys_conf["sp_id"]
+        module_name     = g_config.g_sys_conf["module_name"]
+        platform        = g_config.g_sys_conf["platform"]
+        host_ip         = g_config.g_sys_conf["host_ip"]
+        service         = g_config.g_sys_conf["service"]["ip"]
+        max_log_files   = sys_comm.g_log_conf["max_log_files"]
+        max_log_size    = sys_comm.g_log_conf["max_log_size"]
+        log_lvl         = sys_comm.g_log_conf["log_lvl"]
+        sp_id           = g_config.g_sys_conf["sp_id"]
 
         print(f" ================ system init succeed !")
         print(f" ================ module         : {module_name}")
         print(f" ================ platform       : {platform}")
         print(f" ================ host_ip        : {host_ip}")
+        print(f" ================ service        : {service}")
         print(f" ================ max_log_files  : {max_log_files}")
         print(f" ================ max_log_size   : {max_log_size}")
         print(f" ================ log_lvl        : {log_lvl}")
@@ -144,6 +99,7 @@ def sys_init():
         LOGINFO(f" ================ module         : {module_name}")
         LOGINFO(f" ================ platform       : {platform}")
         LOGINFO(f" ================ host_ip        : {host_ip}")
+        print(f" ================ service        : {service}")
         LOGINFO(f" ================ max_log_files  : {max_log_files}")
         LOGINFO(f" ================ max_log_size   : {max_log_size}")
         LOGINFO(f" ================ log_lvl        : {log_lvl}")

+ 0 - 31
common/sys_comm.py

@@ -12,37 +12,6 @@ class EC(Enum):
     EC_FAILED       = -1    # 一般错误
 
 
-alarm_conf = {
-    "retention_time": 60,
-    "retention_keep_time": 30,
-    "retention_alarm_time": 180,
-    "toilet": {
-        "retention_time": 60,
-        "retention_keep_time": 30,
-        "retention_alarm_time": 900
-    }
-}
-
-# 系统配置
-g_sys_conf_mtx = threading.Lock()
-g_sys_conf = {
-    "module_name": "LAS",
-    "host_ip": "10.206.0.8",
-    "platform": 0,          # 平台,0:windows本地,1:云服务器
-    "sp_id": "",     # 服务程序id
-
-    # 数据库相关参数
-    "db_host": "localhost",
-    "db_username": "root",
-    "db_password": "Hfln@147888",
-
-    # ssh
-    "ssh_host": "119.45.12.173",
-    "ssh_port": 22,
-    "ssh_username": "root",
-    "ssh_password": "Hfln@147888",
-}
-
 # 日志配置
 g_log_conf_mtx = threading.Lock()
 g_log_conf = {

+ 2 - 30
conf.ini

@@ -2,11 +2,8 @@
 ; 模块名称
 module_name = LAS
 
-; 平台,0:windows本地,1:云服务器
-platform = 0
-
-; 数据库
-db_host = localhost
+; 服务器地址
+server_ip = 43.137.10.199
 
 ; 日志等级,从低到高(0-3, DEBUG, INFO, WARN, ERROR)
 log_lvl = 0
@@ -14,28 +11,3 @@ log_lvl = 0
 max_log_size = 50
 ; 日志文件数量
 max_log_files = 10
-
-[windows]
-; 本地ip
-host_ip = 192.168.1.17
-; 生产
-; server_ip = 119.45.12.173
-; 测试
-server_ip = 43.137.10.199
-
-; ssh
-; 生产
-; ssh_host = 119.45.12.173
-; 测试
-ssh_host = 43.137.10.199
-ssh_port = 22
-
-[linux]
-; 生产
-host_ip = 10.206.0.8
-; 测试
-; host_ip = 10.206.0.15
-
-
-
-

+ 10 - 10
core/alarm_plan.py

@@ -8,7 +8,7 @@ import traceback
 from datetime import datetime, timezone, timedelta
 from collections import deque
 
-import common.sys_comm as sys_comm
+import g_config
 from common.sys_comm import (
     LOGDBG, LOGINFO, LOGWARN, LOGERR, EC,
     get_utc_time_ms, get_utc_time_s, get_bj_time_ms, get_bj_time_s,
@@ -473,7 +473,7 @@ class AlarmPlan:
             }
             event_uuid = str(uuid.uuid4())
             remark = {
-                "sp_id": sys_comm.g_sys_conf["sp_id"]
+                "sp_id": g_config.g_sys_conf["sp_id"]
             }
             params = {
                 "dev_id": dev_id,
@@ -535,7 +535,7 @@ class AlarmPlan:
             }
             event_uuid = str(uuid.uuid4())
             remark = {
-                "sp_id": sys_comm.g_sys_conf["sp_id"]
+                "sp_id": g_config.g_sys_conf["sp_id"]
             }
             params = {
                 "dev_id": dev_id,
@@ -597,7 +597,7 @@ class AlarmPlan:
             }
             event_uuid = str(uuid.uuid4())
             remark = {
-                "sp_id": sys_comm.g_sys_conf["sp_id"]
+                "sp_id": g_config.g_sys_conf["sp_id"]
             }
             params = {
                 "dev_id": dev_id,
@@ -834,7 +834,7 @@ class AlarmPlan:
             }
             event_uuid = str(uuid.uuid4())
             remark = {
-                "sp_id": sys_comm.g_sys_conf["sp_id"]
+                "sp_id": g_config.g_sys_conf["sp_id"]
             }
             params = {
                 "dev_id": dev_id,
@@ -1080,7 +1080,7 @@ class AlarmPlan:
                 # 入库
                 event_uuid = str(uuid.uuid4())
                 remark = {
-                    "sp_id": sys_comm.g_sys_conf["sp_id"]
+                    "sp_id": g_config.g_sys_conf["sp_id"]
                 }
                 params = {
                     "dev_id": dev_id,
@@ -1150,7 +1150,7 @@ class AlarmPlan:
                 # 入库
                 event_uuid = str(uuid.uuid4())
                 remark = {
-                    "sp_id": sys_comm.g_sys_conf["sp_id"]
+                    "sp_id": g_config.g_sys_conf["sp_id"]
                 }
                 params = {
                     "dev_id": dev_id,
@@ -1223,7 +1223,7 @@ class AlarmPlan:
                 # 入库
                 event_uuid = str(uuid.uuid4())
                 remark = {
-                    "sp_id": sys_comm.g_sys_conf["sp_id"]
+                    "sp_id": g_config.g_sys_conf["sp_id"]
                 }
                 params = {
                     "dev_id": dev_id,
@@ -1296,7 +1296,7 @@ class AlarmPlan:
                 # 入库
                 event_uuid = str(uuid.uuid4())
                 remark = {
-                    "sp_id": sys_comm.g_sys_conf["sp_id"]
+                    "sp_id": g_config.g_sys_conf["sp_id"]
                 }
                 params = {
                     "dev_id": dev_id,
@@ -1366,7 +1366,7 @@ class AlarmPlan:
                 # 入库
                 event_uuid = str(uuid.uuid4())
                 remark = {
-                    "sp_id": sys_comm.g_sys_conf["sp_id"]
+                    "sp_id": g_config.g_sys_conf["sp_id"]
                 }
                 params = {
                     "dev_id": dev_id,

+ 22 - 35
db/db_process.py

@@ -9,10 +9,10 @@ from sshtunnel import SSHTunnelForwarder, BaseSSHTunnelForwarderError
 import pymysql
 from DBUtils.PooledDB import PooledDB
 from concurrent.futures import ThreadPoolExecutor
-
 import json
 import shutil
 
+import g_config
 import common.sys_comm as sys_comm
 from common.sys_comm import (
     LOGDBG, LOGINFO, LOGWARN, LOGERR, EC
@@ -26,17 +26,11 @@ ssh_conf = {
     "ssh_port": 22,
     "ssh_user": "root",
     "ssh_pwd": "Hfln@147888",
-
 }
 
-# 数据库配置
-db_config = {
-    # 数据库相关参数
-    "host": "localhost",
-    "user": "root",
-    "password": "Hfln@147888",
-    "database": "lnxx_dev"
-}
+service = {}
+db ={}
+
 
 # ===================== 全局对象 =====================
 # 请求队列
@@ -84,32 +78,25 @@ class DBRequest_Sync(DBRequest_Async):
 
 # ========== 初始化配置 ==========
 def db_pro_init():
-    global ssh_conf, db_config
-    with sys_comm.g_sys_conf_mtx:
-        ssh_conf = {
-            "ssh_host": sys_comm.g_sys_conf["ssh_host"],
-            "ssh_port": sys_comm.g_sys_conf["ssh_port"],
-            "ssh_user": sys_comm.g_sys_conf["ssh_username"],
-            "ssh_pwd": sys_comm.g_sys_conf["ssh_password"],
-        }
-
-        db_config = {
-            "host": sys_comm.g_sys_conf["db_host"],
-            "user": sys_comm.g_sys_conf["db_username"],
-            "password": sys_comm.g_sys_conf["db_password"],
-            "database": "lnxx_dev"
-        }
+    global service, db
+    with g_config.g_sys_conf_mtx:
+        service = g_config.g_sys_conf["service"]
+        db = g_config.g_sys_conf["db"]
 
 
 # ========== 初始化 SSH ==========
 def initialize_ssh_connection():
     global ssh_server
     if ssh_server is None or not ssh_server.is_active:
+        with g_config.g_sys_conf_mtx:
+            service = g_config.g_sys_conf["service"]
+            db = g_config.g_sys_conf["db"]
+
         ssh_server = SSHTunnelForwarder(
-            (ssh_conf["ssh_host"], ssh_conf["ssh_port"]),
-            ssh_username=ssh_conf["ssh_user"],
-            ssh_password=ssh_conf["ssh_pwd"],
-            remote_bind_address=('127.0.0.1', 3306)
+            (service["ip"], 22),
+            ssh_username=service["username"],
+            ssh_password=service["password"],
+            remote_bind_address=('localhost', 3306)
         )
         ssh_server.start()
         LOGINFO("SSH connected")
@@ -118,13 +105,13 @@ def initialize_ssh_connection():
 # ========== 初始化连接池 ==========
 def initialize_connection_pool():
     global db_pool, ssh_server
-    if sys_comm.g_sys_conf["platform"] == 0:
+    if g_config.g_sys_conf["platform"] == 0:
         initialize_ssh_connection()
         port = ssh_server.local_bind_port
-        host = "127.0.0.1"
+        host = "localhost"
     else:
         port = 3306
-        host = db_config["host"]
+        host = db["host"]
 
     db_pool = PooledDB(
         creator=pymysql,
@@ -134,9 +121,9 @@ def initialize_connection_pool():
         blocking=True,
         host=host,
         port=port,
-        user=db_config['user'],
-        password=db_config['password'],
-        database=db_config['database'],
+        user=db['username'],
+        password=db['password'],
+        database=db['database'],
         charset='utf8mb4',
         cursorclass=pymysql.cursors.DictCursor
     )

+ 37 - 0
demos/tree.py

@@ -0,0 +1,37 @@
+import os
+
+def print_tree(root_path, ignore_dirs=None, prefix=""):
+    """
+    打印目录树(美观版)
+    :param root_path: 目录绝对路径
+    :param ignore_dirs: 要忽略的目录列表
+    :param prefix: 树状前缀(递归用)
+    """
+    if ignore_dirs is None:
+        ignore_dirs = []
+
+    try:
+        entries = [e for e in os.listdir(root_path) if e not in ignore_dirs]
+    except PermissionError:
+        print(prefix + "└─ [Permission Denied]")
+        return
+
+    entries.sort()
+    total = len(entries)
+    for idx, entry in enumerate(entries):
+        path = os.path.join(root_path, entry)
+        is_last = (idx == total - 1)
+        connector = "└─ " if is_last else "├─ "
+        print(prefix + connector + entry)
+        if os.path.isdir(path):
+            extension = "     " if is_last else "│    "
+            print_tree(path, ignore_dirs, prefix + extension)
+
+if __name__ == "__main__":
+    root_dir = input("请输入目录绝对路径: ").strip()
+    ignore = input("请输入要忽略的目录,用逗号分隔(可留空): ").strip()
+    ignore_list = [d.strip() for d in ignore.split(",") if d.strip()]
+    
+    # 打印根目录
+    print(os.path.basename(root_dir))
+    print_tree(root_dir, ignore_list)

+ 110 - 0
g_config.py

@@ -0,0 +1,110 @@
+import threading
+import traceback
+
+# 系统配置
+g_sys_conf_mtx = threading.Lock()
+g_sys_conf = {}
+
+# platform: 0-本地,1-云服务器
+
+# 43.137.10.199
+sys_conf_pro = {
+    "module_name"   : "LAS",
+    "host_ip"       : "localhost",
+    "platform"      : 0,
+    "sp_id"         : "LAS_123456789",
+    "service": {
+        "ip"        : "43.137.10.199",
+        "username"  : "root",
+        "password"  : "Hfln@147888"
+    },
+    "db": {
+        "host"      : "43.137.10.199",
+        "username"  : "root",
+        "password"  : "Hfln@147888",
+        "database"  : "lnxx_dev"
+    },
+    "mqtt": {
+        "broker"    : "43.137.10.199",
+        "port"      : 1883,
+        "username"  : "lnradar",
+        "password"  : "lnradar"
+    }
+}
+
+# 119.45.12.173
+sys_conf_test = {
+    "module_name"   : "LAS",
+    "host_ip"       : "localhost",
+    "platform"      : 0,
+    "sp_id"         : "LAS_123456789",
+    "service": {
+        "ip"        : "119.45.12.173",
+        "username"  : "root",
+        "password"  : "Hfln@147888"
+    },
+    "db": {
+        "host"      : "119.45.12.173",
+        "username"  : "root",
+        "password"  : "Hfln@147888",
+        "database"  : "jkld"
+    },
+    "mqtt": {
+        "broker"    : "119.45.12.173",
+        "port"      : 1883,
+        "username"  : "lnradar",
+        "password"  : "lnradar"
+    }
+}
+
+# 8.130.28.21
+sys_conf_dev = {
+    "module_name"   : "LAS",
+    "host_ip"       : "localhost",
+    "platform"      : 0,
+    "sp_id"         : "LAS_123456789",
+    "service": {
+        "ip"        : "8.130.28.21",
+        "username"  : "root",
+        "password"  : "Hfln@667788"
+    },
+    "db": {
+        "host"      : "8.130.28.21",
+        "username"  : "root",
+        "password"  : "Hfln@1024",
+        "database"  : "lnxx_dev"
+    },
+    "mqtt": {
+        "broker"    : "8.130.28.21",
+        "port"      : 1883,
+        "username"  : "lnradar",
+        "password"  : "lnradar"
+    }
+}
+
+
+def init_g_sys_conf(server_ip, module_name, sp_id):
+    global g_sys_conf
+
+    conf_map = {
+        "43.137.10.199" : sys_conf_pro,
+        "119.45.12.173" : sys_conf_test,
+        "8.130.28.21"   : sys_conf_dev,
+    }
+
+    try:
+        if not server_ip in conf_map:
+            return -1
+
+        with g_sys_conf_mtx:
+            g_sys_conf.clear()
+            g_sys_conf.update(conf_map.get(server_ip))
+            g_sys_conf["sp_id"] = sp_id
+            g_sys_conf["module_name"] = module_name
+
+        return 0
+    except Exception as e:
+        tb_info = traceback.extract_tb(e.__traceback__)
+        for frame in tb_info:
+            print(f"[{frame.filename}:{frame.lineno}] @{frame.name}(), error: {e}")
+        return -1

+ 10 - 13
mqtt/mqtt_process.py

@@ -12,6 +12,7 @@ from queue import Queue, Empty
 from concurrent.futures import ThreadPoolExecutor
 import signal
 
+import g_config
 import common.sys_comm as sys_comm
 from common.sys_comm import LOGDBG, LOGINFO, LOGWARN, LOGERR
 from mqtt.mqtt_topics import TOPICS, Topic_Pattern
@@ -28,14 +29,6 @@ mqtt_send_que = queue.Queue()   # 发送队列
 '''
 
 # ================================
-# MQTT 配置
-# ================================
-MQTT_BROKER = "119.45.12.173"   # MQTT BROKER 地址
-MQTT_PORT = 1883                # MQTT 端口
-MQTT_USERNAME = "lnradar"       # MQTT 用户名
-MQTT_PASSWD = "lnradar"         # MQTT 密码
-
-# ================================
 # 全局对象
 # ================================
 executor = ThreadPoolExecutor(max_workers=8)
@@ -92,9 +85,11 @@ def on_message(client, userdata, msg):
 class MQTTClientThread(threading.Thread):
     def __init__(self,):
         super().__init__(name= "MQTTClientThread")
+        with g_config.g_sys_conf_mtx:
+            self.mqtt_ = g_config.g_sys_conf["mqtt"]
         self.client:mqtt.Client = mqtt.Client()
         self.publish_status = {}
-        self.client.username_pw_set(MQTT_USERNAME, MQTT_PASSWD)
+        self.client.username_pw_set(self.mqtt_["username"], self.mqtt_["password"])
         self.client.on_connect = self.on_connect
         self.client.on_disconnect = self.on_disconnect
         self.client.on_publish = self.on_publish
@@ -185,7 +180,7 @@ class MQTTClientThread(threading.Thread):
         global shutting_down
         try:
             LOGINFO("Connecting to MQTT broker...")
-            self.client.connect(MQTT_BROKER, MQTT_PORT, 60)
+            self.client.connect(self.mqtt_["broker"], self.mqtt_["port"], 60)
             self.client.loop_start()
 
             while self.running and not shutting_down:
@@ -212,9 +207,11 @@ class MQTTClientThread(threading.Thread):
 class RobustMQTTClient(threading.Thread):
     def __init__(self, max_workers=4):
         super().__init__(name="RobustMQTTClient")
-        client_id: str = str(sys_comm.g_sys_conf["sp_id"])
+        with g_config.g_sys_conf_mtx:
+            self.mqtt_ = g_config.g_sys_conf["mqtt"]
+        client_id: str = str(g_config.g_sys_conf["sp_id"])
         self.client: mqtt.Client = mqtt.Client(client_id= client_id)
-        self.client.username_pw_set(MQTT_USERNAME, MQTT_PASSWD)
+        self.client.username_pw_set(self.mqtt_["username"], self.mqtt_["password"])
         self.client.on_connect = self.on_connect
         self.client.on_disconnect = self.on_disconnect
         self.client.on_publish = self.on_publish
@@ -319,7 +316,7 @@ class RobustMQTTClient(threading.Thread):
         global shutting_down
         try:
             LOGINFO("Connecting to MQTT broker...")
-            self.client.connect(MQTT_BROKER, MQTT_PORT, 60)
+            self.client.connect(self.mqtt_["broker"], self.mqtt_["port"], 60)
             self.client.loop_start()
             self._process_queue()
 

+ 10 - 10
mqtt/mqtt_send.py

@@ -7,7 +7,7 @@ import json
 from enum import Enum
 import numpy
 
-
+import g_config
 import common.sys_comm as sys_comm
 from common.sys_comm import LOGDBG, LOGINFO, LOGWARN, LOGERR
 from common.sys_comm import POSE_CLASS_E, POSE_E
@@ -31,7 +31,7 @@ def send_msg(topic:str, format_json:dict, qos:int=0):
 
         if model != "dev":
             with sys_comm.g_sys_conf_mtx:
-                format_json["sp_id"] = sys_comm.g_sys_conf["sp_id"]
+                format_json["sp_id"] = g_config.g_sys_conf["sp_id"]
         content:str = json.dumps(format_json)
 
         mqtt_msg = {
@@ -70,13 +70,13 @@ def alarm_event(
 
 # 测试
 def las_test_resp():
-    module_name     = sys_comm.g_sys_conf["module_name"]
-    platform        = sys_comm.g_sys_conf["platform"]
-    host_ip         = sys_comm.g_sys_conf["host_ip"]
-    max_log_files   = sys_comm.g_sys_conf["max_log_files"]
-    max_log_size    = sys_comm.g_sys_conf["max_log_size"]
-    log_lvl         = sys_comm.g_sys_conf["log_lvl"]
-    sp_id           = sys_comm.g_sys_conf["sp_id"]
+    module_name     = g_config.g_sys_conf["module_name"]
+    platform        = g_config.g_sys_conf["platform"]
+    host_ip         = g_config.g_sys_conf["host_ip"]
+    max_log_files   = g_config.g_sys_conf["max_log_files"]
+    max_log_size    = g_config.g_sys_conf["max_log_size"]
+    log_lvl         = g_config.g_sys_conf["log_lvl"]
+    sp_id           = g_config.g_sys_conf["sp_id"]
     format_json = dict()
     format_json["module_name"]      = module_name
     format_json["platform"]         = platform
@@ -90,7 +90,7 @@ def las_test_resp():
 
 # 测试
 def las_debug_info(plans_info:list):
-    sp_id   = sys_comm.g_sys_conf["sp_id"]
+    sp_id   = g_config.g_sys_conf["sp_id"]
     format_json = dict()
     format_json["plans_info"]   = plans_info
     format_json["plans_total"]  = len(plans_info)