lesscode-flask 0.1.91__tar.gz → 0.1.93__tar.gz

{lesscode-flask-0.1.91 → lesscode-flask-0.1.93}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.91
+Version: 0.1.93
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

{lesscode-flask-0.1.91 → lesscode-flask-0.1.93}/lesscode_flask/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.91'
+__version__ = '0.1.93'
 
 import functools
 import logging

{lesscode-flask-0.1.91 → lesscode-flask-0.1.93}/lesscode_flask/setup/__init__.py

@@ -11,6 +11,7 @@ from lesscode_flask import download_func_dict, SQ_Blueprint
 from lesscode_flask.db import db
 from lesscode_flask.export_data.data_download_handler import format_to_table_download, upload_result_url
 from lesscode_flask.log.access_log_handler import AccessLogHandler
+from lesscode_flask.model.response_result import ResponseResult
 from lesscode_flask.model.user import User
 from lesscode_flask.utils.file.file_utils import check_or_create_dir
 from lesscode_flask.utils.helpers import app_config
@@ -478,14 +479,14 @@ def setup_common_resource(app):
 
     auth_menu_routes = SQ_Blueprint("菜单管理", url_prefix=f'{app.config.get("ROUTE_PREFIX", "")}/authMenu')
 
-    def capacity_post(path, data=None, headers=None):
+    def capacity_post(path, data=None, headers=None, result_type="json", pack=False, **kwargs):
         res = sync_post(path=path, data=data, base_url=app_config.get("CAPACITY_SERVER"),
-                        headers=headers)
+                        headers=headers, result_type=result_type, pack=pack, **kwargs)
         return res
 
-    def capacity_get(path, params=None, result_type="json", headers=None):
+    def capacity_get(path, params=None, result_type="json", headers=None, pack=False, **kwargs):
         res = sync_get(path=path, params=params, base_url=app_config.get("CAPACITY_SERVER"),
-                       headers=headers, result_type=result_type)
+                       headers=headers, result_type=result_type, pack=pack, **kwargs)
         return res
 
     @routes.get_route("获取图形验证码", '/captcha')
@@ -574,9 +575,12 @@ def setup_common_resource(app):
             "js_code": js_code,
             "client_id": client_id,
             "app_id": app_id,
-        })
-
-        return result
+        }, pack=True)
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @routes.get_route("微信mini的code2session", )
     def wx_mini_code2session_v2(js_code, service_id: str):
@@ -591,8 +595,12 @@ def setup_common_resource(app):
         result = capacity_post("/third_service_user/wx_mini_code2session_v2", headers=headers, data={
             "js_code": js_code,
             "service_id": service_id
-        })
-        return result
+        }, pack=True)
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @routes.post_route("微信mini的用户信息解密")
     def wx_mini_userinfo_decrypt(app_id, session_key, iv, encrypted_data):
@@ -610,27 +618,43 @@ def setup_common_resource(app):
             "session_key": session_key,
             "iv": iv,
             "encrypted_data": encrypted_data,
-        })
-        return result
+        },
+                               pack=True)
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @routes.post_route("通过auth_code获取专有钉钉用户信息")
     def get_proper_ding_user_info_by_auth_code(client_id, app_id, auth_code):
         headers = {key: value for key, value in request.headers if key.lower() in ["authorization"]}
-        result = capacity_post("/third_service_user/get_proper_ding_user_info_by_auth_code", headers=headers, data={
-            "client_id": client_id,
-            "app_id": app_id,
-            "auth_code": auth_code,
-        })
-        return result
+        result = capacity_post("/third_service_user/get_proper_ding_user_info_by_auth_code", headers=headers,
+                               data={
+                                   "client_id": client_id,
+                                   "app_id": app_id,
+                                   "auth_code": auth_code,
+                               }, pack=True)
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @routes.post_route("通过临时授权码code获取专有钉钉用户信息")
     def get_proper_ding_user_info_by_code(client_id, app_id, code):
         headers = {key: value for key, value in request.headers if key.lower() != 'host'}
-        result = capacity_post("/third_service_user/get_proper_ding_user_info_by_code", headers=headers, data={
-            "client_id": client_id,
-            "app_id": app_id,
-            "code": code,
-        })
+        result = capacity_post("/third_service_user/get_proper_ding_user_info_by_code", headers=headers,
+                               data={
+                                   "client_id": client_id,
+                                   "app_id": app_id,
+                                   "code": code,
+                               }, pack=True)
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
         return result
 
     @routes.post_route('微信扫码获取微信用户信息', '/get_wx_user_info_by_code')
@@ -646,9 +670,13 @@ def setup_common_resource(app):
         result = capacity_post("/third_service_user/get_wx_user_info_by_code", headers=headers, data={
             "code": code,
             "state": state,
-        })
+        }, pack=True)
 
-        return result
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @routes.post_route('绑定三方信息', '/bind_by_third_user_info')
     def bind_by_third_user_info(user_id: str, service_id: str, open_id: str = None, union_id: str = None,
@@ -672,9 +700,13 @@ def setup_common_resource(app):
             "union_id": union_id,
             "password": password,
             "third_user_info": third_user_info
-        })
+        }, pack=True)
 
-        return result
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @routes.post_route('解绑三方信息', '/unbind')
     def unbind(user_id: str, service_type: str, open_id: str = None, union_id: str = None, ):
@@ -693,9 +725,13 @@ def setup_common_resource(app):
             "user_id": user_id,
             "open_id": open_id,
             "union_id": union_id,
-        })
+        }, pack=True)
 
-        return result
+        if result.get("status") == "00000":
+            return result.get("data")
+        else:
+            ResponseResult.fail(data=result.get("data"), message=f'{result.get("message", "未知错误")}',
+                                status_code=result.get("status"))
 
     @auth_menu_routes.post_route('查询用户菜单', '/get_menu')
     def get_menu():

{lesscode-flask-0.1.91 → lesscode-flask-0.1.93}/lesscode_flask.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lesscode-flask
-Version: 0.1.91
+Version: 0.1.93
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy