Merge branch 'master' of http://gitlab.ctune.cn/weijunh/DMapManager

@@ -14,6 +14,8 @@ import configure
 from app.decorators.auth_decorator import auth_decorator
 import time
 from app.models import SM3, AESHelper
+from app.util.component.StructurePrint import StructurePrint
+import traceback
 
 
 def current_user():
@@ -184,26 +186,29 @@ class DataManager(BlueprintApi):
     @staticmethod
     @bp.route("/init", methods=["GET"])
     def init():
-        username = 'admin'
-        password = SM3.encode('DMap@123')
-        if not User.query.filter_by(username=username).one_or_none():
-            user = User(username=username, password=password, role='admin',
-                        phone='', company='', position='', email='',
-                        create_time=time.strftime(
-                            "%Y-%m-%d %H:%M:%S", time.localtime()),
-                        update_time=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
-            db.sesion.add(user)
-            db.session.commit()
-            return "创建默认用户成功"
-        else:
-            return "默认用户已存在"
-        
+        try:
+            username = 'admin'
+            password = SM3.encode('DMap@123')
+            if not User.query.filter_by(username=username).one_or_none():
+                user = User(username=username, password=password, role='admin',
+                            phone='', company='', position='', email='',
+                            create_time=time.strftime(
+                                "%Y-%m-%d %H:%M:%S", time.localtime()),
+                            update_time=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
+                db.session.add(user)
+                db.session.commit()
+                return "创建默认用户成功"
+            else:
+                return "默认用户已存在"
+        except Exception as e:
+            StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
+
     @staticmethod
     @bp.route("/translate", methods=["GET"])
     def translate():
-        password = ['esri@123','admin','DMap@123','passwd']
+        password = ['esri@123', 'admin', 'DMap@123', 'passwd']
         result = {}
         for p in password:
             new_pwd = SM3.encode(p)
             result[p] = new_pwd
-        return result
\ No newline at end of file
+        return result

@@ -38,7 +38,6 @@ class Api(ApiTemplate):
             res["msg"] = "获取clients集合成功"
             res["result"] = True
         except Exception as e:
-            db.session.rollback()
             raise e
         return res
 

@@ -5,7 +5,6 @@
 
 # import schedule
 from flask import json
-from sqlalchemy import true
 from .models import MonitorHost, MonitorInfo
 from datetime import datetime, timedelta
 import math