修复

app/controller/errorhandler.py

@@ -57,7 +57,10 @@ def add_errorhandler(app):
         # token = 'eyJhbHQiOiJIUzI1NiIsImFsZyI6IkhTMjU2IiwidHlwIjoiSldUIn0.eyJwYXlsb2FkIjoidGFtcC8xOTM3NzkzMDc5NzY5NDE1NjgiLCJpc3MiOiJjYWl4aWFvcXVhbiIsImlhdCI6MTYwNjI5MDYzMH0.WnADEiWd27A8wr2DmOyX1kcs0dWLxpoO-k1yiF0qbBk'
         url = config[env]['token_auth_url']
         start = time.time()
-        res = requests.get(url, {'tampToken': token})
+        requests.adapters.DEFAULT_RETRIES = 5  # 增加重连次数
+        s = requests.session()
+        s.keep_alive = False
+        res = s.get(url+'?tampToken='+token)
         print('token鉴权时间', time.time() - start)
         resp = res.json()
         if resp['statusCode'] != "0000":

app/controller/order.py

@@ -14,6 +14,7 @@ from app.api import app
 from app.controller.errorhandler import CustomFlaskErr
 from app.config.errors import Errors
 from app.service import order_service
+from app.api.engine import logging
 
 
 class TopUpOrder(Resource):
@@ -204,7 +205,10 @@ class AllOrders(Resource):
         self.parser.add_argument('pageSize', type=int, required=True)
         args = self.parser.parse_args()
         args['user_id'] = request.user_id
+        try:
             data = order_service.getAllOrders(args)
+        except Exception as e:
+            logging.error(e)
         resp = request.return_success
         resp['attributes'] = data
         return resp

app/service/order_service.py

@@ -44,6 +44,8 @@ class TopUpOrderService:
             keys = set(r.keys()) - allowed
             for key in keys:
                 del r[key]
+        tamp_user_session.commit()
+        tamp_user_session.close()
         return {
             'content': res,
             'pageNum': pageNumber,
@@ -104,7 +106,9 @@ class TopUpOrderService:
         order_info = OrderFlow(**args)
         tamp_user_session.add(order_info)
         tamp_user_session.commit()
+        tamp_user_session.close()
         tamp_pay_session.commit()
+        tamp_pay_session.close()
         return pay_params
 
 
@@ -143,6 +147,8 @@ class CurriculumOrderService:
             keys = set(r.keys()) - allowed
             for key in keys:
                 del r[key]
+        tamp_user_session.commit()
+        tamp_user_session.close()
         return {
             'content': temp_orders,
             'pageNum': pageNumber,
@@ -209,7 +215,9 @@ class CurriculumOrderService:
         order_info = OrderFlow(**args)
         tamp_user_session.add(order_info)
         tamp_pay_session.commit()
+        tamp_pay_session.close()
         tamp_user_session.commit()
+        tamp_user_session.close()
         return pay_params
 
 
@@ -234,7 +242,9 @@ def topUpSuccessAction(order_no):
             'apple_balance': AccountBalance.android_balance + account_topup_order.amount
         })
     tamp_user_session.commit()
+    tamp_user_session.close()
     tamp_pay_session.commit()
+    tamp_pay_session.close()
 
 
 
@@ -250,11 +260,14 @@ def consumeSucessAction(order_no):
         'complete_time': datetime.datetime.now()
     })
     tamp_user_session.commit()
+    tamp_user_session.close()
 
 
 def getAccountBalance(user_id):
     """查询探普币余额"""
     account_balance = tamp_pay_session.query(AccountBalance).filter(AccountBalance.user_id == user_id).first()
+    tamp_pay_session.commit()
+    tamp_pay_session.close()
     if not account_balance:
         return {'user_id': user_id, 'android_balance': 0, 'apple_balance': 0}
     else:
@@ -310,13 +323,14 @@ def getAllOrders(args):
     pageSize = args['pageSize']
     user_id = args['user_id']
     offset = (pageNumber - 1) * pageSize
-    totalSize = len(tamp_user_session.query(OrderFlow.id).filter(
-        and_(OrderFlow.createby == user_id, OrderFlow.ab_type == '6', OrderFlow.ab_status == 'SUCCESS')).all())
+    if not user_id:
+        raise CustomFlaskErr(Errors.TOKEN_INVALID)
+    totalSize = len(tamp_user_session.query(OrderFlow.id).filter(and_(OrderFlow.createby == user_id, OrderFlow.ab_type == '6', OrderFlow.ab_status == 'SUCCESS')).all())
     res = tamp_user_session.query(OrderFlow).filter(OrderFlow.createby == user_id).order_by(
         OrderFlow.createtime.desc()).all()
     topup_res = [r.to_dict() for r in res]
     allowed = {'id', 'ab_ordernum', 'transaction_serial_no', 'ab_payment', 'ab_pay_mode', 'createtime', 'pay_time',
-               'complete_time', 'order_status'}
+               'complete_time', 'order_status', 'ab_type'}
     for r in topup_res:
         keys = set(r.keys()) - allowed
         for key in keys:
@@ -351,6 +365,10 @@ def getAllOrders(args):
             del r[key]
     orders = [*topup_res, *temp_orders]
     totalSize = len(orders)
+    tamp_user_session.commit()
+    tamp_user_session.close()
+    tamp_pay_session.commit()
+    tamp_pay_session.close()
     return {
         'content': orders[offset: offset+pageSize],
         'pageNum': pageNumber,