From 281575a423a6cca6799acfb7f78dd424c4d9e881 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 26 Jan 2022 16:08:52 +0800
Subject: [PATCH] fixed issue of config in aggregation service

---
 myems-aggregation/config.py   | 14 +++++++++++---
 myems-aggregation/example.env |  7 +++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/myems-aggregation/config.py b/myems-aggregation/config.py
index b6208713..18c7060a 100644
--- a/myems-aggregation/config.py
+++ b/myems-aggregation/config.py
@@ -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
diff --git a/myems-aggregation/example.env b/myems-aggregation/example.env
index 80de7464..13e491c1 100644
--- a/myems-aggregation/example.env
+++ b/myems-aggregation/example.env
@@ -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