支持禁用接口权限控制

@@ -3,7 +3,7 @@ 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
 from flask import request
-
+import configure
 # 认证装饰器
 # 认证装饰器
 
 
 
 
@@ -17,25 +17,28 @@ class auth_decorator(object):
         
         
         @wraps(func)
         @wraps(func)
         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:
-                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:
                 else:
-                    # 无permission，不校验
-                    return func(*args, **kwargs)
+                    abort(401)  # 无token，401
             else:
             else:
-                abort(401)  # 无token，401
+                return func(*args, **kwargs)
 
 
         @require_oauth(self.scope)
         @require_oauth(self.scope)
         def validate_token():
         def validate_token():

@@ -3,7 +3,7 @@ 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
 from flask import request
-
+import configure
 # 认证装饰器
 # 认证装饰器
 
 
 
 
@@ -14,16 +14,19 @@ class token_decorator(object):
     def __call__(self, func):
     def __call__(self, func):
         @wraps(func)
         @wraps(func)
         def wrapped_function(*args, **kwargs):
         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:
             else:
-                abort(401)  # 无token，401
+                return func(*args, **kwargs)
 
 
         @require_oauth(self.scope)
         @require_oauth(self.scope)
         def validate_token():
         def validate_token():

@@ -6,13 +6,12 @@ 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, generate_user_info
+from .oauth2 import authorization, generate_user_info,require_oauth
 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():
@@ -82,7 +81,7 @@ class DataManager(BlueprintApi):
 
 
     @staticmethod
     @staticmethod
     @bp.route("/userinfo")
     @bp.route("/userinfo")
-    @token_decorator("profile")
+    @require_oauth("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))

@@ -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
@@ -23,6 +23,7 @@ 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]/'
 # 权限
 # 权限
+PermissionActive = False
 UserPermission = ['admin']
 UserPermission = ['admin']
 MonitorPermission = ['admin']
 MonitorPermission = ['admin']
 DataPermission = ['admin', 'dataman']
 DataPermission = ['admin', 'dataman']