2022.01.18 部署现场前

@@ -72,7 +72,7 @@ def create_app():
 
     # swagger设置
     swagger_config = Swagger.DEFAULT_CONFIG
-    swagger_config.update(configure.swagger_configure)
+    swagger_config.update({"title": "DMapManager"})
     Swagger(app, config=swagger_config)
 
     # 创建数据库
@@ -93,7 +93,7 @@ def create_app():
     config_oauth(app)
 
     # 注册blueprint，查找BlueprintApi的子类
-    for scan in configure.scan_module:
+    for scan in ["app.modules"]:
         for api in find_class(scan, BlueprintApi):
             app.register_blueprint(api.bp)
 

@@ -3,7 +3,7 @@ from authlib.integrations.flask_oauth2 import current_token
 from flask import abort
 from app.modules.auth.oauth2 import require_oauth
 from flask import request
-
+import configure
 # 认证装饰器
 
 
@@ -17,25 +17,28 @@ class auth_decorator(object):
         
         @wraps(func)
         def wrapped_function(*args, **kwargs):
-            token = request.headers.get('Authorization')
-            if not token:
-                abort(401)
-            validate_token()
-            if current_token and current_token.user and current_token.user.role:
-                print(func.__name__)
-                if self.permission and len(self.permission) > 0:
-                    # 判断角色是否在permission列表中
-                    role = current_token.user.role
-                    for p in self.permission:
-                        if role == p:
-                            return func(*args, **kwargs)
+            if configure.PermissionActive:
+                token = request.headers.get('Authorization')
+                if not token:
+                    abort(401)
+                validate_token()
+                if current_token and current_token.user and current_token.user.role:
+                    print(func.__name__)
+                    if self.permission and len(self.permission) > 0:
+                        # 判断角色是否在permission列表中
+                        role = current_token.user.role
+                        for p in self.permission:
+                            if role == p:
+                                return func(*args, **kwargs)
 
-                    abort(403)
+                        abort(403)
+                    else:
+                        # 无permission，不校验
+                        return func(*args, **kwargs)
                 else:
-                    # 无permission，不校验
-                    return func(*args, **kwargs)
+                    abort(401)  # 无token，401
             else:
-                abort(401)  # 无token，401
+                return func(*args, **kwargs)
 
         @require_oauth(self.scope)
         def validate_token():

@@ -3,7 +3,7 @@ from authlib.integrations.flask_oauth2 import current_token
 from flask import abort
 from app.modules.auth.oauth2 import require_oauth
 from flask import request
-
+import configure
 # 认证装饰器
 
 
@@ -14,16 +14,19 @@ class token_decorator(object):
     def __call__(self, func):
         @wraps(func)
         def wrapped_function(*args, **kwargs):
-            token = request.headers.get('Authorization')
-            if token:
-                validate_token()
-                if current_token and current_token.user:
-                    return func(*args, **kwargs)
-                else:
-                    abort(403)
+            if configure.PermissionActive:
+                token = request.headers.get('Authorization')
+                if token:
+                    validate_token()
+                    if current_token and current_token.user:
+                        return func(*args, **kwargs)
+                    else:
+                        abort(403)
 
+                else:
+                    abort(401)  # 无token，401
             else:
-                abort(401)  # 无token，401
+                return func(*args, **kwargs)
 
         @require_oauth(self.scope)
         def validate_token():

@@ -6,13 +6,12 @@ from app.util import BlueprintApi
 from flask import Blueprint, render_template, redirect, request, session, jsonify
 from sqlalchemy import and_
 from .models import *
-from .oauth2 import authorization, generate_user_info
+from .oauth2 import authorization, generate_user_info,require_oauth
 from authlib.oauth2 import OAuth2Error
 from authlib.integrations.flask_oauth2 import current_token
 from . import user_create, client_create, client_query, user_query, user_update, user_delete
 import configure
 from app.decorators.auth_decorator import auth_decorator
-from app.decorators.token_decorator import token_decorator
 
 
 def current_user():
@@ -82,7 +81,7 @@ class DataManager(BlueprintApi):
 
     @staticmethod
     @bp.route("/userinfo")
-    @token_decorator("profile")
+    @require_oauth("profile")
     def api_me():
         try:
             return jsonify(generate_user_info(current_token.user, current_token.scope))

@@ -5,15 +5,13 @@
 
 
 from ..models import Database,db,Table,TableVacuate,DES
-
-
-
 from app.util.component.ApiTemplate import ApiTemplate
 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
 
 
 class Api(ApiTemplate):
@@ -24,9 +22,8 @@ class Api(ApiTemplate):
         try:
 
             database = db.session.query(Database).filter_by(guid=self.para.get("guid")).one_or_none()
-            if database.creator != current_token.user.username:
-                raise Exception("缺乏权限！")
-
+            #验证权限
+            UserCheck.verify(database.creator,current_token.user.username)
             if configure.VACUATE_DB_URI:
                 va_ds: DataSource = PGUtil.open_pg_data_source(1, configure.VACUATE_DB_URI)
             else:

@@ -5,14 +5,12 @@
 
 from ..models import Database,db,DES
 from contextlib import closing
-
 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):
     api_name = "修改数据库"
@@ -28,8 +26,8 @@ class Api(ApiTemplate):
             database = Database.query.filter_by(guid=guid)
             dbase:Database = database.one_or_none()
 
-            if dbase.creator != "":
-                raise Exception("缺乏权限！")
+            #验证权限
+            UserCheck.verify(dbase.creator,current_token.user.username)
 
             update_dict={}
     
@@ -40,7 +38,6 @@ class Api(ApiTemplate):
                 res["msg"] = "请填写参数！"
                 return res
 
-    
             if alias:
                 # 检测一波别名
                 check_alias = database_alias_check.Api().result

@@ -74,7 +74,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @bp.route('/GetMeta', methods=['POST'])
     @swag_from(get_meta.Api.api_doc)
-    @auth_decorator(configure.DataPermission)
+    # @auth_decorator(configure.DataPermission)
     def get_meta():
         """
         数据Meta

@@ -7,7 +7,7 @@
 from ..models import *
 
 import traceback
-
+from .util.SchemaAdapter import SchemaAdapter
 from osgeo.ogr import DataSource,Layer,FeatureDefn,FieldDefn,Feature
 from osgeo import gdal,ogr
 import os
@@ -51,6 +51,15 @@ class Api(ApiTemplate):
             db.session.commit()
 
             res["data"] = "下载任务已提交!"
+
+            # 提示信息
+            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
 
         except Exception as e:
@@ -64,11 +73,11 @@ class Api(ApiTemplate):
         task_writer = None
 
         # 设置编码
-        encoding = para.get("encoding")
-        if encoding:
-            gdal.SetConfigOption("SHAPE_ENCODING", encoding)
-        else:
-            gdal.SetConfigOption("SHAPE_ENCODING", "UTF-8")
+        # encoding = para.get("encoding")
+        # if encoding:
+        #     gdal.SetConfigOption("SHAPE_ENCODING", encoding)
+        # else:
+        #     gdal.SetConfigOption("SHAPE_ENCODING", "GBK")
 
         try:
 
@@ -133,10 +142,14 @@ class Api(ApiTemplate):
 
 
         fid = layer.GetFIDColumn()
-        pg_layer: Layer = data_source.CreateLayer(table_name, layer.GetSpatialRef(), layer.GetGeomType(),["ENCODING=UTF-8"])
+        pg_layer: Layer = data_source.CreateLayer(table_name, layer.GetSpatialRef(), layer.GetGeomType(),["ENCODING=GBK"])
+
         schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
+        # 忽略binary字段
+        SchemaAdapter.neglect_binary(schema)
 
         pg_layer.CreateFields(schema)
+
         layer.ResetReading()
 
         count = 0
@@ -147,6 +160,11 @@ class Api(ApiTemplate):
                 StructurePrint().print("{}图层已下载{}个对象".format(table_name, count))
 
         data_source.Destroy()
+
+        #增加cpg文件
+        with open(dirpath + "/{}.cpg".format(table_name),"w") as f:
+            f.write("GBK")
+
         ZipUtil.create_zip(os.path.join(parent, "file_tmp", table_name+"_"+uuid_) + ".zip", [dirpath])
         return "http://" + configure.deploy_ip_host + "/API/IO/Download/{}".format(table_name+"_"+uuid_ + ".zip")
     
@@ -208,6 +226,11 @@ class Api(ApiTemplate):
         return data
 
 
+    def msg(self):
+        pass
+
+
+
     api_doc={
     "tags":["IO接口"],
     "description":"下载数据",
@@ -215,10 +238,10 @@ class Api(ApiTemplate):
         {"name": "table_name",
          "in": "formData",
          "type":"string","description":"支持多图层下载，以逗号相隔","required":"true"},
-        {"name": "encoding",
-         "in": "formData",
-         "type": "string",
-         "enum":["GBK","UTF-8"]},
+        # {"name": "encoding",
+        #  "in": "formData",
+        #  "type": "string",
+        #  "enum":["GBK","UTF-8"]},
         {"name": "download_type",
         "in": "formData",
         "type": "string",

@@ -13,7 +13,7 @@ import json
 from app.util.component.ApiTemplate import ApiTemplate
 from .get_meta import Api as MetaApi
 from threading import Thread
-from ..util.EntryDataVacuate import EntryDataVacuate
+from .util.EntryDataVacuate import EntryDataVacuate
 
 class Api(ApiTemplate):
 

@@ -104,7 +104,7 @@ class EntryDataVacuate:
                     dir_path = os.path.dirname(dir_path)
                     i+=1
                 if i<30:
-                    # shutil.rmtree(dir_path,True)
+                    shutil.rmtree(dir_path,True)
                     StructurePrint().print("删除文件成功！")
                 else:
                     raise Exception("找不到文件！")

+# coding=utf-8
+#author:        4N
+#createtime:    2022/1/17
+#email:         nheweijun@sina.com
+from osgeo import ogr
+
+class SchemaAdapter:
+    @classmethod
+    def neglect_binary(cls,schema):
+        for sche in schema:
+            if sche.GetType() == ogr.OFTBinary:
+                sche.SetType(ogr.OFTInteger)
+
+        return schema
\ No newline at end of file

@@ -4,11 +4,10 @@
 
 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):
     api_name = "修改属性"
@@ -24,8 +23,8 @@ class Api(ApiTemplate):
         if not column:
             raise Exception("数据不存在！")
 
-        if column.relate_table.relate_database.creator != "":
-            raise Exception("缺乏权限！")
+        #验证权限
+        UserCheck.verify(column.relate_table.relate_database.creator,current_token.user.username)
 
         try:
             if self.para.get("column_alias"):

@@ -2,21 +2,16 @@
 #createtime:    2021/1/27
 #email:         nheweijun@sina.com
 
-
-
-import traceback
 from ..models import Table,Database,DES
-
-
 from osgeo.ogr import DataSource
-
-
 from app.models import db
 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):
     api_name = "删除表"
     def process(self):
@@ -37,11 +32,12 @@ class Api(ApiTemplate):
 
     
             table = table.one_or_none()
-    
-
-    
             # 删除真实数据
             database = Database.query.filter_by(guid=table.database_guid).one_or_none()
+
+            #验证权限
+            UserCheck.verify(database.creator,current_token.user.username)
+
             if not database:
                 res["result"]=False
                 res["msg"]= "数据库不存在!"

@@ -2,16 +2,14 @@
 #createtime:    2021/1/27
 #email:         nheweijun@sina.com
 
-
-
 from ..models import *
-
 import json
-
 from sqlalchemy.orm import Session
 import datetime
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
+from authlib.integrations.flask_oauth2 import current_token
+from app.util.component.UserCheck import UserCheck
 
 class Api(ApiTemplate):
     api_name = "修改表信息"
@@ -34,8 +32,8 @@ class Api(ApiTemplate):
                 res["msg"]= "数据不存在！"
                 return res
 
-            if table.relate_database.creator != "":
-                raise Exception("缺乏权限！")
+            #验证权限
+            UserCheck.verify(table.relate_database.creator,current_token.user.username)
     
             if self.para.__contains__("catalog_guid"):
                 if catalog_guid is None:

@@ -2,16 +2,11 @@
 #createtime:    2021/1/27
 #email:         nheweijun@sina.com
 
-
-
 import traceback
 from ..models import Table,Database,Columns,db,TableVacuate,Task,Process,DES
-
 from osgeo.ogr import DataSource,FeatureDefn,FieldDefn,Layer
-
 import datetime
 import uuid
-
 from sqlalchemy.orm import Session
 from app.util.component.SQLUtil import SQLUtil
 from app.util.component.PGUtil import PGUtil
@@ -22,7 +17,8 @@ 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 = "数据刷新"
     def process(self):
@@ -32,6 +28,9 @@ class Api(ApiTemplate):
             database_guid = self.para.get("database_guid")
             database = Database.query.filter_by(guid=database_guid).one_or_none()
 
+            #验证权限
+            UserCheck.verify(database.creator,current_token.user.username)
+
             if database.creator != "":
                 raise Exception("缺乏权限！")
 

@@ -21,10 +21,10 @@ from app.util.component.TaskController import TaskController
 from app.util.component.TaskWriter import TaskWriter
 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 sqlalchemy.orm import Session
-
 
 class Api(ApiTemplate):
 
@@ -42,8 +42,8 @@ class Api(ApiTemplate):
             if not table:
                 raise Exception("数据不存在！")
 
-            if table.relate_database.creator != "":
-                raise Exception("缺乏权限！")
+            #验证权限
+            UserCheck.verify(table.relate_database.creator,current_token.user.username)
 
             pg_ds :DataSource= PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             layer = pg_ds.GetLayerByName(table.name)

@@ -14,7 +14,8 @@ 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
 from app.util.component.TaskWriter import TaskWriter
@@ -40,8 +41,8 @@ class Api(ApiTemplate):
             if not table:
                 raise Exception("数据不存在！")
 
-            if table.relate_database.creator != "":
-                raise Exception("缺乏权限！")
+            #验证权限
+            UserCheck.verify(table.relate_database.creator,current_token.user.username)
 
             # 判断图层是否存在
 

@@ -4,10 +4,9 @@
 #email:         nheweijun@sina.com
 
 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):
     api_name = "删除任务"
@@ -18,29 +17,19 @@ class Api(ApiTemplate):
         res = {}
         try:
             task_guid = self.para.get("task_guid")
-            state = self.para.get("state")
-            creator = self.para.get("creator")
+            task = Task.query.filter_by(guid=task_guid).one_or_none()
+
+            if not task:
+                raise Exception("任务不存在！")
+
+            #验证权限
+            UserCheck.verify(task.creator,current_token.user.username)
 
-            tasks = Task.query
-            if task_guid:
-                tasks = tasks.filter_by(guid=task_guid)
-            if state:
-                state = int(state)
-                tasks = tasks.filter_by(state=state)
-            if creator:
-                tasks = tasks.filter_by(creator=creator)
-            tasks = tasks.all()
+            db.session.delete(task)
+            db.session.commit()
 
-            if not tasks:
-                res["result"] = False
-                res["msg"] = "数据不存在！"
-                return res
-            else:
-                for task in tasks:
-                    db.session.delete(task)
-                db.session.commit()
-                res["msg"] = "删除成功！"
-                res["result"] = True
+            res["msg"] = "删除成功！"
+            res["result"] = True
         except Exception as e:
             db.session.rollback()
             raise e
@@ -53,12 +42,6 @@ class Api(ApiTemplate):
             {"name": "task_guid",
              "in": "formData",
              "type": "string"},
-            {"name": "state",
-             "in": "formData",
-             "type": "string"},
-            {"name": "creator",
-             "in": "formData",
-             "type": "string"},
 
         ],
         "responses": {

@@ -13,6 +13,8 @@ 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):
@@ -23,6 +25,12 @@ class Api(ApiTemplate):
         try:
             task_guid = self.para.get("task_guid")
             task = Task.query.filter_by(guid=task_guid).one_or_none()
+            if not task:
+                raise Exception("任务不存在！")
+
+            #验证权限
+            UserCheck.verify(task.creator,current_token.user.username)
+
             pid = task.task_pid
             try:
                 if platform.system().lower().__contains__("windows"):

@@ -19,6 +19,7 @@ class Api(ApiTemplate):
             catalogs = ServiceCatalog.query.all()
             res["data"]=[]
 
+
             # 获取全部影像服务
             image_engines = ServiceEngine.query.filter_by(type="ImageServer").all()
             image_services = []
@@ -30,6 +31,8 @@ class Api(ApiTemplate):
                 else:
                     image_services.extend(response.json()["data"]["list"])
 
+
+
             for cata in catalogs:
                 catalog_guids = [c.guid for c in ServiceCatalog.query.filter(ServiceCatalog.path.like("%" + cata.guid + "%")).all()]
                 service_count = Service.query.filter(Service.catalog_guid.in_(catalog_guids)).count()
@@ -47,7 +50,7 @@ class Api(ApiTemplate):
                 res["data"].append(cata_json)
     
             res["result"] = True
-    
+            res["service_count"] = len(image_services) + Service.query.count()
         except Exception as e:
             raise e
         return res

@@ -6,6 +6,8 @@
 
 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):
 
@@ -15,6 +17,14 @@ class Api(ApiTemplate):
         # 返回结果
         res = {}
         try:
+
+            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"), current_token.user.username)
+
             url = "{}/API/Service/Delete".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
             if not response.json().get("result"):

@@ -6,6 +6,8 @@
 
 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):
 
@@ -15,6 +17,14 @@ class Api(ApiTemplate):
         # 返回结果
         res = {}
         try:
+
+            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"), current_token.user.username)
+
             url = "{}/API/Service/Edit".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
             if not response.json().get("result"):

@@ -7,9 +7,13 @@
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 from ..models import Service,MapService,db,ServiceFunction
-
-
+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):
 
     api_name = "修改MapService服务"
@@ -22,9 +26,14 @@ class Api(ApiTemplate):
         try:
             guid = self.para.get("guid")
             functions = self.para.get("functions")
-            service = Service.query.filter_by(guid=guid)
+            service :Service = Service.query.filter_by(guid=guid)
             this_time = datetime.datetime.now()
 
+            if not service:
+                raise Exception("服务不存在！")
+
+            #验证权限
+            UserCheck.verify(service.creator,current_token.user.username)
 
             service_update = {"update_time":this_time}
             map_service_update = {}
@@ -35,7 +44,20 @@ class Api(ApiTemplate):
                 if key in ["name","tile","project","capabilities"]:
                     map_service_update[key] = self.para.get(key)
 
-
+            para = {"name":self.para.get("name"),
+                    "title":self.para.get("title"),
+                    "type":"mapserver",
+                    "capabilities":2,
+                    "project":self.para.get("project")}
+
+            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.vector_engine)
+            resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
+                                            headers={'Content-Type':'application/json'},timeout=3
+                                            )
+            resp.encoding="utf-8"
+            resp_json = resp.json()
+            if not resp_json["status"]=="1":
+                raise Exception("调用矢量服务的修改服务接口失败！")
 
             # 修改功能
             if functions:

@@ -8,7 +8,9 @@ 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
-import requests
+from authlib.integrations.flask_oauth2 import current_token
+from app.util.component.UserCheck import UserCheck
+
 class Api(ApiTemplate):
 
     api_name = "服务删除"
@@ -24,10 +26,12 @@ class Api(ApiTemplate):
 
             #删除本地服务
             if s_type in ["切片服务","地图服务"]:
-                service = Service.query.filter_by(guid=guid).one_or_none()
-
+                service:Service = Service.query.filter_by(guid=guid).one_or_none()
                 if service:
 
+                    # 验证权限
+                    UserCheck.verify(service.creator, current_token.user.username)
+
                     try:
                         if service.type.__eq__("切片服务"):
                             #调用接口
@@ -37,6 +41,7 @@ class Api(ApiTemplate):
                         if service.type.__eq__("地图服务"):
                             map_service = MapService.query.filter_by(service_guid=guid).one_or_none()
                             db.session.delete(map_service)
+
                         service_functions = service.relate_service_functions.all()
                         for function in service_functions:
                             db.session.delete(function)

@@ -7,6 +7,7 @@ from app.util.component.ApiTemplate import ApiTemplate
 from app.modules.service.models import Service
 import requests
 
+
 class Api(ApiTemplate):
     api_name = "修改服务"
     def process(self):

@@ -17,14 +17,14 @@ class DataManager(BlueprintApi):
 
     service_type = ["切片服务"]
 
-    @staticmethod
-    @bp.route('/UploadOverview', methods=['POST'])
-    @swag_from(upload_oview.Api.api_doc)
-    def api_upload_oview():
-        """
-        上传缩略图
-        """
-        return upload_oview.Api().result
+    # @staticmethod
+    # @bp.route('/UploadOverview', methods=['POST'])
+    # @swag_from(upload_oview.Api.api_doc)
+    # def api_upload_oview():
+    #     """
+    #     上传缩略图
+    #     """
+    #     return upload_oview.Api().result
 
 
     @staticmethod

@@ -14,6 +14,9 @@ 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):
 
     api_name = "修改切片服务"
@@ -23,6 +26,11 @@ class Api(ApiTemplate):
         try:
             guid = self.para.get("guid")
             service = Service.query.filter_by(guid=guid)
+            if not service:
+                raise Exception("服务不存在！")
+            #验证权限
+            UserCheck.verify(service.creator,current_token.user.username)
+
             this_time = datetime.datetime.now()
 
             service_update = {"update_time":this_time}

@@ -27,7 +27,6 @@ class FileProcess:
         StructurePrint().print(store_file)
 
         file.save(store_file)
-
         if platform.system().lower() == 'linux':
             #设置为444权限
             os.chmod(store_file, stat.S_IRUSR + stat.S_IRGRP + stat.S_IROTH)

+# coding=utf-8
+#author:        4N
+#createtime:    2022/1/14
+#email:         nheweijun@sina.com
+
+import configure
+class UserCheck:
+
+    @classmethod
+    def verify(cls,owner,operator):
+        if configure.PermissionActive:
+            if configure.PermissionActive and operator != "admin" and owner !=operator:
+                raise Exception("缺乏权限！")

@@ -6,7 +6,7 @@
 import zipfile
 import os
 import uuid
-
+import platform,stat
 class ZipUtil:
 
     @classmethod
@@ -69,7 +69,6 @@ class ZipUtil:
 
         os.chdir(os.path.dirname(store_path))
         zip_file.close()
-
         return store_path
     
     

@@ -3,30 +3,22 @@ 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"
 
-
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 #VACUATE_DB_URI = None
 VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
-zookeeper = "172.26.99.168:2181"
-
-
 #切片引擎
 tile_engine = "http://172.26.99.160:6060"
 #矢量引擎
 vector_engine = "http://172.26.99.160:6060"
 
-
 # 固定配置不需要修改
-swagger_configure = {"title": "DMapManager"}
 entry_data_thread = 3
-scan_module = ["app.modules"]  # API所在的模块
 SECRET_KEY = b'_5#y2L"F4Q8z\n\xec]/'
 # 权限
+PermissionActive = False
 UserPermission = ['admin']
 MonitorPermission = ['admin']
 DataPermission = ['admin', 'dataman']

@@ -10,8 +10,8 @@ import threading
 
 import time
 
-
-
+from osgeo import ogr
+from osgeo.ogr import *
 
 # session:Session = get_db_session("postgresql://postgres:chinadci@172.26.99.168:5432/postgres")
 # bbox="113.2470703125 22.840576171875,113.258056640625 22.8515625"
@@ -69,13 +69,41 @@ if __name__ == '__main__':
     #     print(zoo.connected)
     #     print(zoo.get_children("/rpc"))
 
-    if __name__ == '__main__':
-        import re
+    fn = "PG: user=postgres password=chinadci host=172.26.99.160 port=5432 dbname=ceshi "
+    driver = ogr.GetDriverByName("PostgreSQL")
+    if driver is None:
+        raise Exception("打开PostgreSQL驱动失败，可能是当前GDAL未支持PostgreSQL驱动！")
+    ds = driver.Open(fn, 1)
 
-        line = "广州市区"
-        pattern = r"的区"
-        matchObj = re.search(pattern, line)
-        if matchObj:
-            print("y")
-        else:
-            print("n")
\ No newline at end of file
+    layer:Layer =  ds.GetLayerByName("shiyqzd_500_bdc")
+
+
+    driver2 = ogr.GetDriverByName("ESRI Shapefile")
+    data_source: DataSource = driver2.CreateDataSource("H://t3.shp")
+
+
+    fid = layer.GetFIDColumn()
+    pg_layer: Layer = data_source.CreateLayer("t", layer.GetSpatialRef(), layer.GetGeomType(),["ENCODING=GBK"])
+
+    #可能有问题,不支持binary
+    schema = [sche for sche in layer.schema if not sche.name.__eq__(fid)]
+
+    schema_chage = []
+    for sche in schema:
+        ss :FieldDefn = sche
+        if ss.GetType() == ogr.OFTBinary :
+            print(ss.name)
+            ss.SetType(ogr.OFTInteger)
+        schema_chage.append(ss)
+
+    pg_layer.CreateFields(schema_chage)
+
+
+    count =0
+    for feature in layer:
+        pg_layer.CreateFeature(feature)
+        count+=1
+        if count==1000:
+            break
+
+    data_source.Destroy()
\ No newline at end of file