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

@@ -19,6 +19,7 @@ from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 import os
 import os
 from app.modules.data.io.data_entry_center import data_entry_center
 from app.modules.data.io.data_entry_center import data_entry_center
+from app.modules.monitor.schedule import start_schedule
 
 
 class JSONEncoder(_JSONEncoder):
 class JSONEncoder(_JSONEncoder):
     """
     """
@@ -102,5 +103,7 @@ def create_app():
 
 
     # 不检测https
     # 不检测https
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
+
+    # start_schedule()
     return app
     return app
 
 

@@ -7,7 +7,7 @@
 from flasgger import swag_from
 from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
-from . import monitor_info, monitoring, metrics, monitor_host_create, monitor_host_list, monitor_host_delete, monitor_host_edit
+from . import monitoring, metrics, monitor_host_create, monitor_host_list, monitor_host_delete, monitor_host_edit
 
 
 
 
 user_socket_list = []
 user_socket_list = []
@@ -18,14 +18,14 @@ class Monitor(BlueprintApi):
 
 
     bp = Blueprint("Monitor", __name__, url_prefix="/API/Monitor")
     bp = Blueprint("Monitor", __name__, url_prefix="/API/Monitor")
 
 
-    @staticmethod
-    @bp.route('/Info', methods=['GET'])
-    @swag_from(monitor_info.Api.api_doc)
-    def monitor_info():
-        """
-        性能监控
-        """
-        return monitor_info.Api().result
+    # @staticmethod
+    # @bp.route('/Info', methods=['GET'])
+    # @swag_from(monitor_info.Api.api_doc)
+    # def monitor_info():
+    #     """
+    #     性能监控
+    #     """
+    #     return monitor_info.Api().result
 
 
     @staticmethod
     @staticmethod
     @bp.route('/baseMonitoring', methods=['GET'])
     @bp.route('/baseMonitoring', methods=['GET'])

@@ -4,11 +4,8 @@ import logging
 deploy_ip_host = "172.26.40.105:8840"
 deploy_ip_host = "172.26.40.105:8840"
 # 系统数据库
 # 系统数据库
 
 
-
 # SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager_test"
 # SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager_test"
-SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager"
-# SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@localhost:5433/dmap_dms_test"
-
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@localhost:5433/dmap_dms_test"
 
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 #VACUATE_DB_URI = None
 #VACUATE_DB_URI = None