service模块权限控制，删除装饰器非必要import

 from functools import wraps
 from functools import wraps
-from re import I
 from authlib.integrations.flask_oauth2 import current_token
 from authlib.integrations.flask_oauth2 import current_token
 from flask import abort
 from flask import abort
-from sqlalchemy.sql.elements import Null
-from sqlalchemy.sql.functions import mode
-from app.util.component.ParameterUtil import ParameterUtil
-from app.models import db
 from app.modules.auth.oauth2 import require_oauth
 from app.modules.auth.oauth2 import require_oauth
 
 
 # 认证装饰器
 # 认证装饰器

@@ -16,6 +16,7 @@ from . import service_info
 from . import service_edit
 from . import service_edit
 import os
 import os
 from flask import send_from_directory
 from flask import send_from_directory
+from app.modules.auth.oauth2 import require_oauth
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -27,6 +28,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
     @swag_from(service_register.Api.api_doc)
     @swag_from(service_register.Api.api_doc)
+    @require_oauth("profile")
     def api_service_register():
     def api_service_register():
         """
         """
         服务注册
         服务注册
@@ -45,6 +47,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/State', methods=['POST'])
     @bp.route('/State', methods=['POST'])
     @swag_from(service_state.Api.api_doc)
     @swag_from(service_state.Api.api_doc)
+    @require_oauth("profile")
     def api_service_state():
     def api_service_state():
         """
         """
         修改服务状态
         修改服务状态
@@ -82,6 +85,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
     @swag_from(service_edit.Api.api_doc)
     @swag_from(service_edit.Api.api_doc)
+    @require_oauth("profile")
     def api_service_edit():
     def api_service_edit():
         """
         """
         服务Edit
         服务Edit
@@ -93,6 +97,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Delete', methods=['POST'])
     @bp.route('/Delete', methods=['POST'])
     @swag_from(service_delete.Api.api_doc)
     @swag_from(service_delete.Api.api_doc)
+    @require_oauth("profile")
     def api_service_delete():
     def api_service_delete():
         """
         """
         服务删除
         服务删除

@@ -12,6 +12,8 @@ from . import service_engine_delete
 from . import service_engine_edit
 from . import service_engine_edit
 from . import service_engine_list
 from . import service_engine_list
 from . import service_engine_info
 from . import service_engine_info
+import configure
+from app.decorators.auth_decorator import auth_decorator
 
 
 class EngineManager(BlueprintApi):
 class EngineManager(BlueprintApi):
 
 
@@ -19,6 +21,7 @@ class EngineManager(BlueprintApi):
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
+    @auth_decorator(configure.MonitorPermission)
     @swag_from(service_engine_register.Api.api_doc)
     @swag_from(service_engine_register.Api.api_doc)
     def service_engine_register():
     def service_engine_register():
         """
         """
@@ -46,6 +49,7 @@ class EngineManager(BlueprintApi):
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
+    @auth_decorator(configure.MonitorPermission)
     @swag_from(service_engine_edit.Api.api_doc)
     @swag_from(service_engine_edit.Api.api_doc)
     def service_engine_edit():
     def service_engine_edit():
         """
         """
@@ -57,6 +61,7 @@ class EngineManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Delete', methods=['POST'])
     @bp.route('/Delete', methods=['POST'])
     @swag_from(service_engine_delete.Api.api_doc)
     @swag_from(service_engine_delete.Api.api_doc)
+    @auth_decorator(configure.MonitorPermission)
     def service_engine_delete():
     def service_engine_delete():
         """
         """
         Engine Delete
         Engine Delete

@@ -7,6 +7,7 @@ from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
 from . import image_service_delete,image_service_register,image_service_edit,image_build_pyramid
 from . import image_service_delete,image_service_register,image_service_edit,image_build_pyramid
+from app.modules.auth.oauth2 import require_oauth
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
@@ -17,6 +18,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/BuildPyramid', methods=['POST'])
     @bp.route('/BuildPyramid', methods=['POST'])
     @swag_from(image_build_pyramid.Api.api_doc)
     @swag_from(image_build_pyramid.Api.api_doc)
+    @require_oauth("profile")
     def api_image_build_pyramid():
     def api_image_build_pyramid():
         """
         """
         创建影像金字塔
         创建影像金字塔
@@ -26,6 +28,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
     @swag_from(image_service_register.Api.api_doc)
     @swag_from(image_service_register.Api.api_doc)
+    @require_oauth("profile")
     def api_image_service_register():
     def api_image_service_register():
         """
         """
         注册ImageService
         注册ImageService
@@ -35,6 +38,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
     @swag_from(image_service_edit.Api.api_doc)
     @swag_from(image_service_edit.Api.api_doc)
+    @require_oauth("profile")
     def api_image_service_edit():
     def api_image_service_edit():
         """
         """
         修改ImageService
         修改ImageService
@@ -44,8 +48,9 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Delete', methods=['POST'])
     @bp.route('/Delete', methods=['POST'])
     @swag_from(image_service_delete.Api.api_doc)
     @swag_from(image_service_delete.Api.api_doc)
+    @require_oauth("profile")
     def api_image_service_delete():
     def api_image_service_delete():
         """
         """
         ImageService Delete
         ImageService Delete
         """
         """
-        return image_service_delete.Api().result
+        return image_service_delete.Api().result

 # coding=utf-8
 # coding=utf-8
-#author:        4N
+# author:        4N
 #createtime:    2021/9/14
 #createtime:    2021/9/14
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from flasgger import swag_from
 from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
-from . import map_service_register,map_service_edit
+from . import map_service_register, map_service_edit
+from app.modules.auth.oauth2 import require_oauth
+
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
-    bp = Blueprint("MapService", __name__, url_prefix="/API/Service/MapService")
+    bp = Blueprint("MapService", __name__,
+                   url_prefix="/API/Service/MapService")
     service_type = ["地图服务"]
     service_type = ["地图服务"]
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
     @swag_from(map_service_register.Api.api_doc)
     @swag_from(map_service_register.Api.api_doc)
+    @require_oauth("profile")
     def api_wms_register():
     def api_wms_register():
         """
         """
         注册MapService
         注册MapService
         """
         """
         return map_service_register.Api().result
         return map_service_register.Api().result
 
 
-
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
     @swag_from(map_service_edit.Api.api_doc)
     @swag_from(map_service_edit.Api.api_doc)
+    @require_oauth("profile")
     def api_wms_edit():
     def api_wms_edit():
         """
         """
         修改MapService
         修改MapService
         """
         """
-        return map_service_edit.Api().result
+        return map_service_edit.Api().result

@@ -14,6 +14,8 @@ from . import scheme_edit
 from . import scheme_list
 from . import scheme_list
 from . import scheme_resolve
 from . import scheme_resolve
 from . import scheme_info
 from . import scheme_info
+from app.modules.auth.oauth2 import require_oauth
+
 
 
 class SchemeManager(BlueprintApi):
 class SchemeManager(BlueprintApi):
 
 
@@ -23,6 +25,7 @@ class SchemeManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Create', methods=['POST'])
     @bp.route('/Create', methods=['POST'])
     @swag_from(scheme_create.Api.api_doc)
     @swag_from(scheme_create.Api.api_doc)
+    @require_oauth("profile")
     def api_scheme_create():
     def api_scheme_create():
         """
         """
         创建切片方案
         创建切片方案
@@ -33,6 +36,7 @@ class SchemeManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Delete', methods=['POST'])
     @bp.route('/Delete', methods=['POST'])
     @swag_from(scheme_delete.Api.api_doc)
     @swag_from(scheme_delete.Api.api_doc)
+    @require_oauth("profile")
     def api_scheme_delete():
     def api_scheme_delete():
         """
         """
          删除切片方案
          删除切片方案
@@ -42,6 +46,7 @@ class SchemeManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
     @swag_from(scheme_edit.Api.api_doc)
     @swag_from(scheme_edit.Api.api_doc)
+    @require_oauth("profile")
     def api_scheme_edit():
     def api_scheme_edit():
         """
         """
          修改切片方案
          修改切片方案

@@ -8,7 +8,7 @@ from flasgger import swag_from
 from flask import Blueprint
 from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
 from . import upload_oview,tile_service_register,tile_service_edit,tile_service_reload
 from . import upload_oview,tile_service_register,tile_service_edit,tile_service_reload
-
+from app.modules.auth.oauth2 import require_oauth
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -30,6 +30,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Register', methods=['POST'])
     @bp.route('/Register', methods=['POST'])
     @swag_from(tile_service_register.Api.api_doc)
     @swag_from(tile_service_register.Api.api_doc)
+    @require_oauth("profile")
     def api_wmts_register():
     def api_wmts_register():
         """
         """
         注册TileService
         注册TileService
@@ -39,6 +40,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Edit', methods=['POST'])
     @bp.route('/Edit', methods=['POST'])
     @swag_from(tile_service_edit.Api.api_doc)
     @swag_from(tile_service_edit.Api.api_doc)
+    @require_oauth("profile")
     def api_wmts_edit():
     def api_wmts_edit():
         """
         """
         修改TileService
         修改TileService

@@ -13,7 +13,7 @@ VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 
 zookeeper = "172.26.99.168:2181"
 zookeeper = "172.26.99.168:2181"
 
 
-#WMTS服务器
+# WMTS服务器
 wmts_url = "http://172.26.99.160:6060"
 wmts_url = "http://172.26.99.160:6060"
 wms_url = ""
 wms_url = ""
 
 
@@ -22,10 +22,11 @@ swagger_configure = {"title": "DMapManager"}
 entry_data_thread = 3
 entry_data_thread = 3
 scan_module = ["app.modules"]  # API所在的模块
 scan_module = ["app.modules"]  # API所在的模块
 SECRET_KEY = b'_5#y2L"F4Q8z\n\xec]/'
 SECRET_KEY = b'_5#y2L"F4Q8z\n\xec]/'
+# 权限
 UserPermission = ['admin']
 UserPermission = ['admin']
 MonitorPermission = ['admin']
 MonitorPermission = ['admin']
 DataPermission = ['admin', 'dataman']
 DataPermission = ['admin', 'dataman']
 PublishPermission = ['admin', 'dataman', 'publisher']
 PublishPermission = ['admin', 'dataman', 'publisher']
+ServicePermission = ['admin', 'dataman', 'publisher']
 
 
 log_level = logging.INFO
 log_level = logging.INFO
-