From d3ca99e516d1462fb1bbf6a89393c069915eee98 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 30 Jan 2022 20:12:19 +0800 Subject: [PATCH] updated mysql-connector-python version in README --- docs/installation.rst | 6 +++--- myems-aggregation/README.md | 6 +++--- myems-api/README.md | 6 +++--- myems-api/installation_macos_zh.md | 8 ++++---- myems-cleaning/README.md | 6 +++--- myems-modbus-tcp/README.md | 28 +++++++++++++--------------- myems-normalization/README.md | 6 +++--- 7 files changed, 32 insertions(+), 34 deletions(-) diff --git a/docs/installation.rst b/docs/installation.rst index 89d8f67d..faecb178 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -39,9 +39,9 @@ Installation * Install MySQL Connector:: $ cd ~/tools - $ wget wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz - $ tar xzf mysql-connector-python-8.0.23.tar.gz - $ cd ~/tools/mysql-connector-python-8.0.23 + $ wget wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz + $ tar xzf mysql-connector-python-8.0.28.tar.gz + $ cd ~/tools/mysql-connector-python-8.0.28 $ sudo python3 setup.py install * Install Falcon diff --git a/myems-aggregation/README.md b/myems-aggregation/README.md index 03b6a5a1..597a2bf5 100644 --- a/myems-aggregation/README.md +++ b/myems-aggregation/README.md @@ -133,7 +133,7 @@ In this section, you will install myems-aggregation on Ubuntu Server without int Download on any server with internet access: ```bash 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 cd ~ 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: ```bash cd ~/tools -tar xzf mysql-connector-python-8.0.23.tar.gz -cd ~/tools/mysql-connector-python-8.0.23 +tar xzf mysql-connector-python-8.0.28.tar.gz +cd ~/tools/mysql-connector-python-8.0.28 python3 setup.py install cd ~/tools/python-decouple python3 setup.py install diff --git a/myems-api/README.md b/myems-api/README.md index 7dea0551..44ad821a 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -166,7 +166,7 @@ In this section, you will offline install myems-api on Ubuntu Server without int mkdir ~tools && cd ~/tools git clone https://github.com/c0fec0de/anytree.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 pip download cython falcon falcon-cors falcon-multipart cd ~/tools @@ -190,8 +190,8 @@ python setup.py install cd ~/tools/simplejson python setup.py install cd ~/tools -tar xzf mysql-connector-python-8.0.23.tar.gz -cd ~/tools/mysql-connector-python-8.0.23 +tar xzf mysql-connector-python-8.0.28.tar.gz +cd ~/tools/mysql-connector-python-8.0.28 python setup.py install export LC_ALL="en_US.UTF-8" export LC_CTYPE="en_US.UTF-8" diff --git a/myems-api/installation_macos_zh.md b/myems-api/installation_macos_zh.md index ab34a5a3..8d94cbf5 100644 --- a/myems-api/installation_macos_zh.md +++ b/myems-api/installation_macos_zh.md @@ -33,7 +33,7 @@ $ mysql -u root -p密码 mysql: [Warning] Using a password on the command line interface can be insecure. Welcome to the MySQL monitor. Commands end with ; or \g. 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. @@ -97,9 +97,9 @@ $ pip3 install simplejson # 安装mysql-connector-python $ cd ~/tools -$ wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.23.tar.gz -$ tar xzf mysql-connector-python-8.0.23.tar.gz -$ cd ~/tools/mysql-connector-python-8.0.23 +$ wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz +$ tar xzf mysql-connector-python-8.0.28.tar.gz +$ cd ~/tools/mysql-connector-python-8.0.28 $ sudo python3 setup.py install # 安装Falcon diff --git a/myems-cleaning/README.md b/myems-cleaning/README.md index 6327246e..4d520003 100644 --- a/myems-cleaning/README.md +++ b/myems-cleaning/README.md @@ -93,9 +93,9 @@ In this section, you will install myems-cleaning on Ubuntu Server. Download and install MySQL Connector: ```bash cd ~/tools -wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz -tar xzf mysql-connector-python-8.0.23.tar.gz -cd ~/tools/mysql-connector-python-8.0.23 +wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz +tar xzf mysql-connector-python-8.0.28.tar.gz +cd ~/tools/mysql-connector-python-8.0.28 python3 setup.py install ``` diff --git a/myems-modbus-tcp/README.md b/myems-modbus-tcp/README.md index 54266c5e..80250b09 100644 --- a/myems-modbus-tcp/README.md +++ b/myems-modbus-tcp/README.md @@ -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. - * Copy source code to root directory On Windows: @@ -93,9 +91,9 @@ docker load --input .\myems-modbus-tcp.tar Download and install MySQL Connector: ```bash cd ~/tools -wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz -tar xzf mysql-connector-python-8.0.23.tar.gz -cd ~/tools/mysql-connector-python-8.0.23 +wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz +tar xzf mysql-connector-python-8.0.28.tar.gz +cd ~/tools/mysql-connector-python-8.0.28 python3 setup.py install ``` @@ -107,6 +105,14 @@ cd ~/tools/schedule 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 ```bash cd ~/tools @@ -118,14 +124,6 @@ cd ~/tools/modbus-tk 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 ```bash cd myems @@ -157,9 +155,9 @@ View the 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 systemctl restart myems-modbus-tcp.service ``` diff --git a/myems-normalization/README.md b/myems-normalization/README.md index 3effd150..0634b77d 100644 --- a/myems-normalization/README.md +++ b/myems-normalization/README.md @@ -100,9 +100,9 @@ In this section, you will install myems-normalization on Ubuntu Server. Download and install MySQL Connector: ```bash cd ~/tools -wget https://cdn.mysql.com/archives/mysql-connector-python-8.0/mysql-connector-python-8.0.23.tar.gz -tar xzf mysql-connector-python-8.0.23.tar.gz -cd ~/tools/mysql-connector-python-8.0.23 +wget https://cdn.mysql.com//Downloads/Connector-Python/mysql-connector-python-8.0.28.tar.gz +tar xzf mysql-connector-python-8.0.28.tar.gz +cd ~/tools/mysql-connector-python-8.0.28 python3 setup.py install ```