From 596321c4bcaeb87f4106f03f56149c1bbc7c56ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 十二月 2020 18:07:46 +0800
Subject: [PATCH] Merge https://gitee.com/wuxw7/MicroCommunity

---
 Readme.md                 |    3 
 java110-db/pom.xml        |    2 
 java110-interface/pom.xml |    2 
 Readme_en.md              |  170 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 174 insertions(+), 3 deletions(-)

diff --git a/Readme.md b/Readme.md
index 998dfb1..041673e 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1,4 +1,5 @@
-# HC灏忓尯绠$悊绯荤粺鏄墠鍚庣瀹屽叏寮�婧愬苟鍏嶈垂鍟嗙敤鐨勫皬鍖虹墿涓氱鐞嗙郴缁燂紝鍖呭惈灏忓尯鍚庣椤圭洰锛屽皬鍖哄墠娈甸」鐩紝鐗╀笟鐗坲ni-app鍜屼笟涓荤増uni-app,鏈�鏂癝QL鏂囦欢鍔犵兢鑾峰彇827669685(宸叉弧)锛�799748606锛堢兢浜岋級
+[english](Readme_en.md)
+# HC灏忓尯绠$悊绯荤粺鏄墠鍚庣瀹屽叏寮�婧愬苟鍏嶈垂鍟嗙敤鐨勫皬鍖虹墿涓氱鐞嗙郴缁燂紝鍖呭惈灏忓尯鍚庣椤圭洰锛屽皬鍖哄墠娈甸」鐩紝鐗╀笟鐗坲ni-app鍜屼笟涓荤増uni-app,鏈�鏂癝QL鏂囦欢鍔犵兢鑾峰彇827669685(宸叉弧)锛�799748606锛堝凡婊★級1038870655锛堢兢涓夛級
 
 ## 寮�婧愪唬鐮佽鏄�
 
diff --git a/Readme_en.md b/Readme_en.md
new file mode 100644
index 0000000..6b03b9a
--- /dev/null
+++ b/Readme_en.md
@@ -0,0 +1,170 @@
+# HC community management system is an open source and free commercial community property management system, including back-end project, front-end project, property version uni-app and owner's version uni-app. 
+
+
+
+## Open source code description
+
+
+
+### HC cell back end code
+
+[ https://gitee.com/wuxw7/MicroCommunity ] https://gitee.com/wuxw7/MicroCommunity )
+
+### HC cell front end code
+
+[ https://gitee.com/java110/MicroCommunityWeb ] https://gitee.com/java110/MicroCommunityWeb )
+
+### HC smart home (owner version)
+
+[ https://gitee.com/java110/WechatOwnerService ] https://gitee.com/java110/WechatOwnerService )
+
+### HC handheld property (uni app for property)
+
+[ https://gitee.com/java110/PropertyApp ] https://gitee.com/java110/PropertyApp )
+
+
+
+### Branch description
+
+
+
+Branch management Description: Master is the main branch, 0.5-stable is the latest stable branch (recommended for commercial landing version) and 0.1-stable is the front-end and back-end non separation Version (not recommended)
+
+
+
+
+### How to start
+
+
+
+[ http://www.homecommunity.cn/ ] http://www.homecommunity.cn/ )
+
+
+
+### How to install
+
+
+
+Scheme 1, CentOS 7.6 one button automatic installation
+
+
+
+> yum install -y wget && wget https://dl.winqi.cn/hc/hcInstall.sh && sh hcInstall.sh Your private IP
+
+
+
+Note: your private IP address is the intranet IP of the server. If the server has only one private IP address, it can be omitted. If there are more than one private IP address, it needs to be specified
+
+
+
+[reference video]锛� https://www.bilibili.com/video/BV1Dk4y19728/ )
+
+
+
+Scheme 2: self service deployment according to demand
+
+
+
+[reference video]锛� https://www.bilibili.com/video/BV1N7411E7rf/ )
+
+
+
+### Operation document
+
+
+
+[operation document]锛� http://www.homecommunity.cn/operateDoc )
+
+
+
+### Technical documentation
+
+
+
+[technical documents]锛� http://www.homecommunity.cn/devDoc )
+
+
+
+
+### Products
+
+
+
+![image](docs/img/ hc.png )
+
+
+
+
+### System function
+
+
+
+![image](docs/img/ func.png )
+
+
+
+Please check the main system functions
+
+
+
+[ http://www.homecommunity.cn//document/#/func/funcation ] http://www.homecommunity.cn//document/#/func/funcation )
+
+
+
+
+### Demo address
+
+
+
+[ http://www.homecommunity.cn/ ] http://www.homecommunity.cn/ )
+
+
+
+Property account / password: wuxw / Admin
+
+
+
+Agent account / password: days / Admin
+
+
+
+Operation and maintenance team account / password: admin / Admin
+
+
+
+Development team account / password: dev / (due to the large rights of developers, deleting data will affect the stability. To view the specific functions, it can be deployed separately in U_ User table)
+
+
+
+### Running effect (view)
+
+1. Input in the browser http://localhost : 3000 / as shown in the figure below
+
+
+
+![image](docs/img/ login.png )
+
+
+
+The user name is wuxw, and the password is admin, as shown in the figure below
+
+
+
+Click login to enter the following figure:
+
+
+
+![image](docs/img/0004.png)
+
+
+
+![image](docs/img/ index.png )
+
+
+
+![image](docs/img/ owner.png )
+
+
+
+
+![image](docs/img/ qq.png )
diff --git a/java110-db/pom.xml b/java110-db/pom.xml
index 07c3677..f868b00 100644
--- a/java110-db/pom.xml
+++ b/java110-db/pom.xml
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/java110-interface/pom.xml b/java110-interface/pom.xml
index fcadeaa..65b9bff 100644
--- a/java110-interface/pom.xml
+++ b/java110-interface/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>

--
Gitblit v1.8.0