From 38e9fc5996ad231e0f14b263c83cd8a8fbfc0458 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 12 Mar 2022 09:45:28 +0800 Subject: [PATCH] updated README --- docker-compose-cn.md | 22 +++++++++++----------- docker-compose-de.md | 26 +++++++++++++------------- docker-compose-en.md | 28 ++++++++++++++-------------- enterprise-edition-cn.md | 4 +++- enterprise-edition-de.md | 2 ++ enterprise-edition-en.md | 2 ++ 6 files changed, 45 insertions(+), 39 deletions(-) diff --git a/docker-compose-cn.md b/docker-compose-cn.md index a779b961..c3f4300f 100644 --- a/docker-compose-cn.md +++ b/docker-compose-cn.md @@ -9,7 +9,7 @@ ### 配置 -**注**：这里的主机指的是安装Docker的主机, 这里的IP和账号密码都为假定的，用来展示说明，请酌情修改。 +**注**：主机指的是运行Docker引擎的服务器, IP和账号密码请酌情修改。 | -- | -- | | ---------- | ----------- | @@ -46,31 +46,31 @@ mysql -u root -p < myems_user_db.sql 3. 修改配置 -注：如“配置”所述，这里假定的**主机IP为 192.168.0.1，数据库IP为 192.168.0.2，数据库账号为：root,数据库密码:!MyEMS1,用户应该修改为自己对应的主机IP,数据库IP,数据库账号，数据库密码** +**注**：假定的主机IP为 192.168.0.1，数据库IP为 192.168.0.2，数据库账号为：root,数据库密码:!MyEMS1,请酌情修改 3.1 修改nginx.conf里的API配置 ``` cd myems -sed -i 's/127.0.0.1:8000/192.168.0.1:8000/g' admin/nginx.conf -sed -i 's/127.0.0.1:8000/192.168.0.1:8000/g' web/nginx.conf +nano admin/nginx.conf +nano web/nginx.conf ``` -3.2 复制example.env为.env并修改.env里的数据库IP，账号，密码 +3.2 分别复制下列目录中的example.env为.env并修改.env里的数据库IP，账号，密码 ``` cd myems cp myems-aggregation/example.env myems-aggregation/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-aggregation/.env +nano myems-aggregation/.env cp myems-api/example.env myems-api/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-api/.env +nano myems-api/.env cp myems-cleaning/example.env myems-cleaning/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-cleaning/.env +nano myems-cleaning/.env cp myems-modbus-tcp/example.env myems-modbus-tcp/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-modbus-tcp/.env +nano myems-modbus-tcp/.env cp myems-normalization/example.env myems-normalization/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-normalization/.env +nano myems-normalization/.env ``` -3.3 修改docker-compose.yml中upload文件夹 +3.3 修改docker-compose.yml中upload文件夹路径 如果是Windows主机，在api和admin服务中，volumes/source使用 c:\upload 如果是Linux主机，在api和admin服务中，volumes/source使用 /upload 应确保api和admin共享同一主机文件夹。 diff --git a/docker-compose-de.md b/docker-compose-de.md index d40e3e8e..3fb0a4e9 100644 --- a/docker-compose-de.md +++ b/docker-compose-de.md @@ -3,13 +3,13 @@ Erstellen und starten Sie alle Dienste mit einem einzigen Befehl ### Voraussetzung -- Installed docker, docker-compose, npm on a host. -- Installed MySQL database with username 'root' and password '!MyEMS1'. -- The MySQL database can be connected from the host where Docker is installed. +- Installierter Docker, docker-compose, npm auf dem Host. +- Installierter MySQL Server mit Benutzername 'root' und Passwort '! MyEMS1". +- Die MySQL-Datenbank kann von dem Host aus verbunden werden, auf dem die Docker-Engine läuft. ### Konfiguration -**Anmerkung**: Der Host hier bezieht sich auf den Host, auf dem Docker installiert ist. Die IP und das Account-Passwort werden hier angenommen und verwendet, um Anweisungen anzuzeigen. Bitte ändern Sie sie entsprechend. +**Anmerkung**: Der Host bezieht sich auf den Server, auf dem Docker-Engine läuft. Bitte ändern Sie die IP und das Kontopasswort entsprechend.. | -- | -- | | ---------- | ----------- | @@ -46,28 +46,28 @@ Anmerkung: Siehe unter [database/README.md](./database/README.md) 3. Konfiguration ändern -**Anmerkungen**：Die Host-IP hier angenommen ist 192.168.0.1, die Datenbank-IP ist 192.168.0.2, das Datenbank-Konto ist: root und das Datenbank-Passwort ist: !MyEMS1, bitte ändern Sie dies entsprechend +**Anmerkungen**：Die angenommene Host-IP ist 192.168.0.1, die Datenbank-IP ist 192.168.0.2, das Datenbankkonto ist: root und das Datenbank-Passwort ist:! Myems1, bitte ändern Sie dies entsprechend 3.1 API-Adresse ändern in nginx.conf ``` cd myems -sed -i 's/127.0.0.1:8000/192.168.0.1:8000/g' admin/nginx.conf -sed -i 's/127.0.0.1:8000/192.168.0.1:8000/g' web/nginx.conf +nano admin/nginx.conf +nano web/nginx.conf ``` -3.2 Beispiel example.env bis .env und Datenbank-IP, Benutzername und Passwort in .env +3.2 Kopieren Sie das folgende Beispiel in das Verzeichnis bzw. Env ist Env und modifizieren Datenbank IP, Kontonummer und Passwort in Env ``` cd myems cp myems-aggregation/example.env myems-aggregation/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-aggregation/.env +nano myems-aggregation/.env cp myems-api/example.env myems-api/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-api/.env +nano myems-api/.env cp myems-cleaning/example.env myems-cleaning/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-cleaning/.env +nano myems-cleaning/.env cp myems-modbus-tcp/example.env myems-modbus-tcp/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-modbus-tcp/.env +nano myems-modbus-tcp/.env cp myems-normalization/example.env myems-normalization/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-normalization/.env +nano myems-normalization/.env ``` 3.3 Upload-Ordner ändern in docker-compose.yml diff --git a/docker-compose-en.md b/docker-compose-en.md index eaf6e2bd..ee2dbecb 100644 --- a/docker-compose-en.md +++ b/docker-compose-en.md @@ -3,13 +3,13 @@ Create and start all the services with a single command ### Prerequisite -- Installed docker, docker-compose, npm on a host. -- Installed MySQL database with username 'root' and password '!MyEMS1'. -- The MySQL database can be connected from the host where Docker is installed. +- Installed docker, docker-compose, npm on the host. +- Installed MySQL server with username 'root' and password '!MyEMS1'. +- The MySQL database can be connected from the host on which the Docker Engine runs. ### Configuration -**Note**: The host here refers to the host where docker is installed. The IP and account password here are assumed and used to show instructions. Please modify them as appropriate. +**Note**: The host refers to the server on which the docker engine runs. The IP and account password are assumed and used to show instructions. Please modify them as appropriate. | -- | -- | | ---------- | ----------- | @@ -46,28 +46,28 @@ Note: Refer to [database/README.md](./database/README.md) 3. Modify Config -**Note**：The host IP assumed here is 192.168.0.1, the database IP is 192.168.0.2, the database account is: root, and the database password is: !MyEMS1, please modify as appropriate +**Note**：Assume the host IP is 192.168.0.1, the database IP is 192.168.0.2, the database account is: root, and the database password is: !MyEMS1, please modify them as appropriate -3.1 Modify api address in nginx.conf +3.1 Modify API's address in nginx.conf ``` cd myems -sed -i 's/127.0.0.1:8000/192.168.0.1:8000/g' admin/nginx.conf -sed -i 's/127.0.0.1:8000/192.168.0.1:8000/g' web/nginx.conf +nano admin/nginx.conf +nano web/nginx.conf ``` -3.2 Copy example.env to .env and modify database IP, username and password in .env +3.2 Copy example.env to .env in each folder and modify database IP, username and password in .env ``` cd myems cp myems-aggregation/example.env myems-aggregation/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-aggregation/.env +nano myems-aggregation/.env cp myems-api/example.env myems-api/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-api/.env +nano myems-api/.env cp myems-cleaning/example.env myems-cleaning/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-cleaning/.env +nano myems-cleaning/.env cp myems-modbus-tcp/example.env myems-modbus-tcp/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-modbus-tcp/.env +nano myems-modbus-tcp/.env cp myems-normalization/example.env myems-normalization/.env -sed -i 's/127.0.0.1/192.168.0.2/g' myems-normalization/.env +nano myems-normalization/.env ``` 3.3 Modify upload folder in docker-compose.yml diff --git a/enterprise-edition-cn.md b/enterprise-edition-cn.md index 3dd85e2b..f3dbbd92 100644 --- a/enterprise-edition-cn.md +++ b/enterprise-edition-cn.md @@ -1,5 +1,5 @@ -## MyEMS企业版功能 +## MyEMS企业版可选功能 | 功能 |企业版 | 说明 | | :--- | :----: | :----: | @@ -51,6 +51,8 @@ | LoRa无线数传电台模块(数据采集和远程控制）| ✔️ | MyEMS认证 | | 重点用能单位能耗在线监测系统上传省市级平台通信协议| ✔️| 企业版组件授权，可定制开发 | | 第三方系统集成服务 | ✔️ | 企业版组件授权，可定制开发 | +| 支持故障赔付 | ✔️ | | +| 提供正规发票与合同 | ✔️ | | | 线上软件使用培训 | ✔️ | | | 线下软件使用培训 | ✔️ | | | 邮件技术支持 | ✔️ | | diff --git a/enterprise-edition-de.md b/enterprise-edition-de.md index 5f9ecc62..5f646f4b 100644 --- a/enterprise-edition-de.md +++ b/enterprise-edition-de.md @@ -52,6 +52,8 @@ | LoRa Radio Module (Data Acquisition and Remote Control） | ✔️ | MyEMS-zertifiziertes LoRa-Hardwaregerät | | Protocol for Uploading to Provincial/Municipal Platform of On-line monitoring system for Key Energy-Consuming Unit | ❌ | ✔️ | | | 3rd Party Systems Integration Service | ✔️ | Kundenspezifische Entwicklung | +| Fehler Schadensersatz | ✔️ | | +| Formelle Rechnungen und Verträge | ✔️ | | | Online software training | ✔️ | | | Face to face software training | ✔️ | | | Email Customer Support | ✔️ | | diff --git a/enterprise-edition-en.md b/enterprise-edition-en.md index 5cf417e7..7543aa2f 100644 --- a/enterprise-edition-en.md +++ b/enterprise-edition-en.md @@ -52,6 +52,8 @@ | LoRa Radio Module (Data Acquisition and Remote Control）| ✔️ | MyEMS certified LoRa hardware device | | Protocol for Uploading to Provincial/Municipal Platform of On-line monitoring system for Key Energy-Consuming Unit | ❌ | ✔️ | Enterprise version license, or customizable development | | 3rd Party Systems Integration Service | ✔️ | Custom development | +| Fault compensation | ✔️ | | +| Formal invoices and contracts | ✔️ | | | Online software training | ✔️ | | | Face to face software training | ✔️ | | | Email Customer Support | ✔️ | |