浏览代码

update config

Zhang Li 2 年之前
父节点
当前提交
816f88ec89
共有 6 个文件被更改,包括 37 次插入7 次删除
  1. 1 1
      Dockerfile
  2. 1 1
      app/crud/job_jdbc_datasource.py
  3. 11 5
      app/models/database.py
  4. 12 0
      configs/settings.py
  5. 6 0
      development.ini
  6. 6 0
      production.ini

+ 1 - 1
Dockerfile

@@ -71,7 +71,7 @@ startretries=0\n\
 redirect_stderr=true\n\
 stdout_logfile=/var/log/be.log\n\
 stdout_logfile_maxbytes=50MB\n\
-environment=PYTHONUNBUFFERED=1\n\
+environment=PYTHONUNBUFFERED=1,APP_ENV=production\n\
 " > /etc/supervisor/conf.d/be.conf
 
 ADD . ${WORKDIR}

+ 1 - 1
app/crud/job_jdbc_datasource.py

@@ -89,7 +89,7 @@ def update_job_jdbc_datasources(db: Session, ds_id: int, update_item: schemas.Jo
         setattr(db_item, k, v)
     db_item.jdbc_driver_class = ds.jdbc_driver_class
     db_item.update_time = int(time.time())
-    db_item.update_by = 'admin1'
+    db_item.update_by = 'admin1'  # TODO
     db.commit()
     db.flush()
     db.refresh(db_item)

+ 11 - 5
app/models/database.py

@@ -2,12 +2,15 @@
 from sqlalchemy import create_engine
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
+from configs.logging import logger
+from configs.settings import config
+
+USER = config.get('DATABASE', 'USER')
+PWD = config.get('DATABASE', 'pwd')
+DB_NAME = config.get('DATABASE', 'DB_NAME')
+HOST =  config.get('DATABASE', 'HOST')
+PORT = config.get('DATABASE', 'PORT')
 
-USER = 'root'
-PWD = 'happylay'
-DB_NAME = 'datax_web_dev'
-HOST = '192.168.199.107'
-PORT = '10086'
 
 SQLALCHEMY_DATABASE_URL = f'mysql+mysqlconnector://{USER}:{PWD}@{HOST}:{PORT}/{DB_NAME}?charset=utf8&auth_plugin=mysql_native_password'
 engine = create_engine(
@@ -16,6 +19,9 @@ engine = create_engine(
 
 SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
 
+logger.info("connect to mysql success: ")
+
+
 Base = declarative_base()
 
 class BaseModel(Base):

+ 12 - 0
configs/settings.py

@@ -0,0 +1,12 @@
+
+import configparser
+import os
+
+config = configparser.ConfigParser()
+
+if os.environ.get('APP_ENV') == 'development' or os.environ.get('APP_ENV', '') =='':
+    config.readfp(open('development.ini'))
+else:
+    config.readfp(open('production.ini'))
+
+print(config.get('DATABASE', 'host'))

+ 6 - 0
development.ini

@@ -0,0 +1,6 @@
+[DATABASE]
+user = root
+pwd = happylay
+db_name = datax_web_dev
+host = 192.168.199.107
+port = 10086

+ 6 - 0
production.ini

@@ -0,0 +1,6 @@
+[DATABASE]
+user = root
+pwd = happylay
+db_name = datax_web_dev
+host = 192.168.199.107
+port = 10086