seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/121/MERGE
13621160019@163.com 2022-01-30 20:14:08 +08:00
parent 39f419fccc d3ca99e516
commit 4d3fe62eb9
7 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/installation.rst
View File

@ -39,9 +39,9 @@ Installation
* Install MySQL Connector:: * Install MySQL Connector::
$ cd ~/tools $ cd ~/tools
$ wget wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz $ wget wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
$ tar xzf mysql-connector-python-8.0.23.tar.gz $ tar xzf mysql-connector-python-8.0.28.tar.gz
$ cd ~/tools/mysql-connector-python-8.0.23 $ cd ~/tools/mysql-connector-python-8.0.28
$ sudo python3 setup.py install $ sudo python3 setup.py install
* Install Falcon * Install Falcon

6
myems-aggregation/README.md
View File

@ -133,7 +133,7 @@ In this section, you will install myems-aggregation on Ubuntu Server without int
Download on any server with internet access: Download on any server with internet access:
```bash ```bash
cd ~/tools cd ~/tools
wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
git clone https://github.com/henriquebastos/python-decouple.git git clone https://github.com/henriquebastos/python-decouple.git
cd ~ cd ~
git clone https://github.com/MyEMS/myems.git git clone https://github.com/MyEMS/myems.git
@ -142,8 +142,8 @@ git clone https://github.com/MyEMS/myems.git
Copy files to the server without internet access and install prerequisites: Copy files to the server without internet access and install prerequisites:
```bash ```bash
cd ~/tools cd ~/tools
tar xzf mysql-connector-python-8.0.23.tar.gz tar xzf mysql-connector-python-8.0.28.tar.gz
cd ~/tools/mysql-connector-python-8.0.23 cd ~/tools/mysql-connector-python-8.0.28
python3 setup.py install python3 setup.py install
cd ~/tools/python-decouple cd ~/tools/python-decouple
python3 setup.py install python3 setup.py install

6
myems-api/README.md
View File

@ -166,7 +166,7 @@ In this section, you will offline install myems-api on Ubuntu Server without int
mkdir ~tools && cd ~/tools mkdir ~tools && cd ~/tools
git clone https://github.com/c0fec0de/anytree.git git clone https://github.com/c0fec0de/anytree.git
git clone https://github.com/simplejson/simplejson.git git clone https://github.com/simplejson/simplejson.git
wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
mkdir ~/tools/falcon && cd ~/tools/falcon mkdir ~/tools/falcon && cd ~/tools/falcon
pip download cython falcon falcon-cors falcon-multipart pip download cython falcon falcon-cors falcon-multipart
cd ~/tools cd ~/tools
@ -190,8 +190,8 @@ python setup.py install
cd ~/tools/simplejson cd ~/tools/simplejson
python setup.py install python setup.py install
cd ~/tools cd ~/tools
tar xzf mysql-connector-python-8.0.23.tar.gz tar xzf mysql-connector-python-8.0.28.tar.gz
cd ~/tools/mysql-connector-python-8.0.23 cd ~/tools/mysql-connector-python-8.0.28
python setup.py install python setup.py install
export LC_ALL="en_US.UTF-8" export LC_ALL="en_US.UTF-8"
export LC_CTYPE="en_US.UTF-8" export LC_CTYPE="en_US.UTF-8"

8
myems-api/installation_macos_zh.md
View File

@ -33,7 +33,7 @@ $ mysql -u root -p密码
mysql: [Warning] Using a password on the command line interface can be insecure. mysql: [Warning] Using a password on the command line interface can be insecure.
Welcome to the MySQL monitor. Commands end with ; or \g. Welcome to the MySQL monitor. Commands end with ; or \g.
Your MySQL connection id is 8 Your MySQL connection id is 8
Server version: 8.0.23 Homebrew Server version: 8.0.28 Homebrew
Copyright (c) 2000, 2021, Oracle and/or its affiliates. Copyright (c) 2000, 2021, Oracle and/or its affiliates.
@ -97,9 +97,9 @@ $ pip3 install simplejson
# 安装mysql-connector-python # 安装mysql-connector-python
$ cd ~/tools $ cd ~/tools
$ wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.23.tar.gz $ wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
$ tar xzf mysql-connector-python-8.0.23.tar.gz $ tar xzf mysql-connector-python-8.0.28.tar.gz
$ cd ~/tools/mysql-connector-python-8.0.23 $ cd ~/tools/mysql-connector-python-8.0.28
$ sudo python3 setup.py install $ sudo python3 setup.py install
# 安装Falcon # 安装Falcon

6
myems-cleaning/README.md
View File

@ -93,9 +93,9 @@ In this section, you will install myems-cleaning on Ubuntu Server.
Download and install MySQL Connector: Download and install MySQL Connector:
```bash ```bash
cd ~/tools cd ~/tools
wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
tar xzf mysql-connector-python-8.0.23.tar.gz tar xzf mysql-connector-python-8.0.28.tar.gz
cd ~/tools/mysql-connector-python-8.0.23 cd ~/tools/mysql-connector-python-8.0.28
python3 setup.py install python3 setup.py install
``` ```

28
myems-modbus-tcp/README.md
View File

@ -30,8 +30,6 @@ chmod +x run.sh
In this section, you will install myems-modbus-tcp on Docker. In this section, you will install myems-modbus-tcp on Docker.
In this section, you will install myems-modbus-tcp on Docker.
* Copy source code to root directory * Copy source code to root directory
On Windows: On Windows:
@ -93,9 +91,9 @@ docker load --input .\myems-modbus-tcp.tar
Download and install MySQL Connector: Download and install MySQL Connector:
```bash ```bash
cd ~/tools cd ~/tools
wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
tar xzf mysql-connector-python-8.0.23.tar.gz tar xzf mysql-connector-python-8.0.28.tar.gz
cd ~/tools/mysql-connector-python-8.0.23 cd ~/tools/mysql-connector-python-8.0.28
python3 setup.py install python3 setup.py install
``` ```
@ -107,6 +105,14 @@ cd ~/tools/schedule
python3 setup.py install python3 setup.py install
``` ```
Download and install Python Decouple
```bash
cd ~/tools
git clone https://github.com/henriquebastos/python-decouple.git
cd ~/tools/python-decouple
python3 setup.py install
```
Download and install modbus-tk Download and install modbus-tk
```bash ```bash
cd ~/tools cd ~/tools
@ -118,14 +124,6 @@ cd ~/tools/modbus-tk
python3 setup.py install python3 setup.py install
``` ```
Download and install Python Decouple
```bash
cd ~/tools
git clone https://github.com/henriquebastos/python-decouple.git
cd ~/tools/python-decouple
python3 setup.py install
```
Install myems-modbus-tcp service Install myems-modbus-tcp service
```bash ```bash
cd myems cd myems
@ -157,9 +155,9 @@ View the log:
cat /myems-modbus-tcp.log cat /myems-modbus-tcp.log
``` ```
### Add Data Sources and Points in MyEMS Admin ### Add Data Sources and Points in MyEMS Admin UI
NOTE: If you modified Modbus TCP datasources and points, please restart this service: NOTE: If you modified Modbus TCP data sources and points, please restart this service:
```bash ```bash
systemctl restart myems-modbus-tcp.service systemctl restart myems-modbus-tcp.service
``` ```

6
myems-normalization/README.md
View File

@ -100,9 +100,9 @@ In this section, you will install myems-normalization on Ubuntu Server.
Download and install MySQL Connector: Download and install MySQL Connector:
```bash ```bash
cd ~/tools cd ~/tools
wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz
tar xzf mysql-connector-python-8.0.23.tar.gz tar xzf mysql-connector-python-8.0.28.tar.gz
cd ~/tools/mysql-connector-python-8.0.23 cd ~/tools/mysql-connector-python-8.0.28
python3 setup.py install python3 setup.py install
``` ```