diff --git a/database/create_database_ubuntu.sh b/database/create_database_ubuntu.sh index ab4063bb..48e19429 100644 --- a/database/create_database_ubuntu.sh +++ b/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 \ No newline at end of file +mysql -uroot -p$mypassword < demo-en/myems_system_db.sql \ No newline at end of file diff --git a/myems-api/README.md b/myems-api/README.md index bedde402..c01659e9 100644 --- a/myems-api/README.md +++ b/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. diff --git a/myems-api/config.py b/myems-api/config.py index b762986a..c8567c6f 100644 --- a/myems-api/config.py +++ b/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', } diff --git a/myems-api/myems-api.service b/myems-api/myems-api.service index 2bc26c4e..221ba9c7 100644 --- a/myems-api/myems-api.service +++ b/myems-api/myems-api.service @@ -5,10 +5,10 @@ After=network.target [Service] PIDFile=/run/myems-api/pid -User=root -Group=root -WorkingDirectory=/myems-api -ExecStart=/usr/local/bin/gunicorn --pid /run/myems-api/pid --timeout 600 --workers=4 app:api +User=nvidia +Group=nvidia +WorkingDirectory=/home/nvidia/PycharmProjects/myems/myems-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 diff --git a/myems-api/requirements.txt b/myems-api/requirements.txt index 12bd96f0..756cb6e6 100644 --- a/myems-api/requirements.txt +++ b/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 \ No newline at end of file diff --git a/myems-api/run.sh b/myems-api/run.sh new file mode 100644 index 00000000..e4aa9d3f --- /dev/null +++ b/myems-api/run.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +gunicorn --pid pid --timeout 600 --workers=4 app:api \ No newline at end of file