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

app/api/engine.py

@@ -20,10 +20,10 @@ env = sys.argv[-1]
 work_dir = os.getcwd()
 CFG_FILEPATH = work_dir + '/app/config/config.yaml'
 template_folder = work_dir+'/app/templates'
-pdf_folder = work_dir+'/app/pdf/'
 
-config = yaml.load(open(CFG_FILEPATH, 'r'), Loader=yaml.FullLoader)
 
+config = yaml.load(open(CFG_FILEPATH, 'r'), Loader=yaml.FullLoader)
+pdf_folder = os.path.join(work_dir,"app/pdf",config[env]['PDF']['pdf_folder'])
 
 tamp_product_engine = create_engine(
     'mysql+mysqldb://{user}:{password}@{host}:{port}/{db}?charset={charset}'.format(
@@ -99,7 +99,8 @@ tamp_diagnose_app_engine = create_engine(
 redis = redis.StrictRedis(
     host=config[env]['redis']['host'],
     port=config[env]['redis']['port'],
-    db=config[env]['redis']['db']
+    db=config[env]['redis']['db'],
+    password=config[env]['redis']['password']
 )
 
 # logging.basicConfig(level=logging.INFO,

app/controller/report.py

@@ -38,7 +38,10 @@ class ReportHandlers(Resource):
         ifa_id = redis.get(token).decode()
         if not ifa_id:
             return {"code":40005,"data":None,"lang":"zh_CN","msg":"请登陆"}
-        ifa_id = ifa_id.replace('\'', '')
+        if '\''in  ifa_id:
+            ifa_id = ifa_id.replace('\'', '')
+        if '\"'in  ifa_id:
+            ifa_id = ifa_id.replace('\"', '')
         customer_id = args['customer_id']
         pdf_name = str(ifa_id) + str(customer_id) + '.pdf'
 
@@ -64,7 +67,7 @@ class ReportHandlers(Resource):
         bucket = oss2.Bucket(auth, 'http://oss-cn-shanghai.aliyuncs.com', config[env]['oss']['env'])
 
         # 生成下载文件的签名URL，有效时间为60s。
-        path = bucket.sign_url('GET', config[env]['oss']['path'] + pdf_name, 60)
+        path = bucket.sign_url('GET', config[env]['oss']['path'] + pdf_name, config[env]['oss']['validtime'])
         with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
             tamp_diagnose_app_session = tamp_diagnose_app.session
             sql = "update hold_report set update_time='{}', update_status='{}', file='{}' where ifa_id='{}' and customer_id='{}'".format(