fixed one bug for database.

created a dirty and easy way to run myems-api.
enhanced requirements.txt for both database and myems-api.

database/create_database_ubuntu.sh

@@ -11,4 +11,4 @@ mysql -uroot -p$mypassword < myems_historical_db.sql
 mysql -uroot -p$mypassword < myems_reporting_db.sql
 mysql -uroot -p$mypassword < myems_system_db.sql
 mysql -uroot -p$mypassword < myems_user_db.sql
-mysql -uroot -p$mypassword < demo/myems_system_db.sql
+mysql -uroot -p$mypassword < demo-en/myems_system_db.sql

myems-api/README.md

@@ -19,7 +19,13 @@ gunicorn
 
 openpyxl
 
-
+## Quick Installation on Ubuntu 20.04
+We're using anaconda python and create a virtual environment named "myems".
+```bash
+conda activate myems
+pip install -r requirements.txt
+run.sh
+```
 ## Installation
 
 In this step, you will install myems-api on Ubuntu for production or development.

myems-api/config.py

@@ -1,62 +1,62 @@
 myems_system_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_system_db',
 }
 
 myems_energy_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_energy_db',
 }
 
 myems_energy_baseline_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_energy_baseline_db',
 }
 
 myems_billing_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_billing_db',
 }
 
 myems_billing_baseline_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_billing_baseline_db',
 }
 
 myems_historical_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_historical_db',
 }
 
 myems_user_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_user_db',
 }
 
 myems_fdd_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_fdd_db',
 }
 
 myems_reporting_db = {
     'user': 'root',
-    'password': '!MyEMS1',
+    'password': 'pAssw0rd@12345',
     'host': '127.0.0.1',
     'database': 'myems_reporting_db',
 }

myems-api/myems-api.service

@@ -5,10 +5,10 @@ After=network.target
 
 [Service]
 PIDFile=/run/myems-api/pid
-User=root
+User=nvidia
-Group=root
+Group=nvidia
-WorkingDirectory=/myems-api
+WorkingDirectory=/home/nvidia/PycharmProjects/myems/myems-api
-ExecStart=/usr/local/bin/gunicorn --pid /run/myems-api/pid --timeout 600 --workers=4 app:api
+ExecStart=/home/nvidia/anaconda3/envs/myems/bin/gunicorn --pid /run/myems-api/pid --timeout 600 --workers=4 app:api
 ExecReload=/bin/kill -s HUP $MAINPID
 ExecStop=/bin/kill -s TERM $MAINPID
 PrivateTmp=true

myems-api/requirements.txt

@@ -1,9 +1,12 @@
 anytree
 simplejson
+mysql-connector-python==8.0.20
 mysql.connector
 falcon
 falcon_cors
 falcon-multipart
 gunicorn
-openpyxl
+et_xmlfile==1.1
+jdcal
+openpyxl==3.0.7
 pillow

myems-api/run.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+gunicorn --pid pid --timeout 600 --workers=4 app:api