1. util模块问题修复

2. 数据库连接失败处理逻辑完善

6 files changed, 14 insertions, 7 deletions

diff --git a/server/apps/agentcomm.py b/server/apps/agentcomm.py
index e34a63e..9ff2eb4 100644
--- a/server/apps/agentcomm.py
+++ b/server/apps/agentcomm.py
@@ -7,7 +7,7 @@ from apiflask.validators import OneOf
 from flask import request
 
 from settings import *
-from util import da
+from .util import da
 
 bp = APIBlueprint("代理管理接口集合", __name__, url_prefix="/agent")
 
diff --git a/server/apps/sysinfo.py b/server/apps/sysinfo.py
index bae76b2..b18cb65 100644
--- a/server/apps/sysinfo.py
+++ b/server/apps/sysinfo.py
@@ -6,7 +6,7 @@ from apiflask.validators import OneOf
 
 # 测试用
 from settings import *
-from util import da
+from .util import da
 
 bp = APIBlueprint("仪表盘接口", __name__, url_prefix="/sys")
 
diff --git a/server/apps/sysmange.py b/server/apps/sysmange.py
index 017abd9..9f391c7 100644
--- a/server/apps/sysmange.py
+++ b/server/apps/sysmange.py
@@ -3,7 +3,7 @@
 from apiflask import APIBlueprint, Schema
 from apiflask.fields import String, Integer, DateTime, List, Nested
 
-from apps.util import fake
+from .util import fake
 
 bp = APIBlueprint("系统管理接口集合", __name__, url_prefix="/user")
 
diff --git a/server/apps/target.py b/server/apps/target.py
index d3e1ab1..a0606a4 100644
--- a/server/apps/target.py
+++ b/server/apps/target.py
@@ -8,7 +8,7 @@ from apiflask import APIBlueprint, Schema
 from apiflask.fields import Integer, String, List, Nested, IP, DateTime, Dict
 from requests.exceptions import Timeout
 
-from util import da
+from .util import da
 
 bp = APIBlueprint("目标信息及状态接口集合", __name__, url_prefix="/target")
 
diff --git a/server/apps/task.py b/server/apps/task.py
index 3905df4..b5edae1 100644
--- a/server/apps/task.py
+++ b/server/apps/task.py
@@ -6,7 +6,7 @@ from apiflask import APIBlueprint, Schema
 from apiflask.fields import String, Integer, IP, DateTime, List, Nested
 from apiflask.validators import OneOf
 
-from apps.util import fake
+from .util import fake
 
 bp = APIBlueprint("任务管理接口集合", __name__, url_prefix="/task")
 
diff --git a/server/apps/util.py b/server/apps/util.py
index 67227e4..7c0c99a 100644
--- a/server/apps/util.py
+++ b/server/apps/util.py
@@ -1,4 +1,6 @@
 # 工具包
+import sys
+
 import pymysql
 from faker import Faker
 from faker.providers import company
@@ -48,8 +50,13 @@ class DataHandler:
     def __init__(self):
 
         # mysql连接,采用字典游标，返回一系列字典值
-        self.conn = pymysql.connect(cursorclass=DictCursor, host=MYSQL_HOST, user='root',
-                                    password=MYSQL_PAWD, port=MYSQL_PORT)
+        try:
+            self.conn = pymysql.connect(cursorclass=DictCursor, host=MYSQL_HOST, user='root',
+                                        password=MYSQL_PAWD, port=MYSQL_PORT)
+        except Exception as e:
+            error(str(e))
+            # 数据库连接失败，停止后续操作
+            sys.exit(1)
         self.cursor = self.conn.cursor()
 
         # 初始化sql语句