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

app/api/engine.py

@@ -17,7 +17,7 @@ from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, scoped_session
 from sqlalchemy.pool import NullPool
 
-env = sys.argv[-1] if sys.argv[-1] in ["dev", "test", "prod"] else "test"
+env = sys.argv[-1] if sys.argv[-1] in ["dev", "test", "prod"] else "prod"
 work_dir = os.getcwd()
 CFG_FILEPATH = work_dir + '/app/config/config.yaml'
 
@@ -95,10 +95,10 @@ redis = redis.StrictRedis(
     password=config[env]['redis']['password']
 )
 
-redis_host=config[env]['redis']['host'],
-redis_port=config[env]['redis']['port'],
-redis_db=config[env]['redis']['db'],
-redis_password=config[env]['redis']['password']
+redis_host=config[env]['celery']['host'],
+redis_port=config[env]['celery']['port'],
+redis_db=config[env]['celery']['db'],
+redis_password=config[env]['celery']['password']
 
 logging.basicConfig(level=logging.INFO,
                     filename=work_dir + config[env]['log']['filename'],

app/celery.py

@@ -11,7 +11,7 @@ from app.utils.jinjia2html_v2 import DataIntegrate
 
 celery_app = Celery(__name__)
 
-celery_conf = "redis://:{}@{}:{}/{}".format(redis_password,redis_host[0],redis_port[0],"1")
+celery_conf = "redis://:{}@{}:{}/{}".format(redis_password,redis_host[0],redis_port[0],"3")
 celery_app.conf.update({"broker_url": celery_conf, "result_backend": celery_conf})
 
 

app/config/config.yaml

@@ -69,6 +69,12 @@ prod:
       port: 6379
       db: 0
       password: '@imeng123'
+  celery:
+      host: 118.190.63.109
+      port: 56379
+      db: 0
+      password: 'qimeng123'
+
   oss:
     imgs_url_prefix: https://tamper.tanpuyun.com/hangjiapc/report/productionenv/ReportTempImg/
     pdf_url_prefix: https://tamper.tanpuyun.com/hangjiapc/report/productionenv/AppHoldReport/