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

updated version number to v1.3.1

pull/69/head
13621160019@163.com 2021-10-15 16:31:00 +08:00
parent 7eb5effd6a
commit 3936b7c2e7
16 changed files with 79 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
CHANGELOG.md
View File

@ -17,6 +17,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- None.
## [v1.3.1] - 2021-10-15
### Added
- added maximum load to tenantbatch report
### Changed
- updated config.py files to move all variables to .env files via Python Decouple
- modified the doc for docker-compose
- updated database installation script and README
- updated database installation script and README
- reformatted excel exporters
- changed name font from Constantia to Arial in Excel exporters.
### Fixed
- fixed error when opening CombinedEquipmentEfficiency Excel report
- fixed issue for editing user name and password in Admin UI
- fixed NoneType issues in ExcelExporters.
### Removed
- None.
## [v1.3.0] - 2021-09-04
### Added
- added expiration datetimes to User in Admin UI
@ -461,21 +481,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Removed
- None.
[Unreleased]: https://github.com/MyEMS/MyEMS/compare/v1.3.0...HEAD
[v1.3.0]: https://github.com/MyEMS/MyEMS/compare/v1.2.3...v1.3.0
[v1.2.3]: https://github.com/MyEMS/MyEMS/compare/v1.2.2...v1.2.3
[v1.2.2]: https://github.com/MyEMS/MyEMS/compare/v1.2.1...v1.2.2
[v1.2.1]: https://github.com/MyEMS/MyEMS/compare/v1.2.0...v1.2.1
[v1.2.0]: https://github.com/MyEMS/MyEMS/compare/v1.1.6...v1.2.0
[v1.1.6]: https://github.com/MyEMS/MyEMS/compare/v1.1.5...v1.1.6
[v1.1.5]: https://github.com/MyEMS/MyEMS/compare/v1.1.4...v1.1.5
[v1.1.4]: https://github.com/MyEMS/MyEMS/compare/v1.1.3...v1.1.4
[v1.1.3]: https://github.com/MyEMS/MyEMS/compare/v1.1.2...v1.1.3
[v1.1.2]: https://github.com/MyEMS/MyEMS/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/MyEMS/MyEMS/compare/v1.1.0...v1.1.1
[v1.0.8]: https://github.com/MyEMS/MyEMS/compare/v1.0.8...v1.1.0
[v1.0.8]: https://github.com/MyEMS/MyEMS/compare/v1.0.7...v1.0.8
[v1.0.7]: https://github.com/MyEMS/MyEMS/compare/v1.0.6...v1.0.7
[v1.0.6]: https://github.com/MyEMS/MyEMS/compare/v1.0.5...v1.0.6
[v1.0.5]: https://github.com/MyEMS/MyEMS/releases/tag/v1.0.5
[Unreleased]: https://github.com/MyEMS/myems/compare/v1.3.1...HEAD
[v1.3.1]: https://github.com/MyEMS/myems/compare/v1.3.0...v1.3.1
[v1.3.0]: https://github.com/MyEMS/myems/compare/v1.2.3...v1.3.0
[v1.2.3]: https://github.com/MyEMS/myems/compare/v1.2.2...v1.2.3
[v1.2.2]: https://github.com/MyEMS/myems/compare/v1.2.1...v1.2.2
[v1.2.1]: https://github.com/MyEMS/myems/compare/v1.2.0...v1.2.1
[v1.2.0]: https://github.com/MyEMS/myems/compare/v1.1.6...v1.2.0
[v1.1.6]: https://github.com/MyEMS/myems/compare/v1.1.5...v1.1.6
[v1.1.5]: https://github.com/MyEMS/myems/compare/v1.1.4...v1.1.5
[v1.1.4]: https://github.com/MyEMS/myems/compare/v1.1.3...v1.1.4
[v1.1.3]: https://github.com/MyEMS/myems/compare/v1.1.2...v1.1.3
[v1.1.2]: https://github.com/MyEMS/myems/compare/v1.1.1...v1.1.2
[v1.1.1]: https://github.com/MyEMS/myems/compare/v1.1.0...v1.1.1
[v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.8...v1.1.0
[v1.0.8]: https://github.com/MyEMS/myems/compare/v1.0.7...v1.0.8
[v1.0.7]: https://github.com/MyEMS/myems/compare/v1.0.6...v1.0.7
[v1.0.6]: https://github.com/MyEMS/myems/compare/v1.0.5...v1.0.6
[v1.0.5]: https://github.com/MyEMS/myems/releases/tag/v1.0.5

4
README.md
View File

@ -72,10 +72,10 @@ MyEMS项目由下列组件构成:
### 默认端口号
MyEMS API: 8000
MyEMS Web UI: 80
MyEMS API: 8000
MyEMS Admin UI: 8001
### 默认密码

4
README_DE.md
View File

@ -72,10 +72,10 @@ Dieses Projekt besteht aus folgenden Komponenten:
### Standardports
MyEMS API: 8000
MyEMS Web UI: 80
MyEMS API: 8000
MyEMS Admin UI: 8001

4
README_EN.md
View File

@ -72,10 +72,10 @@ This project is compose of following components:
### Default Ports
MyEMS API: 8000
MyEMS Web UI: 80
MyEMS API: 8000
MyEMS Admin UI: 8001
### Default Passwords

2
admin/views/common/footer-login.html
View File

@ -1,5 +1,5 @@
<div class="footer-login">
<div>
<strong>{{'MY_EMS_NAME' | translate}} v1.3.0 <a href="https://myems.io">https://myems.io</a> </strong>
<strong>{{'MY_EMS_NAME' | translate}} v1.3.1 <a href="https://myems.io">https://myems.io</a> </strong>
</div>
</div>

2
admin/views/common/footer.html
View File

@ -3,6 +3,6 @@
<strong><a href="https://myems.io">https://myems.io</a></strong>
</div>
<div>
<strong>{{'MY_EMS_NAME' | translate}} v1.3.0</strong>
<strong>{{'MY_EMS_NAME' | translate}} v1.3.1</strong>
</div>
</div>

3
database/upgrade/upgrade1.3.1.sql Normal file
View File

@ -0,0 +1,3 @@
-- UPDATE VERSION NUMBER
UPDATE myems_system_db.tbl_versions SET version='1.3.1', release_date='2021-10-15' WHERE id=1;

18
docs/installation.rst
View File

@ -39,9 +39,9 @@ Installation
* Install MySQL Connector::
$ cd ~/tools
$ wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.20.tar.gz
$ tar xzf mysql-connector-python-8.0.20.tar.gz
$ cd ~/tools/mysql-connector-python-8.0.20
$ 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
$ sudo python3 setup.py install
* Install Falcon
@ -73,7 +73,7 @@ Installation
| Get the latest version of openpyxl from `https://foss.heptapod.net/openpyxl/openpyxl <https://foss.heptapod.net/openpyxl/openpyxl>`_
::
$ cd ~/tools
$ cd ~/tools
$ wget https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/1.1/et_xmlfile-1.1.tar.gz
$ tar xzf et_xmlfile-1.1.tar.gz
$ cd ~/tools/et_xmlfile-1.1
@ -82,7 +82,7 @@ Installation
$ git clone https://github.com/phn/jdcal.git
$ cd ~/tools/jdcal
$ sudo python3 setup.py install
$ mkdir ~/tools/pillow && cd ~/tools/pillow
$ mkdir ~/tools/pillow && cd ~/tools/pillow
$ pip3 download Pillow
$ sudo pip3 install --no-index --find-links ~/tools/pillow Pillow
$ cd ~/tools
@ -100,11 +100,11 @@ Installation
$ sudo nano /myems-api/config.py
Change the listening port (8080 as an example) in gunicorn.socket::
Change the listening port (8000 as an example) in gunicorn.socket::
$ sudo nano /myems-api/gunicorn.socket
ListenStream=0.0.0.0:8080
$ sudo ufw allow 8080
ListenStream=0.0.0.0:8000
$ sudo ufw allow 8000
Setup systemd configure files::
@ -125,5 +125,5 @@ Installation
**Run for debugging and testing**::
$ cd myems-api
$ sudo gunicorn -b 127.0.0.1:8080 app:api
$ sudo gunicorn -b 127.0.0.1:8000 app:api

8
myems-aggregation/README.md
View File

@ -23,9 +23,9 @@ run.sh
Download and install MySQL Connector:
```bash
cd ~/tools
wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.20.tar.gz
tar xzf mysql-connector-python-8.0.20.tar.gz
cd ~/tools/mysql-connector-python-8.0.20
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
python3 setup.py install
```
@ -45,7 +45,7 @@ cd myems
git checkout master (or the latest release tag)
cp -R ~/myems/myems-aggregation /myems-aggregation
```
Create .env file based on .env.example and edit the .env file if needed:
Create .env file based on example.env and edit the .env file if needed:
```bash
cp /myems-aggregation/example.env /myems-aggregation/.env
nano /myems-aggregation/.env

4
myems-api/README.md
View File

@ -54,7 +54,7 @@ python3 setup.py install
* Install MySQL Connector
```bash
cd ~/tools
wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.20.tar.gz
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.20.tar.gz
cd ~/tools/mysql-connector-python-8.0.20
python3 setup.py install
@ -140,7 +140,7 @@ git clone https://github.com/MyEMS/myems.git
cd ~/myems/myems-api
cp -R ~/myems/myems-api /myems-api
```
Create .env file based on .env.example and edit the .env file if needed:
Create .env file based on example.env and edit the .env file if needed:
```bash
cp /myems-api/example.env /myems-api/.env
nano /myems-api/.env

8
myems-cleaning/README.md
View File

@ -27,9 +27,9 @@ run.sh
Download and install MySQL Connector:
```bash
cd ~/tools
wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.20.tar.gz
tar xzf mysql-connector-python-8.0.20.tar.gz
cd ~/tools/mysql-connector-python-8.0.20
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
python3 setup.py install
```
@ -57,7 +57,7 @@ cd myems
git checkout master (or the latest release tag)
cp -R ~/myems/myems-cleaning /myems-cleaning
```
Create .env file based on .env.example and edit the .env file if needed:
Create .env file based on example.env and edit the .env file if needed:
```bash
cp /myems-cleaning/example.env /myems-cleaning/.env
nano /myems-cleaning/.env

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

@ -27,9 +27,9 @@ run.sh
Download and install MySQL Connector:
```bash
cd ~/tools
wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.20.tar.gz
tar xzf mysql-connector-python-8.0.20.tar.gz
cd ~/tools/mysql-connector-python-8.0.20
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
python3 setup.py install
```

8
myems-normalization/README.md
View File

@ -30,9 +30,9 @@ run.sh
Download and install MySQL Connector:
```bash
cd ~/tools
wget https://dev.mysql.com/get/Downloads/Connector-Python/mysql-connector-python-8.0.20.tar.gz
tar xzf mysql-connector-python-8.0.20.tar.gz
cd ~/tools/mysql-connector-python-8.0.20
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
python3 setup.py install
```
@ -96,7 +96,7 @@ cd myems
git checkout master (or the latest release tag)
cp -r ~/myems/myems-normalization /myems-normalization
```
Create .env file based on .env.example and edit the .env file if needed:
Create .env file based on example.env and edit the .env file if needed:
```bash
cp /myems-normalization/example.env /myems-cleaning/.env
nano /myems-normalization/.env

4
web/package-lock.json generated vendored
View File

@ -1,12 +1,12 @@
{
"name": "myems",
"version": "1.3.0",
"version": "1.3.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "myems",
"version": "1.3.0",
"version": "1.3.1",
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",
"@fortawesome/fontawesome-svg-core": "^1.2.30",

2
web/package.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "myems",
"version": "1.3.0",
"version": "1.3.1",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.1",

2
web/src/config.js
View File

@ -1,4 +1,4 @@
export const version = '1.3.0';
export const version = '1.3.1';
export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint
export const topNavbarBreakpoint = 'lg';
//export const APIBaseURL = 'http://127.0.0.1:8000';