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

@@ -11,5 +11,6 @@ RUN apt-get install apache2 -y
 
 
 COPY --from=dci/dmapserver:build-dev /usr/local /usr/local
 COPY --from=dci/dmapserver:build-dev /usr/local /usr/local
 COPY --from=dci/dmapserver:build-dev /usr/lib/apache2/modules /usr/lib/apache2/modules
 COPY --from=dci/dmapserver:build-dev /usr/lib/apache2/modules /usr/lib/apache2/modules
+CMD ["/usr/sbin/apachectl", "-D", "FOREGROUND"]
 
 
 
 

@@ -11,6 +11,7 @@ from . import task_detail
 from . import task_delete
 from . import task_delete
 from . import task_count
 from . import task_count
 from . import task_kill
 from . import task_kill
+from . import task_update
 from app.decorators.token_decorator import token_decorator
 from app.decorators.token_decorator import token_decorator
 
 
 
 
@@ -64,3 +65,13 @@ class DataManager(BlueprintApi):
         任务统计
         任务统计
         """
         """
         return task_count.Api().result
         return task_count.Api().result
+
+
+    @staticmethod
+    @bp.route('/Update', methods=['POST'])
+    @swag_from(task_update.Api.api_doc)
+    def task_update():
+        """
+        任务信息更新
+        """
+        return task_update.Api().result

+# coding=utf-8
+#author:        4N
+#createtime:    2020/9/4
+#email:         nheweijun@sina.com
+
+from ..models import db,Task,Process
+from app.util.component.ApiTemplate import ApiTemplate
+import datetime
+import json
+import uuid
+class Api(ApiTemplate):
+    api_name = "任务更新"
+    def para_check(self):
+        if not self.para.get("task_guid"):
+            raise Exception("缺乏task_guid参数。")
+
+    def process(self):
+
+        res = {}
+        try:
+            task_guid = self.para.get("task_guid")
+            msg = self.para.get("msg")
+            task:Task = Task.query.filter_by(guid=task_guid)
+            task.update(json.loads(self.para.get("update")))
+
+            if msg:
+                message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), msg)
+                task_process_guid = uuid.uuid1().__str__()
+                task_process = Process(guid=task_process_guid, message=message, time=datetime.datetime.now(),
+                                       task_guid=task_guid)
+                db.session.add(task_process)
+            db.session.commit()
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc={
+    "tags":["任务接口"],
+    "parameters":[
+        {"name": "task_guid",
+         "in": "formData",
+         "type": "string"},
+        {"name": "update",
+         "in": "formData",
+         "type": "string"},
+        {"name": "msg",
+         "in": "formData",
+         "type": "string"},
+
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }

@@ -5,7 +5,7 @@
 
 
 
 
 from ..models import ServiceCatalog,db,Service,ServiceEngine
 from ..models import ServiceCatalog,db,Service,ServiceEngine
-
+from app.util.component.StructurePrint import StructurePrint
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 import requests
 import requests
@@ -25,12 +25,15 @@ class Api(ApiTemplate):
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_services = []
             image_services = []
             for ie in image_engines:
             for ie in image_engines:
-                url = "{}/API/Service/List".format(ie.url)
-                response:requests.Response = requests.post(url,{"page_size":1000})
-                if not response.json().get("result"):
-                    raise Exception("获取影像服务List失败！")
-                else:
-                    image_services.extend(response.json()["data"]["list"])
+                try:
+                    url = "{}/API/Service/List".format(ie.url)
+                    response:requests.Response = requests.post(url,{"page_size":1000})
+                    if not response.json().get("result"):
+                        raise Exception("获取影像服务List失败！")
+                    else:
+                        image_services.extend(response.json()["data"]["list"])
+                except:
+                    StructurePrint().print("{}访问失败".format(ie.url))
 
 
             for cata in catalogs:
             for cata in catalogs:
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]

@@ -7,7 +7,7 @@
 from ..models import ServiceCatalog,Service,ServiceEngine
 from ..models import ServiceCatalog,Service,ServiceEngine
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import requests
 import requests
-
+from app.util.component.StructurePrint import StructurePrint
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "目录树"
     api_name = "目录树"
     def process(self):
     def process(self):
@@ -24,13 +24,15 @@ class Api(ApiTemplate):
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_services = []
             image_services = []
             for ie in image_engines:
             for ie in image_engines:
-                url = "{}/API/Service/List".format(ie.url)
-                response:requests.Response = requests.post(url,{"page_size":1000})
-                if not response.json().get("result"):
-                    raise Exception("获取影像服务List失败！")
-                else:
-                    image_services.extend(response.json()["data"]["list"])
-
+                try:
+                    url = "{}/API/Service/List".format(ie.url)
+                    response:requests.Response = requests.post(url,{"page_size":1000})
+                    if not response.json().get("result"):
+                        raise Exception("获取影像服务List失败！")
+                    else:
+                        image_services.extend(response.json()["data"]["list"])
+                except:
+                    StructurePrint().print("{}访问失败".format(ie.url))
             tree_origin = []
             tree_origin = []
             for cata in catalogs:
             for cata in catalogs:
 
 

@@ -8,6 +8,7 @@ from ..models import Service,ServiceCatalog,db,ServiceEngine
 import requests
 import requests
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.StructurePrint import StructurePrint
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "目录"
     api_name = "目录"
     def process(self):
     def process(self):
@@ -24,12 +25,15 @@ class Api(ApiTemplate):
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_services = []
             image_services = []
             for ie in image_engines:
             for ie in image_engines:
-                url = "{}/API/Service/List".format(ie.url)
-                response:requests.Response = requests.post(url,{"page_size":1000})
-                if not response.json().get("result"):
-                    raise Exception("获取影像服务List失败！")
-                else:
-                    image_services.extend(response.json()["data"]["list"])
+                try:
+                    url = "{}/API/Service/List".format(ie.url)
+                    response:requests.Response = requests.post(url,{"page_size":1000})
+                    if not response.json().get("result"):
+                        raise Exception("获取影像服务List失败！")
+                    else:
+                        image_services.extend(response.json()["data"]["list"])
+                except:
+                    StructurePrint().print("{}访问失败".format(ie.url))
 
 
             for cata in catalogs:
             for cata in catalogs:
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]

@@ -3,7 +3,7 @@
 #createtime:    2021/7/19
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-
+import configure
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.StructurePrint import StructurePrint
 from app.util.component.StructurePrint import StructurePrint
 from app.models import db
 from app.models import db
@@ -14,6 +14,7 @@ import datetime
 import requests
 import requests
 from app.util.component.TaskController import TaskController
 from app.util.component.TaskController import TaskController
 from app.util.component.TaskWriter import TaskWriter
 from app.util.component.TaskWriter import TaskWriter
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "创建影像金字塔"
     api_name = "创建影像金字塔"
@@ -29,14 +30,15 @@ class Api(ApiTemplate):
             pyramid_process = multiprocessing.Process(target=self.task, args=(task_guid,self.para))
             pyramid_process = multiprocessing.Process(target=self.task, args=(task_guid,self.para))
             pyramid_process.start()
             pyramid_process.start()
 
 
+
+
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
                         name="{}构建影像金字塔".format(self.para.get("alias")),
                         name="{}构建影像金字塔".format(self.para.get("alias")),
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
                         task_type=5,
                         task_type=5,
                         creator=self.para.get("creator"),
                         creator=self.para.get("creator"),
-                        process="影像创建金字塔中",
-                        task_pid=pyramid_process.pid)
+                        process="影像创建金字塔中")
 
 
             db.session.add(task)
             db.session.add(task)
             db.session.commit()
             db.session.commit()
@@ -61,18 +63,21 @@ class Api(ApiTemplate):
             task_writer.update_task({"state":2,"update_time":datetime.datetime.now(),"process" : "创建中"})
             task_writer.update_task({"state":2,"update_time":datetime.datetime.now(),"process" : "创建中"})
             task_writer.update_process("开始创建...")
             task_writer.update_process("开始创建...")
 
 
-            url = "{}/API/Service/Image/BuildPyramid".format(para.get("url"))
-            response:requests.Response = requests.post(url,data=self.para)
+            url = "{}/API/Image/BuildPyramid".format(para.get("url"))
+            StructurePrint().print(url)
 
 
-            if not response.json().get("result"):
-                raise Exception("由于{}，影像服务修改失败！".format(response.json().get("msg")))
+            self.para["from"] = configure.deploy_ip_host
+            self.para["task_guid"] = task_guid
 
 
-            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "创建完成"})
-            task_writer.update_process("创建完成！")
+            response:requests.Response = requests.post(url,data=self.para)
 
 
+            if not response.json().get("result"):
+                raise Exception("由于{}，提交任务失败！".format(response.json().get("msg")))
+            else:
+                task_writer.update_task({"task_pid": int(response.json().get("data"))})
         except Exception as e:
         except Exception as e:
             try:
             try:
-                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "下载失败"})
+                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "创建失败"})
                 task_writer.update_process( e.__str__())
                 task_writer.update_process( e.__str__())
                 task_writer.update_process("任务中止！")
                 task_writer.update_process("任务中止！")
             except Exception as ee:
             except Exception as ee:
@@ -84,7 +89,6 @@ class Api(ApiTemplate):
             except Exception as e:
             except Exception as e:
                 StructurePrint().print(e.__str__())
                 StructurePrint().print(e.__str__())
 
 
-
     api_doc = {
     api_doc = {
         "tags": ["影像服务接口"],
         "tags": ["影像服务接口"],
         "parameters": [
         "parameters": [

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+import configure
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.StructurePrint import StructurePrint
+from app.models import db
+from app.modules.data.models import Task
+import multiprocessing
+import uuid
+import datetime
+import requests
+from app.util.component.TaskController import TaskController
+from app.util.component.TaskWriter import TaskWriter
+class Api(ApiTemplate):
+
+    api_name = "创建影像金字塔"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            task_guid = uuid.uuid1().__str__()
+
+
+            pyramid_process = multiprocessing.Process(target=self.task, args=(task_guid,self.para))
+            pyramid_process.start()
+
+            task = Task(guid=task_guid,
+                        name="{}构建影像金字塔".format(self.para.get("alias")),
+                        create_time=datetime.datetime.now(),
+                        state=0,
+                        task_type=5,
+                        creator=self.para.get("creator"),
+                        process="影像创建金字塔中",
+                        task_pid=pyramid_process.pid)
+
+            db.session.add(task)
+            db.session.commit()
+
+            res["data"] = "创建影像金字塔任务已提交！"
+            res["result"] = True
+
+        except Exception as e:
+            raise Exception("数据库错误！")
+
+        return res
+
+
+    def task(self,task_guid,para):
+        task_writer = None
+        try:
+
+            #任务控制,等待执行
+            TaskController.wait(task_guid)
+            task_writer = TaskWriter(task_guid)
+
+            task_writer.update_task({"state":2,"update_time":datetime.datetime.now(),"process" : "创建中"})
+            task_writer.update_process("开始创建...")
+
+            url = "{}/API/Service/Image/BuildPyramid".format(para.get("url"))
+
+            # s = requests.session()
+            # s.keep_alive = True
+            # s.post()
+
+            self.para["from"] = configure.deploy_ip_host
+
+            response:requests.Response = requests.post(url,data=self.para)
+
+            if not response.json().get("result"):
+                raise Exception("由于{}，影像服务修改失败！".format(response.json().get("msg")))
+
+            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "创建完成"})
+            task_writer.update_process("创建完成！")
+
+        except Exception as e:
+            try:
+                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "创建失败"})
+                task_writer.update_process(e.__str__())
+                task_writer.update_process("任务中止！")
+            except Exception as ee:
+                StructurePrint().print(ee.__str__())
+            raise e
+        finally:
+            try:
+                task_writer.close()
+            except Exception as e:
+                StructurePrint().print(e.__str__())
+
+
+    api_doc = {
+        "tags": ["影像服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+            {"name": "url",
+             "in": "formData",
+             "type": "string",
+             "description": "url"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "影像alias"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }
+

@@ -5,6 +5,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.StructurePrint import StructurePrint
 import requests
 import requests
 from app.util.component.UserCheck import UserCheck
 from app.util.component.UserCheck import UserCheck
 
 
@@ -19,6 +20,7 @@ class Api(ApiTemplate):
 
 
             user_req: requests.Response = requests.post("{}/API/Service/Info".format(self.para.get("url")),
             user_req: requests.Response = requests.post("{}/API/Service/Info".format(self.para.get("url")),
                                                         data={"guid":self.para.get("guid")})
                                                         data={"guid":self.para.get("guid")})
+
             if not user_req.json().get("result"):
             if not user_req.json().get("result"):
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
             # 验证权限
             # 验证权限
@@ -26,6 +28,7 @@ class Api(ApiTemplate):
 
 
             url = "{}/API/Service/Delete".format(self.para.get("url"))
             url = "{}/API/Service/Delete".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
             response:requests.Response = requests.post(url,data=self.para)
+
             if not response.json().get("result"):
             if not response.json().get("result"):
                 raise Exception("由于{}，影像地图删除失败！".format(response.json().get("msg")))
                 raise Exception("由于{}，影像地图删除失败！".format(response.json().get("msg")))
             res["result"] = True
             res["result"] = True

@@ -49,7 +49,7 @@ class Api(ApiTemplate):
                     "capabilities":2,
                     "capabilities":2,
                     "project":self.para.get("project")}
                     "project":self.para.get("project")}
 
 
-            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.vector_engine)
+            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.dmap_engine)
             resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
             resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
                                             headers={'Content-Type':'application/json'},timeout=3
                                             headers={'Content-Type':'application/json'},timeout=3
                                             )
                                             )

@@ -34,7 +34,7 @@ class Api(ApiTemplate):
                     "capabilities":2,
                     "capabilities":2,
                     "project":self.para.get("project")}
                     "project":self.para.get("project")}
 
 
-            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.vector_engine)
+            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.dmap_engine)
             resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
             resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
                                             headers={'Content-Type':'application/json'},timeout=3
                                             headers={'Content-Type':'application/json'},timeout=3
                                             )
                                             )

@@ -35,13 +35,7 @@ class Api(ApiTemplate):
             map_services = MapService.query.all()
             map_services = MapService.query.all()
             for ms in map_services:
             for ms in map_services:
                 para = ModelVisitor.object_to_json(ms)
                 para = ModelVisitor.object_to_json(ms)
-                para[""]
-
                 res["data"]["list"].append(para)
                 res["data"]["list"].append(para)
-
-
-
-
             res["data"]["count"] = len(tile_services)+len(map_services)
             res["data"]["count"] = len(tile_services)+len(map_services)
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:

@@ -60,7 +60,7 @@ class Api(ApiTemplate):
                     "type":"tileserver","capabilities":1 if tile_type == "WMTS" else 16,"project":project_file}
                     "type":"tileserver","capabilities":1 if tile_type == "WMTS" else 16,"project":project_file}
 
 
 
 
-            tile_service_edit_url = "{}/dmap/api/manager/RegService".format(configure.tile_engine)
+            tile_service_edit_url = "{}/dmap/api/manager/RegService".format(configure.dmap_engine)
 
 
             resp: Response  = requests.post(tile_service_edit_url,data=json.dumps(para),headers={'Content-Type':'application/json'},timeout=3)
             resp: Response  = requests.post(tile_service_edit_url,data=json.dumps(para),headers={'Content-Type':'application/json'},timeout=3)
             resp.encoding="utf-8"
             resp.encoding="utf-8"

@@ -37,7 +37,7 @@ class Api(ApiTemplate):
                     "capabilities":1 if self.para.get("tile_type") == "WMTS" else 16,
                     "capabilities":1 if self.para.get("tile_type") == "WMTS" else 16,
                     "project":project_file}
                     "project":project_file}
 
 
-            tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.tile_engine)
+            tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.dmap_engine)
             resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),
             resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),
                                             headers={'Content-Type':'application/json'},timeout=3
                                             headers={'Content-Type':'application/json'},timeout=3
                                             )
                                             )
@@ -93,7 +93,7 @@ class Api(ApiTemplate):
 
 
                 scheme=self.para.get("scheme"),
                 scheme=self.para.get("scheme"),
                 service_guid = service_guid,
                 service_guid = service_guid,
-                metadata_url = "{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.tile_engine,self.para.get("name"))
+                metadata_url = "{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.dmap_engine,self.para.get("name"))
             )
             )
 
 
             service_function = ServiceFunction(guid=service_function_guid,
             service_function = ServiceFunction(guid=service_function_guid,

@@ -10,10 +10,8 @@ SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.101:5432/dma
 #VACUATE_DB_URI = None
 #VACUATE_DB_URI = None
 VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 
-#切片引擎
-tile_engine = "http://172.26.99.160:8820"
-#矢量引擎
-vector_engine = "http://172.26.99.160:8820"
+#DMap引擎
+dmap_engine = "http://172.26.99.160:8820"
 
 
 # 固定配置不需要修改
 # 固定配置不需要修改
 
 

-# coding=utf-8
-import os
-bind='0.0.0.0:8840'
-workers=4
-backlog=2048
-worker_class="gevent"
-#daemon=True
-threads =8
-pidfile='logs/gunicore.pid'
-loglevel='info'
-accesslog='logs/gunicorn.log'
-errorlog='logs/gunicorn.err.log'

-#
-# This is the main Apache HTTP server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
-# In particular, see 
-# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
-# for a discussion of each configuration directive.
-#
-# Do NOT simply read the instructions in here without understanding
-# what they do.  They're here only as hints or reminders.  If you are unsure
-# consult the online docs. You have been warned.  
-#
-# Configuration and logfile names: If the filenames you specify for many
-# of the server's control files begin with "/" (or "drive:/" for Win32), the
-# server will use that explicit path.  If the filenames do *not* begin
-# with "/", the value of ServerRoot is prepended -- so 'log/access_log'
-# with ServerRoot set to '/www' will be interpreted by the
-# server as '/www/log/access_log', where as '/log/access_log' will be
-# interpreted as '/log/access_log'.
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# Do not add a slash at the end of the directory path.  If you point
-# ServerRoot at a non-local disk, be sure to specify a local disk on the
-# Mutex directive, if file-based mutexes are used.  If you wish to share the
-# same ServerRoot for multiple httpd daemons, you will need to change at
-# least PidFile.
-#
-ServerRoot "/etc/httpd"
-
-#
-# Listen: Allows you to bind Apache to specific IP addresses and/or
-# ports, instead of the default. See also the <VirtualHost>
-# directive.
-#
-# Change this to Listen on specific IP addresses as shown below to 
-# prevent Apache from glomming onto all bound IP addresses.
-#
-#Listen 12.34.56.78:80
-Listen 80
-Listen 81
-
-#
-# Dynamic Shared Object (DSO) Support
-#
-# To be able to use the functionality of a module which was built as a DSO you
-# have to place corresponding `LoadModule' lines at this location so the
-# directives contained in it are actually available _before_ they are used.
-# Statically compiled modules (those listed by `httpd -l') do not need
-# to be loaded here.
-#
-# Example:
-# LoadModule foo_module modules/mod_foo.so
-#
-Include conf.modules.d/*.conf
-
-#
-# If you wish httpd to run as a different user or group, you must run
-# httpd as root initially and it will switch.  
-#
-# User/Group: The name (or #number) of the user/group to run httpd as.
-# It is usually good practice to create a dedicated user and group for
-# running httpd, as with most system services.
-#
-User apache
-Group apache
-
-# 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition.  These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
-#
-# ServerAdmin: Your address, where problems with the server should be
-# e-mailed.  This address appears on some server-generated pages, such
-# as error documents.  e.g. admin@your-domain.com
-#
-ServerAdmin root@localhost
-
-#
-# ServerName gives the name and port that the server uses to identify itself.
-# This can often be determined automatically, but we recommend you specify
-# it explicitly to prevent problems during startup.
-#
-# If your host doesn't have a registered DNS name, enter its IP address here.
-#
-#ServerName www.example.com:80
-
-#
-# Deny access to the entirety of your server's filesystem. You must
-# explicitly permit access to web content directories in other 
-# <Directory> blocks below.
-#
-<Directory />
-    AllowOverride none
-    Require all denied
-</Directory>
-
-#
-# Note that from this point forward you must specifically allow
-# particular features to be enabled - so if something's not working as
-# you might expect, make sure that you have specifically enabled it
-# below.
-#
-
-#
-# DocumentRoot: The directory out of which you will serve your
-# documents. By default, all requests are taken from this directory, but
-# symbolic links and aliases may be used to point to other locations.
-#
-DocumentRoot "/var/www/html"
-
-#
-# Relax access to content within /var/www.
-#
-<Directory "/var/www">
-    AllowOverride None
-    # Allow open access:
-    Require all granted
-</Directory>
-
-# Further relax access to the default document root:
-<Directory "/var/www/html">
-    #
-    # Possible values for the Options directive are "None", "All",
-    # or any combination of:
-    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
-    #
-    # Note that "MultiViews" must be named *explicitly* --- "Options All"
-    # doesn't give it to you.
-    #
-    # The Options directive is both complicated and important.  Please see
-    # http://httpd.apache.org/docs/2.4/mod/core.html#options
-    # for more information.
-    #
-    Options Indexes FollowSymLinks
-
-    #
-    # AllowOverride controls what directives may be placed in .htaccess files.
-    # It can be "All", "None", or any combination of the keywords:
-    #   Options FileInfo AuthConfig Limit
-    #
-    AllowOverride None
-
-    #
-    # Controls who can get stuff from this server.
-    #
-    Require all granted
-</Directory>
-
-#
-# DirectoryIndex: sets the file that Apache will serve if a directory
-# is requested.
-#
-<IfModule dir_module>
-    DirectoryIndex index.html
-</IfModule>
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being 
-# viewed by Web clients. 
-#
-<Files ".ht*">
-    Require all denied
-</Files>
-
-#
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog "logs/error_log"
-
-#
-# LogLevel: Control the number of messages logged to the error_log.
-# Possible values include: debug, info, notice, warn, error, crit,
-# alert, emerg.
-#
-LogLevel warn
-
-<IfModule log_config_module>
-    #
-    # The following directives define some format nicknames for use with
-    # a CustomLog directive (see below).
-    #
-    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
-    LogFormat "%h %l %u %t \"%r\" %>s %b" common
-
-    <IfModule logio_module>
-      # You need to enable mod_logio.c to use %I and %O
-      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
-    </IfModule>
-
-    #
-    # The location and format of the access logfile (Common Logfile Format).
-    # If you do not define any access logfiles within a <VirtualHost>
-    # container, they will be logged here.  Contrariwise, if you *do*
-    # define per-<VirtualHost> access logfiles, transactions will be
-    # logged therein and *not* in this file.
-    #
-    #CustomLog "logs/access_log" common
-
-    #
-    # If you prefer a logfile with access, agent, and referer information
-    # (Combined Logfile Format) you can use the following directive.
-    #
-    CustomLog "logs/access_log" combined
-</IfModule>
-
-<IfModule alias_module>
-    #
-    # Redirect: Allows you to tell clients about documents that used to 
-    # exist in your server's namespace, but do not anymore. The client 
-    # will make a new request for the document at its new location.
-    # Example:
-    # Redirect permanent /foo http://www.example.com/bar
-
-    #
-    # Alias: Maps web paths into filesystem paths and is used to
-    # access content that does not live under the DocumentRoot.
-    # Example:
-    # Alias /webpath /full/filesystem/path
-    #
-    # If you include a trailing / on /webpath then the server will
-    # require it to be present in the URL.  You will also likely
-    # need to provide a <Directory> section to allow access to
-    # the filesystem path.
-
-    #
-    # ScriptAlias: This controls which directories contain server scripts. 
-    # ScriptAliases are essentially the same as Aliases, except that
-    # documents in the target directory are treated as applications and
-    # run by the server when requested rather than as documents sent to the
-    # client.  The same rules about trailing "/" apply to ScriptAlias
-    # directives as to Alias.
-    #
-    ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
-
-</IfModule>
-
-#
-# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
-# CGI directory exists, if you have that configured.
-#
-<Directory "/var/www/cgi-bin">
-    AllowOverride None
-    Options None
-    Require all granted
-</Directory>
-
-<IfModule mime_module>
-    #
-    # TypesConfig points to the file containing the list of mappings from
-    # filename extension to MIME-type.
-    #
-    TypesConfig /etc/mime.types
-
-    #
-    # AddType allows you to add to or override the MIME configuration
-    # file specified in TypesConfig for specific file types.
-    #
-    #AddType application/x-gzip .tgz
-    #
-    # AddEncoding allows you to have certain browsers uncompress
-    # information on the fly. Note: Not all browsers support this.
-    #
-    #AddEncoding x-compress .Z
-    #AddEncoding x-gzip .gz .tgz
-    #
-    # If the AddEncoding directives above are commented-out, then you
-    # probably should define those extensions to indicate media types:
-    #
-    AddType application/x-compress .Z
-    AddType application/x-gzip .gz .tgz
-
-    #
-    # AddHandler allows you to map certain file extensions to "handlers":
-    # actions unrelated to filetype. These can be either built into the server
-    # or added with the Action directive (see below)
-    #
-    # To use CGI scripts outside of ScriptAliased directories:
-    # (You will also need to add "ExecCGI" to the "Options" directive.)
-    #
-    #AddHandler cgi-script .cgi
-
-    # For type maps (negotiated resources):
-    #AddHandler type-map var
-
-    #
-    # Filters allow you to process content before it is sent to the client.
-    #
-    # To parse .shtml files for server-side includes (SSI):
-    # (You will also need to add "Includes" to the "Options" directive.)
-    #
-    AddType text/html .shtml
-    AddOutputFilter INCLUDES .shtml
-</IfModule>
-
-#
-# Specify a default charset for all content served; this enables
-# interpretation of all content as UTF-8 by default.  To use the 
-# default browser choice (ISO-8859-1), or to allow the META tags
-# in HTML content to override this choice, comment out this
-# directive:
-#
-AddDefaultCharset UTF-8
-
-<IfModule mime_magic_module>
-    #
-    # The mod_mime_magic module allows the server to use various hints from the
-    # contents of the file itself to determine its type.  The MIMEMagicFile
-    # directive tells the module where the hint definitions are located.
-    #
-     conf/magic
-</IfModule>
-
-#
-# Customizable error responses come in three flavors:
-# 1) plain text 2) local redirects 3) external redirects
-#
-# Some examples:
-#ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
-#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
-#ErrorDocument 402 http://www.example.com/subscription_info.html
-#
-
-#
-# EnableMMAP and EnableSendfile: On systems that support it, 
-# memory-mapping or the sendfile syscall may be used to deliver
-# files.  This usually improves server performance, but must
-# be turned off when serving from networked-mounted 
-# filesystems or if support for these functions is otherwise
-# broken on your system.
-# Defaults if commented: EnableMMAP On, EnableSendfile Off
-#
-#EnableMMAP off
-EnableSendfile on
-
-# Supplemental configuration
-#
-# Load config files in the "/etc/httpd/conf.d" directory, if any.
- conf.d/*.conf
-
-LoadModule wsgi_module "/usr/lib64/httpd/modules/mod_wsgi-py37.cpython-37m-x86_64-linux-gnu.so"
- "/var/gdal"
-
-<VirtualHost *:80>
-     dmapmanager processes=4 threads=16 display-name=%{GROUP} 
-     dmapmanager
-     On
-     %{GLOBAL}
-     / /usr/src/app/run.wsgi
-    <Directory /usr/>
-    Require all granted
-    </Directory>
-</VirtualHost>
-
-<VirtualHost *:81>
-     monitormanager processes=1 threads=8 display-name=%{GROUP}
-     monitormanager
-     %{GLOBAL}
-     / /usr/src/app/monitor.wsgi
-    <Directory /usr/>
-    Require all granted
-    </Directory>
-</VirtualHost>
-
-<Directory /usr/>
-  Require all granted
-</Directory>

-#! /bin/sh
-dn="dmapmanager"
-#停止容器
-echo "正在关闭容器..."
-docker stop $dn
-docker rm $dn
-
-curPath=$(readlink -f $(dirname $0))
-
-
-#设置日志权限
-chmod -R 777 $curPath
-
-#设置端口
-port=""
-if [ ! -n "$1" ] ;then
-port="8840"
-echo "未设置端口，使用默认8840端口..."
-else
-port=$1
-echo "端口设置为$1 ..."
-fi
-
-port2=""
-if [ ! -n "$2" ] ;then
-port="8841"
-echo "未设置端口2，使用默认8840端口..."
-else
-port2=$2
-echo "端口2设置为$2 ..."
-fi
-
-
-#启动容器和apache
-echo "正在启动容器..."
-set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
-docker run -d --name $dn $set -p $port:80 -p $port2:81 -v $curPath/logs/apache.error:/var/log/httpd/error_log -v $curPath:/usr/src/app -v $curPath/httpd.conf:/etc/httpd/conf/httpd.conf dci/dmapmanager:4.1 /usr/sbin/init
-docker exec -d $dn systemctl start httpd
-sleep 5
-curl localhost:$port/release
-curl localhost:$port2

-#! /bin/bash
-dn="dmapmanager"
-#停止容器
-echo "正在关闭容器..."
-docker stop $dn
-docker rm $dn
-curPath=$(readlink -f "$(dirname "$0")")
-#设置端口
-port=""
-if [ ! -n "$1" ] ;then
-  port="8840"
-  echo "未设置端口，使用默认8840端口..."
-else
-  port=$1
-  echo "端口设置为$1 ..."
-fi
-docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapdms:4.0 gunicorn -c gun_conf.py run:app
-# 清除未完成的任务任务
-sleep 5
-curl localhost:$port/release

@@ -16,7 +16,7 @@ else
   echo "端口设置为$1 ..."
   echo "端口设置为$1 ..."
 fi
 fi
 
 
-docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapserver:build python3 ./run.py
+docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapmanager:4.1 python3 ./run.py
 # 清除未完成的任务任务
 # 清除未完成的任务任务
 sleep 5
 sleep 5
 curl localhost:$port/release
 curl localhost:$port/release

-#! /bin/sh
-container_name="dmapmanager"
-#停止容器
-echo "正在关闭容器..."
-docker stop $container_name
-docker rm $container_name
-
-curPath=$(readlink -f $(dirname $0))
-
-
-#设置日志权限
-chmod -R 777 $curPath
-
-#设置端口
-port=""
-if [ ! -n "$1" ] ;then
-port="8840"
-echo "未设置端口，使用默认8840端口..."
-else
-port=$1
-echo "端口设置为$1 ..."
-fi
-
-port2=""
-if [ ! -n "$2" ] ;then
-port="8841"
-echo "未设置端口2，使用默认8840端口..."
-else
-port2=$2
-echo "端口2设置为$2 ..."
-fi
-
-
-#启动容器和apache
-echo "正在启动容器..."
-set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -e LAND=C.UTF-8"
-docker run -it -d --name ${container_name} ${set} -p ${port}:81 -p ${port2}:82 -v ${curPath}:/usr/src/app -v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf -v ${curPath}/envvars:/etc/apache2/envvars dci/dmapserver:build
-docker exec -d $container_name service apache2 start
-sleep 5
-curl localhost:$port/release
-curl localhost:$port2