seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/121/MERGE
13621160019@163.com 2022-01-26 16:10:22 +08:00
parent 4f68675c3e 281575a423
commit a544b58d5f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
myems-aggregation/config.py
View File

@ -12,7 +12,7 @@ myems_system_db = {
myems_historical_db = {
'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_system_db'),
'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'),
'user': config('MYEMS_HISTORICAL_DB_USER', default='root'),
'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'),
}
@ -20,7 +20,7 @@ myems_historical_db = {
myems_energy_db = {
'host': config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_system_db'),
'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'),
'user': config('MYEMS_ENERGY_DB_USER', default='root'),
'password': config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1'),
}
@ -28,11 +28,19 @@ myems_energy_db = {
myems_billing_db = {
'host': config('MYEMS_BILLING_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_BILLING_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_system_db'),
'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db'),
'user': config('MYEMS_BILLING_DB_USER', default='root'),
'password': config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1'),
}
myems_carbon_db = {
'host': config('MYEMS_CARBON_DB_HOST', default='127.0.0.1'),
'port': config('MYEMS_CARBON_DB_PORT', default=3306, cast=int),
'database': config('MYEMS_CARBON_DB_DATABASE', default='myems_carbon_db'),
'user': config('MYEMS_CARBON_DB_USER', default='root'),
'password': config('MYEMS_CARBON_DB_PASSWORD', default='!MyEMS1'),
}
# indicates how long in minutes energy data will be aggregated
# 30 for half hourly
# 60 for hourly

7
myems-aggregation/example.env
View File

@ -26,6 +26,13 @@ MYEMS_BILLING_DB_DATABASE=myems_billing_db
MYEMS_BILLING_DB_USER=root
MYEMS_BILLING_DB_PASSWORD=!MyEMS1
# config for myems_carbon_db
MYEMS_CARBON_DB_HOST=127.0.0.1
MYEMS_CARBON_DB_PORT=3306
MYEMS_CARBON_DB_DATABASE=myems_carbon_db
MYEMS_CARBON_DB_USER=root
MYEMS_CARBON_DB_PASSWORD=!MyEMS1
# indicates how long in minutes energy data will be aggregated
# 30 for half hourly
# 60 for hourly