2022.01.24 修复io模块的图层大小写问题

@@ -169,7 +169,7 @@ Include ports.conf
 
 <Directory /var/www/>
 	Options Indexes FollowSymLinks
-	AllowOverride None
+	AllowOverride All
 	Require all granted
 </Directory>
 
@@ -180,8 +180,6 @@ Include ports.conf
 #</Directory>
 
 
-
-
 # AccessFileName: The name of the file to look for in each directory
 # for additional configuration directives.  See also the AllowOverride
 # directive.
@@ -225,4 +223,6 @@ IncludeOptional conf-enabled/*.conf
 IncludeOptional sites-enabled/*.conf
 
 LoadModule wsgi_module "/usr/lib/apache2/modules/mod_wsgi-py38.cpython-38-x86_64-linux-gnu.so"
-WSGIPythonHome "/usr"
\ No newline at end of file
+WSGIPythonHome "/usr"
+
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
\ No newline at end of file

@@ -16,11 +16,7 @@ from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 import os
 from app.modules.monitor.schedule import start_schedule
-import datetime
-
-
-
-
+import requests
 
 class JSONEncoder(_JSONEncoder):
     """
@@ -100,11 +96,6 @@ def create_app():
     # 不检测https
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
 
-
-    @app.before_first_request
-    def init_data():
-        pass
-
     # start_schedule()
     return app
 
@@ -122,7 +113,6 @@ def create_schedule():
     
     # swagger设置
     swagger_config = Swagger.DEFAULT_CONFIG
-    swagger_config.update(configure.swagger_configure)
     Swagger(monitor, config=swagger_config)
     
     # 创建数据库
@@ -143,4 +133,5 @@ def create_schedule():
     # 不检测https
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
     start_schedule()
+
     return monitor

@@ -10,7 +10,6 @@ from app.util.component.PGUtil import PGUtil
 import configure
 from osgeo.ogr import DataSource
 from flask import current_app
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 

@@ -9,7 +9,6 @@ from sqlalchemy import create_engine
 import datetime
 from . import database_alias_check
 from app.util.component.ApiTemplate import ApiTemplate
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 from app.util.component.PGUtil import PGUtil
 class Api(ApiTemplate):

@@ -54,10 +54,7 @@ class Api(ApiTemplate):
 
             # 提示信息
             res["msg"] = "下载格式为shp时，属性名长度超过10个字符将截取为10个字符，binary类型的属性将改成integer类型且值为0。"
-            # table_names = self.para.get("table_name").split(",")
-            #
-            # for tn in table_names:
-            #     table = Table.query.filter_by()
+
 
             res["msg"] = ""
             res["result"] = True

@@ -55,17 +55,19 @@ class Api(ApiTemplate):
 
                 for meta in meta_list:
                     layers:dict = meta.get("layer")
+
                     for layer_name_origin in layers.keys():
+
                         layer_name = layers.get(layer_name_origin)
                         if pg_ds.GetLayerByName(layer_name) or InsertingLayerName.query.filter_by(name=layer_name).one_or_none():
-                            res["data"][layer_name_origin]=0
+                            res["data"][layer_name]=0
                             res["result"] = False
                         # 判断特殊字符
                         elif re.search(r"\W",layer_name):
-                            res["data"][layer_name_origin]=-1
+                            res["data"][layer_name]=-1
                             res["result"] = False
                         else :
-                            res["data"][layer_name_origin] = 1
+                            res["data"][layer_name] = 1
 
                 if pg_ds:
                     try:

@@ -34,7 +34,7 @@ class Api(ApiTemplate):
                     store_path = ZipUtil.unzip(self.para.get("data_path"),True)
                     spatial_files = FileProcess.get_spatial_file(store_path)
 
-                elif  self.para.get("data_path").endswith("shp"):
+                elif self.para.get("data_path").endswith("shp"):
                     data_path=self.para.get("data_path")
                     encoding_cpg_path = data_path.split(".shp")[0]+".cpg"
                     if not os.path.exists(encoding_cpg_path):
@@ -96,7 +96,8 @@ class Api(ApiTemplate):
                 if not ds:
                     raise Exception("打开数据失败！")
                 layer: Layer = ds.GetLayer(0)
-                layer_name[layer.GetName().lower()] = layer.GetName().lower()
+
+                layer_name[layer.GetName()] = layer.GetName()
 
             if data_path.endswith("gdb"):
                 info["type"] = "gdb"
@@ -106,7 +107,9 @@ class Api(ApiTemplate):
                     raise Exception("打开数据失败！")
                 for i in range(ds.GetLayerCount()):
                     layer: Layer = ds.GetLayer(i)
-                    layer_name[layer.GetName().lower()] = layer.GetName().lower()
+
+                    layer_name[layer.GetName()] = layer.GetName()
+
         except Exception as e :
             print(traceback.format_exc())
             info={}

@@ -28,7 +28,6 @@ class EntryDataVacuate:
         try:
             metas: list = parameter.get("meta")
 
-
             # 总的入库是否成功
             is_success=True
 
@@ -41,7 +40,7 @@ class EntryDataVacuate:
             for meta in metas:
                 #设置编码
                 encoding = parameter.get("encoding")
-                if encoding:
+                if encoding and encoding in ["GBK","gbk","UTF-8","utf-8"]:
                     gdal.SetConfigOption("SHAPE_ENCODING",encoding)
                 else:
                     gdal.SetConfigOption("SHAPE_ENCODING", "GBK")
@@ -148,7 +147,7 @@ class EntryDataVacuate:
         for i in range(ds.GetLayerCount()):
 
             layer: Layer = ds.GetLayer(i)
-            if layer.GetName().lower() not in meta.get("layer").keys():
+            if layer.GetName() not in meta.get("layer").keys():
                 continue
             is_success, new_layer_name = self.entry_one_layer(layer,this_task,meta)
             new_layer_names.append(new_layer_name)
@@ -176,18 +175,19 @@ class EntryDataVacuate:
             overwrite = parameter.get("overwrite") if parameter.get("overwrite") is not None and parameter.get("overwrite")=="yes" else "no"
             geom_name = parameter.get("geom_name") if parameter.get("geom_name") is not None else "geom"
             fid =  parameter.get("fid") if parameter.get("fid") is not None else "fid"
-            options = ["OVERWRITE={}".format(overwrite), "FID={}".format(fid), "GEOMETRY_NAME={}".format(geom_name),"PRECISION=NO"]
 
+            options = ["OVERWRITE={}".format(overwrite), "FID={}".format(fid), "GEOMETRY_NAME={}".format(geom_name),"PRECISION=NO","LAUNDER=NO"]
 
             # 将线/面转多线多面
             geom_type = GeometryAdapter.change_geom_type(layer.GetGeomType())
 
             # 更改图层名
             change_name = False
-            origin_name = layer.GetName().lower()
+            origin_name = layer.GetName()
 
             # 新图层名
             new_layer_name: str = meta.get("layer").get(origin_name)
+
             origin_name = new_layer_name
             no = 1
             while overwrite.__eq__("no") and this_task.pg_ds.GetLayerByName(new_layer_name) :
@@ -248,7 +248,7 @@ class EntryDataVacuate:
             else:
                 is_vacuate = 0
 
-            this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
+            this_task.register_table(pg_layer,parameter.get("creator"),is_vacuate,table_guid)
 
             # 注册抽稀表
             if vacuate:
@@ -312,7 +312,7 @@ class ThisTask:
         self.process_session.add(task_process)
         self.process_session.commit()
 
-    def register_table(self, layer: Layer, new_layer_name, overwrite, creator,is_vacuate,table_guid):
+    def register_table(self, layer: Layer,creator,is_vacuate,table_guid):
         '''
         注册表
         :param layer: 图层
@@ -335,7 +335,9 @@ class ThisTask:
         table = Table(guid=table_guid,
                       database_guid=self.database.guid,
                       creator=creator,
-                      name=new_layer_name, create_time=this_time, update_time=this_time,
+                      # name=new_layer_name,
+                      name=layer.GetName(),
+                      create_time=this_time, update_time=this_time,
                       catalog_guid=self.catalog_guid, table_type=GeometryAdapter.get_table_type(geom_type),
                       extent=extent,
                       feature_count=layer.GetFeatureCount(),
@@ -343,10 +345,10 @@ class ThisTask:
                       )
         # 删除遗留业务数据
         try:
-            history_table = self.sys_session.query(Table).filter_by(name=new_layer_name,database_guid=self.database.guid).all()
+            history_table = self.sys_session.query(Table).filter_by(name=layer.GetName(),database_guid=self.database.guid).all()
         except:
             self.sys_session: Session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
-            history_table = self.sys_session.query(Table).filter_by(name=new_layer_name,database_guid=self.database.guid).all()
+            history_table = self.sys_session.query(Table).filter_by(name=layer.GetName(),database_guid=self.database.guid).all()
 
         if history_table:
             for ht in history_table:
@@ -357,7 +359,7 @@ class ThisTask:
 
         for i in range(feature_defn.GetFieldCount()):
             field_defn: FieldDefn = feature_defn.GetFieldDefn(i)
-            field_name = field_defn.GetName().lower()
+            field_name = field_defn.GetName()
             field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                 "") else field_defn.GetAlternativeName()
             column = Columns(guid=uuid.uuid1().__str__(), table_guid=table_guid,

@@ -6,7 +6,6 @@ from ..models import Columns
 import datetime
 from app.models import db
 from app.util.component.ApiTemplate import ApiTemplate
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -9,7 +9,6 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 import configure
 from flask import current_app
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -3,7 +3,7 @@
 #email:         nheweijun@sina.com
 
 import traceback
-from ..models import Table,Database,Columns,db,TableVacuate,Task,Process,DES
+from ..models import Table,Database,Columns,db,TableVacuate,Task,DES
 from osgeo.ogr import DataSource,FeatureDefn,FieldDefn,Layer
 import datetime
 import uuid
@@ -17,7 +17,6 @@ from app.util.component.TaskController import TaskController
 from app.util.component.TaskWriter import TaskWriter
 import multiprocessing
 import configure
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 class Api(ApiTemplate):
     api_name = "数据刷新"

@@ -5,7 +5,7 @@
 
 import datetime
 import traceback
-from ..models import Table, Database, DES,Task,db,TableVacuate,Process
+from ..models import Table, Database, DES,Task,db,TableVacuate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.StructuredPrint import StructurePrint
@@ -14,7 +14,6 @@ import uuid
 import configure
 from osgeo.ogr import DataSource,Layer,Geometry
 from osgeo import ogr
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.TaskController import TaskController

@@ -10,6 +10,9 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 import json
 import decimal
+
+
+
 class Api(ApiTemplate):
     api_name = "数据浏览"
     def process(self):
@@ -56,6 +59,8 @@ class Api(ApiTemplate):
                         d[column] = value.strftime('%Y-%m-%d %H:%M:%S')
                     elif isinstance(value, decimal.Decimal):
                         d[column] = float(value)
+                    elif isinstance(value,datetime.date):
+                        d[column] = value.strftime('%Y-%m-%d %H:%M:%S')
                     else:
                         d[column]=value
                 pkey_dict.update(d)
@@ -66,7 +71,7 @@ class Api(ApiTemplate):
         finally:
             if db_session:
                 db_session.close()
-        return json.dumps(res)
+        return json.dumps(res,ensure_ascii=False)
     
     api_doc={
     "tags":["管理接口"],

@@ -5,7 +5,6 @@
 
 from ..models import db,Task
 from app.util.component.ApiTemplate import ApiTemplate
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -4,17 +4,15 @@
 #email:         nheweijun@sina.com
 
 from ..models import db,Task,Table,InsertingLayerName,Process
-
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.StructuredPrint import StructurePrint
 import os
 import signal
 import platform
-import json
 import datetime
 import uuid
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
+
 class Api(ApiTemplate):
     api_name = "停止任务"
     def para_check(self):

@@ -12,8 +12,7 @@ from app.util.component.StructuredPrint import StructurePrint
 class Api(ApiTemplate):
 
     def process(self):
-        StructurePrint().print("test")
-        return {"Name":socket.gethostname(),"Type":"DMapDMS"}
+        return {"Name":socket.gethostname(),"Type":"DMapManager"}
 
     api_doc={
     "tags":["Index接口"],

@@ -6,7 +6,6 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 import requests
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -6,7 +6,6 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 import requests
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -11,7 +11,6 @@ import requests
 import configure
 import json
 import datetime
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -8,7 +8,6 @@ from app.models import db
 from app.modules.service.models import Service
 from app.modules.service.models import TileService
 from app.modules.service.models import MapService
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):

@@ -5,7 +5,7 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.modules.service.models import Service
-import requests
+
 
 
 class Api(ApiTemplate):

@@ -70,7 +70,7 @@ class Api(ApiTemplate):
                 else:
                     raw_json = response.json()["data"]["list"]
                     if state:
-                        raw_json = [ service for service in raw_json if service["state"] == state]
+                        raw_json = [ service for service in raw_json if service["state"] == int(state)]
                     if type:
                         raw_json = [service for service in raw_json if service["type"] == type]
                     if catalog_guid:

@@ -6,9 +6,7 @@
 
 from app.util.component.ApiTemplate import ApiTemplate
 from .models import TileService,db,Service,MapService
-import configure
 from app.util.component.ModelVisitor import ModelVisitor
-
 from .tile_service.util.ProjectFile import ProjectFile
 
 

@@ -3,11 +3,11 @@
 #createtime:    2021/9/14
 #email:         nheweijun@sina.com
 
-
-
-
+from app.util.component.UserCheck import UserCheck
 from app.util.component.ApiTemplate import ApiTemplate
 from .models import Service,db
+import requests
+
 class Api(ApiTemplate):
     api_name = "修改服务状态"
     def process(self):
@@ -17,10 +17,10 @@ class Api(ApiTemplate):
             state = int(self.para.get("state"))
             s_type = self.para.get("type")
 
-
-            #删除本地服务
             if s_type in ["切片服务","地图服务","地址匹配"]:
                 service = Service.query.filter_by(guid=guid).one_or_none()
+                # 验证权限
+                UserCheck.verify(service.creator)
 
                 if service:
                     service.state = state
@@ -30,10 +30,18 @@ class Api(ApiTemplate):
                     raise Exception("服务不存在！")
             # 删除影像服务
             else:
-                from app.modules.service.image_service.image_service_edit import Api as RealApi
-                api = RealApi()
-                api.para = self.para
-                res = api.process()
+                user_req: requests.Response = requests.post("{}/API/Service/Info".format(self.para.get("url")),
+                                                            data={"guid": self.para.get("guid")})
+                if not user_req.json().get("result"):
+                    raise Exception("服务不存在！")
+                # 验证权限
+                UserCheck.verify(user_req.json().get("data").get("service").get("creator"))
+
+                url = "{}/API/Service/State".format(self.para.get("url"))
+                response: requests.Response = requests.post(url, data=self.para)
+                if not response.json().get("result"):
+                    raise Exception("由于{}，影像服务修改失败！".format(response.json().get("msg")))
+                res["result"] = True
 
         except Exception as e:
             raise e

@@ -14,7 +14,6 @@ from .util.ProjectFile import ProjectFile
 import json
 from requests import Response
 import configure
-from authlib.integrations.flask_oauth2 import current_token
 from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):
@@ -29,7 +28,7 @@ class Api(ApiTemplate):
             if not service:
                 raise Exception("服务不存在！")
             #验证权限
-            UserCheck.verify(service.creator)
+            UserCheck.verify(service.one_or_none().creator)
 
             this_time = datetime.datetime.now()
 

@@ -5,7 +5,7 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ModelVisitor import ModelVisitor
+from app.util.component.StructuredPrint import StructurePrint
 import uuid
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
 
@@ -41,8 +41,12 @@ class Api(ApiTemplate):
             resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),
                                             headers={'Content-Type':'application/json'},timeout=3
                                             )
+
             resp.encoding="utf-8"
             resp_json = resp.json()
+            StructurePrint().print(para)
+            StructurePrint().print(resp_json)
+
             if not resp_json["status"]=="1":
                 raise Exception("调用切片服务的注册服务接口失败！")
 
@@ -105,7 +109,7 @@ class Api(ApiTemplate):
             res["result"] = True
         except Exception as e:
             db.session.rollback()
-            raise Exception("数据库错误！")
+            raise e
         return res
 
 

@@ -30,7 +30,7 @@ class ModelVisitor:
                     continue
                 if isinstance(value, datetime.datetime):
                     value = value.strftime('%Y-%m-%d %H:%M:%S')
-                elif isinstance(value, datetime.time):
+                elif isinstance(value, datetime.time) or isinstance(value, datetime.date):
                     value = value.strftime('%H:%M:%S')
                 yield k,value
         return dict(generator())

@@ -3,7 +3,7 @@ import logging
 # 程序部署ip:host
 deploy_ip_host = "172.26.40.105:8840"
 # 系统数据库
-SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager"
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.101:5432/dmap_manager"
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 #VACUATE_DB_URI = None

+#! /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
+
+port1="8830"
+echo "未设置端口1，使用默认8830端口..."
+else
+port1=$1
+echo "端口1设置为$1 ..."
+fi
+
+port2=""
+if [ ! -n "$2" ] ;then
+port2="8840"
+echo "未设置端口2，使用默认8840端口..."
+else
+port2=$2
+echo "端口2设置为$2 ..."
+fi
+
+port3=""
+if [ ! -n "$3" ] ;then
+port3="8841"
+echo "未设置端口3，使用默认8841端口..."
+else
+port3=$3
+echo "端口3设置为$3 ..."
+fi
+
+#启动容器
+echo "正在启动容器..."
+
+set="--restart=always -e ALLOW_IP_RANGE=0.0.0.0/0 -p  $port1:80 -p $port2:81 -p $port3:82"
+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"
+
+docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.1
+sleep 5
+curl localhost:$port2/release
+curl localhost:$port3

@@ -34,7 +34,7 @@ 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}:80 -p ${port2}:81 -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 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