调整提示信息

@@ -2,18 +2,25 @@ from functools import wraps
 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 app.modules.auth.oauth2 import require_oauth
 from app.modules.auth.oauth2 import require_oauth
+from flask import request
 
 
 # 认证装饰器
 # 认证装饰器
 
 
+
 class auth_decorator(object):
 class auth_decorator(object):
-    def __init__(self, action='', permission=''):
+    def __init__(self, action='', permission='', scope='profile'):
         self.permission = permission
         self.permission = permission
         self.action = action
         self.action = action
+        self.scope = scope
 
 
     def __call__(self, func):
     def __call__(self, func):
+        
         @wraps(func)
         @wraps(func)
-        @require_oauth("profile")
         def wrapped_function(*args, **kwargs):
         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:
             if current_token and current_token.user and current_token.user.role:
                 print(func.__name__)
                 print(func.__name__)
                 if self.permission and len(self.permission) > 0:
                 if self.permission and len(self.permission) > 0:
@@ -28,6 +35,10 @@ class auth_decorator(object):
                     # 无permission，不校验
                     # 无permission，不校验
                     return func(*args, **kwargs)
                     return func(*args, **kwargs)
             else:
             else:
-                pass  # 无token，401
+                abort(401)  # 无token，401
+
+        @require_oauth(self.scope)
+        def validate_token():
+            pass
 
 
         return wrapped_function
         return wrapped_function

+from functools import wraps
+from authlib.integrations.flask_oauth2 import current_token
+from flask import abort
+from app.modules.auth.oauth2 import require_oauth
+from flask import request
+
+# 认证装饰器
+
+
+class token_decorator(object):
+    def __init__(self, scope='profile'):
+        self.scope = scope
+
+    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)
+
+            else:
+                abort(401)  # 无token，401
+
+        @require_oauth(self.scope)
+        def validate_token():
+            pass
+
+        return wrapped_function

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

@@ -11,7 +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 app.modules.auth.oauth2 import require_oauth
+from app.decorators.token_decorator import token_decorator
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -39,7 +39,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Delete', methods=['POST'])
     @bp.route('/Delete', methods=['POST'])
     @swag_from(task_delete.Api.api_doc)
     @swag_from(task_delete.Api.api_doc)
-    @require_oauth("profile")
+    @token_decorator("profile")
     def task_delete():
     def task_delete():
         """
         """
         删除任务
         删除任务
@@ -49,7 +49,7 @@ class DataManager(BlueprintApi):
     @staticmethod
     @staticmethod
     @bp.route('/Kill', methods=['POST'])
     @bp.route('/Kill', methods=['POST'])
     @swag_from(task_kill.Api.api_doc)
     @swag_from(task_kill.Api.api_doc)
-    @require_oauth("profile")
+    @token_decorator("profile")
     def task_kill():
     def task_kill():
         """
         """
         Kill任务
         Kill任务

@@ -16,7 +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
+from app.decorators.token_decorator import token_decorator
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -28,7 +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")
+    @token_decorator("profile")
     def api_service_register():
     def api_service_register():
         """
         """
         服务注册
         服务注册
@@ -47,7 +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")
+    @token_decorator("profile")
     def api_service_state():
     def api_service_state():
         """
         """
         修改服务状态
         修改服务状态
@@ -85,7 +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")
+    @token_decorator("profile")
     def api_service_edit():
     def api_service_edit():
         """
         """
         服务Edit
         服务Edit
@@ -97,7 +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")
+    @token_decorator("profile")
     def api_service_delete():
     def api_service_delete():
         """
         """
         服务删除
         服务删除

@@ -7,7 +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
+from app.decorators.token_decorator import token_decorator
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
@@ -18,7 +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")
+    @token_decorator("profile")
     def api_image_build_pyramid():
     def api_image_build_pyramid():
         """
         """
         创建影像金字塔
         创建影像金字塔
@@ -28,7 +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")
+    @token_decorator("profile")
     def api_image_service_register():
     def api_image_service_register():
         """
         """
         注册ImageService
         注册ImageService
@@ -38,7 +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")
+    @token_decorator("profile")
     def api_image_service_edit():
     def api_image_service_edit():
         """
         """
         修改ImageService
         修改ImageService
@@ -48,7 +48,7 @@ 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")
+    @token_decorator("profile")
     def api_image_service_delete():
     def api_image_service_delete():
         """
         """
         ImageService Delete
         ImageService Delete

@@ -7,7 +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 map_service_register, map_service_edit
 from . import map_service_register, map_service_edit
-from app.modules.auth.oauth2 import require_oauth
+from app.decorators.token_decorator import token_decorator
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -19,7 +19,7 @@ class DataManager(BlueprintApi):
     @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")
+    @token_decorator("profile")
     def api_wms_register():
     def api_wms_register():
         """
         """
         注册MapService
         注册MapService
@@ -29,7 +29,7 @@ class DataManager(BlueprintApi):
     @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")
+    @token_decorator("profile")
     def api_wms_edit():
     def api_wms_edit():
         """
         """
         修改MapService
         修改MapService

@@ -14,7 +14,7 @@ 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
+from app.decorators.token_decorator import token_decorator
 
 
 
 
 class SchemeManager(BlueprintApi):
 class SchemeManager(BlueprintApi):
@@ -25,7 +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")
+    @token_decorator("profile")
     def api_scheme_create():
     def api_scheme_create():
         """
         """
         创建切片方案
         创建切片方案
@@ -36,7 +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")
+    @token_decorator("profile")
     def api_scheme_delete():
     def api_scheme_delete():
         """
         """
          删除切片方案
          删除切片方案
@@ -46,7 +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")
+    @token_decorator("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
+from app.decorators.token_decorator import token_decorator
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -30,7 +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")
+    @token_decorator("profile")
     def api_wmts_register():
     def api_wmts_register():
         """
         """
         注册TileService
         注册TileService
@@ -40,7 +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")
+    @token_decorator("profile")
     def api_wmts_edit():
     def api_wmts_edit():
         """
         """
         修改TileService
         修改TileService

@@ -4,8 +4,8 @@ import logging
 deploy_ip_host = "172.26.40.105:8840"
 deploy_ip_host = "172.26.40.105:8840"
 # 系统数据库
 # 系统数据库
 
 
-SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager_test"
-# SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@localhost:5433/dmap_dms_test"
+# SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager_test"
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@localhost:5433/dmap_dms_test"
 
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 #VACUATE_DB_URI = None
 #VACUATE_DB_URI = None