upgrade celery

cmdb-api/api/app.py

@@ -129,7 +129,7 @@ def register_extensions(app):
     rd.init_app(app)
     if app.config.get('USE_ES'):
         es.init_app(app)
-    celery.conf.update(app.config)
+    celery.conf.update(app.config.get('CELERY'))
 
 
 def register_blueprints(app):

cmdb-api/api/lib/perm/auth.py

@@ -7,10 +7,8 @@ from functools import wraps
 import jwt
 from flask import abort
 from flask import current_app
-from flask import g
 from flask import request
 from flask import session
-from flask_login import current_user
 from flask_login import login_user
 
 from api.lib.perm.acl.acl import ACLManager
@@ -65,12 +63,10 @@ def _auth_with_key():
 
 
 def _auth_with_session():
-    if isinstance(getattr(g, 'user', None), User):
-        login_user(current_user)
-        return True
     if "acl" in session and "userName" in (session["acl"] or {}):
         login_user(UserCache.get(session["acl"]["userName"]))
         return True
+
     return False
 
 
@@ -158,9 +154,12 @@ def _auth_with_acl_token():
 
 
 def auth_required(func):
-    if request.json is not None:
-        setattr(request, 'values', request.json)
-    else:
+    try:
+        if request.json is not None:
+            setattr(request, 'values', request.json)
+        else:
+            setattr(request, 'values', request.values.to_dict())
+    except:
         setattr(request, 'values', request.values.to_dict())
 
     @wraps(func)