From e76066b62a8d2edc2700a04ee122c42b2c28b134 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Wed, 31 Mar 2021 15:49:23 +0800
Subject: [PATCH] upgraded version to v1.1.1

---
 admin/views/common/footer-login.html | 2 +-
 admin/views/common/footer.html       | 2 +-
 database/myems_system_db.sql         | 2 +-
 database/upgrade1.1.1.sql            | 2 +-
 docs/conf.py                         | 2 +-
 myems-api/core/version.py            | 4 ++--
 web/package.json                     | 2 +-
 web/src/config.js                    | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html
index ea45221c..52ee27ab 100644
--- a/admin/views/common/footer-login.html
+++ b/admin/views/common/footer-login.html
@@ -1,5 +1,5 @@
 <div class="footer-login">
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.1.0 <a href="https://myems.io">https://myems.io</a> </strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.1.1 <a href="https://myems.io">https://myems.io</a> </strong>
     </div>
 </div>
diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html
index b241f94c..eca7f5fa 100644
--- a/admin/views/common/footer.html
+++ b/admin/views/common/footer.html
@@ -3,6 +3,6 @@
         <strong><a href="https://myems.io">https://myems.io</a></strong>
     </div>
     <div>
-        <strong>{{'MY_EMS_NAME' | translate}} v1.1.0</strong>
+        <strong>{{'MY_EMS_NAME' | translate}} v1.1.1</strong>
     </div>
 </div>
diff --git a/database/myems_system_db.sql b/database/myems_system_db.sql
index 85903178..264a2930 100644
--- a/database/myems_system_db.sql
+++ b/database/myems_system_db.sql
@@ -2249,6 +2249,6 @@ USE `myems_system_db`;
 INSERT INTO `myems_system_db`.`tbl_versions`
 (`id`, `version`, `release_date`)
 VALUES
-(1, '1.1.0', '2021-03-18');
+(1, '1.1.1', '2021-03-31');
 
 COMMIT;
diff --git a/database/upgrade1.1.1.sql b/database/upgrade1.1.1.sql
index 5c088f81..dc52dab4 100644
--- a/database/upgrade1.1.1.sql
+++ b/database/upgrade1.1.1.sql
@@ -1,6 +1,6 @@
 
 -- UPDATE VERSION NUMBER
-UPDATE myems_system_db.tbl_versions SET version='1.1.1', release_date='2021-03-22' WHERE id=1;
+UPDATE myems_system_db.tbl_versions SET version='1.1.1', release_date='2021-03-31' WHERE id=1;
 
 ALTER TABLE myems_fdd_db.tbl_rules ADD last_run_datetime_utc DATETIME NULL;
 ALTER TABLE myems_fdd_db.tbl_rules ADD next_run_datetime_utc DATETIME NULL;
diff --git a/docs/conf.py b/docs/conf.py
index 5d5b4f7f..259e5494 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -19,7 +19,7 @@ import sphinx_rtd_theme
 # -- Project information -----------------------------------------------------
 
 project = 'MyEMS'
-copyright = '2019, 2020, MyEMS'
+copyright = '2021, MyEMS'
 author = 'MyEMS Team'
 
 
diff --git a/myems-api/core/version.py b/myems-api/core/version.py
index f1ef5dfa..5485cf60 100644
--- a/myems-api/core/version.py
+++ b/myems-api/core/version.py
@@ -14,8 +14,8 @@ class VersionItem:
     @staticmethod
     def on_get(req, resp):
 
-        result = {"version": 'MyEMS 1.1.0 (Community Edition)',
-                  "release-date": '202103018',
+        result = {"version": 'MyEMS 1.1.1',
+                  "release-date": '202103031',
                   "website": "https://myems.io"}
         resp.body = json.dumps(result)
 
diff --git a/web/package.json b/web/package.json
index 34c4e7c9..dec8b75d 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "myems",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome-svg-core": "^1.2.28",
diff --git a/web/src/config.js b/web/src/config.js
index 05edecbf..bb793630 100644
--- a/web/src/config.js
+++ b/web/src/config.js
@@ -1,4 +1,4 @@
-export const version = '1.1.0';
+export const version = '1.1.1';
 export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
 export const topNavbarBreakpoint = 'lg';
 //export const APIBaseURL = 'http://127.0.0.1:8000';