From 28cdf06664b4dc5a0ece1feaebe38741ff77b1c7 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Fri, 22 Apr 2022 16:57:56 +0800
Subject: [PATCH 1/3] added apache2 proxy setting

---
 myems-admin/README.md | 12 +++++++++++-
 myems-web/README.md   | 10 ++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/myems-admin/README.md b/myems-admin/README.md
index 93b70e8f..a8d189af 100644
--- a/myems-admin/README.md
+++ b/myems-admin/README.md
@@ -164,7 +164,7 @@ Listen 8001
 sudo vi /etc/apache2/sites-available/000-default.conf
 ```
 Add a new 'VirtualHost' as below
-```xml
+```
 <VirtualHost 127.0.0.1:8001>
         ServerAdmin MyEMS-admin
         DocumentRoot /var/www/myems-admin
@@ -173,9 +173,19 @@ Add a new 'VirtualHost' as below
                 Options FollowSymLinks
                 AllowOverride All
                 Require all granted
+    			Header set Access-Control-Allow-Origin *
         </Directory>
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined
+        ProxyRequests Off
+		ProxyPreserveHost On
+		
+		<Proxy *>
+			Order Deny,Allow
+			Allow from all
+		</Proxy>
+		ProxyPass /api http://127.0.0.1:8000/
+		ProxyPassReverse /api http://127.0.0.1:8000/
 </VirtualHost>
 ```
 
diff --git a/myems-web/README.md b/myems-web/README.md
index e9176d6e..696d5129 100644
--- a/myems-web/README.md
+++ b/myems-web/README.md
@@ -230,9 +230,19 @@ Add a new 'VirtualHost' as below
                 Options FollowSymLinks
                 AllowOverride All
                 Require all granted
+    			Header set Access-Control-Allow-Origin *
         </Directory>
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined
+        ProxyRequests Off
+		ProxyPreserveHost On
+		
+		<Proxy *>
+			Order Deny,Allow
+			Allow from all
+		</Proxy>
+		ProxyPass /api http://127.0.0.1:8000/
+		ProxyPassReverse /api http://127.0.0.1:8000/
 </VirtualHost>
 ```
 

From dae6d2db2f56d9ecde0751e6169f9ad59ac258c2 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Fri, 22 Apr 2022 17:29:44 +0800
Subject: [PATCH 2/3] added apache2 proxy setting

---
 myems-web/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/myems-web/README.md b/myems-web/README.md
index 696d5129..b29ab4cd 100644
--- a/myems-web/README.md
+++ b/myems-web/README.md
@@ -276,7 +276,7 @@ sudo vi .htaccess
 ```
   Add a IfModule as below:
 ```bash
-IfModule mod_rewrite.c>
+<IfModule mod_rewrite.c>
   RewriteEngine On
   RewriteBase /
   RewriteRule ^index\.html$ - [L]

From d1ddb674851b1d5529b293e7d008a8feae0112b6 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Fri, 22 Apr 2022 17:55:58 +0800
Subject: [PATCH 3/3] added API reverse proxy in Apache conf

---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dca1cd6..2dff6418 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 ### Added
-- None.
+- added API reverse proxy in Apache conf.
 
 ### Changed
-- None.
+- replaced true with 1 in SQL statements of myems-api.
+- updated user insert sql statement for failed_login_count.
 
 ### Fixed
-- None.
+- fixed typo in virtualmetercarbon.
 
 ### Removed
 - None.