2022.02.17 整合监控模块

@@ -13,3 +13,5 @@ kazoo==2.8.0
 paramiko==2.8.0
 paramiko==2.8.0
 requests==2.26.0
 requests==2.26.0
 schedule==1.1.0
 schedule==1.1.0
+gmssl==3.2.1
+pycryptodome==3.13.0

@@ -129,46 +129,5 @@ def create_app():
     # 不检测https
     # 不检测https
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
 
 
-    # start_schedule()
-    return app
-
-
-def create_schedule():
-    monitor = Flask(__name__)
-    monitor.config['SQLALCHEMY_DATABASE_URI'] = configure.SQLALCHEMY_DATABASE_URI
-    monitor.config['echo'] = True
-    monitor.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = True
-    monitor.config['JSON_AS_ASCII'] = False
-    monitor.config['SECRET_KEY'] = configure.SECRET_KEY
-
-    # allows cookies and credentials to be submitted across domains
-    monitor.config['CORS_SUPPORTS_CREDENTIALS'] = true
-    monitor.config['CORS_ORIGINS '] = "*"
-
-    # swagger设置
-    swagger_config = Swagger.DEFAULT_CONFIG
-    Swagger(monitor, config=swagger_config)
-
-    # 创建数据库
-    db.init_app(monitor)
-    # db.create_all(app=monitor)
-
-    # 跨域设置
-    CORS(monitor)
-
-    # 日志
-    logging.basicConfig(level=configure.log_level)
-    log_file = os.path.join(os.path.dirname(os.path.dirname(
-        os.path.realpath(__file__))), "logs", "monitor_log.txt")
-    handler = logging.FileHandler(
-        log_file, encoding='UTF-8')   # 设置日志字符集和存储路径名字
-    logging_format = logging.Formatter(
-        '[%(levelname)s] %(asctime)s %(message)s')
-    handler.setFormatter(logging_format)
-    monitor.logger.addHandler(handler)
-
-    # 不检测https
-    os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
     start_schedule()
     start_schedule()
-
-    return monitor
+    return app

@@ -61,7 +61,7 @@ def pull_metric():
         # 获取数据并汇聚为1min的数据入库
         # 获取数据并汇聚为1min的数据入库
         # 结束
         # 结束
     except Exception as e:
     except Exception as e:
-        sys_session.rollback()
+        #sys_session.rollback()
         StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
         StructurePrint().print(e.__str__()+":" + traceback.format_exc(), "error")
     finally:
     finally:
         if sys_session:
         if sys_session:

@@ -7,8 +7,8 @@ SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.101:5432/dma
 
 
 
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
-#VACUATE_DB_URI = None
-VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
+VACUATE_DB_URI = None
+#VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 
 #DMap引擎
 #DMap引擎
 dmap_engine = "http://172.26.99.160:8820"
 dmap_engine = "http://172.26.99.160:8820"

 Listen 81
 Listen 81
 <VirtualHost *:81>
 <VirtualHost *:81>
     ServerName 172.26.60.101
     ServerName 172.26.60.101
-    WSGIDaemonProcess yourapplication processes=4 threads=16
+    WSGIDaemonProcess yourapplication processes=1 threads=16
     WSGIScriptAlias / /usr/src/app/run.wsgi
     WSGIScriptAlias / /usr/src/app/run.wsgi
     WSGIPassAuthorization On
     WSGIPassAuthorization On
 
 
@@ -12,16 +12,3 @@ Listen 81
         Require all granted
         Require all granted
     </Directory>
     </Directory>
 </VirtualHost>
 </VirtualHost>
-Listen 82
-<VirtualHost *:82>
-    ServerName 172.26.60.101
-    WSGIDaemonProcess monitormanager processes=1 threads=8
-    WSGIScriptAlias / /usr/src/app/monitor.wsgi
-    WSGIPassAuthorization On
-    <Directory /usr/src/app/>
-        WSGIProcessGroup monitormanager
-        WSGIApplicationGroup %{GLOBAL}
-        WSGIScriptReloading On
-        Require all granted
-    </Directory>
-</VirtualHost>

-import sys
-import os
-file_path = os.path.dirname(os.path.realpath(__file__))
-sys.path.insert(0, file_path)
-from run_monitor import monitor as application

@@ -31,23 +31,15 @@ port2=$2
 echo "端口2设置为$2 ..."
 echo "端口2设置为$2 ..."
 fi
 fi
 
 
-port3=""
-if [ ! -n "$3" ] ;then
-port3="8841"
-echo "未设置端口3，使用默认8841端口..."
-else
-port3=$3
-echo "端口3设置为$3 ..."
-fi
 
 
 #启动容器
 #启动容器
 echo "正在启动容器..."
 echo "正在启动容器..."
 
 
-set="--restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -p  $port1:80 -p $port2:81 -p $port3:82"
+set="--restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -p  $port1:80 -p $port2:81 "
 codeMap="-v ${curPath}:/usr/src/app -v ${curPath}/html:/var/www/html"
 codeMap="-v ${curPath}:/usr/src/app -v ${curPath}/html:/var/www/html"
 apacheMap="-v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars"
 apacheMap="-v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars"
 
 
 docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.1
 docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.1
 sleep 5
 sleep 5
 curl localhost:$port2/release
 curl localhost:$port2/release
-curl localhost:$port3
+#curl localhost:$port3

@@ -7,4 +7,3 @@ os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
 app: Flask = create_app()
 app: Flask = create_app()
 if __name__ == '__main__':
 if __name__ == '__main__':
     app.run(host="0.0.0.0", port="8841", threaded=True, debug=True)
     app.run(host="0.0.0.0", port="8841", threaded=True, debug=True)
-    # app.run(host="0.0.0.0", port="8840", threaded=True)

-# coding=utf-8
-from flask import Flask
-from app import create_schedule
-import os
-os.environ['AUTHLIB_INSECURE_TRANSPORT'] = '1'
-monitor:Flask=create_schedule()
-if __name__ == '__main__':
-    monitor.run(host="0.0.0.0", port="8840", threaded=True, debug=True)
-    # app.run(host="0.0.0.0", port="8840", threaded=True)

-# coding=utf-8
-#author:        4N
-#createtime:    2021/7/15
-#email:         nheweijun@sina.com
-
-from osgeo import gdal,osr,ogr
-from osgeo.gdal import *
-from osgeo.ogr import *
-
-import os
-import json
-
-
-def getInfo( path):
-    # driver: Driver = ogr.GetDriverByName("OpenFileGDB")
-    # ds: DataSource = driver.Open(path, 0)
-    #
-    #
-    # layer:Layer = ds.GetLayerByName("LM51130251998341HAJ00_B2")
-    #
-    # count = layer.GetFeatureCount()
-    #
-    # dd:Feature = layer.GetNextFeature()
-    # dd.
-    #
-    # for i in range(dd.GetFieldCount()):
-    #     print(dd.GetField(i))
-    # ff = dd.GetField(1)
-    image: Dataset = gdal.Open(path)
-
-    geo = image.GetGeoTransform()
-
-    # print(image.GetSpatialRef())
-
-    origin: osr.SpatialReference = osr.SpatialReference()
-    origin.ImportFromWkt(image.GetProjection())
-
-    authority_code = origin.GetAuthorityCode(None)
-
-    band_count = image.RasterCount
-    band: Band = image.GetRasterBand(1)
-
-    count = band.GetOverviewCount()
-    nodatavalue = band.GetNoDataValue()
-
-    left_top = (geo[0], geo[3])
-    right_buttom = (geo[0] + geo[1] * image.RasterXSize, geo[3] + geo[5] * image.RasterYSize)
-
-    origin_extent = [left_top[0], right_buttom[1], right_buttom[0], left_top[1]]
-
-    info = {"band_count": band_count,
-            "overview_count": count,
-            "xy_size": [image.RasterXSize, image.RasterYSize],
-            "origin_extent": origin_extent,
-            "null_value": nodatavalue,
-            "crs_wkt": image.GetProjection(),
-            "crs": authority_code,
-            "crs_proj4": origin.ExportToProj4(),
-            "size": os.path.getsize(path),
-            "path": path,
-            "cell_x_size": geo[1],
-            "cell_y_size": geo[5]}
-
-    del image
-    return json.dumps(info)
-
-if __name__ == '__main__':
-    data_path = r"E:\Data\矢量数据\广州\广州\dataset.gdb"
-
-    driver: Driver = ogr.GetDriverByName("OpenFileGDB")
-    ds: DataSource = driver.Open(data_path, 0)
-    layer : Layer = ds.GetLayer(0)
-
-
-    print(layer.GetMetadata())
-    print(layer.GetDescription())
-    print(layer.GetStyleTable())
-
-    print(ds.GetStyleTable())
-
-
-
-