From 55b50246199f8281b5b8ebfdcebc0caa52afebb6 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 15 Oct 2021 13:32:43 +0800 Subject: [PATCH] renamed example.env files and fixed typos in config --- myems-aggregation/README.md | 2 +- myems-aggregation/{.env.example => example.env} | 0 myems-api/README.md | 2 +- myems-api/{.env.example => example.env} | 0 myems-cleaning/README.md | 2 +- myems-cleaning/{.env.example => example.env} | 0 myems-modbus-tcp/README.md | 2 +- myems-modbus-tcp/{.env.example => example.env} | 0 myems-normalization/README.md | 2 +- myems-normalization/config.py | 6 +++--- myems-normalization/{.env.example => example.env} | 0 11 files changed, 8 insertions(+), 8 deletions(-) rename myems-aggregation/{.env.example => example.env} (100%) rename myems-api/{.env.example => example.env} (100%) rename myems-cleaning/{.env.example => example.env} (100%) rename myems-modbus-tcp/{.env.example => example.env} (100%) rename myems-normalization/{.env.example => example.env} (100%) diff --git a/myems-aggregation/README.md b/myems-aggregation/README.md index 4a54a46d..2589b171 100644 --- a/myems-aggregation/README.md +++ b/myems-aggregation/README.md @@ -39,7 +39,7 @@ cp -R ~/myems/myems-aggregation /myems-aggregation ``` Create .env file based on .env.example and edit the .env file if needed: ```bash -cp /myems-aggregation/.env.example /myems-aggregation/.env +cp /myems-aggregation/example.env /myems-aggregation/.env nano /myems-aggregation/.env ``` Setup systemd service: diff --git a/myems-aggregation/.env.example b/myems-aggregation/example.env similarity index 100% rename from myems-aggregation/.env.example rename to myems-aggregation/example.env diff --git a/myems-api/README.md b/myems-api/README.md index 3e3be42b..2b059222 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -132,7 +132,7 @@ cp -R ~/myems/myems-api /myems-api ``` Create .env file based on .env.example and edit the .env file if needed: ```bash -cp /myems-api/.env.example /myems-api/.env +cp /myems-api/example.env /myems-api/.env nano /myems-api/.env ``` Change the listening port (default is 8000) in gunicorn.socket: diff --git a/myems-api/.env.example b/myems-api/example.env similarity index 100% rename from myems-api/.env.example rename to myems-api/example.env diff --git a/myems-cleaning/README.md b/myems-cleaning/README.md index 605628eb..dabbb212 100644 --- a/myems-cleaning/README.md +++ b/myems-cleaning/README.md @@ -43,7 +43,7 @@ cp -R ~/myems/myems-cleaning /myems-cleaning ``` Create .env file based on .env.example and edit the .env file if needed: ```bash -cp /myems-cleaning/.env.example /myems-cleaning/.env +cp /myems-cleaning/example.env /myems-cleaning/.env nano /myems-cleaning/.env ``` Setup systemd service: diff --git a/myems-cleaning/.env.example b/myems-cleaning/example.env similarity index 100% rename from myems-cleaning/.env.example rename to myems-cleaning/example.env diff --git a/myems-modbus-tcp/README.md b/myems-modbus-tcp/README.md index 1e0acc63..24be7527 100644 --- a/myems-modbus-tcp/README.md +++ b/myems-modbus-tcp/README.md @@ -62,7 +62,7 @@ cp -R ~/myems/myems-modbus-tcp /myems-modbus-tcp ``` Create .env file based on .env.example and edit the .env file if needed: ```bash -cp /myems-modbus-tcp/.env.example /myems-cleaning/.env +cp /myems-modbus-tcp/example.env /myems-cleaning/.env nano /myems-modbus-tcp/.env ``` Setup systemd service: diff --git a/myems-modbus-tcp/.env.example b/myems-modbus-tcp/example.env similarity index 100% rename from myems-modbus-tcp/.env.example rename to myems-modbus-tcp/example.env diff --git a/myems-normalization/README.md b/myems-normalization/README.md index ef2f4223..68f3d5dd 100644 --- a/myems-normalization/README.md +++ b/myems-normalization/README.md @@ -90,7 +90,7 @@ cp -r ~/myems/myems-normalization /myems-normalization ``` Create .env file based on .env.example and edit the .env file if needed: ```bash -cp /myems-normalization/.env.example /myems-cleaning/.env +cp /myems-normalization/example.env /myems-cleaning/.env nano /myems-normalization/.env ``` Setup systemd service: diff --git a/myems-normalization/config.py b/myems-normalization/config.py index b82709fa..d2b522e6 100644 --- a/myems-normalization/config.py +++ b/myems-normalization/config.py @@ -9,19 +9,19 @@ MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1') MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1') MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int) -MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_system_db') +MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db') MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root') MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1') MYEMS_ENERGY_DB_HOST = config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1') MYEMS_ENERGY_DB_PORT = config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int) -MYEMS_ENERGY_DB_DATABASE = config('MYEMS_ENERGY_DB_DATABASE', default='myems_system_db') +MYEMS_ENERGY_DB_DATABASE = config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db') MYEMS_ENERGY_DB_USER = config('MYEMS_ENERGY_DB_USER', default='root') MYEMS_ENERGY_DB_PASSWORD = config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1') MYEMS_BILLING_DB_HOST = config('MYEMS_BILLING_DB_HOST', default='127.0.0.1') MYEMS_BILLING_DB_PORT = config('MYEMS_BILLING_DB_PORT', default=3306, cast=int) -MYEMS_BILLING_DB_DATABASE = config('MYEMS_BILLING_DB_DATABASE', default='myems_system_db') +MYEMS_BILLING_DB_DATABASE = config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db') MYEMS_BILLING_DB_USER = config('MYEMS_BILLING_DB_USER', default='root') MYEMS_BILLING_DB_PASSWORD = config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1') diff --git a/myems-normalization/.env.example b/myems-normalization/example.env similarity index 100% rename from myems-normalization/.env.example rename to myems-normalization/example.env