Merge remote-tracking branch 'origin/app' into app

app/api/app.py

@@ -11,7 +11,9 @@ from flask import Flask
 from flask_restful import Api
 from app.router.version1 import add_route
 from app.api.engine import template_folder
+from flask_cors import *
 
 app = Flask(__name__, template_folder=template_folder)
+CORS(app, supports_credentials=True)
 api = Api(app)
 add_route(api)

app/controller/report.py

@@ -54,12 +54,16 @@ class ReportHandlers(Resource):
             )
             tamp_diagnose_app_session.execute(sql)
         start = time.time()
+        check = 0
         try:
             dt = DataIntegrate(ifa_id=ifa_id, customer_id=customer_id, pdf_name=pdf_name)
             dt.render_data()
+            check = 1
         except:
-            return {"code":-1, "msg": "内部错误"}
+            pass
         print('耗时{}秒'.format(round(time.time() - start, 2)))
+        if check == 0:
+            return {"code":-1, "msg": "内部错误"}
 
         # auth = oss2.Auth(config[env]['oss']['account'], config[env]['oss']['password'])
         # # Endpoint以杭州为例，其它Region请按实际情况填写。