Merge branch 'wsc' into 'master'

修改行业分析数据接口

See merge request root/tfse_admin!19

Manage/industry/industry_routes.py

@@ -1,11 +1,28 @@
 from flask import Blueprint, request
 
+from user.user_utils import verify_token, authority_scope
 from Manage.industry.industry_obj import PrimaryIndustry
 
 industry_route = Blueprint('/manage/industry', __name__)
 
 
-@industry_route.route('/create_primary_industry', methods=['POST'])
+@industry_route.route('/search')
+@verify_token
+@authority_scope(['admin', 'developer', 'analysts', 'operator '])
+def search_route(**kwargs):
+    pass
+
+
+@industry_route.route('/get_primary_industry_data')
+@verify_token
+@authority_scope(['admin', 'developer', 'analysts', 'operator '])
+def get_primary_industry_data_route(**kwargs):
+    pass
+
+
+@industry_route.route('/save_primary_industry_data', methods=['POST'])
+@verify_token
+@authority_scope(['admin', 'developer', 'analysts', 'operator '])
 def create_primary_industry_routes(**kwargs):
 
     body = request.json

user/user_utils.py

@@ -124,13 +124,13 @@ def verify_token(func):
             uid = records[0]['UID']
 
         except TypeError:
-            return {"info": "验证参数错误"}, 401
+            return {"info": "缺少token"}, 401
         except KeyError:
-            return {"info": "验证参数错误"}, 401
+            return {"info": "异常token"}, 401
         except BadSignature:
-            return {"info": "token错误"}, 401
+            return {"info": "错误token"}, 401
         except SignatureExpired:
-            return {"info": "token过期"}, 401
+            return {"info": "过期token"}, 401
         return func(*args, **kwargs, uid=uid)
     return internal