From 013ee2800381927123c21def62c253e2beb8f30c Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 25 Nov 2021 16:55:26 +0800 Subject: [PATCH 001/117] updated README --- myems-aggregation/README.md | 68 ++++++++++++++++++++++++++++++------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/myems-aggregation/README.md b/myems-aggregation/README.md index e0e3a1aa..ad548087 100644 --- a/myems-aggregation/README.md +++ b/myems-aggregation/README.md @@ -52,34 +52,74 @@ docker run -d --restart always --name myems-aggregation myems/myems-aggregation --name Assign a name to the container -### Option 2: Install myems-aggregation on Ubuntu Server (bare-metal or virtual machine) -In this section, you will install myems-aggregation on Ubuntu Server. +### Option 2: Online install myems-aggregation on Ubuntu Server with internet access -Download and install MySQL Connector: +In this section, you will install myems-aggregation on Ubuntu Server with internet access. + +```bash +cd ~ +git clone https://github.com/MyEMS/myems.git +cd myems +git checkout master (or the latest release tag) +cd myems-aggregation +pip install -r requirements.txt +cp -r ~/myems/myems-aggregation /myems-aggregation +``` +Copy exmaple.env file to .env and modify the .env file: +```bash +cp /myems-aggregation/example.env /myems-aggregation/.env +nano /myems-aggregation/.env +``` +Setup systemd service: +```bash +cp myems-aggregation.service /lib/systemd/system/ +``` +Enable the service: +```bash +systemctl enable myems-aggregation.service +``` +Start the service: +```bash +systemctl start myems-aggregation.service +``` +Monitor the service: +```bash +systemctl status myems-aggregation.service +``` +View the log: +```bash +cat /myems-aggregation.log +``` + +### Option 3: Offline install myems-aggregation on Ubuntu Server without internet access + +In this section, you will install myems-aggregation on Ubuntu Server without internet access. + +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 +git clone https://github.com/henriquebastos/python-decouple.git +cd ~ +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 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-aggregation service: ```bash -cd ~ -git clone https://github.com/MyEMS/myems.git -cd myems +cd ~/myems git checkout master (or the latest release tag) -cp -R ~/myems/myems-aggregation /myems-aggregation +cp -r ~/myems/myems-aggregation /myems-aggregation ``` Copy exmaple.env file to .env and modify the .env file: ```bash @@ -112,3 +152,5 @@ cat /myems-aggregation.log [1]. https://myems.io [2]. https://dev.mysql.com/doc/connector-python/en/ + +[3]. https://github.com/henriquebastos/python-decouple/ From 27f9bb862927075e60a3150d23e7f6fe3ce7c239 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 26 Nov 2021 19:17:09 +0800 Subject: [PATCH 002/117] updated postman collection and README of myems-api --- myems-api/MyEMS.postman_collection.json | 112 ++++++++++-- myems-api/README.md | 233 ++++++++++++++---------- 2 files changed, 227 insertions(+), 118 deletions(-) diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 4a108d31..14620963 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "188bbc28-1018-45ae-bdc8-c0b465102f5f", + "_postman_id": "edda43bf-7618-4cef-a9dc-b5eb90fde85a", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -1844,7 +1844,20 @@ "name": "POST Create an Energy Category", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"柴油\",\"unit_of_measure\":\"L\", \"kgce\":0.1229 , \"kgco2e\":0.8825}}" @@ -1865,19 +1878,32 @@ "name": "PUT Update an Energy Category", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"汽油\",\"unit_of_measure\":\"L\", \"kgce\":0.1229 , \"kgco2e\":0.8825}}" }, "url": { - "raw": "{{base_url}}/energycategories/9", + "raw": "{{base_url}}/energycategories/12", "host": [ "{{base_url}}" ], "path": [ "energycategories", - "9" + "12" ] } }, @@ -1887,15 +1913,28 @@ "name": "DELETE an Energy Category", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/energycategories/9", + "raw": "{{base_url}}/energycategories/12", "host": [ "{{base_url}}" ], "path": [ "energycategories", - "9" + "12" ] } }, @@ -3274,7 +3313,20 @@ "name": "POST Create New Meter", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"PM20\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"master_meter_id\":1, \"description\":\"空调用电\"}}" @@ -3295,19 +3347,32 @@ "name": "PUT Update a Meter", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"name\":\"PM201\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"master_meter_id\":7, \"description\":\"空调用电\"}}" + "raw": "{\"data\":{\"name\":\"PM201\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"master_meter_id\":1, \"description\":\"空调用电\"}}" }, "url": { - "raw": "{{base_url}}/meters/28", + "raw": "{{base_url}}/meters/4", "host": [ "{{base_url}}" ], "path": [ "meters", - "28" + "4" ] } }, @@ -3317,15 +3382,28 @@ "name": "DELETE Meter by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/meters/2", + "raw": "{{base_url}}/meters/4", "host": [ "{{base_url}}" ], "path": [ "meters", - "2" + "4" ] } }, @@ -3357,7 +3435,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\"data\":{\"point_id\":\"1\"}}" + "raw": "{\"data\":{\"point_id\":\"3\"}}" }, "url": { "raw": "{{base_url}}/meters/1/points", diff --git a/myems-api/README.md b/myems-api/README.md index bd2b19a5..7a6dd830 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -33,7 +33,7 @@ python-decouple ```bash cd myems/myems-api -pip install -r requirements.txt +pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com cp example.env .env chmod +x run.sh ./run.sh @@ -41,7 +41,7 @@ chmod +x run.sh ## Installation -### Option 1: Install myems-api on Docker +### Installation Option 1: Install myems-api on Docker In this section, you will install myems-api on Docker. @@ -69,107 +69,18 @@ docker run -d -p 8000:8000 --restart always --name myems-api myems/myems-api --name Assign a name to the container -### Option 2: Install myems-api on Ubuntu Server (bare-metal or virtual machine) +### Option 2: Online install myems-api on Ubuntu Server with internet access -In this section, you will install myems-api on Ubuntu Server. - -* Install anytree +In this section, you will online install myems-api on Ubuntu Server with internet access. +* Copy source code to a production Ubuntu Server and then install tools ```bash -cd ~/tools -git clone https://github.com/c0fec0de/anytree.git -cd anytree -python3 setup.py install +cd ~/myems/myems-api +pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com ``` -* Install simplejson +* Install myems-api service: ```bash -cd ~/tools -git clone https://github.com/simplejson/simplejson.git -cd simplejson -python3 setup.py install -``` - -* 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 - python3 setup.py install -``` - -* Install Falcon, - - if you are behind proxy, use --proxy parameter - - Refer to - - https://falconframework.org/ - - https://github.com/lwcolton/falcon-cors - - https://github.com/yohanboniface/falcon-multipart -```bash - mkdir ~/tools/falcon && cd ~/tools/falcon - pip3 download cython falcon falcon-cors falcon-multipart - export LC_ALL="en_US.UTF-8" - export LC_CTYPE="en_US.UTF-8" - dpkg-reconfigure locales - pip3 install --upgrade --no-index --find-links ~/tools/falcon cython falcon falcon-cors falcon-multipart -``` - -* Install gunicorn, refer to http://gunicorn.org -```bash - mkdir ~/tools/gunicorn && cd ~/tools/gunicorn - pip3 download gunicorn - pip3 install --no-index --find-links ~/tools/gunicorn gunicorn -``` - -* Install openpyxl, refer to https://foss.heptapod.net/openpyxl/openpyxl -Get the latest version of et_xmlfile from https://foss.heptapod.net/openpyxl/et_xmlfile/ -```bash -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 -``` -Get jdcal -```bash -cd ~/tools -git clone https://github.com/phn/jdcal.git -``` -Get Pillow -``` -mkdir ~/tools/pillow && cd ~/tools/pillow -pip3 download Pillow -``` -Get the latest version of openpyxl from https://foss.heptapod.net/openpyxl/openpyxl -```bash -cd ~/tools -wget https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.7/openpyxl-3.0.7.tar.gz -tar xzf openpyxl-3.0.7.tar.gz -``` - -```bash -cd ~/tools/et_xmlfile-1.1 -python3 setup.py install -cd ~/tools/jdcal -python3 setup.py install -pip3 install --no-index --find-links ~/tools/pillow Pillow -cd ~/tools/openpyxl-3.0.7 -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 gunicorn service for myems-api: -```bash -cp -R myems/myems-api /myems-api +cp -r ~/myems/myems-api /myems-api ``` Create .env file based on example.env and edit the .env file if needed: ```bash @@ -180,7 +91,105 @@ Check or change the listening port (default is 8000) in myems-api.service and my ```bash nano /myems-api/myems-api.service ``` -``` +```bash +ExecStart=/usr/local/bin/gunicorn -b 0.0.0.0:8000 --pid /run/myems-api/pid --timeout 600 --workers=4 app:api +``` +```bash +nano /myems-api/myems-api.socket +``` +```bash +ListenStream=0.0.0.0:8000 +``` +Add port to firewall: +```bash +ufw allow 8000 +``` +Setup systemd configure files: +```bash +cp /myems-api/myems-api.service /lib/systemd/system/ +cp /myems-api/myems-api.socket /lib/systemd/system/ +cp /myems-api/myems-api.conf /usr/lib/tmpfiles.d/ +``` +Next enable the services so that they autostart at boot: +```bash + systemctl enable myems-api.socket + systemctl enable myems-api.service +``` +Start the services : +```bash +systemctl start myems-api.socket +systemctl start myems-api.service +``` + +### Option 3: Offline install myems-api on Ubuntu Server without internet access + +In this section, you will offline install myems-api on Ubuntu Server without internet access. +* Download tools +```bash +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 +mkdir ~/tools/falcon && cd ~/tools/falcon +pip download cython falcon falcon-cors falcon-multipart +cd ~/tools +mkdir ~/tools/gunicorn && cd ~/tools/gunicorn +pip download gunicorn +cd ~/tools +wget https://foss.heptapod.net/openpyxl/et_xmlfile/-/archive/1.1/et_xmlfile-1.1.tar.gz +cd ~/tools +git clone https://github.com/phn/jdcal.git +mkdir ~/tools/pillow && cd ~/tools/pillow +pip download Pillow +cd ~/tools +wget https://foss.heptapod.net/openpyxl/openpyxl/-/archive/3.0.7/openpyxl-3.0.7.tar.gz +cd ~/tools +git clone https://github.com/henriquebastos/python-decouple.git +``` +* Copy source code and tools to the production Ubuntu Server and then run: +```bash +cd ~/tools/anytree +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 +python setup.py install +export LC_ALL="en_US.UTF-8" +export LC_CTYPE="en_US.UTF-8" +dpkg-reconfigure locales +pip install --upgrade --no-index --find-links ~/tools/falcon cython falcon falcon-cors falcon-multipart +pip install --no-index --find-links ~/tools/gunicorn gunicorn +cd ~/tools +tar xzf et_xmlfile-1.1.tar.gz +cd ~/tools/et_xmlfile-1.1 +python setup.py install +cd ~/tools/jdcal +python setup.py install +cd ~/tools +pip install --no-index --find-links ~/tools/pillow Pillow +tar xzf openpyxl-3.0.7.tar.gz +cd ~/tools/openpyxl-3.0.7 +python setup.py install +cd ~/tools/python-decouple +python setup.py install +``` + +* Install myems-api service: +```bash +cp -r ~/myems/myems-api /myems-api +``` +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 +``` +Check or change the listening port (default is 8000) in myems-api.service and myems-api.socket: +```bash +nano /myems-api/myems-api.service +``` +```bash ExecStart=/usr/local/bin/gunicorn -b 0.0.0.0:8000 --pid /run/myems-api/pid --timeout 600 --workers=4 app:api ``` ```bash @@ -210,7 +219,7 @@ systemctl start myems-api.socket systemctl start myems-api.service ``` -### Option 3: Install myems-api on macOS +### Installation Option 4: Install myems-api on macOS Please refer to [Installation on macOS (Chinese)](./installation_macos_zh.md) @@ -219,7 +228,6 @@ Please refer to [Installation on macOS (Chinese)](./installation_macos_zh.md) View in Postman: import the file MyEMS.postman_collection.json with Postman - [Energy Category](#Energy-Category) | [Energy Item](#Energy-Item) [Data Source](#Data-Source) | [Point](#Point) @@ -2390,3 +2398,26 @@ curl -i -X GET {{base_url}}/reports/virtualmeterenergy?virtualmeterid=1&periodty ```bash curl -i -X GET {{base_url}}/reports/virtualmetercost?virtualmeterid=1&periodtype=daily&baseperiodstartdatetime=2020-08-01T00:00:00&baseperiodenddatetime=2020-09-01T00:00:00&reportingperiodstartdatetime=2020-09-01T00:00:00&reportingperiodenddatetime=2020-10-01T00:00:00 ``` + +## References + +[1]. http://myems.io + +[2]. https://falconframework.org/ + +[3]. https://github.com/lwcolton/falcon-cors + +[4]. https://github.com/yohanboniface/falcon-multipart + +[5]. http://gunicorn.org + +[6]. https://github.com/henriquebastos/python-decouple/ + +[7]. https://foss.heptapod.net/openpyxl/openpyxl + +[8]. https://foss.heptapod.net/openpyxl/et_xmlfile/ + + + + + From d937acd1bb31ae0102b160274b7051c003c21608 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 26 Nov 2021 20:05:01 +0800 Subject: [PATCH 003/117] fixed issue of EnergyCategory in admin and updated README of admin --- admin/README.md | 18 +++++++++++++++--- .../category/energycategory.controller.js | 11 ++++++++--- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/admin/README.md b/admin/README.md index e3e92fc9..6653e273 100644 --- a/admin/README.md +++ b/admin/README.md @@ -14,6 +14,16 @@ nginx-1.18.0 or later In this section, you will install myems-admin on Docker. +* replace ~~127.0.0.1:8000~~ in nginx.conf with actual **HOST** ip and port of myems-api +```bash +cd myems/admin +nano nginx.conf +``` + +```bash + proxy_pass http://127.0.0.1:8000/; +``` + * Build a Docker image ```bash cd myems/admin @@ -141,6 +151,8 @@ sudo nano /var/www/html/admin/app/api.js ## References -1. https://myems.io -2. https://dev.mysql.com/doc/connector-python/en/ -3. https://nginx.org/ \ No newline at end of file +[1]. https://myems.io + +[2]. https://dev.mysql.com/doc/connector-python/en/ + +[3]. https://nginx.org/ \ No newline at end of file diff --git a/admin/app/controllers/settings/category/energycategory.controller.js b/admin/app/controllers/settings/category/energycategory.controller.js index fcc0db00..def966a5 100644 --- a/admin/app/controllers/settings/category/energycategory.controller.js +++ b/admin/app/controllers/settings/category/energycategory.controller.js @@ -1,7 +1,13 @@ 'use strict'; -app.controller('EnergyCategoryController', function($scope, $translate,$uibModal, CategoryService,toaster,SweetAlert) { - +app.controller('EnergyCategoryController', function($scope, + $window, + $translate, + $uibModal, + CategoryService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -10,7 +16,6 @@ app.controller('EnergyCategoryController', function($scope, $translate,$uibModal $scope.categories = []; } }); - }; $scope.addCategory = function() { From 3b0d4a13f5dc5023a53ec56c9c0afbc8ca2a8bc1 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 27 Nov 2021 21:15:43 +0800 Subject: [PATCH 004/117] added access control to meter in api and admin --- .../combinedequipmentparameter.controller.js | 19 ++++++++++-- .../datasource/datasource.controller.js | 3 +- .../settings/datasource/point.controller.js | 3 +- .../distributioncircuitpoint.controller.js | 19 ++++++++++-- .../equipmentparameter.controller.js | 17 +++++++++-- .../settings/meter/meter.controller.js | 13 ++++++-- .../settings/meter/meterpoint.controller.js | 29 +++++++++++------- .../settings/sensor/sensorpoint.controller.js | 19 ++++++++++-- .../shopfloor/shopfloorpoint.controller.js | 18 +++++++++-- .../settings/space/spacepoint.controller.js | 18 +++++++++-- .../settings/store/storepoint.controller.js | 18 +++++++++-- .../settings/tenant/tenantpoint.controller.js | 18 +++++++++-- .../settings/datasource/datasource.service.js | 2 +- .../settings/meter/meterpoint.service.js | 10 +++---- myems-api/MyEMS.postman_collection.json | 30 +++++++++++++++++-- myems-api/README.md | 14 ++++----- myems-api/core/meter.py | 3 ++ 17 files changed, 201 insertions(+), 52 deletions(-) diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js index c52bef8f..5455780a 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js @@ -1,6 +1,19 @@ 'use strict'; -app.controller('CombinedEquipmentParameterController', function ($scope, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentParameterService, CombinedEquipmentService, PointService, toaster, SweetAlert) { +app.controller('CombinedEquipmentParameterController', function ( + $scope, + $window, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + CombinedEquipmentParameterService, + CombinedEquipmentService, + PointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = { selected: undefined }; $scope.is_show_add_parameter = false; $scope.combinedequipments = []; @@ -36,7 +49,6 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod }; $scope.addCombinedEquipmentParameter = function () { - var modalInstance = $uibModal.open({ templateUrl: 'views/settings/combinedequipment/combinedequipmentparameter.model.html', controller: 'ModalAddCombinedEquipmentParameterCtrl', @@ -250,7 +262,8 @@ app.controller('CombinedEquipmentParameterController', function ($scope, $uibMod }; $scope.getAllPoints = function () { - PointService.getAllPoints(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getAllPoints(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/datasource/datasource.controller.js b/admin/app/controllers/settings/datasource/datasource.controller.js index 45e5df29..bb26dec2 100644 --- a/admin/app/controllers/settings/datasource/datasource.controller.js +++ b/admin/app/controllers/settings/datasource/datasource.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('DataSourceController', function($scope, +app.controller('DataSourceController', function( + $scope, $window, $uibModal, $translate, diff --git a/admin/app/controllers/settings/datasource/point.controller.js b/admin/app/controllers/settings/datasource/point.controller.js index 83ec5913..e426df06 100644 --- a/admin/app/controllers/settings/datasource/point.controller.js +++ b/admin/app/controllers/settings/datasource/point.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('PointController', function($scope, +app.controller('PointController', function( + $scope, $window, $uibModal, $translate, diff --git a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js index 8b5f8aaf..b7a63720 100644 --- a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js @@ -1,9 +1,21 @@ 'use strict'; -app.controller('DistributionCircuitPointController', function ($scope, $timeout, $translate, DistributionCircuitService, DataSourceService, PointService, DistributionCircuitPointService, toaster, SweetAlert) { +app.controller('DistributionCircuitPointController', function ( + $scope, + $window, + $timeout, + $translate, + DistributionCircuitService, + DataSourceService, + PointService, + DistributionCircuitPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentDistributionCircuit = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +29,8 @@ app.controller('DistributionCircuitPointController', function ($scope, $timeout, }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js index 17ae48d8..09a9a133 100644 --- a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('EquipmentParameterController', function($scope, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentParameterService, EquipmentService, PointService, toaster,SweetAlert) { +app.controller('EquipmentParameterController', function( + $scope, + $window, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + EquipmentParameterService, + EquipmentService, + PointService, + toaster,SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentEquipment = {selected:undefined}; $scope.is_show_add_parameter = false; $scope.equipments = []; @@ -251,7 +263,8 @@ app.controller('EquipmentParameterController', function($scope, $uibModal, $tran }; $scope.getAllPoints = function() { - PointService.getAllPoints(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getAllPoints(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/meter/meter.controller.js b/admin/app/controllers/settings/meter/meter.controller.js index 747c3bbe..9f43df25 100644 --- a/admin/app/controllers/settings/meter/meter.controller.js +++ b/admin/app/controllers/settings/meter/meter.controller.js @@ -1,7 +1,16 @@ 'use strict'; -app.controller('MeterController', function($scope, $translate, $uibModal, MeterService, CategoryService, CostCenterService, EnergyItemService,toaster, SweetAlert) { - +app.controller('MeterController', function($scope, + $window, + $translate, + $uibModal, + MeterService, + CategoryService, + CostCenterService, + EnergyItemService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { diff --git a/admin/app/controllers/settings/meter/meterpoint.controller.js b/admin/app/controllers/settings/meter/meterpoint.controller.js index fa0f697b..44e6fb38 100644 --- a/admin/app/controllers/settings/meter/meterpoint.controller.js +++ b/admin/app/controllers/settings/meter/meterpoint.controller.js @@ -1,14 +1,20 @@ 'use strict'; -app.controller('MeterPointController', function ($scope, $timeout, $translate, - MeterService, - DataSourceService, - PointService, - MeterPointService, - toaster) { +app.controller('MeterPointController', function ( + $scope, + $window, + $timeout, + $translate, + MeterService, + DataSourceService, + PointService, + MeterPointService, + toaster) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentMeter = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -22,7 +28,8 @@ app.controller('MeterPointController', function ($scope, $timeout, $translate, }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { @@ -69,7 +76,8 @@ app.controller('MeterPointController', function ($scope, $timeout, $translate, $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var meterid = $scope.currentMeter.id; - MeterPointService.addPair(meterid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + MeterPointService.addPair(meterid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -95,7 +103,8 @@ app.controller('MeterPointController', function ($scope, $timeout, $translate, } var meterpointid = angular.element('#' + dragEl).scope().meterpoint.id; var meterid = $scope.currentMeter.id; - MeterPointService.deletePair(meterid, meterpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + MeterPointService.deletePair(meterid, meterpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/sensor/sensorpoint.controller.js b/admin/app/controllers/settings/sensor/sensorpoint.controller.js index 3ba13fd3..c2b6839c 100644 --- a/admin/app/controllers/settings/sensor/sensorpoint.controller.js +++ b/admin/app/controllers/settings/sensor/sensorpoint.controller.js @@ -1,9 +1,21 @@ 'use strict'; -app.controller('SensorPointController', function ($scope, $timeout, $translate, SensorService, DataSourceService, PointService, SensorPointService, toaster, SweetAlert) { +app.controller('SensorPointController', function ( + $scope, + $window, + $timeout, + $translate, + SensorService, + DataSourceService, + PointService, + SensorPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentSensor = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -18,7 +30,8 @@ app.controller('SensorPointController', function ($scope, $timeout, $translate, }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js index a88ea9f1..09eb88a0 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js @@ -1,9 +1,20 @@ 'use strict'; -app.controller('ShopfloorPointController', function ($scope, $translate, ShopfloorService, DataSourceService, PointService, ShopfloorPointService, toaster, SweetAlert) { +app.controller('ShopfloorPointController', function ( + $scope, + $window, + $translate, + ShopfloorService, + DataSourceService, + PointService, + ShopfloorPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentShopfloor = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +28,8 @@ app.controller('ShopfloorPointController', function ($scope, $translate, Shopflo }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/space/spacepoint.controller.js b/admin/app/controllers/settings/space/spacepoint.controller.js index cec6de57..c1b50d52 100644 --- a/admin/app/controllers/settings/space/spacepoint.controller.js +++ b/admin/app/controllers/settings/space/spacepoint.controller.js @@ -1,6 +1,16 @@ 'use strict'; -app.controller('SpacePointController', function ($scope, $translate, SpaceService, DataSourceService, PointService, SpacePointService, toaster, SweetAlert) { +app.controller('SpacePointController', function ( + $scope, + $window, + $translate, + SpaceService, + DataSourceService, + PointService, + SpacePointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.spaces = []; $scope.currentSpaceID = 1; $scope.spacepoints = []; @@ -42,7 +52,8 @@ app.controller('SpacePointController', function ($scope, $translate, SpaceServic }; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -56,7 +67,8 @@ app.controller('SpacePointController', function ($scope, $translate, SpaceServic }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/store/storepoint.controller.js b/admin/app/controllers/settings/store/storepoint.controller.js index 17cc3c0e..d239d6c5 100644 --- a/admin/app/controllers/settings/store/storepoint.controller.js +++ b/admin/app/controllers/settings/store/storepoint.controller.js @@ -1,9 +1,20 @@ 'use strict'; -app.controller('StorePointController', function ($scope, $translate, StoreService, DataSourceService, PointService, StorePointService, toaster, SweetAlert) { +app.controller('StorePointController', function ( + $window, + $scope, + $translate, + StoreService, + DataSourceService, + PointService, + StorePointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentStore = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +28,8 @@ app.controller('StorePointController', function ($scope, $translate, StoreServic }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/controllers/settings/tenant/tenantpoint.controller.js b/admin/app/controllers/settings/tenant/tenantpoint.controller.js index b29505ee..d8c687e2 100644 --- a/admin/app/controllers/settings/tenant/tenantpoint.controller.js +++ b/admin/app/controllers/settings/tenant/tenantpoint.controller.js @@ -1,9 +1,20 @@ 'use strict'; -app.controller('TenantPointController', function ($scope, $translate, TenantService, DataSourceService, PointService, TenantPointService, toaster, SweetAlert) { +app.controller('TenantPointController', function ( + $scope, + $window, + $translate, + TenantService, + DataSourceService, + PointService, + TenantPointService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentTenant = {selected:undefined}; $scope.getAllDataSources = function () { - DataSourceService.getAllDataSources(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DataSourceService.getAllDataSources(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.datasources = response.data; if ($scope.datasources.length > 0) { @@ -17,7 +28,8 @@ app.controller('TenantPointController', function ($scope, $translate, TenantServ }; $scope.getPointsByDataSourceID = function (id) { - PointService.getPointsByDataSourceID(id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PointService.getPointsByDataSourceID(id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.points = response.data; } else { diff --git a/admin/app/services/settings/datasource/datasource.service.js b/admin/app/services/settings/datasource/datasource.service.js index f33486c0..b3e88a92 100644 --- a/admin/app/services/settings/datasource/datasource.service.js +++ b/admin/app/services/settings/datasource/datasource.service.js @@ -2,7 +2,7 @@ app.factory('DataSourceService', function($http) { return { getAllDataSources:function(headers, callback){ - $http.get(getAPI()+'datasources', {headers}) + $http.get(getAPI() + 'datasources', {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/meter/meterpoint.service.js b/admin/app/services/settings/meter/meterpoint.service.js index e9184851..3c1ebf28 100644 --- a/admin/app/services/settings/meter/meterpoint.service.js +++ b/admin/app/services/settings/meter/meterpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('MeterPointService', function($http) { return { - addPair: function(meterID,pointID,callback) { - $http.post(getAPI()+'meters/'+meterID+'/points',{data:{'point_id':pointID}}) + addPair: function(meterID, pointID, headers, callback) { + $http.post(getAPI() + 'meters/' + meterID + '/points', {data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('MeterPointService', function($http) { }); }, - deletePair: function(meterID,pointID, callback) { - $http.delete(getAPI()+'meters/'+meterID+'/points/'+pointID) + deletePair: function(meterID,pointID, headers, callback) { + $http.delete(getAPI() + 'meters/' + meterID + '/points/' + pointID, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,7 +19,7 @@ app.factory('MeterPointService', function($http) { }); }, getPointsByMeterID: function(id, callback) { - $http.get(getAPI()+'meters/'+id+'/points') + $http.get(getAPI() + 'meters/' + id + '/points') .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 14620963..af45e87a 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -3432,7 +3432,20 @@ "name": "POST Meter Point Relation", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "ee46c3c7ca148dcb76af23fd2431fd925d20d570c363dc8d478a3afa74a9c8743886cdaf8d37b94faa49210d9003a916313790c7818c2ab7e87647489aaabfb7", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"point_id\":\"3\"}}" @@ -3474,7 +3487,20 @@ "name": "DELETE Meter Point Relation", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "ee46c3c7ca148dcb76af23fd2431fd925d20d570c363dc8d478a3afa74a9c8743886cdaf8d37b94faa49210d9003a916313790c7818c2ab7e87647489aaabfb7", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/meters/1/points/3", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index 7a6dd830..b8c163dc 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -574,15 +574,15 @@ curl -i -X GET {{base_url}}/energycategories ``` * DELETE an Energy Category by ID ```bash -curl -i -X DELETE {{base_url}}/energycategories/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/energycategories/{id} ``` * POST Create an Energy Category ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"电","unit_of_measure":"kWh", "kgce":0.1229 , "kgco2e":0.8825}}' {{base_url}}/energycategories +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"电","unit_of_measure":"kWh", "kgce":0.1229 , "kgco2e":0.8825}}' {{base_url}}/energycategories ``` * PUT Update an Energy Category ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"电","unit_of_measure":"kWh", "kgce":0.1329 , "kgco2e":0.9825}}' {{base_url}}/energycategories/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"电","unit_of_measure":"kWh", "kgce":0.1329 , "kgco2e":0.9825}}' {{base_url}}/energycategories/{id} ``` ### Energy Flow Diagram @@ -1053,11 +1053,11 @@ curl -i -X DELETE {{base_url}}/meters/{id} ``` * POST Create a Meter ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X POST -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters ``` * PUT Update a Meter ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X PUT -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters/{id} ``` * GET All Submeters of Meter by ID ```bash @@ -1069,11 +1069,11 @@ curl -i -X GET {{base_url}}/meters/{id}/points ``` * POST Meter Point Relation ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/meters/{id}/points +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/meters/{id}/points ``` * DELETE Meter Point Relation ```bash -curl -i -X DELETE {{base_url}}/meters/{id}/points/{pid} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X DELETE {{base_url}}/meters/{id}/points/{pid} ``` ### Notification diff --git a/myems-api/core/meter.py b/myems-api/core/meter.py index 5a5dd1a2..11812ea3 100644 --- a/myems-api/core/meter.py +++ b/myems-api/core/meter.py @@ -900,6 +900,7 @@ class MeterPointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -967,6 +968,8 @@ class MeterPointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + """Handles DELETE requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_METER_ID') From ccf7b9d43533bee1fc54b56149296af2d03c063b Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 28 Nov 2021 20:46:46 +0800 Subject: [PATCH 005/117] updated requirements of myems-api --- myems-api/requirements.txt | 2 +- web/README.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/myems-api/requirements.txt b/myems-api/requirements.txt index b2db7617..430b7cc9 100644 --- a/myems-api/requirements.txt +++ b/myems-api/requirements.txt @@ -1,7 +1,7 @@ anytree simplejson mysql-connector-python -falcon +falcon==3.0.1 falcon_cors falcon-multipart gunicorn diff --git a/web/README.md b/web/README.md index 01e763f6..4ea41edb 100644 --- a/web/README.md +++ b/web/README.md @@ -57,6 +57,13 @@ In this section, you will install myems-web on Docker. cd myems/web sudo nano src/config.js ``` + +* replace ~~127.0.0.1:8000~~ in nginx.conf with actual **HOST** ip and port of myems-api +```bash +cd myems/web +nano nginx.conf +``` + * Download all the necessary dependencies into the node_modules directory. ```bash sudo npm i --unsafe-perm=true --allow-root --legacy-peer-deps From 7a2d2a3f1de92bbafa63664d4388921e01c1511d Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 29 Nov 2021 16:07:31 +0800 Subject: [PATCH 006/117] menu of access_control --- .../settings/menu/menu.controller.js | 7 +-- .../services/settings/menu/menu.service.js | 4 +- myems-api/MyEMS.postman_collection.json | 43 +++++++++++++++++-- myems-api/core/menu.py | 3 +- 4 files changed, 48 insertions(+), 9 deletions(-) diff --git a/admin/app/controllers/settings/menu/menu.controller.js b/admin/app/controllers/settings/menu/menu.controller.js index 13ada957..31689cdd 100644 --- a/admin/app/controllers/settings/menu/menu.controller.js +++ b/admin/app/controllers/settings/menu/menu.controller.js @@ -1,10 +1,10 @@ 'use strict'; -app.controller('MenuController', function ($scope, $uibModal, MenuService, toaster, $translate) { +app.controller('MenuController', function ($scope, $window, $uibModal, MenuService, toaster, $translate) { $scope.menus = []; $scope.currentMenu = {}; $scope.currentMenuChildren = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllMenus = function () { MenuService.getAllMenus(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -104,7 +104,8 @@ app.controller('MenuController', function ($scope, $uibModal, MenuService, toast }); modalInstance.result.then(function (modifiedMenu) { - MenuService.editMenu(modifiedMenu, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + MenuService.editMenu(modifiedMenu, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/menu/menu.service.js b/admin/app/services/settings/menu/menu.service.js index fc0c6505..7d2080bb 100644 --- a/admin/app/services/settings/menu/menu.service.js +++ b/admin/app/services/settings/menu/menu.service.js @@ -17,8 +17,8 @@ app.factory('MenuService', function($http) { callback(response); }); }, - editMenu: function(menu, callback) { - $http.put(getAPI()+'menus/'+menu.id,{data:menu}) + editMenu: function(menu, headers, callback) { + $http.put(getAPI()+'menus/'+menu.id, {data:menu}, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index af45e87a..623bddec 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "edda43bf-7618-4cef-a9dc-b5eb90fde85a", + "_postman_id": "27f47263-6e8e-4d74-93a9-0ee9b56eccfc", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -3214,7 +3214,18 @@ "name": "PUT Update a Menu", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "816be1f0-cf59-4aa4-bf81-a0e90577d416", + "type": "text" + }, + { + "key": "Token", + "value": "fc037979da169499d2c84d9ff838ae2599f1934b2e43872a8dc9da033f4d5811a0ca711595a576dcd6b340ffc3d8a8824630cf04b4e67331a6a82e8ec2dfd155", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"is_hidden\":true}}" @@ -7414,7 +7425,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\"data\":{\"email\":\"administrator@myems.io\", \"password\":\"!MyEMS1\"}}" + "raw": "{\"data\":{\"email\":\"admin1130@kwh-w.com\", \"password\":\"c2c77a39ab28\"}}" }, "url": { "raw": "{{base_url}}/users/login", @@ -10631,5 +10642,31 @@ }, "response": [] } + ], + "event": [ + { + "listen": "prerequest", + "script": { + "type": "text/javascript", + "exec": [ + "" + ] + } + }, + { + "listen": "test", + "script": { + "type": "text/javascript", + "exec": [ + "" + ] + } + } + ], + "variable": [ + { + "key": "base_url", + "value": "127.0.0.1:8000" + } ] } \ No newline at end of file diff --git a/myems-api/core/menu.py b/myems-api/core/menu.py index 2f620d75..8845ca6b 100644 --- a/myems-api/core/menu.py +++ b/myems-api/core/menu.py @@ -2,7 +2,7 @@ import falcon import simplejson as json import mysql.connector import config -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class MenuCollection: @@ -83,6 +83,7 @@ class MenuItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From d5ad69b7b986aeab8377546fd975fe50b4325bce Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 29 Nov 2021 17:02:06 +0800 Subject: [PATCH 007/117] menu of access_control2 --- myems-api/MyEMS.postman_collection.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 623bddec..51ba6bc6 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -7425,7 +7425,7 @@ "header": [], "body": { "mode": "raw", - "raw": "{\"data\":{\"email\":\"admin1130@kwh-w.com\", \"password\":\"c2c77a39ab28\"}}" + "raw": "{\"data\":{\"email\":\"administrator@myems.io\", \"password\":\"!MyEMS1\"}}" }, "url": { "raw": "{{base_url}}/users/login", @@ -10662,11 +10662,5 @@ ] } } - ], - "variable": [ - { - "key": "base_url", - "value": "127.0.0.1:8000" - } ] } \ No newline at end of file From dfec9a8fc0c6221ffa8f1ac1df8cc128b36f2376 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 29 Nov 2021 17:46:14 +0800 Subject: [PATCH 008/117] added access_control to menu in api and admin --- .../settings/menu/menu.controller.js | 8 ++++- myems-api/MyEMS.postman_collection.json | 16 ++++++---- myems-api/README.md | 32 +++++++++---------- web/README.md | 10 +++--- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/admin/app/controllers/settings/menu/menu.controller.js b/admin/app/controllers/settings/menu/menu.controller.js index 31689cdd..03400cfd 100644 --- a/admin/app/controllers/settings/menu/menu.controller.js +++ b/admin/app/controllers/settings/menu/menu.controller.js @@ -1,6 +1,12 @@ 'use strict'; -app.controller('MenuController', function ($scope, $window, $uibModal, MenuService, toaster, $translate) { +app.controller('MenuController', function ( + $scope, + $window, + $uibModal, + MenuService, + toaster, + $translate) { $scope.menus = []; $scope.currentMenu = {}; $scope.currentMenuChildren = []; diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 51ba6bc6..df8ee26b 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "27f47263-6e8e-4d74-93a9-0ee9b56eccfc", + "_postman_id": "1a6c20d8-4d7a-49a1-a5e9-3d4261ba0505", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -3217,13 +3217,15 @@ "header": [ { "key": "User-UUID", - "value": "816be1f0-cf59-4aa4-bf81-a0e90577d416", - "type": "text" + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", - "value": "fc037979da169499d2c84d9ff838ae2599f1934b2e43872a8dc9da033f4d5811a0ca711595a576dcd6b340ffc3d8a8824630cf04b4e67331a6a82e8ec2dfd155", - "type": "text" + "value": "9217343d83a59d87cd7d28949d039cbea8b05c219a40ef1d71fe8db6ceebedf5bb7eadf34792c31bc6dccda27e9d5d932ae6e4da444dddbfe1e1fad14a1f5384", + "type": "text", + "description": "Login to get a valid token" } ], "body": { @@ -3231,13 +3233,13 @@ "raw": "{\"data\":{\"is_hidden\":true}}" }, "url": { - "raw": "{{base_url}}/menus/1", + "raw": "{{base_url}}/menus/100", "host": [ "{{base_url}}" ], "path": [ "menus", - "1" + "100" ] } }, diff --git a/myems-api/README.md b/myems-api/README.md index b8c163dc..afea25e8 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -352,7 +352,7 @@ curl -i -X DELETE {{base_url}}/costfiles/{id} * POST Upload a Cost File (call users login API to get 'User-UUID' and 'Token') ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/costfiles +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/costfiles ``` * GET Restore a Cost File by ID from database to disk ```bash @@ -982,7 +982,7 @@ curl -i -X DELETE {{base_url}}/knowledgefiles/{id} * POST Upload a Knowledge File (call users login API to get 'User-UUID' and 'Token') ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/knowledgefiles +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/knowledgefiles ``` * GET Restore a Knowledge File by id from database to disk ```bash @@ -1010,7 +1010,7 @@ curl -i -X GET {{base_url}}/menus ``` * PUT Update a Menu ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"is_hidden": false}}' {{base_url}}/menus/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"is_hidden": false}}' {{base_url}}/menus/{id} ``` * Get All Menus for Web UI ```bash @@ -1053,11 +1053,11 @@ curl -i -X DELETE {{base_url}}/meters/{id} ``` * POST Create a Meter ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X POST -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters ``` * PUT Update a Meter ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X PUT -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters/{id} ``` * GET All Submeters of Meter by ID ```bash @@ -1069,11 +1069,11 @@ curl -i -X GET {{base_url}}/meters/{id}/points ``` * POST Meter Point Relation ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/meters/{id}/points +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/meters/{id}/points ``` * DELETE Meter Point Relation ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d9658cbf3811fe6c93" -X DELETE {{base_url}}/meters/{id}/points/{pid} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/meters/{id}/points/{pid} ``` ### Notification @@ -1097,19 +1097,19 @@ Result * GET All Notifications ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -X GET {{base_url}}/notifications?startdatetime={startdatetime}&enddatetime={enddatetime}&status={status} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/notifications?startdatetime={startdatetime}&enddatetime={enddatetime}&status={status} ``` * DELETE Notification by ID ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -X DELETE {{base_url}}/notifications/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/notifications/{id} ``` * PUT Update a Notification ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -H "Content-Type: application/json" -X PUT -d '{"data":{"status":"read"}}' {{base_url}}/notifications/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"status":"read"}}' {{base_url}}/notifications/{id} ``` * DELETE Notification ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -X DELETE {{base_url}}/notifications/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/notifications/{id} ``` ### Offline Meter @@ -1178,7 +1178,7 @@ curl -i -X DELETE {{base_url}}/offlinemeterfiles/{id} * POST Upload an Offline Meter File (call users login API to get 'User-UUID' and 'Token') ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: 02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/offlinemeterfiles +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/offlinemeterfiles ``` * GET Restore an Offline Meter File by ID from database to disk ```bash @@ -1604,7 +1604,7 @@ curl -i -X DELETE {{base_url}}/spaces/{id}/virtualmeters/{mid} ``` * GET Space Tree of User ```bash -curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: a6e52af82e5b4168ae03b1c5fd8fa31b2ab3a338" -X GET {{base_url}}/spaces/tree +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/spaces/tree ``` ### Store @@ -2009,15 +2009,15 @@ curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"email":"johnson ``` * PUT User Logout ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: a6e52af82e5b4168ae03b1c5fd8fa31b2ab3a338" -X PUT {{base_url}}/users/logout +curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT {{base_url}}/users/logout ``` * PUT User change password ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: a6e52af82e5b4168ae03b1c5fd8fa31b2ab3a338" -X PUT -d '{"data":{"old_password":"Password1", "new_password":"Password2"}}' {{base_url}}/users/changepassword +curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"old_password":"Password1", "new_password":"Password2"}}' {{base_url}}/users/changepassword ``` * PUT User reset other user's password by administrator ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: a6e52af82e5b4168ae03b1c5fd8fa31b2ab3a338" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword +curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword ``` ### Virtual Meter diff --git a/web/README.md b/web/README.md index 4ea41edb..dab37692 100644 --- a/web/README.md +++ b/web/README.md @@ -55,7 +55,7 @@ In this section, you will install myems-web on Docker. * Check and change the config file if necessary: ```bash cd myems/web -sudo nano src/config.js +nano src/config.js ``` * replace ~~127.0.0.1:8000~~ in nginx.conf with actual **HOST** ip and port of myems-api @@ -66,11 +66,11 @@ nano nginx.conf * Download all the necessary dependencies into the node_modules directory. ```bash -sudo npm i --unsafe-perm=true --allow-root --legacy-peer-deps +npm i --unsafe-perm=true --allow-root --legacy-peer-deps ``` * Build for production with NPM ```bash -sudo npm run build +npm run build ``` * Build a Docker image ```bash @@ -91,14 +91,14 @@ docker run -d -p 80:80 --restart always --name myems-web myems/myems-web --name Assign a name to the container -### Option 2: Install myems-web on NGINX Server +### Option 2: Install myems-web on Server with NGINX * Install NGINX Server refer to http://nginx.org/en/docs/install.html * Configure NGINX ```bash -sudo nano /etc/nginx/nginx.conf +nano /etc/nginx/nginx.conf ``` In the 'http' section, add some directives: ``` From 9304225419495c1ce034c52f71104098ed699afd Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 29 Nov 2021 18:48:29 +0800 Subject: [PATCH 009/117] contact of access_control --- .../settings/contact/contact.controller.js | 13 +++-- .../settings/contact/contact.service.js | 12 ++--- myems-api/MyEMS.postman_collection.json | 47 +++++++++++++++++-- myems-api/README.md | 10 ++-- myems-api/core/contact.py | 5 +- 5 files changed, 66 insertions(+), 21 deletions(-) diff --git a/admin/app/controllers/settings/contact/contact.controller.js b/admin/app/controllers/settings/contact/contact.controller.js index 02aa61ac..89d5a05a 100644 --- a/admin/app/controllers/settings/contact/contact.controller.js +++ b/admin/app/controllers/settings/contact/contact.controller.js @@ -1,8 +1,8 @@ 'use strict'; -app.controller('ContactController', function($scope, $translate,$uibModal, ContactService,toaster,SweetAlert) { - +app.controller('ContactController', function($scope, $window, $translate,$uibModal, ContactService,toaster,SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllContacts = function() { ContactService.getAllContacts(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -28,7 +28,8 @@ app.controller('ContactController', function($scope, $translate,$uibModal, Conta } }); modalInstance.result.then(function(contact) { - ContactService.addContact(contact, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ContactService.addContact(contact, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -67,7 +68,8 @@ app.controller('ContactController', function($scope, $translate,$uibModal, Conta }); modalInstance.result.then(function (modifiedContact) { - ContactService.editContact(modifiedContact, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ContactService.editContact(modifiedContact, headers, function (response) { if(angular.isDefined(response.status) && response.status === 200){ toaster.pop({ type: "success", @@ -103,7 +105,8 @@ app.controller('ContactController', function($scope, $translate,$uibModal, Conta closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - ContactService.deleteContact(contact, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ContactService.deleteContact(contact, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/contact/contact.service.js b/admin/app/services/settings/contact/contact.service.js index 19b47c98..437540e0 100644 --- a/admin/app/services/settings/contact/contact.service.js +++ b/admin/app/services/settings/contact/contact.service.js @@ -17,24 +17,24 @@ app.factory('ContactService', function($http) { callback(response); }); }, - addContact: function(contact, callback) { - $http.post(getAPI()+'contacts',{data:contact}) + addContact: function(contact, headers, callback) { + $http.post(getAPI()+'contacts',{data:contact}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editContact: function(contact, callback) { - $http.put(getAPI()+'contacts/'+contact.id,{data:contact}) + editContact: function(contact, headers, callback) { + $http.put(getAPI()+'contacts/'+contact.id,{data:contact}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteContact: function(contact, callback) { - $http.delete(getAPI()+'contacts/'+contact.id) + deleteContact: function(contact, headers, callback) { + $http.delete(getAPI()+'contacts/'+contact.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index df8ee26b..4192a101 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "1a6c20d8-4d7a-49a1-a5e9-3d4261ba0505", + "_postman_id": "92712647-82fc-4cf2-acae-25fb13badd9e", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -634,7 +634,20 @@ "name": "POST Create New Contact", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "e3e753d078585ff791e8a899ad4bf3cc3673912061d5b6ab5119ed3ac713895ae1fc5f90f8d4a7942b1b139774b4db82e6702593b9a453a82982fdae47edac34", + "description": "Login to get a valid token", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"albert\", \"email\":\"albert@myems.io\", \"phone\":\"+8613888888888\", \"description\":\"contact description\"}}" @@ -655,7 +668,20 @@ "name": "PUT Update a Contact", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "e3e753d078585ff791e8a899ad4bf3cc3673912061d5b6ab5119ed3ac713895ae1fc5f90f8d4a7942b1b139774b4db82e6702593b9a453a82982fdae47edac34", + "description": "Login to get a valid token", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"albert\", \"email\":\"albert@myems.io\", \"phone\":\"+8613888888899\", \"description\":\"contact description\"}}" @@ -677,7 +703,20 @@ "name": "DELETE a Contact by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "e3e753d078585ff791e8a899ad4bf3cc3673912061d5b6ab5119ed3ac713895ae1fc5f90f8d4a7942b1b139774b4db82e6702593b9a453a82982fdae47edac34", + "description": "Login to get a valid token", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/contacts/2", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index afea25e8..2d2a2374 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -269,15 +269,15 @@ curl -i -X GET {{base_url}}/contacts ``` * DELETE Contact by ID ```bash -curl -i -X DELETE {{base_url}}/contacts/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/contacts/{id} ``` * POST Create a New Contact ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"albert", "email":"albert@myems.io", "phone":"+8613888888888", "description":"contact description"}}' {{base_url}}/contacts +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"albert", "email":"albert@myems.io", "phone":"+8613888888888", "description":"contact description"}}' {{base_url}}/contacts ``` * PUT Update a Contact ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"albert", "email":"albert@myems.io", "phone":"+8613888888899", "description":"contact description"}}' {{base_url}}/contacts/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"albert", "email":"albert@myems.io", "phone":"+8613888888899", "description":"contact description"}}' {{base_url}}/contacts/{id} ``` ### Cost Center @@ -2402,9 +2402,9 @@ curl -i -X GET {{base_url}}/reports/virtualmetercost?virtualmeterid=1&periodtype ## References [1]. http://myems.io - + [2]. https://falconframework.org/ - + [3]. https://github.com/lwcolton/falcon-cors [4]. https://github.com/yohanboniface/falcon-multipart diff --git a/myems-api/core/contact.py b/myems-api/core/contact.py index 5a10a0d3..ef5dfd90 100644 --- a/myems-api/core/contact.py +++ b/myems-api/core/contact.py @@ -4,7 +4,7 @@ import mysql.connector import config import uuid import re -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class ContactCollection: @@ -48,6 +48,7 @@ class ContactCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -160,6 +161,7 @@ class ContactItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_CONTACT_ID') @@ -236,6 +238,7 @@ class ContactItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From 16c7e858fbeb331cc7f17d4495f6a32c92c6ad16 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Tue, 30 Nov 2021 10:00:38 +0800 Subject: [PATCH 010/117] added access control to EnergyItem --- .../settings/category/energyitem.controller.js | 10 +++++++--- .../services/settings/category/energyitem.service.js | 12 ++++++------ myems-api/MyEMS.postman_collection.json | 2 +- myems-api/README.md | 6 +++--- myems-api/core/energyitem.py | 5 ++++- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/admin/app/controllers/settings/category/energyitem.controller.js b/admin/app/controllers/settings/category/energyitem.controller.js index e6abad0b..03261570 100644 --- a/admin/app/controllers/settings/category/energyitem.controller.js +++ b/admin/app/controllers/settings/category/energyitem.controller.js @@ -1,6 +1,7 @@ 'use strict'; app.controller('EnergyItemController', function($scope, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -38,7 +39,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca } }); modalInstance.result.then(function(energyItem) { - EnergyItemService.addEnergyItem(energyItem, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyItemService.addEnergyItem(energyItem, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -78,7 +80,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca }); modalInstance.result.then(function (modifiedEnergyItem) { - EnergyItemService.editEnergyItem(modifiedEnergyItem, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyItemService.editEnergyItem(modifiedEnergyItem, headers, function (response){ if(angular.isDefined(response.status) && response.status === 200){ toaster.pop({ type: "success", @@ -114,7 +117,8 @@ app.controller('EnergyItemController', function($scope, $translate,$uibModal, Ca closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - EnergyItemService.deleteEnergyItem(energyItem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyItemService.deleteEnergyItem(energyItem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/category/energyitem.service.js b/admin/app/services/settings/category/energyitem.service.js index 503a8542..ee0fff62 100644 --- a/admin/app/services/settings/category/energyitem.service.js +++ b/admin/app/services/settings/category/energyitem.service.js @@ -17,24 +17,24 @@ app.factory('EnergyItemService', function($http) { callback(response); }); }, - addEnergyItem: function(energyItem, callback) { - $http.post(getAPI()+'energyitems',{data:energyItem}) + addEnergyItem: function(energyItem, headers, callback) { + $http.post(getAPI()+'energyitems',{data:energyItem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyItem: function(energyItem, callback) { - $http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem}) + editEnergyItem: function(energyItem, headers, callback) { + $http.put(getAPI()+'energyitems/'+energyItem.id,{data:energyItem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteEnergyItem: function(energyItem, callback) { - $http.delete(getAPI()+'energyitems/'+energyItem.id) + deleteEnergyItem: function(energyItem, headers, callback) { + $http.delete(getAPI()+'energyitems/'+energyItem.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index df8ee26b..7f2c217c 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "1a6c20d8-4d7a-49a1-a5e9-3d4261ba0505", + "_postman_id": "36fe4322-48fb-414c-8328-665d2872c2b7", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, diff --git a/myems-api/README.md b/myems-api/README.md index afea25e8..74f2d05b 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -669,15 +669,15 @@ curl -i -X GET {{base_url}}/energyitems ``` * DELETE an Energy Item by ID ```bash -curl -i -X DELETE {{base_url}}/energyitems/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/energyitems/{id} ``` * POST Create an Energy Item ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"空调用电","energy_category_id":1}}' {{base_url}}/energyitems +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"空调用电","energy_category_id":1}}' {{base_url}}/energyitems ``` * PUT Update an Energy Item ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"动力用电","energy_category_id":1}}' {{base_url}}/energyitems/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"动力用电","energy_category_id":1}}' {{base_url}}/energyitems/{id} ``` ### Equipment diff --git a/myems-api/core/energyitem.py b/myems-api/core/energyitem.py index f2edffcb..b22b06a2 100644 --- a/myems-api/core/energyitem.py +++ b/myems-api/core/energyitem.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class EnergyItemCollection: @@ -55,6 +55,7 @@ class EnergyItemCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -165,6 +166,7 @@ class EnergyItemItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_ITEM_ID') @@ -225,6 +227,7 @@ class EnergyItemItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From 6e5344943998ed6469ff2e5d1250284ef9038cb7 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Tue, 30 Nov 2021 10:07:12 +0800 Subject: [PATCH 011/117] added access control to EnergyItem --- .../app/controllers/settings/category/energyitem.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/app/controllers/settings/category/energyitem.controller.js b/admin/app/controllers/settings/category/energyitem.controller.js index 03261570..439e2db7 100644 --- a/admin/app/controllers/settings/category/energyitem.controller.js +++ b/admin/app/controllers/settings/category/energyitem.controller.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('EnergyItemController', function($scope, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) { +app.controller('EnergyItemController', function($scope, $window, $translate,$uibModal, CategoryService, EnergyItemService, toaster,SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { From 20db5357b28a7fe80a763017da56a7fb1f175800 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Tue, 30 Nov 2021 10:11:04 +0800 Subject: [PATCH 012/117] modified postman_collection.json --- myems-api/MyEMS.postman_collection.json | 58 +++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 4 deletions(-) diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 7f2c217c..5b66a321 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -2257,7 +2257,20 @@ "name": "POST Create an Energy Item", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2", + "description": "Login to get a valid token", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"租户用电\",\"energy_category_id\":1}}" @@ -2278,7 +2291,20 @@ "name": "PUT Update an Energy Item", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2", + "description": "Login to get a valid token", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"空调用\",\"energy_category_id\":1}}" @@ -2300,7 +2326,20 @@ "name": "DELETE an Energy Item", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2", + "description": "Login to get a valid token", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/energyitems/4", "host": [ @@ -7424,7 +7463,18 @@ "name": "PUT User Login by Email", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "816be1f0-cf59-4aa4-bf81-a0e90577d416", + "type": "text" + }, + { + "key": "Token", + "value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"email\":\"administrator@myems.io\", \"password\":\"!MyEMS1\"}}" From 8481fa68a5836ceef569c630e3bddb9733eed0c8 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Tue, 30 Nov 2021 10:13:11 +0800 Subject: [PATCH 013/117] modified postman_collection.json --- myems-api/MyEMS.postman_collection.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 5b66a321..090d3d35 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -7463,18 +7463,7 @@ "name": "PUT User Login by Email", "request": { "method": "PUT", - "header": [ - { - "key": "User-UUID", - "value": "816be1f0-cf59-4aa4-bf81-a0e90577d416", - "type": "text" - }, - { - "key": "Token", - "value": "89d8c1a8e6e2a4fc3b7a7eb3964c4e6fc97b5ae216591a986deb43f8a03babcd72ce5ad0c160e3ed4c9550cea29a9a548a261812484f2c7ac9aa039aa33441e2", - "type": "text" - } - ], + "header": [], "body": { "mode": "raw", "raw": "{\"data\":{\"email\":\"administrator@myems.io\", \"password\":\"!MyEMS1\"}}" From 637f8ce481abdc9726631a45268dc4344d932315 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 30 Nov 2021 22:57:51 +0800 Subject: [PATCH 014/117] added accecc_control to contact in api and admin --- .../settings/contact/contact.controller.js | 9 ++++++- myems-api/MyEMS.postman_collection.json | 25 ++++++++++++------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/admin/app/controllers/settings/contact/contact.controller.js b/admin/app/controllers/settings/contact/contact.controller.js index 89d5a05a..1dadf16c 100644 --- a/admin/app/controllers/settings/contact/contact.controller.js +++ b/admin/app/controllers/settings/contact/contact.controller.js @@ -1,6 +1,13 @@ 'use strict'; -app.controller('ContactController', function($scope, $window, $translate,$uibModal, ContactService,toaster,SweetAlert) { +app.controller('ContactController', function( + $scope, + $window, + $translate, + $uibModal, + ContactService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllContacts = function() { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 4192a101..d17add4c 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "92712647-82fc-4cf2-acae-25fb13badd9e", + "_postman_id": "98580f5c-106c-4b86-8262-ec3c918608e1", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -625,7 +625,14 @@ "method": "GET", "header": [], "url": { - "raw": "" + "raw": "{{base_url}}/contacts/1", + "host": [ + "{{base_url}}" + ], + "path": [ + "contacts", + "1" + ] } }, "response": [] @@ -643,7 +650,7 @@ }, { "key": "Token", - "value": "e3e753d078585ff791e8a899ad4bf3cc3673912061d5b6ab5119ed3ac713895ae1fc5f90f8d4a7942b1b139774b4db82e6702593b9a453a82982fdae47edac34", + "value": "835aa13a4bc4af4ca2f47cac03d186bc49c13a30a025e9d983cc52238027f2eb7bd323784ee53a3833109ce1234acf9c8cb6754ba602b84049bb9244e3df6aeb", "description": "Login to get a valid token", "type": "text" } @@ -677,7 +684,7 @@ }, { "key": "Token", - "value": "e3e753d078585ff791e8a899ad4bf3cc3673912061d5b6ab5119ed3ac713895ae1fc5f90f8d4a7942b1b139774b4db82e6702593b9a453a82982fdae47edac34", + "value": "835aa13a4bc4af4ca2f47cac03d186bc49c13a30a025e9d983cc52238027f2eb7bd323784ee53a3833109ce1234acf9c8cb6754ba602b84049bb9244e3df6aeb", "description": "Login to get a valid token", "type": "text" } @@ -687,13 +694,13 @@ "raw": "{\"data\":{\"name\":\"albert\", \"email\":\"albert@myems.io\", \"phone\":\"+8613888888899\", \"description\":\"contact description\"}}" }, "url": { - "raw": "{{base_url}}/contacts/2", + "raw": "{{base_url}}/contacts/3", "host": [ "{{base_url}}" ], "path": [ "contacts", - "2" + "3" ] } }, @@ -712,19 +719,19 @@ }, { "key": "Token", - "value": "e3e753d078585ff791e8a899ad4bf3cc3673912061d5b6ab5119ed3ac713895ae1fc5f90f8d4a7942b1b139774b4db82e6702593b9a453a82982fdae47edac34", + "value": "835aa13a4bc4af4ca2f47cac03d186bc49c13a30a025e9d983cc52238027f2eb7bd323784ee53a3833109ce1234acf9c8cb6754ba602b84049bb9244e3df6aeb", "description": "Login to get a valid token", "type": "text" } ], "url": { - "raw": "{{base_url}}/contacts/2", + "raw": "{{base_url}}/contacts/3", "host": [ "{{base_url}}" ], "path": [ "contacts", - "2" + "3" ] } }, From c7fe4dea79435841ef8c7358e9ed794651986a77 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 1 Dec 2021 14:21:38 +0800 Subject: [PATCH 015/117] energyflowdiagram of access_control --- .../energyflowdiagram.controller.js | 19 ++++++-- .../energyflowdiagram.service.js | 12 ++--- myems-api/MyEMS.postman_collection.json | 47 +++++++++++++++++-- myems-api/README.md | 6 +-- myems-api/core/energyflowdiagram.py | 5 +- 5 files changed, 70 insertions(+), 19 deletions(-) diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js index dd8f81fe..5cf69fae 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js @@ -1,7 +1,13 @@ 'use strict'; -app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibModal, EnergyFlowDiagramService, toaster,SweetAlert) { - +app.controller('EnergyFlowDiagramController', function($scope, + $window, + $translate, + $uibModal, + EnergyFlowDiagramService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEnergyFlowDiagrams = function() { EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -19,7 +25,8 @@ app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibM windowClass: "animated fadeIn", }); modalInstance.result.then(function(energyflowdiagram) { - EnergyFlowDiagramService.addEnergyFlowDiagram(energyflowdiagram, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramService.addEnergyFlowDiagram(energyflowdiagram, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -58,7 +65,8 @@ app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibM }); modalInstance.result.then(function(modifiedEnergyFlowDiagram) { - EnergyFlowDiagramService.editEnergyFlowDiagram(modifiedEnergyFlowDiagram, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramService.editEnergyFlowDiagram(modifiedEnergyFlowDiagram, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -95,7 +103,8 @@ app.controller('EnergyFlowDiagramController', function($scope, $translate, $uibM closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - EnergyFlowDiagramService.deleteEnergyFlowDiagram(energyflowdiagram, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramService.deleteEnergyFlowDiagram(energyflowdiagram, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js b/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js index c82b3f22..6180fe60 100644 --- a/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js +++ b/admin/app/services/settings/energyflowdiagram/energyflowdiagram.service.js @@ -17,24 +17,24 @@ app.factory('EnergyFlowDiagramService', function($http) { callback(response); }); }, - addEnergyFlowDiagram: function(energyflowdiagram, callback) { - $http.post(getAPI()+'energyflowdiagrams',{data:energyflowdiagram}) + addEnergyFlowDiagram: function(energyflowdiagram, headers, callback) { + $http.post(getAPI()+'energyflowdiagrams',{data:energyflowdiagram}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyFlowDiagram: function(energyflowdiagram, callback) { - $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id,{data:energyflowdiagram}) + editEnergyFlowDiagram: function(energyflowdiagram, headers, callback) { + $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id,{data:energyflowdiagram}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteEnergyFlowDiagram: function(energyflowdiagram, callback) { - $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id) + deleteEnergyFlowDiagram: function(energyflowdiagram, headers, callback) { + $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagram.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index d17add4c..86ba0b6c 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "98580f5c-106c-4b86-8262-ec3c918608e1", + "_postman_id": "ab4b1f3e-3892-4a0e-801b-4ec90d4592fe", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -2030,7 +2030,20 @@ "name": "POST Create an Energy Flow Diagram", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d7254cbf3811fe6c93", + "description": "Login to get a valid token", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMS Energy Flow\"}}" @@ -2051,7 +2064,20 @@ "name": "PUT Update an Energy Flow Diagram", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d7254cbf3811fe6c93", + "description": "Login to get a valid token", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMS Energy Flow Diagram\"}}" @@ -2073,7 +2099,20 @@ "name": "DELETE an Energy Flow Diagram", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "description": "Any admin users' UUID", + "type": "text" + }, + { + "key": "Token", + "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d7254cbf3811fe6c93", + "description": "Login to get a valid token", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/energyflowdiagrams/2", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index 2d2a2374..99bcea51 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -604,15 +604,15 @@ curl -i -X GET {{base_url}}/energyflowdiagrams ``` * DELETE an Energy Flow Diagram by ID ```bash -curl -i -X DELETE {{base_url}}/energyflowdiagrams/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/energyflowdiagrams/{id} ``` * POST Create an Energy Flow Diagram ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Energy Flow"}}' {{base_url}}/energyflowdiagrams +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"MyEMS Energy Flow"}}' {{base_url}}/energyflowdiagrams ``` * PUT Update an Energy Flow Diagram ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Energy Flow Diagram"}}' {{base_url}}/energyflowdiagrams/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"MyEMS Energy Flow Diagram"}}' {{base_url}}/energyflowdiagrams/{id} ``` * GET All Nodes of an Energy Flow Diagram by ID ```bash diff --git a/myems-api/core/energyflowdiagram.py b/myems-api/core/energyflowdiagram.py index 82c8c7d5..fa4f9304 100644 --- a/myems-api/core/energyflowdiagram.py +++ b/myems-api/core/energyflowdiagram.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class EnergyFlowDiagramCollection: @@ -124,6 +124,7 @@ class EnergyFlowDiagramCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -285,6 +286,7 @@ class EnergyFlowDiagramItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') @@ -315,6 +317,7 @@ class EnergyFlowDiagramItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') From 62312e8c5477cdd369dbe6903593804d626045df Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Thu, 2 Dec 2021 09:56:13 +0800 Subject: [PATCH 016/117] energyflowdiagram of access_control2 --- .../energyflowdiagramlink.controller.js | 26 ++++++++++++++----- .../energyflowdiagramnode.controller.js | 22 +++++++++++----- .../energyflowdiagramlink.service.js | 12 ++++----- .../energyflowdiagramnode.service.js | 12 ++++----- myems-api/README.md | 12 ++++----- myems-api/core/energyflowdiagram.py | 6 +++++ 6 files changed, 60 insertions(+), 30 deletions(-) diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js index 2849bd9d..330aadfa 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EnergyFlowDiagramLinkService, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) { +app.controller('EnergyFlowDiagramLinkController', function( + $scope, + $window, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + EnergyFlowDiagramLinkService, + EnergyFlowDiagramService, + EnergyFlowDiagramNodeService, + toaster, + SweetAlert) { $scope.currentEnergyFlowDiagram = {selected:undefined}; $scope.is_show_add_link = false; $scope.energyflowdiagrams = []; @@ -10,7 +22,7 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr $scope.offlinemeters = []; $scope.virtualmeters = []; $scope.mergedMeters = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEnergyFlowDiagrams = function() { EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -77,8 +89,8 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr if (energyflowdiagramlink.meter != null) { energyflowdiagramlink.meter_uuid = energyflowdiagramlink.meter.uuid; } - - EnergyFlowDiagramLinkService.addEnergyFlowDiagramLink(energyflowdiagramid, energyflowdiagramlink, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramLinkService.addEnergyFlowDiagramLink(energyflowdiagramid, energyflowdiagramlink, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -128,7 +140,8 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr if (modifiedEnergyFlowDiagramLink.meter != null) { modifiedEnergyFlowDiagramLink.meter_uuid = modifiedEnergyFlowDiagramLink.meter.uuid; } - EnergyFlowDiagramLinkService.editEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramLink, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramLinkService.editEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramLink, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -166,7 +179,8 @@ app.controller('EnergyFlowDiagramLinkController', function($scope,$uibModal, $tr }, function(isConfirm) { if (isConfirm) { - EnergyFlowDiagramLinkService.deleteEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, energyflowdiagramlink.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramLinkService.deleteEnergyFlowDiagramLink($scope.currentEnergyFlowDiagram.id, energyflowdiagramlink.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js index fae5cfe7..bae48548 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramnode.controller.js @@ -1,10 +1,18 @@ 'use strict'; -app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $uibModal, EnergyFlowDiagramService, EnergyFlowDiagramNodeService, toaster,SweetAlert) { +app.controller('EnergyFlowDiagramNodeController', function( + $scope, + $window, + $translate, + $uibModal, + EnergyFlowDiagramService, + EnergyFlowDiagramNodeService, + toaster, + SweetAlert) { $scope.energyflowdiagrams = []; $scope.energyflowdiagramnodes = []; $scope.currentEnergyFlowDiagram = null; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEnergyFlowDiagrams = function() { EnergyFlowDiagramService.getAllEnergyFlowDiagrams(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -48,8 +56,8 @@ app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $ }); modalInstance.result.then(function(energyflowdiagramnode) { var energyflowdiagramid = $scope.currentEnergyFlowDiagram.id; - - EnergyFlowDiagramNodeService.addEnergyFlowDiagramNode(energyflowdiagramid, energyflowdiagramnode, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramNodeService.addEnergyFlowDiagramNode(energyflowdiagramid, energyflowdiagramnode, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +96,8 @@ app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $ }); modalInstance.result.then(function(modifiedEnergyFlowDiagramNode) { - EnergyFlowDiagramNodeService.editEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramNode, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramNodeService.editEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, modifiedEnergyFlowDiagramNode, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -126,7 +135,8 @@ app.controller('EnergyFlowDiagramNodeController', function($scope, $translate, $ }, function(isConfirm) { if (isConfirm) { - EnergyFlowDiagramNodeService.deleteEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, energyflowdiagramnode.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EnergyFlowDiagramNodeService.deleteEnergyFlowDiagramNode($scope.currentEnergyFlowDiagram.id, energyflowdiagramnode.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js b/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js index 511fb04a..0709c60b 100644 --- a/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js +++ b/admin/app/services/settings/energyflowdiagram/energyflowdiagramlink.service.js @@ -10,16 +10,16 @@ app.factory('EnergyFlowDiagramLinkService', function($http) { callback(response); }); }, - addEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, callback) { - $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links',{data:energyflowdiagramlink}) + addEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, headers, callback) { + $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links',{data:energyflowdiagramlink}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyFlowDiagramLink: function(energyflowdiagramID,energyflowdiagramlink,callback) { - $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+energyflowdiagramlink.id,{data:energyflowdiagramlink}) + editEnergyFlowDiagramLink: function(energyflowdiagramID, energyflowdiagramlink, headers, callback) { + $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+energyflowdiagramlink.id,{data:energyflowdiagramlink}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -27,8 +27,8 @@ app.factory('EnergyFlowDiagramLinkService', function($http) { }); }, - deleteEnergyFlowDiagramLink: function(energyflowdiagramID, linkID, callback) { - $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+linkID) + deleteEnergyFlowDiagramLink: function(energyflowdiagramID, linkID, headers, callback) { + $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/links/'+linkID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js b/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js index b9d69a7f..4786ec09 100644 --- a/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js +++ b/admin/app/services/settings/energyflowdiagram/energyflowdiagramnode.service.js @@ -9,16 +9,16 @@ app.factory('EnergyFlowDiagramNodeService', function($http) { callback(response); }); }, - addEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode,callback) { - $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes',{data:energyflowdiagramnode}) + addEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode, headers, callback) { + $http.post(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes',{data:energyflowdiagramnode}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEnergyFlowDiagramNode: function(energyflowdiagramID,energyflowdiagramnode,callback) { - $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+energyflowdiagramnode.id,{data:energyflowdiagramnode}) + editEnergyFlowDiagramNode: function(energyflowdiagramID, energyflowdiagramnode, headers, callback) { + $http.put(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+energyflowdiagramnode.id,{data:energyflowdiagramnode}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -26,8 +26,8 @@ app.factory('EnergyFlowDiagramNodeService', function($http) { }); }, - deleteEnergyFlowDiagramNode: function(energyflowdiagramID, nodeID, callback) { - $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+nodeID) + deleteEnergyFlowDiagramNode: function(energyflowdiagramID, nodeID, headers, callback) { + $http.delete(getAPI()+'energyflowdiagrams/'+energyflowdiagramID+'/nodes/'+nodeID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/README.md b/myems-api/README.md index 1832f4d0..262bdef5 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -620,15 +620,15 @@ curl -i -X GET {{base_url}}/energyflowdiagrams/{id}/nodes ``` * POST Create a Node of an Energy Flow Diagram ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"10KV#1"}}' {{base_url}}/energyflowdiagrams/{id}/nodes +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"10KV#1"}}' {{base_url}}/energyflowdiagrams/{id}/nodes ``` * PUT Update a Node of an Energy Flow Diagram ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"10KV#2"}}' {{base_url}}/energyflowdiagrams/{id}/nodes/{nid} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"10KV#2"}}' {{base_url}}/energyflowdiagrams/{id}/nodes/{nid} ``` * DELETE a Node of an Energy Flow Diagram ```bash -curl -i -X DELETE {{base_url}}/energyflowdiagrams/{id}/nodes/{nid} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/energyflowdiagrams/{id}/nodes/{nid} ``` * GET All Links of an Energy Flow Diagram by ID ```bash @@ -636,15 +636,15 @@ curl -i -X GET {{base_url}}/energyflowdiagrams/{id}/links ``` * POST Create a Link of an Energy Flow Diagram ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"source_node_id":1, "target_node_id":3, "meter_uuid":"d806a78d-a31e-4833-b5c8-81261cfeb1f2"}}' {{base_url}}/energyflowdiagrams/{id}/links +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"source_node_id":1, "target_node_id":3, "meter_uuid":"d806a78d-a31e-4833-b5c8-81261cfeb1f2"}}' {{base_url}}/energyflowdiagrams/{id}/links ``` * PUT Update a Link of an Energy Flow Diagram ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"source_node_id":1, "target_node_id":4, "meter_uuid":"d806a78d-a31e-4833-b5c8-81261cfeb1f2"}}' {{base_url}}/energyflowdiagrams/{id}/links/{lid} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"source_node_id":1, "target_node_id":4, "meter_uuid":"d806a78d-a31e-4833-b5c8-81261cfeb1f2"}}' {{base_url}}/energyflowdiagrams/{id}/links/{lid} ``` * DELETE a Link of an Energy Flow Diagram ```bash -curl -i -X DELETE {{base_url}}/energyflowdiagrams/{id}/links/{lid} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/energyflowdiagrams/{id}/links/{lid} ``` ### Energy Item diff --git a/myems-api/core/energyflowdiagram.py b/myems-api/core/energyflowdiagram.py index fa4f9304..6eaa9b79 100644 --- a/myems-api/core/energyflowdiagram.py +++ b/myems-api/core/energyflowdiagram.py @@ -480,6 +480,7 @@ class EnergyFlowDiagramLinkCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') @@ -723,6 +724,7 @@ class EnergyFlowDiagramLinkItem: @staticmethod @user_logger def on_delete(req, resp, id_, lid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') @@ -771,6 +773,7 @@ class EnergyFlowDiagramLinkItem: @user_logger def on_put(req, resp, id_, lid): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') @@ -977,6 +980,7 @@ class EnergyFlowDiagramNodeCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') @@ -1072,6 +1076,7 @@ class EnergyFlowDiagramNodeItem: @staticmethod @user_logger def on_delete(req, resp, id_, nid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') @@ -1120,6 +1125,7 @@ class EnergyFlowDiagramNodeItem: @user_logger def on_put(req, resp, id_, nid): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_ENERGY_FLOW_DIAGRAM_ID') From 8dd998ed0c699e2be31dde5e9a1c79c8a4d311cd Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 2 Dec 2021 10:43:32 +0800 Subject: [PATCH 017/117] added access_control to privilege --- .../users/privilege/privilege.controller.js | 11 ++++++++--- .../services/users/privilege/privilege.service.js | 12 ++++++------ myems-api/README.md | 6 +++--- myems-api/core/privilege.py | 5 ++++- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/admin/app/controllers/users/privilege/privilege.controller.js b/admin/app/controllers/users/privilege/privilege.controller.js index 80b2c094..30bfca59 100644 --- a/admin/app/controllers/users/privilege/privilege.controller.js +++ b/admin/app/controllers/users/privilege/privilege.controller.js @@ -1,11 +1,13 @@ 'use strict'; app.controller('PrivilegeController', function ($scope, + $window, $uibModal, PrivilegeService, toaster, $translate, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllPrivileges = function () { PrivilegeService.getAllPrivileges(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -31,7 +33,8 @@ app.controller('PrivilegeController', function ($scope, } }); modalInstance.result.then(function (privilege) { - PrivilegeService.addPrivilege(privilege, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PrivilegeService.addPrivilege(privilege, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -70,7 +73,8 @@ app.controller('PrivilegeController', function ($scope, }); modalInstance.result.then(function (modifiedPrivilege) { - PrivilegeService.editPrivilege(modifiedPrivilege, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PrivilegeService.editPrivilege(modifiedPrivilege, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -107,7 +111,8 @@ app.controller('PrivilegeController', function ($scope, }, function (isConfirm) { if (isConfirm) { - PrivilegeService.deletePrivilege(privilege, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + PrivilegeService.deletePrivilege(privilege, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/users/privilege/privilege.service.js b/admin/app/services/users/privilege/privilege.service.js index 04402b9a..096408a4 100644 --- a/admin/app/services/users/privilege/privilege.service.js +++ b/admin/app/services/users/privilege/privilege.service.js @@ -9,24 +9,24 @@ app.factory('PrivilegeService', function($http) { callback(response); }); }, - addPrivilege: function(privilege, callback) { - $http.post(getAPI()+'privileges',{data:privilege}) + addPrivilege: function(privilege, headers, callback) { + $http.post(getAPI()+'privileges', {headers}, {data:privilege}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editPrivilege: function(privilege, callback) { - $http.put(getAPI()+'privileges/'+privilege.id,{data:privilege}) + editPrivilege: function(privilege, headers, callback) { + $http.put(getAPI()+'privileges/'+privilege.id, {headers}, {data:privilege}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deletePrivilege: function(privilege, callback) { - $http.delete(getAPI()+'privileges/'+privilege.id) + deletePrivilege: function(privilege, headers, callback) { + $http.delete(getAPI()+'privileges/'+privilege.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/README.md b/myems-api/README.md index 4c5cc047..9219b549 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1251,15 +1251,15 @@ curl -i -X GET {{base_url}}/privileges ``` * DELETE Privilege by ID ```bash -curl -i -X DELETE {{base_url}}/privileges/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/privileges/{id} ``` * POST New Privilege ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"superusers","data":"{\"spaces\":[1,2,3,5]}"}}' {{base_url}}/privileges +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"superusers","data":"{\"spaces\":[1,2,3,5]}"}}' {{base_url}}/privileges ``` * PUT Privilege ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"superusers", "data":"{\"spaces\":[1, 3]}"}}' {{base_url}}/privileges/{id} +curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"superusers", "data":"{\"spaces\":[1, 3]}"}}' {{base_url}}/privileges/{id} ``` ### Rule diff --git a/myems-api/core/privilege.py b/myems-api/core/privilege.py index f0faa48d..302530e3 100644 --- a/myems-api/core/privilege.py +++ b/myems-api/core/privilege.py @@ -2,7 +2,7 @@ import falcon import simplejson as json import mysql.connector import config -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class PrivilegeCollection: @@ -42,6 +42,7 @@ class PrivilegeCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') new_values = json.loads(raw_json) @@ -101,6 +102,7 @@ class PrivilegeItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_PRIVILEGE_ID') @@ -142,6 +144,7 @@ class PrivilegeItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') new_values = json.loads(raw_json) From 29f3b91e56c1c0eb13d1d3dc8732332e2a4dfeea Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 2 Dec 2021 10:57:39 +0800 Subject: [PATCH 018/117] fixed the sequence of parameter --- admin/app/services/users/privilege/privilege.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/app/services/users/privilege/privilege.service.js b/admin/app/services/users/privilege/privilege.service.js index 096408a4..53ac75d5 100644 --- a/admin/app/services/users/privilege/privilege.service.js +++ b/admin/app/services/users/privilege/privilege.service.js @@ -10,7 +10,7 @@ app.factory('PrivilegeService', function($http) { }); }, addPrivilege: function(privilege, headers, callback) { - $http.post(getAPI()+'privileges', {headers}, {data:privilege}) + $http.post(getAPI()+'privileges', {data:privilege}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -18,7 +18,7 @@ app.factory('PrivilegeService', function($http) { }); }, editPrivilege: function(privilege, headers, callback) { - $http.put(getAPI()+'privileges/'+privilege.id, {headers}, {data:privilege}) + $http.put(getAPI()+'privileges/'+privilege.id, {data:privilege}, {headers}) .then(function (response) { callback(response); }, function (response) { From 8f2db8952f97535102adb8f718f8c2cb352f7a33 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 3 Dec 2021 13:51:14 +0800 Subject: [PATCH 019/117] added access control to energyflowdiagram in api and admin --- .../energyflowdiagram.controller.js | 3 +- .../energyflowdiagramlink.controller.js | 19 ++- .../equipmentparameter.model.html | 84 ---------- myems-api/MyEMS.postman_collection.json | 150 +++++++++++++----- 4 files changed, 125 insertions(+), 131 deletions(-) delete mode 100644 admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js index 5cf69fae..f17b5639 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagram.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('EnergyFlowDiagramController', function($scope, +app.controller('EnergyFlowDiagramController', function( + $scope, $window, $translate, $uibModal, diff --git a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js index 330aadfa..2355d33f 100644 --- a/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js +++ b/admin/app/controllers/settings/energyflowdiagram/energyflowdiagramlink.controller.js @@ -279,15 +279,14 @@ app.controller('EnergyFlowDiagramLinkController', function( app.controller('ModalAddEnergyFlowDiagramLinkCtrl', function($scope, $uibModalInstance, params) { $scope.operation = "ENERGY_FLOW_DIAGRAM.ADD_LINK"; - $scope.energyflowdiagramlink = { - source_node: {id: null, name: null}, - target_node: {id: null, name: null}, - meter: {id: null, uuid: null, name: null, type: null}, - }; - $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; - $scope.mergedmeters = params.mergedmeters; + $scope.energyflowdiagramlink = { + source_node: {id: null, name: null}, + target_node: {id: null, name: null}, + meter: {id: null, uuid: null, name: null, type: null}, + }; + $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; + $scope.mergedmeters = params.mergedmeters; $scope.ok = function() { - $uibModalInstance.close($scope.energyflowdiagramlink); }; @@ -299,8 +298,8 @@ app.controller('ModalAddEnergyFlowDiagramLinkCtrl', function($scope, $uibModalIn app.controller('ModalEditEnergyFlowDiagramLinkCtrl', function($scope, $uibModalInstance, params) { $scope.operation = "ENERGY_FLOW_DIAGRAM.EDIT_LINK"; $scope.energyflowdiagramlink = params.energyflowdiagramlink; - $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; - $scope.mergedmeters = params.mergedmeters; + $scope.energyflowdiagramnodes = params.energyflowdiagramnodes; + $scope.mergedmeters = params.mergedmeters; $scope.ok = function() { $uibModalInstance.close($scope.energyflowdiagramlink); }; diff --git a/admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html b/admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html deleted file mode 100644 index f1bfb19c..00000000 --- a/admin/app/services/settings/energyflowdiagram/equipmentparameter.model.html +++ /dev/null @@ -1,84 +0,0 @@ -
-
-

{{operation | translate}}

-
-
-
-
- -
-
- {{'EQUIPMENT.INPUT_PARAMETER_NAME' | translate}} -
-
-
-
-
- -
- -
- {{'EQUIPMENT.SELECT_PARAMETER_TYPE' | translate}} -
-
-
-
-
- -
- -
- {{'EQUIPMENT.INPUT_CONSTANT' | translate}} -
-
-
-
-
- -
- - {{$select.selected.name}} - -
- - -
- {{'EQUIPMENT.SELECT_POINT' | translate}} -
-
-
-
-
- -
- - {{$select.selected.name}} - -
- - -
-
-
-
- -
- - {{$select.selected.name}} - -
- - -
-
-
-
-
- - -
-
diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 64f782a1..e97d0f14 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1,6 +1,6 @@ { "info": { - "_postman_id": "ab4b1f3e-3892-4a0e-801b-4ec90d4592fe", + "_postman_id": "275f5f12-078c-421a-a050-f054e344dc2b", "name": "MyEMS", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json" }, @@ -2039,7 +2039,7 @@ }, { "key": "Token", - "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d7254cbf3811fe6c93", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", "description": "Login to get a valid token", "type": "text" } @@ -2073,7 +2073,7 @@ }, { "key": "Token", - "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d7254cbf3811fe6c93", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", "description": "Login to get a valid token", "type": "text" } @@ -2083,13 +2083,13 @@ "raw": "{\"data\":{\"name\":\"MyEMS Energy Flow Diagram\"}}" }, "url": { - "raw": "{{base_url}}/energyflowdiagrams/1", + "raw": "{{base_url}}/energyflowdiagrams/2000000", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1" + "2000000" ] } }, @@ -2108,19 +2108,19 @@ }, { "key": "Token", - "value": "073b43c05dadd89b833c0595b81c49cb9c1a54ca52b024b301a001720e52c5bf3b95951d5c54766de1028d20301cbd2bb6ec3fb62f9e14d7254cbf3811fe6c93", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", "description": "Login to get a valid token", "type": "text" } ], "url": { - "raw": "{{base_url}}/energyflowdiagrams/2", + "raw": "{{base_url}}/energyflowdiagrams/2000000", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "2" + "2000000" ] } }, @@ -2132,13 +2132,13 @@ "method": "GET", "header": [], "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/nodes", + "raw": "{{base_url}}/energyflowdiagrams/1000000/nodes", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "nodes" ] } @@ -2149,19 +2149,32 @@ "name": "POST Create new Node of an Energy Flow Diagram", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"10KV#3\"}}" }, "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/nodes", + "raw": "{{base_url}}/energyflowdiagrams/1000000/nodes", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "nodes" ] } @@ -2172,21 +2185,34 @@ "name": "PUT Update an Node of an Energy Flow Diagram", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"10KV Input #1\"}}" }, "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/nodes/1", + "raw": "{{base_url}}/energyflowdiagrams/1000000/nodes/3000000", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "nodes", - "1" + "3000000" ] } }, @@ -2196,17 +2222,30 @@ "name": "DELETE an Node of an Energy Flow Diagram", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/nodes/3", + "raw": "{{base_url}}/energyflowdiagrams/1000000/nodes/3000000", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "nodes", - "3" + "3000000" ] } }, @@ -2218,13 +2257,13 @@ "method": "GET", "header": [], "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/links", + "raw": "{{base_url}}/energyflowdiagrams/1000000/links", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "links" ] } @@ -2235,19 +2274,32 @@ "name": "POST Create new Link of an Energy Flow Diagram", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"source_node_id\":1, \"target_node_id\":2, \"meter_uuid\":\"493cd112-6295-43c6-98aa-e7f801e7b7ba\"}}" + "raw": "{\"data\":{\"source_node_id\":1000000, \"target_node_id\":1000008, \"meter_uuid\":\"eb78f7f9-f26f-463b-92fa-d9daf5b3651c\"}}" }, "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/links", + "raw": "{{base_url}}/energyflowdiagrams/1000000/links", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "links" ] } @@ -2258,21 +2310,34 @@ "name": "PUT Update a Link of an Energy Flow Diagram", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"source_node_id\":1, \"target_node_id\":4, \"meter_uuid\":\"493cd112-6295-43c6-98aa-e7f801e7b7ba\"}}" + "raw": "{\"data\":{\"source_node_id\":1000000, \"target_node_id\":1000009, \"meter_uuid\":\"eb78f7f9-f26f-463b-92fa-d9daf5b3651c\"}}" }, "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/links/1", + "raw": "{{base_url}}/energyflowdiagrams/1000000/links/3000000", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "links", - "1" + "3000000" ] } }, @@ -2282,17 +2347,30 @@ "name": "DELETE a Link of an Energy Flow Diagram", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/energyflowdiagrams/1/links/2", + "raw": "{{base_url}}/energyflowdiagrams/1000000/links/3000000", "host": [ "{{base_url}}" ], "path": [ "energyflowdiagrams", - "1", + "1000000", "links", - "2" + "3000000" ] } }, From fb8284ca521d21c364d5fff270842481655582ad Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 3 Dec 2021 14:16:51 +0800 Subject: [PATCH 020/117] added access control to privilege in api and admin --- .../users/privilege/privilege.controller.js | 3 +- myems-api/MyEMS.postman_collection.json | 55 ++++++++++++++++--- myems-api/README.md | 14 ++--- 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/admin/app/controllers/users/privilege/privilege.controller.js b/admin/app/controllers/users/privilege/privilege.controller.js index 30bfca59..cd2df729 100644 --- a/admin/app/controllers/users/privilege/privilege.controller.js +++ b/admin/app/controllers/users/privilege/privilege.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('PrivilegeController', function ($scope, +app.controller('PrivilegeController', function ( + $scope, $window, $uibModal, PrivilegeService, diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index e97d0f14..2b93ff88 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -4345,19 +4345,32 @@ "name": "PUT Update Privilege Data", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "46a767c678fc3d1bcacda116c639ebac77dd1a8407956a0f244a7900dc9c9bf88bb0c8be668d4962bb98f0108ebfeda603a4a6cd0c2031c6a9e864d8052e279e", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"privilege 1\", \"data\":\"{\\\"spaces\\\":[1, 3]}\"}}" }, "url": { - "raw": "{{base_url}}/privileges/2", + "raw": "{{base_url}}/privileges/1", "host": [ "{{base_url}}" ], "path": [ "privileges", - "2" + "1" ] } }, @@ -4367,25 +4380,51 @@ "name": "DELETE Privilege", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "46a767c678fc3d1bcacda116c639ebac77dd1a8407956a0f244a7900dc9c9bf88bb0c8be668d4962bb98f0108ebfeda603a4a6cd0c2031c6a9e864d8052e279e", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/privileges/2", + "raw": "{{base_url}}/privileges/1", "host": [ "{{base_url}}" ], "path": [ "privileges", - "2" + "1" ] } }, "response": [] }, { - "name": "Create Privilege", + "name": "POST Create Privilege", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "46a767c678fc3d1bcacda116c639ebac77dd1a8407956a0f244a7900dc9c9bf88bb0c8be668d4962bb98f0108ebfeda603a4a6cd0c2031c6a9e864d8052e279e", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\": {\"name\": \"privilege 1\", \"data\":\"{\\\"spaces\\\":[1, 3]}\"}}" diff --git a/myems-api/README.md b/myems-api/README.md index aa28f3dc..915199ae 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1229,15 +1229,15 @@ curl -i -X GET {{base_url}}/points ``` * DELETE Point by ID ```bash -curl -i -X DELETE {{base_url}}/points/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/points/{id} ``` -* POST Point +* POST Create Point ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"ModbusPoint1", "data_source_id":1, "object_type": "ENERGY_VALUE", "units":"kWh", "low_limit":0, "high_limit":999999999, "is_trend":true, "is_virtual":false, "address":"{\"slave_id\":1, \"function_code\":3, \"offset\":1, \"number_of_registers\":2, \"data_format\":\"float\"}", "description":null}}' {{base_url}}/points +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"ModbusPoint1", "data_source_id":1, "object_type": "ENERGY_VALUE", "units":"kWh", "low_limit":0, "high_limit":999999999, "is_trend":true, "is_virtual":false, "address":"{\"slave_id\":1, \"function_code\":3, \"offset\":1, \"number_of_registers\":2, \"data_format\":\"float\"}", "description":null}}' {{base_url}}/points ``` -* PUT Point +* PUT Update Point ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"ModbusPoint1", "data_source_id":1, "object_type": "ENERGY_VALUE", "units":"kWh", "low_limit":0, "high_limit":999999999, "is_trend":true, "is_virtual":false, "address":"{\"slave_id\":1, \"function_code\":3, \"offset\":1, \"number_of_registers\":2, \"data_format\":\"float\"}", "description":null}}' {{base_url}}/points/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"ModbusPoint1", "data_source_id":1, "object_type": "ENERGY_VALUE", "units":"kWh", "low_limit":0, "high_limit":999999999, "is_trend":true, "is_virtual":false, "address":"{\"slave_id\":1, \"function_code\":3, \"offset\":1, \"number_of_registers\":2, \"data_format\":\"float\"}", "description":null}}' {{base_url}}/points/{id} ``` ### Privilege @@ -1253,11 +1253,11 @@ curl -i -X GET {{base_url}}/privileges ```bash curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/privileges/{id} ``` -* POST New Privilege +* POST Create New Privilege ```bash curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"superusers","data":"{\"spaces\":[1,2,3,5]}"}}' {{base_url}}/privileges ``` -* PUT Privilege +* PUT Update Privilege ```bash curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"superusers", "data":"{\"spaces\":[1, 3]}"}}' {{base_url}}/privileges/{id} ``` From 469c21672bad9924f7bd7c8a553a7c01cc20c20e Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Fri, 3 Dec 2021 14:58:04 +0800 Subject: [PATCH 021/117] distrbutioncircuit/distributionsystem of access_control --- .../distributioncircuit.controller.js | 21 ++++++++++++++----- .../distributioncircuitpoint.controller.js | 6 ++++-- .../distributionsystem.controller.js | 20 +++++++++++++----- .../distributioncircuit.service.js | 12 +++++------ .../distributioncircuitpoint.service.js | 8 +++---- .../distributionsystem.service.js | 12 +++++------ myems-api/core/distributioncircuit.py | 7 ++++++- myems-api/core/distributionsystem.py | 5 ++++- 8 files changed, 61 insertions(+), 30 deletions(-) diff --git a/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js b/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js index 7f21a276..526c5413 100644 --- a/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributioncircuit.controller.js @@ -1,10 +1,18 @@ 'use strict'; -app.controller('DistributionCircuitController', function($scope, $translate, $uibModal, DistributionSystemService, DistributionCircuitService, toaster,SweetAlert) { +app.controller('DistributionCircuitController', function( + $scope, + $window, + $translate, + $uibModal, + DistributionSystemService, + DistributionCircuitService, + toaster, + SweetAlert) { $scope.distributionsystems = []; $scope.distributioncircuits = []; $scope.currentDistributionSystem = null; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllDistributionSystems = function() { DistributionSystemService.getAllDistributionSystems(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -48,7 +56,8 @@ app.controller('DistributionCircuitController', function($scope, $translate, $ui }); modalInstance.result.then(function(distributioncircuit) { distributioncircuit.distribution_system_id = $scope.currentDistributionSystem.id; - DistributionCircuitService.addDistributionCircuit(distributioncircuit, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitService.addDistributionCircuit(distributioncircuit, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -88,7 +97,8 @@ app.controller('DistributionCircuitController', function($scope, $translate, $ui modalInstance.result.then(function(modifiedDistributionCircuit) { modifiedDistributionCircuit.distribution_system_id = $scope.currentDistributionSystem.id; - DistributionCircuitService.editDistributionCircuit(modifiedDistributionCircuit, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitService.editDistributionCircuit(modifiedDistributionCircuit, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -126,7 +136,8 @@ app.controller('DistributionCircuitController', function($scope, $translate, $ui }, function(isConfirm) { if (isConfirm) { - DistributionCircuitService.deleteDistributionCircuit(distributioncircuit.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitService.deleteDistributionCircuit(distributioncircuit.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js index b7a63720..c97b7fd1 100644 --- a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js @@ -80,7 +80,8 @@ app.controller('DistributionCircuitPointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var distributioncircuitid = $scope.currentDistributionCircuit.id; - DistributionCircuitPointService.addPair(distributioncircuitid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitPointService.addPair(distributioncircuitid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -106,7 +107,8 @@ app.controller('DistributionCircuitPointController', function ( } var distributioncircuitpointid = angular.element('#' + dragEl).scope().distributioncircuitpoint.id; var distributioncircuitid = $scope.currentDistributionCircuit.id; - DistributionCircuitPointService.deletePair(distributioncircuitid, distributioncircuitpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionCircuitPointService.deletePair(distributioncircuitid, distributioncircuitpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js b/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js index 57c8f4fd..d87e8265 100644 --- a/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributionsystem.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('DistributionSystemController', function($scope, $translate, $uibModal, DistributionSystemService, toaster,SweetAlert) { - +app.controller('DistributionSystemController', function( + $scope, + $window, + $translate, + $uibModal, + DistributionSystemService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllDistributionSystems = function() { DistributionSystemService.getAllDistributionSystems(function(response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -19,7 +26,8 @@ app.controller('DistributionSystemController', function($scope, $translate, $uib windowClass: "animated fadeIn", }); modalInstance.result.then(function(distributionsystem) { - DistributionSystemService.addDistributionSystem(distributionsystem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionSystemService.addDistributionSystem(distributionsystem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -58,7 +66,8 @@ app.controller('DistributionSystemController', function($scope, $translate, $uib }); modalInstance.result.then(function(modifiedDistributionSystem) { - DistributionSystemService.editDistributionSystem(modifiedDistributionSystem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionSystemService.editDistributionSystem(modifiedDistributionSystem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -95,7 +104,8 @@ app.controller('DistributionSystemController', function($scope, $translate, $uib closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - DistributionSystemService.deleteDistributionSystem(distributionsystem, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + DistributionSystemService.deleteDistributionSystem(distributionsystem, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/distributionsystem/distributioncircuit.service.js b/admin/app/services/settings/distributionsystem/distributioncircuit.service.js index ff4be381..1c7914de 100644 --- a/admin/app/services/settings/distributionsystem/distributioncircuit.service.js +++ b/admin/app/services/settings/distributionsystem/distributioncircuit.service.js @@ -17,16 +17,16 @@ app.factory('DistributionCircuitService', function($http) { callback(response); }); }, - addDistributionCircuit: function(distributioncircuit,callback) { - $http.post(getAPI()+'/distributioncircuits',{data:distributioncircuit}) + addDistributionCircuit: function(distributioncircuit, headers, callback) { + $http.post(getAPI()+'/distributioncircuits',{data:distributioncircuit}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editDistributionCircuit: function(distributioncircuit,callback) { - $http.put(getAPI()+'/distributioncircuits/'+distributioncircuit.id,{data:distributioncircuit}) + editDistributionCircuit: function(distributioncircuit, headers, callback) { + $http.put(getAPI()+'/distributioncircuits/'+distributioncircuit.id,{data:distributioncircuit}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -34,8 +34,8 @@ app.factory('DistributionCircuitService', function($http) { }); }, - deleteDistributionCircuit: function(distributioncircuitID, callback) { - $http.delete(getAPI()+'/distributioncircuits/'+distributioncircuitID) + deleteDistributionCircuit: function(distributioncircuitID, headers, callback) { + $http.delete(getAPI()+'/distributioncircuits/'+distributioncircuitID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js b/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js index c2ca6420..ab56348c 100644 --- a/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js +++ b/admin/app/services/settings/distributionsystem/distributioncircuitpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('DistributionCircuitPointService', function($http) { return { - addPair: function(distributioncircuitID,pointID,callback) { - $http.post(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points',{data:{'point_id':pointID}}) + addPair: function(distributioncircuitID,pointID, headers, callback) { + $http.post(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('DistributionCircuitPointService', function($http) { }); }, - deletePair: function(distributioncircuitID,pointID, callback) { - $http.delete(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points/'+pointID) + deletePair: function(distributioncircuitID,pointID, headers, callback) { + $http.delete(getAPI()+'distributioncircuits/'+distributioncircuitID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/distributionsystem/distributionsystem.service.js b/admin/app/services/settings/distributionsystem/distributionsystem.service.js index 358cf58a..19ba3b99 100644 --- a/admin/app/services/settings/distributionsystem/distributionsystem.service.js +++ b/admin/app/services/settings/distributionsystem/distributionsystem.service.js @@ -17,24 +17,24 @@ app.factory('DistributionSystemService', function($http) { callback(response); }); }, - addDistributionSystem: function(distributionsystem, callback) { - $http.post(getAPI()+'distributionsystems',{data:distributionsystem}) + addDistributionSystem: function(distributionsystem, headers, callback) { + $http.post(getAPI()+'distributionsystems',{data:distributionsystem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editDistributionSystem: function(distributionsystem, callback) { - $http.put(getAPI()+'distributionsystems/'+distributionsystem.id,{data:distributionsystem}) + editDistributionSystem: function(distributionsystem, headers, callback) { + $http.put(getAPI()+'distributionsystems/'+distributionsystem.id,{data:distributionsystem}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteDistributionSystem: function(distributionsystem, callback) { - $http.delete(getAPI()+'distributionsystems/'+distributionsystem.id) + deleteDistributionSystem: function(distributionsystem, headers, callback) { + $http.delete(getAPI()+'distributionsystems/'+distributionsystem.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/distributioncircuit.py b/myems-api/core/distributioncircuit.py index e4ac8d7d..d6bd8f6a 100644 --- a/myems-api/core/distributioncircuit.py +++ b/myems-api/core/distributioncircuit.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class DistributionCircuitCollection: @@ -63,6 +63,7 @@ class DistributionCircuitCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -232,6 +233,7 @@ class DistributionCircuitItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_DISTRIBUTION_CIRCUIT_ID') @@ -264,6 +266,7 @@ class DistributionCircuitItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -440,6 +443,7 @@ class DistributionCircuitPointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -507,6 +511,7 @@ class DistributionCircuitPointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_DISTRIBUTION_CIRCUIT_ID') diff --git a/myems-api/core/distributionsystem.py b/myems-api/core/distributionsystem.py index d1385da8..f0dce86e 100644 --- a/myems-api/core/distributionsystem.py +++ b/myems-api/core/distributionsystem.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class DistributionSystemCollection: @@ -47,6 +47,7 @@ class DistributionSystemCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -146,6 +147,7 @@ class DistributionSystemItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_DISTRIBUTION_SYSTEM_ID') @@ -186,6 +188,7 @@ class DistributionSystemItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From 2eaa8df6c6cc22eb727c26d3e221b700d726d7f3 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Fri, 3 Dec 2021 16:36:48 +0800 Subject: [PATCH 022/117] added access control to sensor --- .../settings/sensor/sensor.controller.js | 14 +++++++++----- .../settings/sensor/sensorpoint.controller.js | 6 ++++-- .../app/services/settings/sensor/sensor.service.js | 12 ++++++------ .../settings/sensor/sensorpoint.service.js | 4 ++-- myems-api/core/sensor.py | 7 ++++++- 5 files changed, 27 insertions(+), 16 deletions(-) diff --git a/admin/app/controllers/settings/sensor/sensor.controller.js b/admin/app/controllers/settings/sensor/sensor.controller.js index ee242f3f..b4ee268a 100644 --- a/admin/app/controllers/settings/sensor/sensor.controller.js +++ b/admin/app/controllers/settings/sensor/sensor.controller.js @@ -1,7 +1,7 @@ 'use strict'; -app.controller('SensorController', function($scope, $translate, $uibModal, SensorService, toaster, SweetAlert) { - +app.controller('SensorController', function($scope, $window, $translate, $uibModal, SensorService, toaster, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function() { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -27,7 +27,9 @@ app.controller('SensorController', function($scope, $translate, $uibModal, Sens } }); modalInstance.result.then(function(sensor) { - SensorService.addSensor(sensor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorService.addSensor(sensor, {headers}, + function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -67,7 +69,8 @@ app.controller('SensorController', function($scope, $translate, $uibModal, Sens }); modalInstance.result.then(function(modifiedSensor) { - SensorService.editSensor(modifiedSensor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorService.editSensor(modifiedSensor, {headers}, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -105,7 +108,8 @@ app.controller('SensorController', function($scope, $translate, $uibModal, Sens }, function(isConfirm) { if (isConfirm) { - SensorService.deleteSensor(sensor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorService.deleteSensor(sensor, {headers}, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/sensor/sensorpoint.controller.js b/admin/app/controllers/settings/sensor/sensorpoint.controller.js index c2b6839c..b4c58ee4 100644 --- a/admin/app/controllers/settings/sensor/sensorpoint.controller.js +++ b/admin/app/controllers/settings/sensor/sensorpoint.controller.js @@ -80,7 +80,8 @@ app.controller('SensorPointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var sensorid = $scope.currentSensor.id; - SensorPointService.addPair(sensorid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorPointService.addPair(sensorid, pointid, {headers}, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -106,7 +107,8 @@ app.controller('SensorPointController', function ( } var sensorpointid = angular.element('#' + dragEl).scope().sensorpoint.id; var sensorid = $scope.currentSensor.id; - SensorPointService.deletePair(sensorid, sensorpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SensorPointService.deletePair(sensorid, sensorpointid, {headers}, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/sensor/sensor.service.js b/admin/app/services/settings/sensor/sensor.service.js index 1282799b..e28b6e59 100644 --- a/admin/app/services/settings/sensor/sensor.service.js +++ b/admin/app/services/settings/sensor/sensor.service.js @@ -17,24 +17,24 @@ app.factory('SensorService', function($http) { callback(response); }); }, - addSensor: function(sensor, callback) { - $http.post(getAPI()+'sensors',{data:sensor}) + addSensor: function(sensor, headers, callback) { + $http.post(getAPI()+'sensors',{data:sensor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editSensor: function(sensor, callback) { - $http.put(getAPI()+'sensors/'+sensor.id,{data:sensor}) + editSensor: function(sensor, headers, callback) { + $http.put(getAPI()+'sensors/'+sensor.id,{data:sensor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteSensor: function(sensor, callback) { - $http.delete(getAPI()+'sensors/'+sensor.id) + deleteSensor: function(sensor, headers, callback) { + $http.delete(getAPI()+'sensors/'+sensor.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/sensor/sensorpoint.service.js b/admin/app/services/settings/sensor/sensorpoint.service.js index d2f614de..c12cd976 100644 --- a/admin/app/services/settings/sensor/sensorpoint.service.js +++ b/admin/app/services/settings/sensor/sensorpoint.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('SensorPointService', function($http) { return { - addPair: function(sensorID,pointID,callback) { + addPair: function(sensorID,pointID, headers, callback) { $http.post(getAPI()+'sensors/'+sensorID+'/points',{data:{'point_id':pointID}}) .then(function (response) { callback(response); @@ -10,7 +10,7 @@ app.factory('SensorPointService', function($http) { }); }, - deletePair: function(sensorID,pointID, callback) { + deletePair: function(sensorID,pointID, headers, callback) { $http.delete(getAPI()+'sensors/'+sensorID+'/points/'+pointID) .then(function (response) { callback(response); diff --git a/myems-api/core/sensor.py b/myems-api/core/sensor.py index b8984ed8..9c15b6d3 100644 --- a/myems-api/core/sensor.py +++ b/myems-api/core/sensor.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class SensorCollection: @@ -44,6 +44,7 @@ class SensorCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -133,6 +134,7 @@ class SensorItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SENSOR_ID') @@ -209,6 +211,7 @@ class SensorItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -320,6 +323,7 @@ class SensorPointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -387,6 +391,7 @@ class SensorPointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SENSOR_ID') From 0edaf58aeea2431c9b53a982495e2dc53925594e Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Fri, 3 Dec 2021 16:42:18 +0800 Subject: [PATCH 023/117] added access control to sensorpoint --- admin/app/services/settings/sensor/sensorpoint.service.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/app/services/settings/sensor/sensorpoint.service.js b/admin/app/services/settings/sensor/sensorpoint.service.js index c12cd976..365771a1 100644 --- a/admin/app/services/settings/sensor/sensorpoint.service.js +++ b/admin/app/services/settings/sensor/sensorpoint.service.js @@ -2,7 +2,7 @@ app.factory('SensorPointService', function($http) { return { addPair: function(sensorID,pointID, headers, callback) { - $http.post(getAPI()+'sensors/'+sensorID+'/points',{data:{'point_id':pointID}}) + $http.post(getAPI()+'sensors/'+sensorID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -11,7 +11,7 @@ app.factory('SensorPointService', function($http) { }, deletePair: function(sensorID,pointID, headers, callback) { - $http.delete(getAPI()+'sensors/'+sensorID+'/points/'+pointID) + $http.delete(getAPI()+'sensors/'+sensorID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { From 4e0961e5fbb01c6bad3640db86a6b8546b40bfee Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 3 Dec 2021 19:09:39 +0800 Subject: [PATCH 024/117] added access control to distribution system in api and admin --- .../distributioncircuitpoint.controller.js | 10 +- myems-api/MyEMS.postman_collection.json | 173 ++++++--- myems-api/README.md | 342 +++++++++--------- 3 files changed, 293 insertions(+), 232 deletions(-) diff --git a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js index c97b7fd1..96e4abe8 100644 --- a/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js +++ b/admin/app/controllers/settings/distributionsystem/distributioncircuitpoint.controller.js @@ -49,11 +49,11 @@ app.controller('DistributionCircuitPointController', function ( }); }; - $scope.changeDistributionCircuit=function(item,model){ - $scope.currentDistributionCircuit=item; - $scope.currentDistributionCircuit.selected=model; - $scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id); - }; + $scope.changeDistributionCircuit=function(item,model){ + $scope.currentDistributionCircuit=item; + $scope.currentDistributionCircuit.selected=model; + $scope.getPointsByDistributionCircuitID($scope.currentDistributionCircuit.id); + }; $scope.changeDataSource = function (item, model) { $scope.currentDataSource = model; diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 2b93ff88..75145af6 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1301,7 +1301,20 @@ "name": "POST Create Distribution System", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"示例配电系统2\", \"svg\":\"Four separate rectangles\", \"description\":\"demo description\"}}" @@ -1322,7 +1335,20 @@ "name": "DELETE Distribution Systems by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/distributionsystems/2", "host": [ @@ -1340,7 +1366,20 @@ "name": "PUT Update Distribution System by ID", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"示例配电系统1\", \"svg\":\"Four separate rectangles\", \"description\":\"demo description\"}}" @@ -1376,49 +1415,6 @@ } }, "response": [] - }, - { - "name": "POST Bind Distribution Circuit to Distribution System", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"distribution_circuit_id\":\"1\"}}" - }, - "url": { - "raw": "{{base_url}}/distributionsystems/1/distributioncircuits", - "host": [ - "{{base_url}}" - ], - "path": [ - "distributionsystems", - "1", - "distributioncircuits" - ] - } - }, - "response": [] - }, - { - "name": "DELETE Unbind Distribution Circuit from Distribution System", - "request": { - "method": "DELETE", - "header": [], - "url": { - "raw": "{{base_url}}/distributionsystems/1/distributioncircuits/1", - "host": [ - "{{base_url}}" - ], - "path": [ - "distributionsystems", - "1", - "distributioncircuits", - "1" - ] - } - }, - "response": [] } ] }, @@ -1464,7 +1460,20 @@ "name": "POST Create new Distribution Circuit", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"51W92\", \"distribution_system_id\":1, \"distribution_room\":\"EW1\", \"switchgear\":\"51AL9\", \"peak_load\": 30, \"peak_current\": 53.6, \"customers\": \"地下室应急照明\", \"meters\": \"ALE-1102, ALE-1082\"}}" @@ -1485,7 +1494,20 @@ "name": "DELETE a Distribution Circuit by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/distributioncircuits/2", "host": [ @@ -1503,7 +1525,20 @@ "name": "PUT Update Distribution Circuit by ID", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"51W91\", \"distribution_system_id\":1, \"distribution_room\":\"EW1\", \"switchgear\":\"51AL9\", \"peak_load\": 30, \"peak_current\": 53.6, \"customers\": \"地下室应急照明\", \"meters\": \"ALE-1102, ALE-1082\"}}" @@ -1525,10 +1560,23 @@ "name": "POST Bind Point to Distribution Circuit", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"point_id\":\"1\"}}" + "raw": "{\"data\":{\"point_id\":\"2\"}}" }, "url": { "raw": "{{base_url}}/distributioncircuits/1/points", @@ -1567,9 +1615,22 @@ "name": "DELETE Unbind Point from Distribution Circuit", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "bd16461ce31dca5c026ee17b1e6e10167d7558230fc6387b4149819a1a2b0d19b87b72687fa488ee41b358b7d229ab44f1011968308c0cf3e9d379e6ae6b2565", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/distributioncircuits/1/points/1", + "raw": "{{base_url}}/distributioncircuits/1/points/2", "host": [ "{{base_url}}" ], @@ -1577,7 +1638,7 @@ "distributioncircuits", "1", "points", - "1" + "2" ] } }, @@ -3644,7 +3705,7 @@ "response": [] }, { - "name": "POST Meter Point Relation", + "name": "POST Bind Point to Meter", "request": { "method": "POST", "header": [ @@ -3699,7 +3760,7 @@ "response": [] }, { - "name": "DELETE Meter Point Relation", + "name": "DELETE Unbind Point from Meter", "request": { "method": "DELETE", "header": [ diff --git a/myems-api/README.md b/myems-api/README.md index 915199ae..e3629388 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -301,15 +301,15 @@ curl -i -X GET {{base_url}}/costcenters ``` * DELETE Cost Center by ID ```bash -curl -i -X DELETE {{base_url}}/costcenters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/costcenters/{id} ``` * POST Create New Cost Center ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"动力中心", "external_id":"21829198980001"}}' {{base_url}}/costcenters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"动力中心", "external_id":"21829198980001"}}' {{base_url}}/costcenters ``` * PUT Update a Cost Center ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"动力中心2", "external_id":"21829198980002"}}' {{base_url}}/costcenters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"动力中心2", "external_id":"21829198980002"}}' {{base_url}}/costcenters/{id} ``` * GET All Tariffs associated with Cost Center ID ```bash @@ -317,11 +317,11 @@ curl -i -X GET {{base_url}}/costcenters/{id}/tariffs ``` * POST Create a Cost Center and Tariff Relation ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"tariff_id":"3"}}' {{base_url}}/costcenters/{id}/tariffs +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"tariff_id":"3"}}' {{base_url}}/costcenters/{id}/tariffs ``` * DELETE a Cost Center and Tariff Relation by tid ```bash -curl -i -X DELETE {{base_url}}/costcenters/{id}/tariffs/{tid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/costcenters/{id}/tariffs/{tid} ``` ### Cost File @@ -380,23 +380,23 @@ Result in JSON * GET all Data Sources ```bash -curl -i -X GET {{base_url}}/datasources +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/datasources ``` * DELETE Data Source by ID ```bash -curl -i -X DELETE {{base_url}}/datasources/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/datasources/{id} ``` * POST Data Source ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Modbus1", "gateway_id":1, "protocol":"modbus-tcp", "connection":"{\"host\":\"10.1.2.88\", \"port\":502}"}}' {{base_url}}/datasources +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Modbus1", "gateway_id":1, "protocol":"modbus-tcp", "connection":"{\"host\":\"10.1.2.88\", \"port\":502}"}}' {{base_url}}/datasources ``` * PUT Data Source ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Modbus1", "gateway_id":1, "protocol":"modbus-tcp", "connection":"{\"host\":\"10.1.2.99\", \"port\":502}"}}' {{base_url}}/datasources/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Modbus1", "gateway_id":1, "protocol":"modbus-tcp", "connection":"{\"host\":\"10.1.2.99\", \"port\":502}"}}' {{base_url}}/datasources/{id} ``` * GET all points of the Data Source by ID ```bash -curl -i -X GET {{base_url}}/datasources/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/datasources/{id}/points ``` ### Distribution Circuit @@ -424,17 +424,17 @@ Result in JSON ```bash curl -i -X GET {{base_url}}/distributioncircuits ``` -* DELETE a Distribution Circuit by ID -```bash -curl -i -X DELETE {{base_url}}/distributioncircuits/{id} -``` * POST Create new Distribution Circuit ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"51W91", "distribution_system_id":1, "distribution_room":"EW1", "switchgear":"51AL9", "peak_load": 30, "peak_current": 53.6, "customers": "地下室应急照明", "meters": "ALE-1102, ALE-1082"}}' {{base_url}}/distributioncircuits +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"51W91", "distribution_system_id":1, "distribution_room":"EW1", "switchgear":"51AL9", "peak_load": 30, "peak_current": 53.6, "customers": "地下室应急照明", "meters": "ALE-1102, ALE-1082"}}' {{base_url}}/distributioncircuits ``` -* PUT Update a Distribution Circuit +* DELETE a Distribution Circuit by ID ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"51W92", "distribution_system_id":1, "distribution_room":"EW1", "switchgear":"51AL9", "peak_load": 30, "peak_current": 53.6, "customers": "地下室应急照明", "meters": "ALE-1102, ALE-1082"}}' {{base_url}}/distributioncircuits/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/distributioncircuits/{id} +``` +* PUT Update a Distribution Circuit by ID +```bash +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"51W92", "distribution_system_id":1, "distribution_room":"EW1", "switchgear":"51AL9", "peak_load": 30, "peak_current": 53.6, "customers": "地下室应急照明", "meters": "ALE-1102, ALE-1082"}}' {{base_url}}/distributioncircuits/{id} ``` * GET All Points associated with Distribution Circuit ID ```bash @@ -442,11 +442,11 @@ curl -i -X GET {{base_url}}/distributioncircuits/{id}/points ``` * POST Bind Point to Distribution Circuit ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/distributioncircuits/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"1"}}' {{base_url}}/distributioncircuits/{id}/points ``` * DELETE Unbind Point from Distribution Circuit ```bash -curl -i -X DELETE {{base_url}}/distributioncircuits/{id}/points/{pid} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/distributioncircuits/{id}/points/{pid} ``` ### Distribution System @@ -471,15 +471,15 @@ curl -i -X GET {{base_url}}/distributionsystems ``` * DELETE a Distribution System by ID ```bash -curl -i -X DELETE {{base_url}}/distributionsystems/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/distributionsystems/{id} ``` * POST Create new Distribution System ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"示例配电系统", "svg":"Four separate rectangles", "description":"demo description"}}' {{base_url}}/distributionsystems +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"示例配电系统", "svg":"Four separate rectangles", "description":"demo description"}}' {{base_url}}/distributionsystems ``` * PUT Update a Distribution System ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"示例配电系统", "svg":"Four separate rectangles", "description":"demo description"}}' {{base_url}}/distributionsystems/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"示例配电系统", "svg":"Four separate rectangles", "description":"demo description"}}' {{base_url}}/distributionsystems/{id} ``` * GET All Distribution Circuits associated with Distribution Circuit ```bash @@ -512,7 +512,7 @@ curl -i -X GET {{base_url}}/emailmessages/from/{startdate}/to/{enddate} ``` * DELETE an Email Message by ID ```bash -curl -i -X DELETE {{base_url}}/emailmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/emailmessages/{id} ``` ### Email Server @@ -539,15 +539,15 @@ curl -i -X GET {{base_url}}/emailservers ``` * DELETE an Email Server by ID ```bash -curl -i -X DELETE {{base_url}}/emailservers/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/emailservers/{id} ``` * POST Create New Email Server ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"host":"smtp.163.com","port":25, "requires_authentication":true, "user_name":"myems" , "password":"!MyEMS1" , "from_addr":"myems@163.com"}}' {{base_url}}/emailservers +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"host":"smtp.163.com","port":25, "requires_authentication":true, "user_name":"myems" , "password":"!MyEMS1" , "from_addr":"myems@163.com"}}' {{base_url}}/emailservers ``` * PUT Update an Email Server ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"host":"smtp.myems.io","port":25, "requires_authentication":true, "user_name":"myems" , "password":"!MyEMS1" , "from_addr":"myems@myems.io"}}' {{base_url}}/emailservers/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"host":"smtp.myems.io","port":25, "requires_authentication":true, "user_name":"myems" , "password":"!MyEMS1" , "from_addr":"myems@myems.io"}}' {{base_url}}/emailservers/{id} ``` ### Energy Category @@ -703,19 +703,19 @@ curl -i -X GET {{base_url}}/equipments ``` * DELETE Equipment by ID ```bash -curl -i -X DELETE {{base_url}}/equipments/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/equipments/{id} ``` * POST Create an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Chiller", "is_input_counted":true, "is_output_counted":false, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/equipments +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Chiller", "is_input_counted":true, "is_output_counted":false, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/equipments ``` * PUT Update an Equipment ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Chiller", "is_input_counted":true, "is_output_counted":true, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/equipments/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Chiller", "is_input_counted":true, "is_output_counted":true, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/equipments/{id} ``` * POST Clone an Equipment ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{}}' {{base_url}}/equipments/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{}}' {{base_url}}/equipments/{id} ``` * GET All Meters of Equipment by ID ```bash @@ -723,11 +723,11 @@ curl -i -X GET {{base_url}}/equipments/{id}/meters ``` * POST Bind a Meter to an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/equipments/{id}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/equipments/{id}/meters ``` * DELETE a Meter from an Equipment ```bash -curl -i -X DELETE {{base_url}}/equipments/{id}/meters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/equipments/{id}/meters/{mid} ``` * GET All Parameters of Equipment by ID ```bash @@ -753,19 +753,19 @@ Result * POST Create a constant Parameter for an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"constant", "constant":"test constant", "point_id":null, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/equipments/{id}/parameters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"constant", "constant":"test constant", "point_id":null, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/equipments/{id}/parameters ``` * POST Create a point Parameter for an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"point", "constant":null, "point_id":1, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/equipments/{id}/parameters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"point", "constant":null, "point_id":1, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/equipments/{id}/parameters ``` * POST Create a meter Parameter for an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"fraction", "constant":null, "point_id":null, "numerator_meter_uuid":"89ff5118-d0c2-4dd8-8098-a8698189b2ea", "denominator_meter_uuid":"5ca62d2a-908e-40c5-a6b5-a8e436d60db4"}}' {{base_url}}/equipments/{id}/parameters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"fraction", "constant":null, "point_id":null, "numerator_meter_uuid":"89ff5118-d0c2-4dd8-8098-a8698189b2ea", "denominator_meter_uuid":"5ca62d2a-908e-40c5-a6b5-a8e436d60db4"}}' {{base_url}}/equipments/{id}/parameters ``` * DELETE a Parameter from an Equipment ```bash -curl -i -X DELETE {{base_url}}/equipments/{id}/parameters/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/equipments/{id}/parameters/{pid} ``` * GET All Offline Meters of Equipment by ID ```bash @@ -773,11 +773,11 @@ curl -i -X GET {{base_url}}/equipments/{id}/offlinemeters ``` * POST Bind an Offline Meter to an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/equipments/{id}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/equipments/{id}/offlinemeters ``` * DELETE an Offline Meter from an Equipment ```bash -curl -i -X DELETE {{base_url}}/equipments/{id}/offlinemeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/equipments/{id}/offlinemeters/{mid} ``` * GET All Virtual Meters of Equipment by ID ```bash @@ -785,11 +785,11 @@ curl -i -X GET {{base_url}}/equipments/{id}/virtualmeters ``` * POST Bind Virtual Meter to an Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/equipments/{id}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/equipments/{id}/virtualmeters ``` * DELETE an Virtual Meter from an Equipment ```bash -curl -i -X DELETE {{base_url}}/equipments/{id}/virtualmeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/equipments/{id}/virtualmeters/{mid} ``` ### Combined Equipment @@ -815,19 +815,19 @@ curl -i -X GET {{base_url}}/combinedequipments ``` * DELETE a Combined Equipment by ID ```bash -curl -i -X DELETE {{base_url}}/combinedequipments/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/combinedequipments/{id} ``` * POST Create a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Chiller Plant", "is_input_counted":true, "is_output_counted":false, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/combinedequipments +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Chiller Plant", "is_input_counted":true, "is_output_counted":false, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/combinedequipments ``` * PUT Update a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Chiller Plant", "is_input_counted":true, "is_output_counted":true, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/combinedequipments/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Chiller Plant", "is_input_counted":true, "is_output_counted":true, "cost_center_id":1, "description":"equipment description"}}' {{base_url}}/combinedequipments/{id} ``` * POST Clone a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{}}' {{base_url}}/combinedequipments/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{}}' {{base_url}}/combinedequipments/{id} ``` * GET All Equipments of a Combined Equipment by ID ```bash @@ -835,11 +835,11 @@ curl -i -X GET {{base_url}}/combinedequipments/{id}/equipments ``` * POST Bind an Equipment to a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"equipment_id":1}}' {{base_url}}/combinedequipments/{id}/equipments +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"equipment_id":1}}' {{base_url}}/combinedequipments/{id}/equipments ``` * DELETE an Equipment from a Combined Equipment ```bash -curl -i -X DELETE {{base_url}}/combinedequipments/{id}/equipments/{eid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/combinedequipments/{id}/equipments/{eid} ``` * GET All Meters of a Combined Equipment by ID ```bash @@ -847,11 +847,11 @@ curl -i -X GET {{base_url}}/combinedequipments/{id}/meters ``` * POST Bind a Meter to a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/combinedequipments/{id}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/combinedequipments/{id}/meters ``` * DELETE a Meter from a Combined Equipment ```bash -curl -i -X DELETE {{base_url}}/combinedequipments/{id}/meters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/combinedequipments/{id}/meters/{mid} ``` * GET All Parameters of a Combined Equipment by ID ```bash @@ -877,19 +877,19 @@ Result * POST Create a constant Parameter for a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"constant", "constant":"test constant", "point_id":null, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/combinedequipments/{id}/parameters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"constant", "constant":"test constant", "point_id":null, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/combinedequipments/{id}/parameters ``` * POST Create a point Parameter for a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"point", "constant":null, "point_id":1, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/combinedequipments/{id}/parameters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"point", "constant":null, "point_id":1, "numerator_meter_uuid":null, "denominator_meter_uuid":null}}' {{base_url}}/combinedequipments/{id}/parameters ``` * POST Create a meter Parameter for a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"fraction", "constant":null, "point_id":null, "numerator_meter_uuid":"89ff5118-d0c2-4dd8-8098-a8698189b2ea", "denominator_meter_uuid":"5ca62d2a-908e-40c5-a6b5-a8e436d60db4"}}' {{base_url}}/combinedequipments/{id}/parameters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"test parameter", "parameter_type":"fraction", "constant":null, "point_id":null, "numerator_meter_uuid":"89ff5118-d0c2-4dd8-8098-a8698189b2ea", "denominator_meter_uuid":"5ca62d2a-908e-40c5-a6b5-a8e436d60db4"}}' {{base_url}}/combinedequipments/{id}/parameters ``` * DELETE a Parameter from a Combined Equipment ```bash -curl -i -X DELETE {{base_url}}/combinedequipments/{id}/parameters/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/combinedequipments/{id}/parameters/{pid} ``` * GET All Offline Meters of a Combined Equipment by ID ```bash @@ -897,11 +897,11 @@ curl -i -X GET {{base_url}}/combinedequipments/{id}/offlinemeters ``` * POST Bind an Offline Meter to a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/combinedequipments/{id}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/combinedequipments/{id}/offlinemeters ``` * DELETE an Offline Meter from a Combined Equipment ```bash -curl -i -X DELETE {{base_url}}/combinedequipments/{id}/offlinemeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/combinedequipments/{id}/offlinemeters/{mid} ``` * GET All Virtual Meters of a Combined Equipment by ID ```bash @@ -909,11 +909,11 @@ curl -i -X GET {{base_url}}/combinedequipments/{id}/virtualmeters ``` * POST Bind Virtual Meter to a Combined Equipment ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/combinedequipments/{id}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/combinedequipments/{id}/virtualmeters ``` * DELETE an Virtual Meter from a Combined Equipment ```bash -curl -i -X DELETE {{base_url}}/combinedequipments/{id}/virtualmeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/combinedequipments/{id}/virtualmeters/{mid} ``` ### Gateway @@ -935,19 +935,19 @@ Result in JSON * GET all Gateways ```bash -curl -i -X GET {{base_url}}/gateways +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/gateways ``` * DELETE Gateway by ID ```bash -curl -i -X DELETE {{base_url}}/gateways/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/gateways/{id} ``` * POST Gateway ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Gateway 1"}}' {{base_url}}/gateways +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Gateway 1"}}' {{base_url}}/gateways ``` * PUT Gateway ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Gateway #1"}}' {{base_url}}/gateways/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Gateway #1"}}' {{base_url}}/gateways/{id} ``` * GET all data sources of the Gateway by ID ```bash @@ -977,7 +977,7 @@ curl -i -X GET {{base_url}}/knowledgefiles ``` * DELETE a Knowledge File by id ```bash -curl -i -X DELETE {{base_url}}/knowledgefiles/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/knowledgefiles/{id} ``` * POST Upload a Knowledge File (call users login API to get 'User-UUID' and 'Token') @@ -1010,7 +1010,7 @@ curl -i -X GET {{base_url}}/menus ``` * PUT Update a Menu ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"is_hidden": false}}' {{base_url}}/menus/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"is_hidden": false}}' {{base_url}}/menus/{id} ``` * Get All Menus for Web UI ```bash @@ -1049,17 +1049,17 @@ curl -i -X GET {{base_url}}/meters ``` * DELETE Meter by ID ```bash -curl -i -X DELETE {{base_url}}/meters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/meters/{id} ``` * POST Create a Meter ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters ``` * PUT Update a Meter ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"PM20", "energy_category_id":1, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "is_counted":true, "cost_center_id":1, "energy_item_id":1, "master_meter_id":1, "description":"空调用电"}}' {{base_url}}/meters/{id} ``` -* GET All Submeters of Meter by ID +* GET All Sub-meters of Meter by ID ```bash curl -i -X GET {{base_url}}/meters/{id}/submeters ``` @@ -1067,11 +1067,11 @@ curl -i -X GET {{base_url}}/meters/{id}/submeters ```bash curl -i -X GET {{base_url}}/meters/{id}/points ``` -* POST Meter Point Relation +* POST Bind Point to Meter ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/meters/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/meters/{id}/points ``` -* DELETE Meter Point Relation +* DELETE Unbind Point from Meter ```bash curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/meters/{id}/points/{pid} ``` @@ -1139,15 +1139,15 @@ curl -i -X GET {{base_url}}/offlinemeters ``` * DELETE Offline Meter by ID ```bash -curl -i -X DELETE {{base_url}}/offlinemeters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/offlinemeters/{id} ``` -* POST Create a Offline Meter +* POST Create an Offline Meter ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"OfflinePM20", "energy_category_id":1, "is_counted":true, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "cost_center_id":1, "energy_item_id":1, "description":"空调用电"}}' {{base_url}}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"OfflinePM20", "energy_category_id":1, "is_counted":true, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "cost_center_id":1, "energy_item_id":1, "description":"空调用电"}}' {{base_url}}/offlinemeters ``` -* PUT Update a Offline Meter +* PUT Update an Offline Meter ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"OfflinePM20", "energy_category_id":1, "is_counted":true, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "cost_center_id":1, "energy_item_id":1, "description":"空调用电"}}' {{base_url}}/offlinemeters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"OfflinePM20", "energy_category_id":1, "is_counted":true, "hourly_low_limit":0.000, "hourly_high_limit":999.999, "cost_center_id":1, "energy_item_id":1, "description":"空调用电"}}' {{base_url}}/offlinemeters/{id} ``` ### Offline Meter File @@ -1173,7 +1173,7 @@ curl -i -X GET {{base_url}}/offlinemeterfiles ``` * DELETE an Offline Meter File by ID ```bash -curl -i -X DELETE {{base_url}}/offlinemeterfiles/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/offlinemeterfiles/{id} ``` * POST Upload an Offline Meter File (call users login API to get 'User-UUID' and 'Token') @@ -1291,15 +1291,15 @@ curl -i -X GET {{base_url}}/rules ``` * DELETE a Rule by ID ```bash -curl -i -X DELETE {{base_url}}/rules/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/rules/{id} ``` * POST Create New Rule ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Space Energy Consumption Over Limit", "fdd_code":"SPACE01", "category":"SPACE", "priority":"HIGH", "channel":"WEB", "expression":"{\"space_id\":1, \"high_limit\":1000.000}", "message_template":"%s截止到目前电耗%s，超标%s。", "is_enabled":true}}' {{base_url}}/rules +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Space Energy Consumption Over Limit", "fdd_code":"SPACE01", "category":"SPACE", "priority":"HIGH", "channel":"WEB", "expression":"{\"space_id\":1, \"high_limit\":1000.000}", "message_template":"%s截止到目前电耗%s，超标%s。", "is_enabled":true}}' {{base_url}}/rules ``` * PUT Update a Rule ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Space Energy Consumption Over Limit", "fdd_code":"SPACE01", "category":"SPACE", "priority":"HIGH", "channel":"WEB", "expression":"{\"space_id\":1, \"high_limit\":1000.000}", "message_template":"%s截止到目前电耗%s，超标%s。", "is_enabled":true}}' {{base_url}}/rules/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Space Energy Consumption Over Limit", "fdd_code":"SPACE01", "category":"SPACE", "priority":"HIGH", "channel":"WEB", "expression":"{\"space_id\":1, \"high_limit\":1000.000}", "message_template":"%s截止到目前电耗%s，超标%s。", "is_enabled":true}}' {{base_url}}/rules/{id} ``` ### Sensor @@ -1323,15 +1323,15 @@ curl -i -X GET {{base_url}}/sensors ``` * DELETE a Sensor by ID ```bash -curl -i -X DELETE {{base_url}}/sensors/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/sensors/{id} ``` * POST Create New Sensor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Sensor10", "description":"sensor description"}}' {{base_url}}/sensors +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Sensor10", "description":"sensor description"}}' {{base_url}}/sensors ``` * PUT Update a Sensor ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Sensor10", "description":"sensor description"}}' {{base_url}}/sensors/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Sensor10", "description":"sensor description"}}' {{base_url}}/sensors/{id} ``` * GET All Points associated with Sensor ID ```bash @@ -1339,11 +1339,11 @@ curl -i -X GET {{base_url}}/sensors/{id}/points ``` * POST Sensor Point Relation ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/sensors/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/sensors/{id}/points ``` * DELETE Sensor Point Relation ```bash -curl -i -X DELETE {{base_url}}/sensors/{id}/points/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/sensors/{id}/points/{pid} ``` ### Shopfloor @@ -1370,15 +1370,15 @@ curl -i -X GET {{base_url}}/shopfloors ``` * DELETE a Shopfloor by ID ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id} ``` * POST Create a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Shopfloor", "area":999.99, "is_input_counted":true, "contact_id":1, "cost_center_id":1, "description":"Shopfloor description"}}' {{base_url}}/shopfloors +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMS Shopfloor", "area":999.99, "is_input_counted":true, "contact_id":1, "cost_center_id":1, "description":"Shopfloor description"}}' {{base_url}}/shopfloors ``` * PUT Update a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Shopfloor", "area":999.99, "is_input_counted":true, "contact_id":1, "cost_center_id":1, "description":"Shopfloor description"}}' {{base_url}}/shopfloors/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMS Shopfloor", "area":999.99, "is_input_counted":true, "contact_id":1, "cost_center_id":1, "description":"Shopfloor description"}}' {{base_url}}/shopfloors/{id} ``` * GET All Equipments of Shopfloor by ID ```bash @@ -1386,11 +1386,11 @@ curl -i -X GET {{base_url}}/shopfloors/{id}/equipments ``` * POST Bind Equipment to a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"equipment_id":1}}' {{base_url}}/shopfloors/{id}/equipments +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"equipment_id":1}}' {{base_url}}/shopfloors/{id}/equipments ``` * DELETE Equipment from Shopfloor ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id}/equipments/{eid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id}/equipments/{eid} ``` * GET All Meters of Shopfloor by ID ```bash @@ -1398,11 +1398,11 @@ curl -i -X GET {{base_url}}/shopfloors/{id}/meters ``` * POST Bind a Meter to a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/shopfloors/{id}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/shopfloors/{id}/meters ``` * DELETE a Meter from Shopfloor ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id}/meters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id}/meters/{mid} ``` * GET All Offline Meters of Shopfloor by ID ```bash @@ -1410,11 +1410,11 @@ curl -i -X GET {{base_url}}/shopfloors/{id}/offlinemeters ``` * POST Bind an Offline Meter to a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/shopfloors/{id}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/shopfloors/{id}/offlinemeters ``` * DELETE an Offline Meter from Shopfloor ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id}/offlinemeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id}/offlinemeters/{mid} ``` * GET All Points of Shopfloor by ID ```bash @@ -1422,11 +1422,11 @@ curl -i -X GET {{base_url}}/shopfloors/{id}/points ``` * POST Bind a Point to a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/shopfloors/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/shopfloors/{id}/points ``` * DELETE a Point from Shopfloor ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id}/points/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id}/points/{pid} ``` * GET All Sensors of Shopfloor by ID ```bash @@ -1434,11 +1434,11 @@ curl -i -X GET {{base_url}}/shopfloors/{id}/sensors ``` * POST Bind a Sensor to a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/shopfloors/{id}/sensors +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/shopfloors/{id}/sensors ``` * DELETE a Sensor from Shopfloor ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id}/sensors/{sid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id}/sensors/{sid} ``` * GET All Virtual Meters of Shopfloor by ID ```bash @@ -1446,11 +1446,11 @@ curl -i -X GET {{base_url}}/shopfloors/{id}/virtualmeters ``` * POST Bind Virtual Meter to a Shopfloor ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/shopfloors/{id}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/shopfloors/{id}/virtualmeters ``` * DELETE Virtual Meter from Shopfloor ```bash -curl -i -X DELETE {{base_url}}/shopfloors/{id}/virtualmeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/shopfloors/{id}/virtualmeters/{mid} ``` ### Space @@ -1480,15 +1480,15 @@ curl -i -X GET {{base_url}}/spaces ``` * DELETE Space by ID ```bash -curl -i -X DELETE {{base_url}}/spaces/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id} ``` * POST Create a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMSSpace", "parent_space_id":1, "area":999.99, "timezone_id":56, "is_input_counted":true, "is_output_counted":false, "contact_id":1, "cost_center_id":1, "description":"Space description"}}' {{base_url}}/spaces +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"MyEMSSpace", "parent_space_id":1, "area":999.99, "timezone_id":56, "is_input_counted":true, "is_output_counted":false, "contact_id":1, "cost_center_id":1, "description":"Space description"}}' {{base_url}}/spaces ``` * PUT Update a Space ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMSSpace", "parent_space_id":2, "area":999.99, "timezone_id":56, "is_input_counted":true, "is_output_counted":true, "contact_id":1, "cost_center_id":1, "description":"Space description"}}' {{base_url}}/spaces/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"MyEMSSpace", "parent_space_id":2, "area":999.99, "timezone_id":56, "is_input_counted":true, "is_output_counted":true, "contact_id":1, "cost_center_id":1, "description":"Space description"}}' {{base_url}}/spaces/{id} ``` * GET All Children of Space by ID ```bash @@ -1500,11 +1500,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/combinedequipments ``` * POST Bind a Combined Equipment to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"combined_equipment_id":1}}' {{base_url}}/spaces/{id}/equipments +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"combined_equipment_id":1}}' {{base_url}}/spaces/{id}/equipments ``` * DELETE a Combined Equipment from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/combinedequipments/{eid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/combinedequipments/{eid} ``` * GET All Equipments of Space by ID ```bash @@ -1512,11 +1512,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/equipments ``` * POST Bind Equipment to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"equipment_id":1}}' {{base_url}}/spaces/{id}/equipments +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"equipment_id":1}}' {{base_url}}/spaces/{id}/equipments ``` * DELETE Equipment from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/equipments/{eid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/equipments/{eid} ``` * GET All Meters of Space by ID ```bash @@ -1524,11 +1524,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/meters ``` * POST Bind a Meter to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/spaces/{id}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/spaces/{id}/meters ``` * DELETE a Meter from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/meters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/meters/{mid} ``` * GET All Offline Meters of Space by ID ```bash @@ -1536,11 +1536,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/offlinemeters ``` * POST Bind an Offline Meter to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/spaces/{id}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/spaces/{id}/offlinemeters ``` * DELETE an Offline Meter from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/offlinemeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/offlinemeters/{mid} ``` * GET All Points of Space by ID ```bash @@ -1548,11 +1548,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/points ``` * POST Bind a Point to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/spaces/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/spaces/{id}/points ``` * DELETE a Point from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/points/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/points/{pid} ``` * GET All Sensors of Space by ID ```bash @@ -1560,11 +1560,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/sensors ``` * POST Bind a Sensor to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/spaces/{id}/sensors +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/spaces/{id}/sensors ``` * DELETE a Sensor from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/sensors/{sid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/sensors/{sid} ``` * GET All Stores of Space by ID ```bash @@ -1572,11 +1572,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/stores ``` * POST Bind a Store to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"store_id":1}}' {{base_url}}/spaces/{id}/stores +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"store_id":1}}' {{base_url}}/spaces/{id}/stores ``` * DELETE a Store from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/stores/{tid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/stores/{tid} ``` * GET All Tenants of Space by ID ```bash @@ -1584,11 +1584,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/tenants ``` * POST Bind a Tenant to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"tenant_id":1}}' {{base_url}}/spaces/{id}/tenants +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"tenant_id":1}}' {{base_url}}/spaces/{id}/tenants ``` * DELETE a Tenant from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/tenants/{tid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/tenants/{tid} ``` * GET All Virtual Meters of Space by ID ```bash @@ -1596,11 +1596,11 @@ curl -i -X GET {{base_url}}/spaces/{id}/virtualmeters ``` * POST Bind Virtual Meter to a Space ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/spaces/{id}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/spaces/{id}/virtualmeters ``` * DELETE Virtual Meter from Space ```bash -curl -i -X DELETE {{base_url}}/spaces/{id}/virtualmeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/spaces/{id}/virtualmeters/{mid} ``` * GET Space Tree of User ```bash @@ -1635,15 +1635,15 @@ curl -i -X GET {{base_url}}/stores ``` * POST Create New Store ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"麦当劳(新王府井店)", "address":"北京市东城区王府井大街200号工美大厦1层010-65120499", "latitude":39.909429, "longitude":116.416993, "area":418.8, "store_type_id":9, "is_input_counted": true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/stores +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"麦当劳(新王府井店)", "address":"北京市东城区王府井大街200号工美大厦1层010-65120499", "latitude":39.909429, "longitude":116.416993, "area":418.8, "store_type_id":9, "is_input_counted": true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/stores ``` * PUT Update a Store ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"麦当劳(新王府井店)", "address":"北京市东城区王府井大街200号工美大厦1层010-65120499", "latitude":39.909429, "longitude":116.416993, "area":818.8, "store_type_id":9, "is_input_counted": true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/stores/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"麦当劳(新王府井店)", "address":"北京市东城区王府井大街200号工美大厦1层010-65120499", "latitude":39.909429, "longitude":116.416993, "area":818.8, "store_type_id":9, "is_input_counted": true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/stores/{id} ``` * DELETE Store by ID ```bash -curl -i -X DELETE {{base_url}}/stores/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/stores/{id} ``` * GET All Meters of Store by ID ```bash @@ -1651,11 +1651,11 @@ curl -i -X GET {{base_url}}/stores/{id}/meters ``` * POST Bind a Meter to a Store ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/stores/{id}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/stores/{id}/meters ``` * DELETE a Meter from Store ```bash -curl -i -X DELETE {{base_url}}/stores/{id}/meters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/stores/{id}/meters/{mid} ``` * GET All Offline Meters of Store by ID ```bash @@ -1663,11 +1663,11 @@ curl -i -X GET {{base_url}}/stores/{id}/offlinemeters ``` * POST Bind an Offline Meter to a Store ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/stores/{id}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/stores/{id}/offlinemeters ``` * DELETE an Offline Meter from Store ```bash -curl -i -X DELETE {{base_url}}/stores/{id}/offlinemeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/stores/{id}/offlinemeters/{mid} ``` * GET All Points of Store by ID ```bash @@ -1675,11 +1675,11 @@ curl -i -X GET {{base_url}}/stores/{id}/points ``` * POST Bind a Point to a Store ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/stores/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/stores/{id}/points ``` * DELETE a Point from Store ```bash -curl -i -X DELETE {{base_url}}/stores/{id}/points/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/stores/{id}/points/{pid} ``` * GET All Sensors of Store by ID ```bash @@ -1687,11 +1687,11 @@ curl -i -X GET {{base_url}}/stores/{id}/sensors ``` * POST Bind a Sensor to a Store ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/stores/{id}/sensors +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/stores/{id}/sensors ``` * DELETE a Sensor from Store ```bash -curl -i -X DELETE {{base_url}}/stores/{id}/sensors/{sid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/stores/{id}/sensors/{sid} ``` * GET All Virtual Meters of Store by ID ```bash @@ -1699,11 +1699,11 @@ curl -i -X GET {{base_url}}/stores/{id}/virtualmeters ``` * POST Bind Virtual Meter to a Store ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/stores/{id}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/stores/{id}/virtualmeters ``` * DELETE Virtual Meter from Store ```bash -curl -i -X DELETE {{base_url}}/stores/{id}/virtualmeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/stores/{id}/virtualmeters/{mid} ``` @@ -1729,15 +1729,15 @@ curl -i -X GET {{base_url}}/storetypes ``` * POST Create New Store Types ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name": "Office", "description":"办公", "simplified_code":"OF"}}' {{base_url}}/storetypes +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name": "Office", "description":"办公", "simplified_code":"OF"}}' {{base_url}}/storetypes ``` * PUT Update a Store Types ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name": "Office1", "description":"办公", "simplified_code":"OF1"}}' {{base_url}}/storetypes/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name": "Office1", "description":"办公", "simplified_code":"OF1"}}' {{base_url}}/storetypes/{id} ``` * DELETE a Store Types by ID ```bash -curl -i -X DELETE {{base_url}}/storetypes/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/storetypes/{id} ``` @@ -1776,26 +1776,26 @@ curl -i -X GET {{base_url}}/tariffs ``` * DELETE Tariff by ID ```bash -curl -i -X DELETE {{base_url}}/tariffs/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tariffs/{id} ``` * POST Create a Tariff To POST a block tariff: ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"阶梯电价","energy_category_id":1, "tariff_type":"block", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2021-01-01T00:00:00", "block":[{"start_amount":"0", "end_amount":"10000", "price":"0.567"}, {"start_amount":"10000", "end_amount":"30000", "price":"0.678"}, {"start_amount":"30000", "end_amount":"100000", "price":"0.789"}]}}' {{base_url}}/tariffs +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"阶梯电价","energy_category_id":1, "tariff_type":"block", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2021-01-01T00:00:00", "block":[{"start_amount":"0", "end_amount":"10000", "price":"0.567"}, {"start_amount":"10000", "end_amount":"30000", "price":"0.678"}, {"start_amount":"30000", "end_amount":"100000", "price":"0.789"}]}}' {{base_url}}/tariffs ``` To POST a time of use tariff: ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"2020分时电价1-6","energy_category_id":1, "tariff_type":"timeofuse", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2020-07-01T00:00:00", "timeofuse":[{"start_time_of_day":"00:00:00", "end_time_of_day":"05:59:59", "peak_type":"offpeak", "price":0.345}, {"start_time_of_day":"06:00:00", "end_time_of_day":"07:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"08:00:00", "end_time_of_day":"10:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"11:00:00", "end_time_of_day":"17:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"18:00:00", "end_time_of_day":"20:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"21:00:00", "end_time_of_day":"21:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"22:00:00", "end_time_of_day":"23:59:59", "peak_type":"offpeak", "price":0.345}]}}' {{base_url}}/tariffs +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"2020分时电价1-6","energy_category_id":1, "tariff_type":"timeofuse", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2020-07-01T00:00:00", "timeofuse":[{"start_time_of_day":"00:00:00", "end_time_of_day":"05:59:59", "peak_type":"offpeak", "price":0.345}, {"start_time_of_day":"06:00:00", "end_time_of_day":"07:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"08:00:00", "end_time_of_day":"10:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"11:00:00", "end_time_of_day":"17:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"18:00:00", "end_time_of_day":"20:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"21:00:00", "end_time_of_day":"21:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"22:00:00", "end_time_of_day":"23:59:59", "peak_type":"offpeak", "price":0.345}]}}' {{base_url}}/tariffs ``` * PUT Update a Tariff To update a block tariff: ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"阶梯电价","energy_category_id":1, "tariff_type":"block", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2021-01-01T00:00:00", "block":[{"start_amount":"0", "end_amount":"20000", "price":"0.567"}, {"start_amount":"20000", "end_amount":"30000", "price":"0.678"}, {"start_amount":"30000", "end_amount":"100000", "price":"0.789"}]}}' {{base_url}}/tariffs/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"阶梯电价","energy_category_id":1, "tariff_type":"block", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2021-01-01T00:00:00", "block":[{"start_amount":"0", "end_amount":"20000", "price":"0.567"}, {"start_amount":"20000", "end_amount":"30000", "price":"0.678"}, {"start_amount":"30000", "end_amount":"100000", "price":"0.789"}]}}' {{base_url}}/tariffs/{id} ``` To update a time of use tariff: ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"2020分时电价1-6","energy_category_id":1, "tariff_type":"timeofuse", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2020-07-01T00:00:00", "timeofuse":[{"start_time_of_day":"00:00:00", "end_time_of_day":"05:59:59", "peak_type":"offpeak", "price":0.456}, {"start_time_of_day":"06:00:00", "end_time_of_day":"07:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"08:00:00", "end_time_of_day":"10:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"11:00:00", "end_time_of_day":"17:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"18:00:00", "end_time_of_day":"20:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"21:00:00", "end_time_of_day":"21:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"22:00:00", "end_time_of_day":"23:59:59", "peak_type":"offpeak", "price":0.345}]}}' {{base_url}}/tariffs/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"2020分时电价1-6","energy_category_id":1, "tariff_type":"timeofuse", "unit_of_price":"元/千瓦时", "valid_from":"2020-01-01T00:00:00", "valid_through":"2020-07-01T00:00:00", "timeofuse":[{"start_time_of_day":"00:00:00", "end_time_of_day":"05:59:59", "peak_type":"offpeak", "price":0.456}, {"start_time_of_day":"06:00:00", "end_time_of_day":"07:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"08:00:00", "end_time_of_day":"10:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"11:00:00", "end_time_of_day":"17:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"18:00:00", "end_time_of_day":"20:59:59", "peak_type":"onpeak", "price":1.159}, {"start_time_of_day":"21:00:00", "end_time_of_day":"21:59:59", "peak_type":"midpeak", "price":0.708}, {"start_time_of_day":"22:00:00", "end_time_of_day":"23:59:59", "peak_type":"offpeak", "price":0.345}]}}' {{base_url}}/tariffs/{id} ``` @@ -1832,15 +1832,15 @@ curl -i -X GET {{base_url}}/tenants ``` * POST Create New Tenant ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Starbucks", "buildings":"Building #1", "floors":"L1 L2 L3", "rooms":"1201b+2247+3F", "area":418.8, "tenant_type_id":9, "is_input_counted": true, "is_key_tenant":true, "lease_number":"6b0da806", "lease_start_datetime":"2021-01-01T00:00:00", "lease_end_datetime":"2022-01-01T00:00:00", "is_in_lease":true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/tenants +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Starbucks", "buildings":"Building #1", "floors":"L1 L2 L3", "rooms":"1201b+2247+3F", "area":418.8, "tenant_type_id":9, "is_input_counted": true, "is_key_tenant":true, "lease_number":"6b0da806", "lease_start_datetime":"2021-01-01T00:00:00", "lease_end_datetime":"2022-01-01T00:00:00", "is_in_lease":true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/tenants ``` * PUT Update a Tenant ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Hermes 爱马仕", "buildings":"Building #1", "floors":"L1 L2 L3 L4 L5", "rooms":"1201b+2247+3F", "area":818.8, "tenant_type_id":9, "is_input_counted": true, "is_key_tenant":true, "lease_number":"6b0da806", "lease_start_datetime":"2021-01-01T00:00:00", "lease_end_datetime":"2022-01-01T00:00:00", "is_in_lease":true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/tenants/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Hermes 爱马仕", "buildings":"Building #1", "floors":"L1 L2 L3 L4 L5", "rooms":"1201b+2247+3F", "area":818.8, "tenant_type_id":9, "is_input_counted": true, "is_key_tenant":true, "lease_number":"6b0da806", "lease_start_datetime":"2021-01-01T00:00:00", "lease_end_datetime":"2022-01-01T00:00:00", "is_in_lease":true, "contact_id":1, "cost_center_id":1, "description":"my description"}}' {{base_url}}/tenants/{id} ``` * DELETE Tenant by ID ```bash -curl -i -X DELETE {{base_url}}/tenants/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenants/{id} ``` * GET All Meters of Tenant by ID ```bash @@ -1848,11 +1848,11 @@ curl -i -X GET {{base_url}}/tenants/{id}/meters ``` * POST Bind a Meter to a Tenant ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/tenants/{id}/meters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"meter_id":1}}' {{base_url}}/tenants/{id}/meters ``` * DELETE a Meter from Tenant ```bash -curl -i -X DELETE {{base_url}}/tenants/{id}/meters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenants/{id}/meters/{mid} ``` * GET All Offline Meters of Tenant by ID ```bash @@ -1860,11 +1860,11 @@ curl -i -X GET {{base_url}}/tenants/{id}/offlinemeters ``` * POST Bind an Offline Meter to a Tenant ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/tenants/{id}/offlinemeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"offline_meter_id":1}}' {{base_url}}/tenants/{id}/offlinemeters ``` * DELETE an Offline Meter from Tenant ```bash -curl -i -X DELETE {{base_url}}/tenants/{id}/offlinemeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenants/{id}/offlinemeters/{mid} ``` * GET All Points of Tenant by ID ```bash @@ -1872,11 +1872,11 @@ curl -i -X GET {{base_url}}/tenants/{id}/points ``` * POST Bind a Point to a Tenant ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/tenants/{id}/points +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":1}}' {{base_url}}/tenants/{id}/points ``` * DELETE a Point from Tenant ```bash -curl -i -X DELETE {{base_url}}/tenants/{id}/points/{pid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenants/{id}/points/{pid} ``` * GET All Sensors of Tenant by ID ```bash @@ -1884,11 +1884,11 @@ curl -i -X GET {{base_url}}/tenants/{id}/sensors ``` * POST Bind a Sensor to a Tenant ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/tenants/{id}/sensors +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"sensor_id":1}}' {{base_url}}/tenants/{id}/sensors ``` * DELETE a Sensor from Tenant ```bash -curl -i -X DELETE {{base_url}}/tenants/{id}/sensors/{sid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenants/{id}/sensors/{sid} ``` * GET All Virtual Meters of Tenant by ID ```bash @@ -1896,11 +1896,11 @@ curl -i -X GET {{base_url}}/tenants/{id}/virtualmeters ``` * POST Bind Virtual Meter to a Tenant ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/tenants/{id}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"virtual_meter_id":1}}' {{base_url}}/tenants/{id}/virtualmeters ``` * DELETE an Virtual Meter from Tenant ```bash -curl -i -X DELETE {{base_url}}/tenants/{id}/virtualmeters/{mid} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenants/{id}/virtualmeters/{mid} ``` ### Tenant Type @@ -1925,15 +1925,15 @@ curl -i -X GET {{base_url}}/tenanttypes ``` * POST Create New Tenant Types ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name": "Office", "description":"办公", "simplified_code":"OF"}}' {{base_url}}/tenanttypes +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name": "Office", "description":"办公", "simplified_code":"OF"}}' {{base_url}}/tenanttypes ``` * PUT Update a Tenant Types ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name": "Office1", "description":"办公", "simplified_code":"OF1"}}' {{base_url}}/tenanttypes/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name": "Office1", "description":"办公", "simplified_code":"OF1"}}' {{base_url}}/tenanttypes/{id} ``` * DELETE a Tenant Types by ID ```bash -curl -i -X DELETE {{base_url}}/tenanttypes/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/tenanttypes/{id} ``` ### Text Message @@ -1961,7 +1961,7 @@ curl -i -X GET {{base_url}}/textmessages/from/{startdate}/to/{enddate} ``` * DELETE Text Message by ID ```bash -curl -i -X DELETE {{base_url}}/textmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/textmessages/{id} ``` ### Timezone @@ -1975,7 +1975,7 @@ curl -i -X GET {{base_url}}/timezones ``` * PUT Update a Timezone by ID ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Hawaiian Standard Time","description":"(GMT-10:00) Hawaii", "utc_offset":"-10:00"}}' {{base_url}}/timezones/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Hawaiian Standard Time","description":"(GMT-10:00) Hawaii", "utc_offset":"-10:00"}}' {{base_url}}/timezones/{id} ``` ### User @@ -1989,15 +1989,15 @@ curl -i -X GET {{base_url}}/users/{id} ``` * DELETE User by id ```bash -curl -i -X DELETE {{base_url}}/users/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/users/{id} ``` * POST New User ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"albert", "display_name":"Mr. Albert", "email":"albert@myems.io", "is_admin":false, "password":"!MyEMS1", "account_expiration_datetime":"2100-01-01T00:00:00", "password_expiration_datetime":"2100-01-01T00:00:00"}}' {{base_url}}/users +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"albert", "display_name":"Mr. Albert", "email":"albert@myems.io", "is_admin":false, "password":"!MyEMS1", "account_expiration_datetime":"2100-01-01T00:00:00", "password_expiration_datetime":"2100-01-01T00:00:00"}}' {{base_url}}/users ``` -* PUT User Profile +* PUT Update User Profile ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"albert", "display_name":"Mr. Albert", "email":"albert@myems.io", "is_admin":false, "privilege_id":1, "password":"!MyEMS1", "account_expiration_datetime":"2100-01-01T00:00:00", "password_expiration_datetime":"2100-01-01T00:00:00"}}' {{base_url}}/users/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"albert", "display_name":"Mr. Albert", "email":"albert@myems.io", "is_admin":false, "privilege_id":1, "password":"!MyEMS1", "account_expiration_datetime":"2100-01-01T00:00:00", "password_expiration_datetime":"2100-01-01T00:00:00"}}' {{base_url}}/users/{id} ``` * PUT User Login by Username ```bash @@ -2009,15 +2009,15 @@ curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"email":"johnson ``` * PUT User Logout ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT {{base_url}}/users/logout +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT {{base_url}}/users/logout ``` * PUT User change password ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"old_password":"Password1", "new_password":"Password2"}}' {{base_url}}/users/changepassword +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"old_password":"Password1", "new_password":"Password2"}}' {{base_url}}/users/changepassword ``` * PUT User reset other user's password by administrator ```bash -curl -i -H "Content-Type: application/json" -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword ``` ### Virtual Meter @@ -2055,15 +2055,15 @@ curl -i -X GET {{base_url}}/virtualmeters ``` * DELETE a Virtual Meter by ID ```bash -curl -i -X DELETE {{base_url}}/virtualmeters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/virtualmeters/{id} ``` * POST Create New Virtual Meter ```bash -curl -i -H "Content-Type: application/json" -X POST -d '{"data":{"name":"VM21", "energy_category_id":1, "is_counted": true, "cost_center_id":1, "energy_item_id":1, "description":"virtual description", "expression": {"equation":"x1-x2-x3", "variables":[{"name":"x1", "meter_type":"meter", "meter_id":3},{"name":"x2", "meter_type":"meter", "meter_id":4},{"name":"x3", "meter_type":"meter", "meter_id":5}] } }}' {{base_url}}/virtualmeters +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"VM21", "energy_category_id":1, "is_counted": true, "cost_center_id":1, "energy_item_id":1, "description":"virtual description", "expression": {"equation":"x1-x2-x3", "variables":[{"name":"x1", "meter_type":"meter", "meter_id":3},{"name":"x2", "meter_type":"meter", "meter_id":4},{"name":"x3", "meter_type":"meter", "meter_id":5}] } }}' {{base_url}}/virtualmeters ``` * PUT Update a Virtual Meter by ID ```bash -curl -i -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"VM21", "energy_category_id":1, "is_counted": true, "cost_center_id":1, "energy_item_id":1, "description":"virtual description", "expression": {"equation":"x1-x2-x3", "variables":[{"name":"x1", "meter_type":"meter", "meter_id":3},{"name":"x2", "meter_type":"meter", "meter_id":4},{"name":"x3", "meter_type":"meter", "meter_id":5}] } }}' {{base_url}}/virtualmeters/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"VM21", "energy_category_id":1, "is_counted": true, "cost_center_id":1, "energy_item_id":1, "description":"virtual description", "expression": {"equation":"x1-x2-x3", "variables":[{"name":"x1", "meter_type":"meter", "meter_id":3},{"name":"x2", "meter_type":"meter", "meter_id":4},{"name":"x3", "meter_type":"meter", "meter_id":5}] } }}' {{base_url}}/virtualmeters/{id} ``` ### Web Message @@ -2094,7 +2094,7 @@ curl -i -X GET {{base_url}}/webmessagesnew ``` * DELETE a Web Message by ID ```bash -curl -i -X DELETE {{base_url}}/webmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/webmessages/{id} ``` ### Wechat Message @@ -2122,7 +2122,7 @@ curl -i -X GET {{base_url}}/wechatmessages/from/{startdate}/to/{enddate} ``` * DELETE Wechat Message by ID ```bash -curl -i -X DELETE {{base_url}}/wechatmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/wechatmessages/{id} ``` ### Reports @@ -2136,7 +2136,7 @@ curl -i -X GET {{base_url}}/reports/advancedreports/{id} ``` * DELETE AdvancedReport by ID ```bash -curl -i -X GET {{base_url}}/reports/advancedreports/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/reports/advancedreports/{id} ``` * GET Combined Equipment Batch Analysis Report ```bash From 3ec50fab0d6d4c69a5051acdd37eb101acc61de4 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 3 Dec 2021 19:53:12 +0800 Subject: [PATCH 025/117] added access control to sersor in api and admin --- .../settings/sensor/sensor.controller.js | 16 ++-- .../settings/sensor/sensorpoint.controller.js | 14 +-- myems-api/MyEMS.postman_collection.json | 85 +++++++++++++++---- myems-api/README.md | 20 ++--- 4 files changed, 98 insertions(+), 37 deletions(-) diff --git a/admin/app/controllers/settings/sensor/sensor.controller.js b/admin/app/controllers/settings/sensor/sensor.controller.js index b4ee268a..e9f5edae 100644 --- a/admin/app/controllers/settings/sensor/sensor.controller.js +++ b/admin/app/controllers/settings/sensor/sensor.controller.js @@ -1,6 +1,13 @@ 'use strict'; -app.controller('SensorController', function($scope, $window, $translate, $uibModal, SensorService, toaster, SweetAlert) { +app.controller('SensorController', function( + $scope, + $window, + $translate, + $uibModal, + SensorService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function() { SensorService.getAllSensors(function (response) { @@ -28,8 +35,7 @@ app.controller('SensorController', function($scope, $window, $translate, $uibMo }); modalInstance.result.then(function(sensor) { let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SensorService.addSensor(sensor, {headers}, - function (response) { + SensorService.addSensor(sensor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -70,7 +76,7 @@ app.controller('SensorController', function($scope, $window, $translate, $uibMo modalInstance.result.then(function(modifiedSensor) { let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SensorService.editSensor(modifiedSensor, {headers}, function (response) { + SensorService.editSensor(modifiedSensor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -109,7 +115,7 @@ app.controller('SensorController', function($scope, $window, $translate, $uibMo function(isConfirm) { if (isConfirm) { let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SensorService.deleteSensor(sensor, {headers}, function (response) { + SensorService.deleteSensor(sensor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/sensor/sensorpoint.controller.js b/admin/app/controllers/settings/sensor/sensorpoint.controller.js index b4c58ee4..2edbd3e0 100644 --- a/admin/app/controllers/settings/sensor/sensorpoint.controller.js +++ b/admin/app/controllers/settings/sensor/sensorpoint.controller.js @@ -52,11 +52,11 @@ app.controller('SensorPointController', function ( }; - $scope.changeSensor=function(item,model){ - $scope.currentSensor=item; - $scope.currentSensor.selected=model; - $scope.getPointsBySensorID($scope.currentSensor.id); - }; + $scope.changeSensor=function(item,model){ + $scope.currentSensor=item; + $scope.currentSensor.selected=model; + $scope.getPointsBySensorID($scope.currentSensor.id); + }; $scope.changeDataSource = function (item, model) { $scope.currentDataSource = model; @@ -81,7 +81,7 @@ app.controller('SensorPointController', function ( var pointid = angular.element('#' + dragEl).scope().point.id; var sensorid = $scope.currentSensor.id; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SensorPointService.addPair(sensorid, pointid, {headers}, function (response) { + SensorPointService.addPair(sensorid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -108,7 +108,7 @@ app.controller('SensorPointController', function ( var sensorpointid = angular.element('#' + dragEl).scope().sensorpoint.id; var sensorid = $scope.currentSensor.id; let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SensorPointService.deletePair(sensorid, sensorpointid, {headers}, function (response) { + SensorPointService.deletePair(sensorid, sensorpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 75145af6..404a52d1 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -4647,7 +4647,18 @@ "name": "POST Create New Sensor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"Sensor10\", \"description\":\"sensor description\"}}" @@ -4668,19 +4679,30 @@ "name": "PUT Update a Sensor", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"Sensor10\", \"description\":\"sensor description\"}}" }, "url": { - "raw": "{{base_url}}/sensors/5", + "raw": "{{base_url}}/sensors/3", "host": [ "{{base_url}}" ], "path": [ "sensors", - "5" + "3" ] } }, @@ -4690,28 +4712,50 @@ "name": "DELETE Sensor by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", + "type": "text" + } + ], "url": { - "raw": "{{base_url}}/sensors/2", + "raw": "{{base_url}}/sensors/3", "host": [ "{{base_url}}" ], "path": [ "sensors", - "2" + "3" ] } }, "response": [] }, { - "name": "POST Sensor Point Relation", + "name": "POST Bind Point to Sensor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", + "type": "text" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"point_id\":\"2686\"}}" + "raw": "{\"data\":{\"point_id\":\"2\"}}" }, "url": { "raw": "{{base_url}}/sensors/1/points", @@ -4728,7 +4772,7 @@ "response": [] }, { - "name": "GET All Points associated with Sensor ID", + "name": "GET All Points associated with Sensor by ID", "request": { "method": "GET", "header": [], @@ -4747,12 +4791,23 @@ "response": [] }, { - "name": "DELETE Sensor Point Relation", + "name": "DELETE Unbind Point from Sensor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", + "type": "text" + } + ], "url": { - "raw": "{{base_url}}/sensors/1/points/2686", + "raw": "{{base_url}}/sensors/1/points/2", "host": [ "{{base_url}}" ], @@ -4760,7 +4815,7 @@ "sensors", "1", "points", - "2686" + "2" ] } }, diff --git a/myems-api/README.md b/myems-api/README.md index e3629388..73700050 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1321,10 +1321,6 @@ Result ```bash curl -i -X GET {{base_url}}/sensors ``` -* DELETE a Sensor by ID -```bash -curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/sensors/{id} -``` * POST Create New Sensor ```bash curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"name":"Sensor10", "description":"sensor description"}}' {{base_url}}/sensors @@ -1333,15 +1329,19 @@ curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKE ```bash curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"Sensor10", "description":"sensor description"}}' {{base_url}}/sensors/{id} ``` -* GET All Points associated with Sensor ID +* DELETE Sensor by ID +```bash +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/sensors/{id} +``` +* POST Bind Point to Sensor +```bash +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"2"}}' {{base_url}}/sensors/{id}/points +``` +* GET All Points associated with Sensor by ID ```bash curl -i -X GET {{base_url}}/sensors/{id}/points ``` -* POST Sensor Point Relation -```bash -curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X POST -d '{"data":{"point_id":"3"}}' {{base_url}}/sensors/{id}/points -``` -* DELETE Sensor Point Relation +* DELETE Unbind Point from Sensor ```bash curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/sensors/{id}/points/{pid} ``` From 3e536d503e1cf2e77a765e5f6f516868e8b51783 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 4 Dec 2021 19:52:12 +0800 Subject: [PATCH 026/117] added access control to email message in api and admin --- .../emailmessage/emailmessage.controller.js | 18 ++- .../emailmessageoption.controller.js | 14 ++- .../fdd/emailmessageanalysis.service.js | 10 +- myems-api/MyEMS.postman_collection.json | 113 +++++++++++++++--- myems-api/README.md | 6 +- myems-api/core/emailmessage.py | 5 +- 6 files changed, 125 insertions(+), 41 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js index 6ffeeedc..d7130749 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessage.controller.js @@ -1,9 +1,14 @@ 'use strict'; -app.controller('EmailMessageController', function($scope, $timeout,$translate, +app.controller('EmailMessageController', function( + $scope, + $window, + $timeout, + $translate, EmailMessageAnalysisService, - toaster, SweetAlert) { - + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastEmailMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -34,7 +39,8 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate, }, function(isConfirm) { if (isConfirm) { - EmailMessageAnalysisService.deleteEmailMessage(emailmessage, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EmailMessageAnalysisService.deleteEmailMessage(emailmessage, headers, function(response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -50,11 +56,11 @@ app.controller('EmailMessageController', function($scope, $timeout,$translate, body: $translate.instant(response.data.description), showCloseButton: true, }); - } }); } - }); + } + ); }; }); \ No newline at end of file diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 69eb0b6a..06195354 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -1,7 +1,11 @@ 'use strict'; -app.controller('EmailMessageOptionController', function($scope, $timeout, +app.controller('EmailMessageOptionController', function( + $scope, + $window, + $timeout, EmailMessageAnalysisService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() @@ -18,17 +22,15 @@ app.controller('EmailMessageOptionController', function($scope, $timeout, applyLabel: "OK", cancelLabel: "Cancel", }, - eventHandlers:{ 'apply.daterangepicker':function(ev,picker){ //$scope.execute(); } } - }; $scope.execute = function() { - var datestart,dateend; + var datestart, dateend; var query = { datestart: $scope.daterange.startDate.format().slice(0, 10), dateend: $scope.daterange.endDate.format().slice(0, 10) @@ -37,8 +39,8 @@ app.controller('EmailMessageOptionController', function($scope, $timeout, load: true, period:$scope.currentPeriod }); - - EmailMessageAnalysisService.getAnalysisResult(query, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EmailMessageAnalysisService.getAnalysisResult(query, headers, function(response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitEmailMessageOptionChanged', response.data); } diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessageanalysis.service.js index a9512c89..be596a7a 100644 --- a/admin/app/services/fdd/emailmessageanalysis.service.js +++ b/admin/app/services/fdd/emailmessageanalysis.service.js @@ -2,10 +2,8 @@ app.factory('EmailMessageAnalysisService', function($http) { return { - getAnalysisResult: function(query,callback) { - var base="emailmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getAnalysisResult: function(query, headers, callback) { + $http.get(getAPI()+"emailmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,8 +11,8 @@ app.factory('EmailMessageAnalysisService', function($http) { }); }, - deleteEmailMessage: function(emailmessage, callback) { - $http.delete(getAPI()+'emailmessages/'+emailmessage.id) + deleteEmailMessage: function(emailmessage, headers, callback) { + $http.delete(getAPI()+'emailmessages/'+emailmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 404a52d1..0c4770b9 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1816,21 +1816,34 @@ "name": "Email Message", "item": [ { - "name": "GET Email Messages from Startdate to Enddate", + "name": "GET Email Messages by Date Range", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/emailmessages/from/2020-04-01/to/2020-05-01", + "raw": "{{base_url}}/emailmessages/from/2021-12-01/to/2021-12-31", "host": [ "{{base_url}}" ], "path": [ "emailmessages", "from", - "2020-04-01", + "2021-12-01", "to", - "2020-05-01" + "2021-12-31" ], "query": [ { @@ -1847,7 +1860,20 @@ "name": "GET an Email Message by ID", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/emailmessages/1", "host": [ @@ -1865,7 +1891,20 @@ "name": "POST Create New Email Message TODO", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/emailmessages", "host": [ @@ -1882,7 +1921,20 @@ "name": "PUT Update an Email Message TODO", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "" } @@ -1893,7 +1945,20 @@ "name": "DELETE an Email Message by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/emailmessages/2", "host": [ @@ -4651,12 +4716,14 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", - "type": "text" + "type": "text", + "description": "Login to get a valid token" } ], "body": { @@ -4683,12 +4750,14 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", - "type": "text" + "type": "text", + "description": "Login to get a valid token" } ], "body": { @@ -4716,12 +4785,14 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", - "type": "text" + "type": "text", + "description": "Login to get a valid token" } ], "url": { @@ -4745,12 +4816,14 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", - "type": "text" + "type": "text", + "description": "Login to get a valid token" } ], "body": { @@ -4798,12 +4871,14 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", "value": "e713a4845a2f936eef1dca4314e7fad875b898854c56b4c5176d219f5ee19a0831d2ee67c63b17c2f2a49474d090cccb024f98a797d96571bc61027cbe1995af", - "type": "text" + "type": "text", + "description": "Login to get a valid token" } ], "url": { diff --git a/myems-api/README.md b/myems-api/README.md index 73700050..e405e268 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -504,11 +504,11 @@ Result in JSON | status | string | Status ('new', 'sent', 'timeout' | ```bash -curl -i -X GET {{base_url}}/emailmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/emailmessages/{id} ``` -* GET Email Messages from Startdate to Enddate +* GET Email Messages by Date Range ```bash -curl -i -X GET {{base_url}}/emailmessages/from/{startdate}/to/{enddate} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/emailmessages/from/{startdate}/to/{enddate} ``` * DELETE an Email Message by ID ```bash diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 0068462f..318f39aa 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -3,7 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class EmailMessageCollection: @@ -18,6 +18,7 @@ class EmailMessageCollection: @staticmethod def on_get(req, resp, startdate, enddate): + access_control(req) try: start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') except Exception: @@ -100,6 +101,7 @@ class EmailMessageItem: @staticmethod def on_get(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EMAIL_MESSAGE_ID') @@ -149,6 +151,7 @@ class EmailMessageItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EMAIL_MESSAGE_ID') From 65565a53511931b2325d9d927b93c59f78bc9771 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 4 Dec 2021 20:48:56 +0800 Subject: [PATCH 027/117] added access control to text message in api and admin --- .../fdd/textmessage/textmessage.controller.js | 19 +++-- .../textmessageoption.controller.js | 10 ++- .../fdd/textmessageanalysis.service.js | 10 +-- myems-api/MyEMS.postman_collection.json | 83 +++++++++++++++++-- myems-api/README.md | 6 +- myems-api/core/textmessage.py | 5 +- 6 files changed, 105 insertions(+), 28 deletions(-) diff --git a/admin/app/controllers/fdd/textmessage/textmessage.controller.js b/admin/app/controllers/fdd/textmessage/textmessage.controller.js index 4a0ee551..f46cf8a1 100644 --- a/admin/app/controllers/fdd/textmessage/textmessage.controller.js +++ b/admin/app/controllers/fdd/textmessage/textmessage.controller.js @@ -1,8 +1,14 @@ 'use strict'; -app.controller('TextMessageController', function($scope,$timeout,$translate, - TextMessageAnalysisService,SweetAlert,toaster) { - +app.controller('TextMessageController', function( + $scope, + $window, + $timeout, + $translate, + TextMessageAnalysisService, + SweetAlert, + toaster) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastTextMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -32,7 +38,8 @@ app.controller('TextMessageController', function($scope,$timeout,$translate, }, function(isConfirm) { if (isConfirm) { - TextMessageAnalysisService.deleteTextMessage(textmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TextMessageAnalysisService.deleteTextMessage(textmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -52,7 +59,7 @@ app.controller('TextMessageController', function($scope,$timeout,$translate, } }); } - }); + } + ); }; - }); diff --git a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js index 2d9873c1..44b5eef7 100644 --- a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js +++ b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js @@ -1,7 +1,11 @@ 'use strict'; -app.controller('TextMessageOptionController', function($scope, $timeout, +app.controller('TextMessageOptionController', function( + $scope, + $window, + $timeout, TextMessageAnalysisService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() @@ -37,8 +41,8 @@ app.controller('TextMessageOptionController', function($scope, $timeout, load: true, period:$scope.currentPeriod }); - - TextMessageAnalysisService.getAnalysisResult(query, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TextMessageAnalysisService.getAnalysisResult(query, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitTextMessageOptionChanged', response.data); } diff --git a/admin/app/services/fdd/textmessageanalysis.service.js b/admin/app/services/fdd/textmessageanalysis.service.js index 81ccdc22..dbe2d8d9 100644 --- a/admin/app/services/fdd/textmessageanalysis.service.js +++ b/admin/app/services/fdd/textmessageanalysis.service.js @@ -2,10 +2,8 @@ app.factory('TextMessageAnalysisService', function($http) { return { - getAnalysisResult: function(query, callback) { - var base="textmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getAnalysisResult: function(query, headers, callback) { + $http.get(getAPI()+"textmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,8 +11,8 @@ app.factory('TextMessageAnalysisService', function($http) { }); }, - deleteTextMessage: function(textmessage, callback) { - $http.delete(getAPI()+'textmessages/'+textmessage.id) + deleteTextMessage: function(textmessage, headers, callback) { + $http.delete(getAPI()+'textmessages/'+textmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 0c4770b9..8e909fff 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -7377,21 +7377,34 @@ "name": "Text Message", "item": [ { - "name": "GET Text Messages from Startdate to Enddate", + "name": "GET Text Messages by Date Range", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/textmessages/from/2020-04-01/to/2020-05-01", + "raw": "{{base_url}}/textmessages/from/2021-12-01/to/2021-12-31", "host": [ "{{base_url}}" ], "path": [ "textmessages", "from", - "2020-04-01", + "2021-12-01", "to", - "2020-05-01" + "2021-12-31" ], "query": [ { @@ -7408,7 +7421,20 @@ "name": "GET an Text Message by ID", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/textmessages/1", "host": [ @@ -7426,7 +7452,20 @@ "name": "POST Create New Text Message TODO", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/textmessages", "host": [ @@ -7443,7 +7482,20 @@ "name": "PUT Update an Text Message TODO", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/textmessages/1", "host": [ @@ -7461,7 +7513,20 @@ "name": "DELETE an Text Message by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/textmessages/2", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index e405e268..c6937a04 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1953,11 +1953,11 @@ Result in JSON | acknowledge_code| string | Recipient reply with Acknowledge code to acknowledge | | status | string | Status ('new', 'sent', 'acknowledged', 'timeout'| ```bash -curl -i -X GET {{base_url}}/textmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/textmessages/{id} ``` -* GET Text Messages from Startdate to Enddate +* GET Text Messages by Date Range ```bash -curl -i -X GET {{base_url}}/textmessages/from/{startdate}/to/{enddate} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/textmessages/from/{startdate}/to/{enddate} ``` * DELETE Text Message by ID ```bash diff --git a/myems-api/core/textmessage.py b/myems-api/core/textmessage.py index 04d989fc..8f3679c1 100644 --- a/myems-api/core/textmessage.py +++ b/myems-api/core/textmessage.py @@ -3,7 +3,7 @@ import json import mysql.connector import config from datetime import datetime, timedelta, timezone -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class TextMessageCollection: @@ -18,6 +18,7 @@ class TextMessageCollection: @staticmethod def on_get(req, resp, startdate, enddate): + access_control(req) try: start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') except Exception: @@ -97,6 +98,7 @@ class TextMessageItem: @staticmethod def on_get(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TEXT_MESSAGE_ID') @@ -145,6 +147,7 @@ class TextMessageItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TEXT_MESSAGE_ID') From 996f7066e14f7a90e11bd639ad251b9d972ce465 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 5 Dec 2021 12:37:42 +0800 Subject: [PATCH 028/117] added access control to wechat message in api and admin --- .../wechatmessage/wechatmessage.controller.js | 17 ++- .../wechatmessageoption.controller.js | 9 +- .../fdd/wechatmessageanalysis.service.js | 11 +- myems-api/MyEMS.postman_collection.json | 85 +++++++++++-- myems-api/README.md | 4 +- myems-api/core/emailmessage.py | 120 ++++++------------ myems-api/core/textmessage.py | 108 +++++----------- myems-api/core/wechatmessage.py | 35 +++-- 8 files changed, 192 insertions(+), 197 deletions(-) diff --git a/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js b/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js index 0da845ce..af330bea 100644 --- a/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js +++ b/admin/app/controllers/fdd/wechatmessage/wechatmessage.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('WechatMessageController', function($scope, $timeout,$translate, WechatMessageAnalysisService, toaster, SweetAlert) { - +app.controller('WechatMessageController', function( + $scope, + $window, + $timeout, + $translate, + WechatMessageAnalysisService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastWechatMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -31,7 +38,8 @@ app.controller('WechatMessageController', function($scope, $timeout,$translate, }, function(isConfirm) { if (isConfirm) { - WechatMessageAnalysisService.deleteWechatMessage(wechatmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WechatMessageAnalysisService.deleteWechatMessage(wechatmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -51,6 +59,7 @@ app.controller('WechatMessageController', function($scope, $timeout,$translate, } }); } - }); + } + ); }; }); diff --git a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js index 8f8b3ce5..0b46f7d1 100644 --- a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js +++ b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js @@ -1,7 +1,11 @@ 'use strict'; -app.controller('WechatMessageOptionController', function($scope, $timeout, +app.controller('WechatMessageOptionController', function( + $scope, + $window, + $timeout, WechatMessageAnalysisService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() @@ -36,7 +40,8 @@ app.controller('WechatMessageOptionController', function($scope, $timeout, load: true, period:$scope.currentPeriod }); - WechatMessageAnalysisService.getAnalysisResult(query, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WechatMessageAnalysisService.getAnalysisResult(query, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitWechatMessageOptionChanged', response.data); } diff --git a/admin/app/services/fdd/wechatmessageanalysis.service.js b/admin/app/services/fdd/wechatmessageanalysis.service.js index e19d9532..13d3be20 100644 --- a/admin/app/services/fdd/wechatmessageanalysis.service.js +++ b/admin/app/services/fdd/wechatmessageanalysis.service.js @@ -1,11 +1,8 @@ 'use strict'; app.factory('WechatMessageAnalysisService', function($http) { return { - - getAnalysisResult: function(query,callback) { - var base="wechatmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getAnalysisResult: function(query, headers, callback) { + $http.get(getAPI()+"wechatmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,8 +10,8 @@ app.factory('WechatMessageAnalysisService', function($http) { }); }, - deleteWechatMessage: function(wechatmessage, callback) { - $http.delete(getAPI()+'wechatmessages/'+wechatmessage.id) + deleteWechatMessage: function(wechatmessage, headers, callback) { + $http.delete(getAPI()+'wechatmessages/'+wechatmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 8e909fff..af77b436 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -7389,7 +7389,7 @@ }, { "key": "Token", - "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c", "type": "text", "description": "Login to get a valid token" } @@ -8178,21 +8178,34 @@ "name": "Wechat Message", "item": [ { - "name": "GET Wechat Messages from Startdate to Enddate", + "name": "GET Wechat Messages by Date Range", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/wechatmessages/from/2020-04-01/to/2020-05-01", + "raw": "{{base_url}}/wechatmessages/from/2021-12-01/to/2021-12-31", "host": [ "{{base_url}}" ], "path": [ "wechatmessages", "from", - "2020-04-01", + "2021-12-01", "to", - "2020-05-01" + "2021-12-31" ], "query": [ { @@ -8209,7 +8222,20 @@ "name": "GET a Wechat Message by ID", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/wechatmessages/1", "host": [ @@ -8227,7 +8253,20 @@ "name": "POST Create New Wechat Message TODO", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/wechatmessages", "host": [ @@ -8244,7 +8283,20 @@ "name": "PUT Update a Wechat Message TODO", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c6f5fa938c0e228d06e1f3adb3ef1eac319e1167e6ff0cb7fd5d928e83da5764ddb66e29204e0f4e6aa407ded3702b15be67a435c4825dc722b6047010398714", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/wechatmessages/1", "host": [ @@ -8262,7 +8314,20 @@ "name": "DELETE a Wechat Message by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/wechatmessages/2", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index c6937a04..1dd3d0d1 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -2114,11 +2114,11 @@ Result in JSON | acknowledge_code| string | Recipient reply with Acknowledge code to acknowledge | | status | string | Status ('new', 'sent', 'acknowledged', 'timeout'| ```bash -curl -i -X GET {{base_url}}/wechatmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/wechatmessages/{id} ``` * GET Wechat Messages from Startdate to Enddate ```bash -curl -i -X GET {{base_url}}/wechatmessages/from/{startdate}/to/{enddate} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/wechatmessages/from/{startdate}/to/{enddate} ``` * DELETE Wechat Message by ID ```bash diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 318f39aa..eab41ee5 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config from datetime import datetime, timedelta, timezone @@ -48,28 +48,22 @@ class EmailMessageCollection: title='API.BAD_REQUEST', description='API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME') - try: - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - except Exception as e: - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cnx = mysql.connector.connect(**config.myems_fdd_db) + cursor = cnx.cursor() - try: - query = (" SELECT id, recipient_name, recipient_email, " - " subject, message, attachment_file_name, " - " created_datetime_utc, scheduled_datetime_utc, status " - " FROM tbl_email_messages " - " WHERE created_datetime_utc >= %s AND created_datetime_utc < %s " - " ORDER BY created_datetime_utc ") - cursor.execute(query, (start_datetime_utc, end_datetime_utc)) - rows = cursor.fetchall() + query = (" SELECT id, recipient_name, recipient_email, " + " subject, message, attachment_file_name, " + " created_datetime_utc, scheduled_datetime_utc, status " + " FROM tbl_email_messages " + " WHERE created_datetime_utc >= %s AND created_datetime_utc < %s " + " ORDER BY created_datetime_utc ") + cursor.execute(query, (start_datetime_utc, end_datetime_utc)) + rows = cursor.fetchall() - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - except Exception as e: - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + if cursor: + cursor.close() + if cnx: + cnx.disconnect() result = list() if rows is not None and len(rows) > 0: @@ -106,31 +100,21 @@ class EmailMessageItem: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EMAIL_MESSAGE_ID') - try: - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - except Exception as e: - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cnx = mysql.connector.connect(**config.myems_fdd_db) + cursor = cnx.cursor() - try: - query = (" SELECT id, recipient_name, recipient_email, " - " subject, message, attachment_file_name, " - " created_datetime_utc, scheduled_datetime_utc, status " - " FROM tbl_email_messages " - " WHERE id = %s ") - cursor.execute(query, (id_,)) - row = cursor.fetchone() + query = (" SELECT id, recipient_name, recipient_email, " + " subject, message, attachment_file_name, " + " created_datetime_utc, scheduled_datetime_utc, status " + " FROM tbl_email_messages " + " WHERE id = %s ") + cursor.execute(query, (id_,)) + row = cursor.fetchone() - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + if cursor: + cursor.close() + if cnx: + cnx.disconnect() if row is None: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', @@ -156,29 +140,13 @@ class EmailMessageItem: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EMAIL_MESSAGE_ID') - cnx = None - cursor = None - try: - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cnx = mysql.connector.connect(**config.myems_fdd_db) + cursor = cnx.cursor() - try: - cursor.execute(" SELECT id " - " FROM tbl_email_messages " - " WHERE id = %s ", (id_,)) - row = cursor.fetchone() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cursor.execute(" SELECT id " + " FROM tbl_email_messages " + " WHERE id = %s ", (id_,)) + row = cursor.fetchone() if row is None: if cursor: @@ -188,19 +156,13 @@ class EmailMessageItem: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', description='API.EMAIL_MESSAGE_NOT_FOUND') - try: - cursor.execute(" DELETE FROM tbl_email_messages WHERE id = %s ", (id_,)) - cnx.commit() - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cursor.execute(" DELETE FROM tbl_email_messages WHERE id = %s ", (id_,)) + cnx.commit() + + if cursor: + cursor.close() + if cnx: + cnx.disconnect() resp.status = falcon.HTTP_204 diff --git a/myems-api/core/textmessage.py b/myems-api/core/textmessage.py index 8f3679c1..5ce69800 100644 --- a/myems-api/core/textmessage.py +++ b/myems-api/core/textmessage.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config from datetime import datetime, timedelta, timezone @@ -47,27 +47,21 @@ class TextMessageCollection: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME') - try: - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - except Exception as e: - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cnx = mysql.connector.connect(**config.myems_fdd_db) + cursor = cnx.cursor() - try: - query = (" SELECT id, recipient_name, recipient_mobile, " - " message, created_datetime_utc, scheduled_datetime_utc, acknowledge_code, status " - " FROM tbl_text_messages_outbox " - " WHERE created_datetime_utc >= %s AND created_datetime_utc < %s " - " ORDER BY created_datetime_utc ") - cursor.execute(query, (start_datetime_utc, end_datetime_utc)) - rows = cursor.fetchall() + query = (" SELECT id, recipient_name, recipient_mobile, " + " message, created_datetime_utc, scheduled_datetime_utc, acknowledge_code, status " + " FROM tbl_text_messages_outbox " + " WHERE created_datetime_utc >= %s AND created_datetime_utc < %s " + " ORDER BY created_datetime_utc DESC ") + cursor.execute(query, (start_datetime_utc, end_datetime_utc)) + rows = cursor.fetchall() - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - except Exception as e: - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + if cursor: + cursor.close() + if cnx: + cnx.disconnect() result = list() if rows is not None and len(rows) > 0: @@ -77,8 +71,7 @@ class TextMessageCollection: "recipient_mobile": row[2], "message": row[3], "created_datetime": row[4].timestamp() * 1000 if isinstance(row[4], datetime) else None, - "scheduled_datetime": row[5].timestamp() * 1000 if isinstance(row[5], datetime) - else None, + "scheduled_datetime": row[5].timestamp() * 1000 if isinstance(row[5], datetime) else None, "acknowledge_code": row[6], "status": row[7]} result.append(meta_result) @@ -103,31 +96,20 @@ class TextMessageItem: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TEXT_MESSAGE_ID') - try: - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - except Exception as e: - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cnx = mysql.connector.connect(**config.myems_fdd_db) + cursor = cnx.cursor() - try: - query = (" SELECT id, recipient_name, recipient_mobile, " - " message, created_datetime_utc, scheduled_datetime_utc, acknowledge_code, status " - " FROM tbl_text_messages_outbox " - " WHERE id = %s ") - cursor.execute(query, (id_,)) - row = cursor.fetchone() + query = (" SELECT id, recipient_name, recipient_mobile, " + " message, created_datetime_utc, scheduled_datetime_utc, acknowledge_code, status " + " FROM tbl_text_messages_outbox " + " WHERE id = %s ") + cursor.execute(query, (id_,)) + row = cursor.fetchone() - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + if cursor: + cursor.close() + if cnx: + cnx.disconnect() if row is None: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', @@ -152,27 +134,11 @@ class TextMessageItem: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TEXT_MESSAGE_ID') - cnx = None - cursor = None - try: - cnx = mysql.connector.connect(**config.myems_fdd_db) - cursor = cnx.cursor() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cnx = mysql.connector.connect(**config.myems_fdd_db) + cursor = cnx.cursor() - try: - cursor.execute(" SELECT id FROM tbl_text_messages_outbox WHERE id = %s ", (id_,)) - row = cursor.fetchone() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cursor.execute(" SELECT id FROM tbl_text_messages_outbox WHERE id = %s ", (id_,)) + row = cursor.fetchone() if row is None: if cursor: @@ -182,15 +148,8 @@ class TextMessageItem: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', description='API.TEXT_MESSAGE_NOT_FOUND') - try: - cursor.execute(" DELETE FROM tbl_text_messages_outbox WHERE id = %s ", (id_,)) - cnx.commit() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.DATABASE_ERROR', description=str(e)) + cursor.execute(" DELETE FROM tbl_text_messages_outbox WHERE id = %s ", (id_,)) + cnx.commit() if cursor: cursor.close() @@ -198,4 +157,3 @@ class TextMessageItem: cnx.disconnect() resp.status = falcon.HTTP_204 - diff --git a/myems-api/core/wechatmessage.py b/myems-api/core/wechatmessage.py index 1aba6b05..3b3c0b78 100644 --- a/myems-api/core/wechatmessage.py +++ b/myems-api/core/wechatmessage.py @@ -1,12 +1,16 @@ import falcon -import json +import simplejson as json import mysql.connector import config from datetime import datetime, timedelta, timezone -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class WechatMessageCollection(object): + @staticmethod + def __init__(): + """"Initializes WechatMessageCollection""" + pass @staticmethod def on_options(req, resp, startdate, enddate): @@ -14,6 +18,7 @@ class WechatMessageCollection(object): @staticmethod def on_get(req, resp, startdate, enddate): + access_control(req) try: start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') except Exception: @@ -42,7 +47,6 @@ class WechatMessageCollection(object): raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME') - cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor() @@ -51,7 +55,7 @@ class WechatMessageCollection(object): " acknowledge_code, status " " FROM tbl_wechat_messages_outbox " " WHERE created_datetime_utc >= %s AND created_datetime_utc < %s " - " ORDER BY id DESC ") + " ORDER BY created_datetime_utc DESC ") cursor.execute(query, (start_datetime_utc, end_datetime_utc)) rows = cursor.fetchall() @@ -68,11 +72,12 @@ class WechatMessageCollection(object): "recipient_openid": row[2], "message_template_id": row[3], "message_data": row[4], - "created_datetime_utc": row[5].timestamp() * 1000 if row[5] else None, - "scheduled_datetime_utc": row[6].timestamp() * 1000 if row[6] else None, + "created_datetime_utc": row[5].timestamp() * 1000 if isinstance(row[5], datetime) else None, + "scheduled_datetime_utc": row[6].timestamp() * 1000 if isinstance(row[6], datetime) else None, "acknowledge_code": row[7], "status": row[8]} result.append(meta_result) + resp.text = json.dumps(result) @@ -88,6 +93,7 @@ class WechatMessageItem: @staticmethod def on_get(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_WECHAT_MESSAGE_ID') @@ -117,8 +123,8 @@ class WechatMessageItem: "recipient_openid": row[2], "recipient_template_id": row[3], "message_data": row[4], - "created_datetime_utc": row[5].timestamp() * 1000 if row[5] else None, - "scheduled_datetime_utc": row[6].timestamp() * 1000 if row[6] else None, + "created_datetime_utc": row[5].timestamp() * 1000 if isinstance(row[5], datetime) else None, + "scheduled_datetime_utc": row[6].timestamp() * 1000 if isinstance(row[6], datetime) else None, "acknowledge_code": row[7], "status": row[8]} @@ -127,6 +133,7 @@ class WechatMessageItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_WECHAT_MESSAGE_ID') @@ -147,16 +154,8 @@ class WechatMessageItem: raise falcon.HTTPError(falcon.HTTP_404, title='API.NOT_FOUND', description='API.WECHAT_MESSAGE_NOT_FOUND') - try: - cursor.execute(" DELETE FROM tbl_wechat_messages_outbox WHERE id = %s ", (id_,)) - cnx.commit() - except Exception as e: - if cursor: - cursor.close() - if cnx: - cnx.disconnect() - raise falcon.HTTPError(falcon.HTTP_500, title='API.ERROR', - description='API.DATABASE_ERROR') + cursor.execute(" DELETE FROM tbl_wechat_messages_outbox WHERE id = %s ", (id_,)) + cnx.commit() if cursor: cursor.close() From cd94e31a98943a7e091fc36e91984d0aa0b417a2 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 5 Dec 2021 18:06:50 +0800 Subject: [PATCH 029/117] added user varification to webmessage in admin and api --- admin/Dockerfile | 9 +- .../fdd/webmessage/webmessage.controller.js | 17 +- .../webmessage/webmessageoption.controller.js | 9 +- .../app/controllers/login/login.controller.js | 13 +- .../fdd/webmessageanalysis.service.js | 19 +- admin/views/fdd/webmessage.html | 2 - admin/views/fdd/webmessage.model.html | 8 - myems-api/Dockerfile | 3 + myems-api/MyEMS.postman_collection.json | 186 ++++++--- myems-api/README.md | 6 +- myems-api/core/costfile.py | 2 +- myems-api/core/emailserver.py | 2 +- myems-api/core/knowledgefile.py | 2 +- myems-api/core/notification.py | 2 +- myems-api/core/offlinemeterfile.py | 2 +- myems-api/core/webmessage.py | 352 ++++++++++++++---- myems-api/example.env | 1 + web/Dockerfile | 6 +- 18 files changed, 480 insertions(+), 161 deletions(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 3ae1a605..2afb2091 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,9 +1,12 @@ FROM nginx:1.21.1 -# remove the config +# remove the default config RUN rm /etc/nginx/conf.d/default.conf && \ - rm /etc/nginx/nginx.conf && \ - mkdir -p /var/www/html/admin + rm /etc/nginx/nginx.conf + +# create new root folder +# todo: share upload folder in admin with myems-api container on Docker +RUN mkdir -p /var/www/html/admin # copy the config and web codes COPY nginx.conf /etc/nginx/ diff --git a/admin/app/controllers/fdd/webmessage/webmessage.controller.js b/admin/app/controllers/fdd/webmessage/webmessage.controller.js index 9cf4e0f3..fe7a729f 100644 --- a/admin/app/controllers/fdd/webmessage/webmessage.controller.js +++ b/admin/app/controllers/fdd/webmessage/webmessage.controller.js @@ -1,6 +1,15 @@ 'use strict'; -app.controller('WebMessageController', function($scope, $timeout, $translate, $uibModal, WebMessageAnalysisService, toaster, SweetAlert) { +app.controller('WebMessageController', function( + $scope, + $window, + $timeout, + $translate, + $uibModal, + WebMessageAnalysisService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.$on('handleBroadcastWebMessageOptionChanged', function (event, data) { if (angular.isDefined(data.load)) { $scope.tabledata = []; @@ -32,7 +41,8 @@ app.controller('WebMessageController', function($scope, $timeout, $translate, $u modalInstance.result.then(function(modifiedWebmessage) { modifiedWebmessage.status = "acknowledged"; - WebMessageAnalysisService.editWebMessage(modifiedWebmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageAnalysisService.editWebMessage(modifiedWebmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -70,7 +80,8 @@ app.controller('WebMessageController', function($scope, $timeout, $translate, $u }, function(isConfirm) { if (isConfirm) { - WebMessageAnalysisService.deleteWebMessage(webmessage, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageAnalysisService.deleteWebMessage(webmessage, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js index 2301def8..6a84f101 100644 --- a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js +++ b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js @@ -1,7 +1,11 @@ 'use strict'; -app.controller('WebMessageOptionController', function($scope, $timeout, +app.controller('WebMessageOptionController', function( + $scope, + $window, + $timeout, WebMessageAnalysisService) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.daterange = { startDate: moment().subtract(7,'days'), endDate: moment() @@ -36,7 +40,8 @@ app.controller('WebMessageOptionController', function($scope, $timeout, load: true, period:$scope.currentPeriod }); - WebMessageAnalysisService.getAnalysisResult(query, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageAnalysisService.getAnalysisResult(query, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.$emit('handleEmitWebMessageOptionChanged', response.data); } diff --git a/admin/app/controllers/login/login.controller.js b/admin/app/controllers/login/login.controller.js index 86e702b9..e8e3670a 100644 --- a/admin/app/controllers/login/login.controller.js +++ b/admin/app/controllers/login/login.controller.js @@ -200,11 +200,14 @@ app.controller('LoginController', function ( // web message alarm section start $scope.webmessages = []; $scope.getWebMessage = function () { - WebMessageAnalysisService.getStatusNewResult(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.webmessages = response.data; - } - }); + if ($scope.cur_user != null && $scope.cur_user.uuid != null && $scope.cur_user.token != null) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + WebMessageAnalysisService.getStatusNewResult(headers, function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.webmessages = response.data; + } + }); + } }; // web message alarm section end diff --git a/admin/app/services/fdd/webmessageanalysis.service.js b/admin/app/services/fdd/webmessageanalysis.service.js index 25fed0f6..9fc18fcd 100644 --- a/admin/app/services/fdd/webmessageanalysis.service.js +++ b/admin/app/services/fdd/webmessageanalysis.service.js @@ -2,10 +2,8 @@ app.factory('WebMessageAnalysisService', function($http) { return { - getAnalysisResult: function(query,callback) { - var base="webmessages"; - var url=base+"/from/"+query.datestart+"/to/"+query.dateend; - $http.get(getAPI()+url) + getAnalysisResult: function(query, headers, callback) { + $http.get(getAPI()+"webmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -13,9 +11,8 @@ app.factory('WebMessageAnalysisService', function($http) { }); }, - getStatusNewResult: function(callback) { - var base="webmessagesnew"; - $http.get(getAPI()+base) + getStatusNewResult: function(headers, callback) { + $http.get(getAPI()+"webmessagesnew", {headers}) .then(function (response) { callback(response); }, function (response) { @@ -23,8 +20,8 @@ app.factory('WebMessageAnalysisService', function($http) { }); }, - editWebMessage: function(webmessage, callback) { - $http.put(getAPI()+'webmessages/'+webmessage.id, {data:webmessage}) + editWebMessage: function(webmessage, headers, callback) { + $http.put(getAPI()+'webmessages/'+webmessage.id, {data:webmessage}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -32,8 +29,8 @@ app.factory('WebMessageAnalysisService', function($http) { }); }, - deleteWebMessage: function(webmessage, callback) { - $http.delete(getAPI()+'webmessages/'+webmessage.id) + deleteWebMessage: function(webmessage, headers, callback) { + $http.delete(getAPI()+'webmessages/'+webmessage.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/views/fdd/webmessage.html b/admin/views/fdd/webmessage.html index b6e7f4fb..0b0004d9 100644 --- a/admin/views/fdd/webmessage.html +++ b/admin/views/fdd/webmessage.html @@ -30,7 +30,6 @@ {{'FDD.ID' | translate}} - {{'FDD.RECIPIENT_NAME' | translate}} {{'FDD.TOPIC' | translate}} {{'FDD.ALARM_MESSAGE' | translate}} {{'FDD.ALARM_TIME' | translate}} @@ -42,7 +41,6 @@ {{ row.id }} - {{ row.user_display_name }} {{ row.subject }} {{ row.message.slice(0,50) }} ... diff --git a/admin/views/fdd/webmessage.model.html b/admin/views/fdd/webmessage.model.html index e2f58306..28857e74 100644 --- a/admin/views/fdd/webmessage.model.html +++ b/admin/views/fdd/webmessage.model.html @@ -4,14 +4,6 @@
-
- -
-
- {{'SETTING.NOT_NULLABLE' | translate}} -
-
-
diff --git a/myems-api/Dockerfile b/myems-api/Dockerfile index 629bcc0a..a9098c12 100644 --- a/myems-api/Dockerfile +++ b/myems-api/Dockerfile @@ -1,6 +1,9 @@ FROM python:3.9.6 WORKDIR /code +# todo: share upload folder with admin container on Docker +RUN mkdir -p /var/www/html/admin/upload + COPY . /code RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com EXPOSE 8000 diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index af77b436..086eb3ba 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -910,7 +910,7 @@ }, { "key": "Token", - "value": "6ab593bb7e48f22da551572b444b2095b02f7fd717681215c16866b18846c9e0c7c9a10b612d26e262d2100223197a3804daec0ace179623dcb3d3e0a3213dbe", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } @@ -940,7 +940,7 @@ }, { "key": "Token", - "value": "6ab593bb7e48f22da551572b444b2095b02f7fd717681215c16866b18846c9e0c7c9a10b612d26e262d2100223197a3804daec0ace179623dcb3d3e0a3213dbe", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } @@ -966,12 +966,14 @@ { "key": "User_UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", - "value": "6b0622f8974b2e6f2d7a7470baf073b78bddffd4", - "type": "text" + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", + "type": "text", + "description": "Login to get a valid token" } ], "body": { @@ -980,7 +982,7 @@ { "key": "file", "type": "file", - "src": "/zh/myems/myems-doc/offlinemeters.xlsx" + "src": "/D:/myems/myems/myems-normalization/offline_meter_data.xlsx" } ] }, @@ -1009,7 +1011,7 @@ }, { "key": "Token", - "value": "6ab593bb7e48f22da551572b444b2095b02f7fd717681215c16866b18846c9e0c7c9a10b612d26e262d2100223197a3804daec0ace179623dcb3d3e0a3213dbe", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } @@ -1040,19 +1042,19 @@ }, { "key": "Token", - "value": "6ab593bb7e48f22da551572b444b2095b02f7fd717681215c16866b18846c9e0c7c9a10b612d26e262d2100223197a3804daec0ace179623dcb3d3e0a3213dbe", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } ], "url": { - "raw": "{{base_url}}/costfiles/20/restore", + "raw": "{{base_url}}/costfiles/2/restore", "host": [ "{{base_url}}" ], "path": [ "costfiles", - "20", + "2", "restore" ] } @@ -1828,7 +1830,7 @@ }, { "key": "Token", - "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c", "type": "text", "description": "Login to get a valid token" } @@ -1900,7 +1902,7 @@ }, { "key": "Token", - "value": "592641a558bc1724c4b75bd80d7d37b9b6a441b9b2231e3a5b2843b1f1e4f6864608ca97c4db00c94012b3406bf0c45cf231b789d2f551c1d420aa4de09f75cd", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "type": "text", "description": "Login to get a valid token" } @@ -3408,7 +3410,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "type": "text", "description": "Login to get a valid token" } @@ -3419,7 +3421,7 @@ { "key": "file", "type": "file", - "src": "/zh/myems/myems-standards/ISO 50001-2018.pdf" + "src": "/D:/myems/myems/myems-normalization/offline_meter_data.xlsx" } ] }, @@ -3448,7 +3450,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } @@ -3479,7 +3481,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } @@ -3870,13 +3872,13 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "description": "Update this value after login", + "description": "Any users' UUID", "type": "text" }, { "key": "Token", - "value": "02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48", - "description": "Update this value after login", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", + "description": "Login to get a valid token", "type": "text" } ], @@ -3915,13 +3917,13 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "description": "Update this value after login", + "description": "Any users' UUID", "type": "text" }, { "key": "Token", - "value": "02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48", - "description": "Update this value after login", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", + "description": "Login to get a valid token", "type": "text" } ], @@ -3946,13 +3948,13 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "description": "Update this value after login", + "description": "Any users' UUID", "type": "text" }, { "key": "Token", - "value": "02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48", - "description": "Update this value after login", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", + "description": "Login to get a valid token", "type": "text" } ], @@ -3988,13 +3990,13 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "description": "Update this value after login", + "description": "Any users' UUID", "type": "text" }, { "key": "Token", - "value": "02f93023a39c98e1d1bc9f5197a83dfc5ddc0d48", - "description": "Update this value after login", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", + "description": "Login to get a valid token", "type": "text" } ], @@ -4130,7 +4132,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "description": "Login to get a valid token", "type": "text" } @@ -4160,7 +4162,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "type": "text", "description": "Login to get a valid token" } @@ -4186,12 +4188,14 @@ { "key": "User_UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any admin users' UUID" }, { "key": "Token", - "value": "6b0622f8974b2e6f2d7a7470baf073b78bddffd4", - "type": "text" + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", + "type": "text", + "description": "Login to get a valid token" } ], "body": { @@ -4200,7 +4204,7 @@ { "key": "file", "type": "file", - "src": "/zh/myems/myems-doc/offlinemeters.xlsx" + "src": "/D:/myems/myems/myems-normalization/offline_meter_data.xlsx" } ] }, @@ -4229,7 +4233,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "type": "text", "description": "Login to get a valid token" } @@ -4260,7 +4264,7 @@ }, { "key": "Token", - "value": "d2506282920bd7f1fb5db68605324bd7b8c6c305d84dcd43d43edfba6908136c4e468eca553c72f0211b2ad44fedb71c2f5c901816e5de828fa21cfb88a2552e", + "value": "aad10e8cd48a3b8719860fed577033098cbc6caeb1454986189b0018bb76c6abc3a0b0600d0bec2fefb2c9cc5147aab23f50c4a4c8a64aaad0b7e4a7054905b8", "type": "text", "description": "Login to get a valid token" } @@ -7389,7 +7393,7 @@ }, { "key": "Token", - "value": "14f2bb7378e6926c20b54bd48bd8618e4d78ece1f1658c946a7257eaa97d3149ecd6407a62a39f0f3a6ef6b65f19d63894f297ad5a58d7b597a547f8b8e2898c", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", "type": "text", "description": "Login to get a valid token" } @@ -8046,21 +8050,34 @@ "name": "Web Message", "item": [ { - "name": "GET Web Messages from Startdate to Enddate", + "name": "GET Web Messages by Date Range", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/webmessages/from/2020-04-01/to/2020-05-01", + "raw": "{{base_url}}/webmessages/from/2021-12-01/to/2021-12-31", "host": [ "{{base_url}}" ], "path": [ "webmessages", "from", - "2020-04-01", + "2021-12-01", "to", - "2020-05-01" + "2021-12-31" ], "query": [ { @@ -8077,7 +8094,20 @@ "name": "GET All New Web Messages", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/webmessagesnew", "host": [ @@ -8098,10 +8128,23 @@ "response": [] }, { - "name": "GET an Web Message by ID", + "name": "GET a Web Message by ID", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/webmessages/1", "host": [ @@ -8119,7 +8162,20 @@ "name": "POST Create New Web Message TODO", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/webmessages", "host": [ @@ -8133,10 +8189,23 @@ "response": [] }, { - "name": "PUT Update an Web Message", + "name": "PUT Update an Web Message TODO", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"status\":\"acknowledged\", \"reply\":\"this is my reply\"}}" @@ -8155,18 +8224,31 @@ "response": [] }, { - "name": "DELETE an Web Message by ID", + "name": "DELETE a Web Message by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "24bb236244f26784fb1397344d926b4871e87a90096eae926a0e448396dbd3ff4a2f70f727089f025238cb47bdbccdc877ef4a50fad8f05a4e5100c5d3eb0d3c", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/webmessages/2", + "raw": "{{base_url}}/webmessages/1", "host": [ "{{base_url}}" ], "path": [ "webmessages", - "2" + "1" ] } }, diff --git a/myems-api/README.md b/myems-api/README.md index 1dd3d0d1..4205a77e 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -2082,15 +2082,15 @@ Result in JSON | status | string | Status ('new', 'acknowledged', 'timeout') | | reply | string | User's Reply text, allow null | ```bash -curl -i -X GET {{base_url}}/webmessages/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages/{id} ``` * GET Web Messages from Startdate to Enddate ```bash -curl -i -X GET {{base_url}}/webmessages/from/{startdate}/to/{enddate} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessages/from/{startdate}/to/{enddate} ``` * GET New Web Messages ```bash -curl -i -X GET {{base_url}}/webmessagesnew +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/webmessagesnew ``` * DELETE a Web Message by ID ```bash diff --git a/myems-api/core/costfile.py b/myems-api/core/costfile.py index 24b11487..5ec2852b 100644 --- a/myems-api/core/costfile.py +++ b/myems-api/core/costfile.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config import uuid diff --git a/myems-api/core/emailserver.py b/myems-api/core/emailserver.py index ac69286a..fafd7227 100644 --- a/myems-api/core/emailserver.py +++ b/myems-api/core/emailserver.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config import base64 diff --git a/myems-api/core/knowledgefile.py b/myems-api/core/knowledgefile.py index 6caa8180..2a1def2b 100644 --- a/myems-api/core/knowledgefile.py +++ b/myems-api/core/knowledgefile.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config import uuid diff --git a/myems-api/core/notification.py b/myems-api/core/notification.py index 24ea7046..53543f6f 100644 --- a/myems-api/core/notification.py +++ b/myems-api/core/notification.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config from datetime import datetime, timedelta, timezone diff --git a/myems-api/core/offlinemeterfile.py b/myems-api/core/offlinemeterfile.py index bd4b7ebe..b4ba0799 100644 --- a/myems-api/core/offlinemeterfile.py +++ b/myems-api/core/offlinemeterfile.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config import uuid diff --git a/myems-api/core/webmessage.py b/myems-api/core/webmessage.py index 83b0aefe..671aa0c8 100644 --- a/myems-api/core/webmessage.py +++ b/myems-api/core/webmessage.py @@ -1,5 +1,5 @@ import falcon -import json +import simplejson as json import mysql.connector import config from datetime import datetime, timedelta, timezone @@ -46,35 +46,74 @@ class WebMessageCollection: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.START_DATETIME_MUST_BE_EARLIER_THAN_END_DATETIME') - # get user dict + + # Verify User Session + token = req.headers.get('TOKEN') + user_uuid = req.headers.get('USER-UUID') + if token is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + if user_uuid is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_UUID_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + cnx = mysql.connector.connect(**config.myems_user_db) cursor = cnx.cursor(dictionary=True) - query = (" SELECT id, display_name " - " FROM tbl_users ") - cursor.execute(query) - rows_users = cursor.fetchall() + query = (" SELECT utc_expires " + " FROM tbl_sessions " + " WHERE user_uuid = %s AND token = %s") + cursor.execute(query, (user_uuid, token,)) + row = cursor.fetchone() + + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_SESSION_PLEASE_RE_LOGIN') + else: + utc_expires = row['utc_expires'] + if datetime.utcnow() > utc_expires: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_SESSION_TIMEOUT') + + cursor.execute(" SELECT id " + " FROM tbl_users " + " WHERE uuid = %s ", + (user_uuid,)) + row = cursor.fetchone() + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_PLEASE_RE_LOGIN') + else: + user_id = row['id'] if cursor: cursor.close() if cnx: cnx.disconnect() - user_dict = dict() - if rows_users is not None and len(rows_users) > 0: - for row in rows_users: - user_dict[row['id']] = row['display_name'] - # get web messages cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor() - query = (" SELECT id, user_id, subject, message, " + query = (" SELECT id, subject, message, " " created_datetime_utc, status, reply " " FROM tbl_web_messages " - " WHERE created_datetime_utc >= %s AND created_datetime_utc < %s " + " WHERE user_id = %s AND " + " created_datetime_utc >= %s AND created_datetime_utc < %s " " ORDER BY created_datetime_utc DESC ") - cursor.execute(query, (start_datetime_utc, end_datetime_utc)) + cursor.execute(query, (user_id, start_datetime_utc, end_datetime_utc)) rows = cursor.fetchall() if cursor: @@ -86,13 +125,11 @@ class WebMessageCollection: if rows is not None and len(rows) > 0: for row in rows: meta_result = {"id": row[0], - "user_id": row[1], - "user_display_name": user_dict.get(row[1], None), - "subject": row[2], - "message": row[3].replace("
", ""), - "created_datetime": row[4].timestamp() * 1000 if isinstance(row[4], datetime) else None, - "status": row[5], - "reply": row[6]} + "subject": row[1], + "message": row[2].replace("
", ""), + "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, + "status": row[4], + "reply": row[5]} result.append(meta_result) resp.text = json.dumps(result) @@ -110,36 +147,74 @@ class WebMessageStatusNewCollection: @staticmethod def on_get(req, resp): + """Handles GET requests""" + # Verify User Session + token = req.headers.get('TOKEN') + user_uuid = req.headers.get('USER-UUID') + if token is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + if user_uuid is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_UUID_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') - # get user dict cnx = mysql.connector.connect(**config.myems_user_db) cursor = cnx.cursor(dictionary=True) - query = (" SELECT id, display_name " - " FROM tbl_users ") - cursor.execute(query) - rows_users = cursor.fetchall() + query = (" SELECT utc_expires " + " FROM tbl_sessions " + " WHERE user_uuid = %s AND token = %s") + cursor.execute(query, (user_uuid, token,)) + row = cursor.fetchone() + + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_SESSION_PLEASE_RE_LOGIN') + else: + utc_expires = row['utc_expires'] + if datetime.utcnow() > utc_expires: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_SESSION_TIMEOUT') + + cursor.execute(" SELECT id " + " FROM tbl_users " + " WHERE uuid = %s ", + (user_uuid,)) + row = cursor.fetchone() + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_PLEASE_RE_LOGIN') + else: + user_id = row['id'] if cursor: cursor.close() if cnx: cnx.disconnect() - user_dict = dict() - if rows_users is not None and len(rows_users) > 0: - for row in rows_users: - user_dict[row['id']] = row['display_name'] - - # get new web messages + # get 'new' web messages cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor() - query = (" SELECT id, user_id, subject, message, " - " created_datetime_utc, status " + query = (" SELECT id, subject, message, " + " created_datetime_utc, status, reply " " FROM tbl_web_messages " - " WHERE status = %s " + " WHERE user_id = %s AND " + " status = %s " " ORDER BY created_datetime_utc DESC ") - cursor.execute(query, ("new", )) + cursor.execute(query, (user_id, 'new')) rows = cursor.fetchall() if cursor: @@ -151,12 +226,11 @@ class WebMessageStatusNewCollection: if rows is not None and len(rows) > 0: for row in rows: meta_result = {"id": row[0], - "user_id": row[1], - "user_display_name": user_dict.get(row[1], None), - "subject": row[2], - "message": row[3].replace("
", ""), - "created_datetime": row[4].timestamp() * 1000 if isinstance(row[4], datetime) else None, - "status": row[5]} + "subject": row[1], + "message": row[2].replace("
", ""), + "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, + "status": row[4], + "reply": row[5]} result.append(meta_result) resp.text = json.dumps(result) @@ -179,34 +253,72 @@ class WebMessageItem: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_WEB_MESSAGE_ID') - # get user dict + # Verify User Session + token = req.headers.get('TOKEN') + user_uuid = req.headers.get('USER-UUID') + if token is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + if user_uuid is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_UUID_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + cnx = mysql.connector.connect(**config.myems_user_db) cursor = cnx.cursor(dictionary=True) - query = (" SELECT id, display_name " - " FROM tbl_users ") - cursor.execute(query) - rows_users = cursor.fetchall() + query = (" SELECT utc_expires " + " FROM tbl_sessions " + " WHERE user_uuid = %s AND token = %s") + cursor.execute(query, (user_uuid, token,)) + row = cursor.fetchone() + + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_SESSION_PLEASE_RE_LOGIN') + else: + utc_expires = row['utc_expires'] + if datetime.utcnow() > utc_expires: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_SESSION_TIMEOUT') + + cursor.execute(" SELECT id " + " FROM tbl_users " + " WHERE uuid = %s ", + (user_uuid,)) + row = cursor.fetchone() + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_PLEASE_RE_LOGIN') + else: + user_id = row['id'] if cursor: cursor.close() if cnx: cnx.disconnect() - user_dict = dict() - if rows_users is not None and len(rows_users) > 0: - for row in rows_users: - user_dict[row['id']] = row['display_name'] - - # get web message + # get web message by id cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor() - query = (" SELECT id, user_id, subject, message, " + query = (" SELECT id, subject, message, " " created_datetime_utc, status, reply " " FROM tbl_web_messages " - " WHERE id = %s ") - cursor.execute(query, (id_,)) + " WHERE id = %s AND user_id = %s " + " ORDER BY created_datetime_utc DESC ") + cursor.execute(query, (id_, user_id)) row = cursor.fetchone() if cursor: @@ -219,13 +331,11 @@ class WebMessageItem: description='API.WEB_MESSAGE_NOT_FOUND') meta_result = {"id": row[0], - "user_id": row[1], - "user_display_name": user_dict.get(row[1], None), - "subject": row[2], - "message": row[3].replace("
", ""), - "created_datetime": row[4].timestamp() * 1000 if isinstance(row[4], datetime) else None, - "status": row[5], - "reply": row[6]} + "subject": row[1], + "message": row[2].replace("
", ""), + "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, + "status": row[4], + "reply": row[5]} resp.text = json.dumps(meta_result) @@ -259,12 +369,68 @@ class WebMessageItem: description='API.INVALID_REPLY') reply = str.strip(new_values['data']['reply']) + # Verify User Session + token = req.headers.get('TOKEN') + user_uuid = req.headers.get('USER-UUID') + if token is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + if user_uuid is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_UUID_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + + cnx = mysql.connector.connect(**config.myems_user_db) + cursor = cnx.cursor(dictionary=True) + + query = (" SELECT utc_expires " + " FROM tbl_sessions " + " WHERE user_uuid = %s AND token = %s") + cursor.execute(query, (user_uuid, token,)) + row = cursor.fetchone() + + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_SESSION_PLEASE_RE_LOGIN') + else: + utc_expires = row['utc_expires'] + if datetime.utcnow() > utc_expires: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_SESSION_TIMEOUT') + + cursor.execute(" SELECT id " + " FROM tbl_users " + " WHERE uuid = %s ", + (user_uuid,)) + row = cursor.fetchone() + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_PLEASE_RE_LOGIN') + else: + user_id = row['id'] + + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor() cursor.execute(" SELECT user_id " " FROM tbl_web_messages " - " WHERE id = %s ", (id_,)) + " WHERE id = %s AND user_id = %s ", (id_, user_id)) if cursor.fetchone() is None: cursor.close() cnx.disconnect() @@ -291,12 +457,68 @@ class WebMessageItem: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_WEB_MESSAGE_ID') + # Verify User Session + token = req.headers.get('TOKEN') + user_uuid = req.headers.get('USER-UUID') + if token is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + if user_uuid is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_UUID_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN') + + cnx = mysql.connector.connect(**config.myems_user_db) + cursor = cnx.cursor(dictionary=True) + + query = (" SELECT utc_expires " + " FROM tbl_sessions " + " WHERE user_uuid = %s AND token = %s") + cursor.execute(query, (user_uuid, token,)) + row = cursor.fetchone() + + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_SESSION_PLEASE_RE_LOGIN') + else: + utc_expires = row['utc_expires'] + if datetime.utcnow() > utc_expires: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.USER_SESSION_TIMEOUT') + + cursor.execute(" SELECT id " + " FROM tbl_users " + " WHERE uuid = %s ", + (user_uuid,)) + row = cursor.fetchone() + if row is None: + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_PLEASE_RE_LOGIN') + else: + user_id = row['id'] + + if cursor: + cursor.close() + if cnx: + cnx.disconnect() + cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor() cursor.execute(" SELECT id " " FROM tbl_web_messages " - " WHERE id = %s ", (id_,)) + " WHERE id = %s AND user_id = %s ", (id_, user_id)) row = cursor.fetchone() if row is None: diff --git a/myems-api/example.env b/myems-api/example.env index f4c2db4a..13064eca 100644 --- a/myems-api/example.env +++ b/myems-api/example.env @@ -76,6 +76,7 @@ WORKING_DAY_START_TIME_LOCAL=00:00:00 # must use the root folder of myems-admin web application # for example if you serve myems-admin at /var/www/html/admin # you should set the upload_path as below +# todo: share upload folder with admin container on Docker UPLOAD_PATH=/var/www/html/admin/upload/ # main currency unit diff --git a/web/Dockerfile b/web/Dockerfile index 05208cb9..efdeac9d 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,9 +1,11 @@ FROM nginx:1.21.1 -# remove the config +# remove the default config RUN rm /etc/nginx/conf.d/default.conf && \ rm /etc/nginx/nginx.conf && \ - mkdir -p /var/www/html/web + +# create new root folder +RUN mkdir -p /var/www/html/web # Note: You should run 'npm run build' in the web direction to generate the production build. COPY nginx.conf /etc/nginx/ From 5d1e46989438e9fb15b57dab1ded143d3d27e0c2 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 5 Dec 2021 22:37:59 +0800 Subject: [PATCH 030/117] updated nofification(web message) in web and api --- myems-api/core/webmessage.py | 6 +++--- web/Dockerfile | 3 +-- web/src/components/MyEMS/Notification/Notification.js | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/myems-api/core/webmessage.py b/myems-api/core/webmessage.py index 671aa0c8..70a984f7 100644 --- a/myems-api/core/webmessage.py +++ b/myems-api/core/webmessage.py @@ -127,7 +127,7 @@ class WebMessageCollection: meta_result = {"id": row[0], "subject": row[1], "message": row[2].replace("
", ""), - "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, + "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None, "status": row[4], "reply": row[5]} result.append(meta_result) @@ -228,7 +228,7 @@ class WebMessageStatusNewCollection: meta_result = {"id": row[0], "subject": row[1], "message": row[2].replace("
", ""), - "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, + "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None, "status": row[4], "reply": row[5]} result.append(meta_result) @@ -333,7 +333,7 @@ class WebMessageItem: meta_result = {"id": row[0], "subject": row[1], "message": row[2].replace("
", ""), - "created_datetime": row[3].timestamp() * 1000 if isinstance(row[4], datetime) else None, + "created_datetime": row[3].timestamp() * 1000 if isinstance(row[3], datetime) else None, "status": row[4], "reply": row[5]} diff --git a/web/Dockerfile b/web/Dockerfile index efdeac9d..0df5fdd6 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,8 +1,7 @@ FROM nginx:1.21.1 # remove the default config -RUN rm /etc/nginx/conf.d/default.conf && \ - rm /etc/nginx/nginx.conf && \ +RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf # create new root folder RUN mkdir -p /var/www/html/web diff --git a/web/src/components/MyEMS/Notification/Notification.js b/web/src/components/MyEMS/Notification/Notification.js index 62aa3a62..1b8ad793 100644 --- a/web/src/components/MyEMS/Notification/Notification.js +++ b/web/src/components/MyEMS/Notification/Notification.js @@ -62,9 +62,9 @@ const Notification = ({ setRedirect, setRedirectUrl, t }) => { let isResponseOK = false; if (!fetchSuccess) { - fetch(APIBaseURL + '/webmessagesnew?' + - 'startdatetime=' + startDatetime.format('YYYY-MM-DDTHH:mm:ss') + - '&enddatetime=' + endDatetime.format('YYYY-MM-DDTHH:mm:ss'), { + fetch(APIBaseURL + '/webmessages' + + '/from/' + startDatetime.format('YYYY-MM-DD') + + '/to/' + endDatetime.format('YYYY-MM-DD'), { method: 'GET', headers: { "Content-type": "application/json", From b9de4e3c4346a79db66f6ce947189eb4b01eb7dc Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 6 Dec 2021 11:20:24 +0800 Subject: [PATCH 031/117] added qq group qr code --- README.md | 3 +++ README_DE.md | 4 ++++ README_EN.md | 4 ++++ docs/images/qq-group-1.png | Bin 0 -> 15278 bytes 4 files changed, 11 insertions(+) create mode 100644 docs/images/qq-group-1.png diff --git a/README.md b/README.md index 7bf62b7e..290dc82d 100644 --- a/README.md +++ b/README.md @@ -219,3 +219,6 @@ administrator@myems.io [社区版路线图](https://github.com/orgs/MyEMS/projects) +## QQ交流群 + +![QQ群1](/docs/images/qq-group-1.png) \ No newline at end of file diff --git a/README_DE.md b/README_DE.md index 3f4b43e6..15f66141 100644 --- a/README_DE.md +++ b/README_DE.md @@ -214,3 +214,7 @@ Sehen [Docker Compose Schnelle Bereitstellung](docker-compose.md) ## MyEMS Straßenkarte [Community Edition Straßenkarte](https://github.com/orgs/MyEMS/projects) + +## QQ Group + +![QQ Group 1](/docs/images/qq-group-1.png) \ No newline at end of file diff --git a/README_EN.md b/README_EN.md index 9a5f1417..5d50117f 100644 --- a/README_EN.md +++ b/README_EN.md @@ -216,3 +216,7 @@ See [Docker Compose Repaid Deployment](docker-compose.md) ## MyEMS Roadmap [Community Edition Roadmap](https://github.com/orgs/MyEMS/projects) + +## QQ Group + +![QQ Group 1](/docs/images/qq-group-1.png) \ No newline at end of file diff --git a/docs/images/qq-group-1.png b/docs/images/qq-group-1.png new file mode 100644 index 0000000000000000000000000000000000000000..610e84f03825d8a2f9d43e5b10e830ebe37b674d GIT binary patch literal 15278 zcmb_jRalfyxCfT*?rsqzm+o#PC6oq%rMp9FY3c4p5RmSaZYk+b>F)FW@6W}#I9Ke$ z?9LZ6^TsbCKB~%Lppv4(z`$TA$V+Pgf45*@U}=#NfloVemyCw?e3 zhB6KIOiXm?^74W3$Wr3w$U`4D2w1yWn!T_~KI!)4rP2tS6jW(Ykt7gpA%b z+^SC4T z2D}QayMw|w%ZbE?F^qJ}MVji(lcx2Yndfb)x3qJ7gzaoD3&kZZQ2)jDV4FfBBY}m3 zzL8QLPf$hgJ1*>i*Q;EiHGCN)pT8EVEx`Q3)`XyfS%;2w$R^@kwAk&Jk&}z6+pQ>e zo7S;X=n481ItL^}2S;t#qmN8X=e1>8$%RC%1O*>CknSd--}N0V@Ki4jO< zkj^DBY%MiFRw+DI;@fgIMss{l(`S#}adFl$N^||aKj7WNYobY?Xn&I?|3p;X_3C|j zFSP!kdI@Kx^{%4i_pHfj6c%Kptj|KLaZwxYN(m0x$Y{gh=H+f(Et6mukCYIB_5g!I zkjKNiy5m;=uA$m*Jn-P`8Xel;GZ3gdiUl&=$)+tYVZ?DU>Q_KWgbIqLOOI{-*@G+K zL9a?i>r&AJ@A@|oGWjwSR750}6-4?a}7#EAi{F9rF!Id=CiI8Gdhj69Ao+Ly&$FtGq{A0I_?6;_u{%O+aksi6zVqe`M`y$_6Ph= zCJJopYIai>2t9T~r=zytn++QzjY>`ULK+VJE#Ycnh%=|Q>fImo?D%5Qu>&E;;HA&9 z>q}2y>rG%Sv)*m9v0uywrm=rxx$8{hF!}bh!z7k2hMSK#3rBS+PR0Tfjpo3dU|B0h zoix_eSKI9L%*i|PW1bdsuo(_Z-bW!*cG!pBDu+LPtG~;a>fTON6BWqDRFclwkMqB# zYclTnRz&GbJQzck`Wzi)UmY867G~4zeRHH**{krL%!ZqSvJSq#)9*>}{>NjlT|I96 z!?0ML^p01G-kD>LepL~2)ku)8Ifs{9gLvh_udtX-v%$w1*mz!5%)vMlg3l1WJ{E&9 zs(3!kfK(ebmE(rW_&{Rr$9Xt)7mI|Z>PS&OY8ELAVr)nuJu!BaB%5K^D9m*3cd+~8 z#0iiAz$`|@*<*kDOajGZLLc{(gY3Grlos=PLB&`DgQ1B+o2DQCZwGugxs;-4I=zc}2Rgbc!FID7mygyv z!+G-unS)wko%GqJqTe%W;%TajYHJ0@>`YDQ7#tqjZ!RVqQot6N(2DP>OJ3k#Ij~N2 zd>ByYXC06!9Zl+LDv)o|$}=wAIjP;bsd<+$Dxz(MSlJ5at!AaG#0u)$Il;9RZ0ZA! zG=ztlgXJRNU0z=evP|ykd`qzqriPmt+gWd0od_%OB(qAZt_9MDa}zN{>C}+uYs@MA zb3PjpbSQ#=HLeq0pE51sig5fD@byq4qs$jhk@MZ?>fu$;kC7UCx2Nlh8BoLFHKB-j|x zhqj^#QpA2=L>)Nk3AdnrW({0Y1-9?Fz1@ScRdW1DG)y8AGbFiL49duTD0&+t3EIX8 zTWk`>>TnQjBmMQhE!Czd&M!?2T=kd-JPYhl6V7&k4zv`uVc57_yM!68DEA z9CX27njP~GnubwKuzOaR7A4Ft$~8+%io906CZL!_p3xD zeJAW4*E2jl6SaesnT+`oxd+Qc?=GMI{jFP-!V*bp5o?XMskljDugDFTT_0npf^EEx zNqw6*DpPkIvnteUPMdCWx5X73Sp13W39H}NY%PfL(A)5f{ zF%pnFbDRF`Jm>ey;lMTeWv-wRquuxsY(bF2V5$tpSP+R~G8>3?G8>E?Hz)d${*kI9 zUqH?&IC3;1n%<4L;&7$K1y8W@TR3c3af8=h`d4z?J#&IX%|glpo?>ZM7r!3mDOrTF zPvfkA4C{0)0(A$FxOfS3GUxkM`r;OoBW4ZBRMl;$Kn4Av*sT)1I`3m*Y&7SZG6n6P z)5Ighe*K>$*rWdn;5Z>gd}#{(6lkT_yb;V)Md{M4Fy<hB>+I`r#8dM2nTDnFF z&?S1Fm0WxlI@!eB-;x&iyUFuZoP_EsX0Lk_EfK}mQvy5JTw}nREfRKGpfp*P^gD#FETu%D|If^j-OZ9;hV)8(@Oy#E zcodY9CM2H0N8r(NNU*`xGYM|Wv?I~nK!#dY+ETO~h>)f4(21>DySEWJ?K=-D3JtGMd7sR2AWU`!8J(K9J)~yCgzdK;st$xh=R=>oTSc z?6f^>HQVHPnKA0dhF!cu#2Ka}KD&14w60H`@{p3U*S!wWr~4)=NH=)-H| z46?|zKt$Elk`AlB76!ZpxonEG~D z^YO2`u7u-55M@{NLah~Xad-rfjMIUo=Bq}cP4jX4H7%Z$@VH^y{iDiPBdVYGqfi}c zLGa!20=rkg262LcS!JA{;mPyMSwQaIC+Xa*ds#))ezT)r3RXPS$j9>Hm3(lGIx0zH zNA>v_W(h`x?y2de^S{Cl>%eM-LCodjH+wA6<$a{u9b?G~P4cUDK!FkndvVUwkaK&Q zAYdiV8qB;u^Bv2?rAX?QhV?u;(aX`9*nSYj~47z02`FDhEdu$K$UUlCemQlE>(4 zGGG^naBxyz)};XzhdsJ9+hlVN@6UHl)83M^J~k}la+!&>=we6KX5wR;Ik4)M-(hPh z59S*GtFe^M7(u4i^LGAoNoshbJDnRiQn{&}3@wHv>*DrQLOn^kldxfCqjWM_+q{{_ z&R>Kk2JHA!KaWxuna$s2gkk2!Kh=^194?aK-z&(7Q`e$1%txDOn#?8)PA1fFo?&yb zA?0@ZW81iB60-x+vkXpA4Qy!1I(kcFyh66@+lUZ7^o?0d7bvlF=_ToU7>#&qJKVJ%Q0#tvSc z%ceIagn?~O{-M)02bpgLL*|>~mX@_)j{g?Q`J9P%tP;LFwy-_kMZx_Ev=VpKpTmFk z6&-Q$-1<#*^c-EtPWOwC7F-yDVzOwQ#wM}B*K#v&z+`7!a}v|ofMTMHAa;-!OrCIN zP7tdcvww1Of^wh2W^_7VWl#-gm~(x++V<&bBM7t_$oA-QgmpyyeANqwMs>y)`IY=I z^LT4EqpI+pWJwky`QQavGA23F(j?Rm?tU~k1VZI( zeWjJWi2X62|7MAQZt!+{+G05SgxKwvzr3`x6mBQ5cyqQ;t-(Rq@rRq*eoK5;JS5{F zvG8B(@y}S7Wd#)Jq9*h;%gPKz7P!khnsyLsLY*fV>lx>F zo0$rAe@$`bc#i6;>jWh3tCXrelv3O~Q@WqOPBv@#N^lc1tjTud$Q#>(DFKc}~P5K;6&CwF{dQVn1|Y3om!DawIiRa zH~Ukv&4{b1f>kqRoW=B3@rkyfdJ;lDm4ktS8sF8UlFeeoj~E;SjB#OwWDO6Qck!v9ovHo9;DJ`rmJkO@&o=K2}Ic z+ZpLn?9_P5E5p4f$1jr+2U+_WZ(f zk?@>HcpJ4_oQj`is6LNiI>_>R?b-#ai{)Ok54KE_x2vhV&;%njV3F`}qz9))qDzNp z`fdavCGg6#zz5qH89Q#GkzAD=87j{#3p!XeJQIdx*;wJEin{ zz6(u73vBj!>}r)&kfap%Y>0Pr)ZD8H^Lnp0&qIrXF)8B$)@HO+*+h6h-5uB*Z+!#D zc{ah}KKaRXm2{r|IF_^BfQOnldeu}e8RXO(f?|zJS{CtTs2*YkXGLWDSjr0a2|hAeHE*{$pPm*z5&JvH4>9!US~5FG6@iJZL%t-6|-f`0D~ z>x}m$zu3#6TAS1M07F0p7YfE7Y1|9|cwv3Oa~Aw%GkTLJ*+)ZGY*2JMUxu7kDcfM) zHtD!+UHREGvjH8OVe+x*t@h(HudNRDH$EvuEXM`qV`PURi#EF^`#T!`dh7b)o2fmP zq?z80^S&LO!W* zbbBfuM{zDDkg3!n`AL!U9FJ`FpN}r67WTnSB>Sj4Uo(;xkzqHbjPt6JybT^@eE~GW z#+SKnhL_#b!RaXj3=x98Xm>E&)u}#3zMC3?qb_LgIFRyKvJk6oJ7&E}V!!_na@q;O zM;QM6-JcABg(}xn>DXyM+e5Idh#7zv+~s9MzUAqzIq>kJsIFqTx%YfSNT2f(b3#y6 z$IKA@CmU_4q#$h>BCCQyQmP)*u!+w=ZR7r6aQ0j%@_tH_U}h?AFc_zc>TO(TWn`{F zeT`>ZHoGbe!|9XX-TUl{?Q7R3^<_qOqAdGIhg;pQjGHM^WA5y zT-~`g2q%8wS0`4$(^&4xzh%MG{+hS9`v8~Kv9~|*h%uv$1{khwF_e4$FTQfu z-*5~t9oL_lCf36{F#?!u_VV=NxbirtZJKk{VC4|EL4732Eyu=s!cgPMrqEK zfX87>7xVC6m2p$?XgB}2#Ol^VF`p&BtE9ecV_cWM@yg#(S-w5&|n#R>xf%(4cmn^&P#>r_lc31o_ZV@>@o=+8IiWnXVqs|2xh1)U{drmn1 z>yj7&oK&d~*-zvBVCTsU;KE3Gc_Km4g?Wg?J?l)W!dzzU^u4 z?cc0R3V!C@Jg&z?efZ^k`KHFS2XheiBnEWB;<95DCVmdL5sdMbp}d6LjHgiwj5BA- z14d7_RWS=&)0=VJ5{q*yrD`(zu1`aZaV7TZI~5 zzZm)M8hmO?e*dY|t^#I@PxXQ6Ze6s_;2pJ%I5hU*vA6o&vw}b?9~Mmh$6u(?m78+J zg!JhWztSsjnm5D9RtODT`Q?KdZ!uBP-#TDD7O8%eBw(4BWjx-XKS|Q&i`=bnKX8*H zP35w;cPX)n%N8mIGGqKyKC*8F+qo7w#IzC^*b0xfPUYSiIkZ^6`9q4uE0I?8sV%=8 zKrm|39rOzw-U)}NSdvi5k9!pJs;Y|Q@lX@)7|!=vq&I{0MKHQ>M&Z=aBzc|82(2Yd z#913_Szu|IYy|E%f>(#)=@Qjx1kis(Xkd!!s0e(bku=`m86{FEkRX8jf=}OV(f}7O zcT+~Jr(pG~pb?ANleHSiNDj@vwOTN#C}GpbF6iQ@$Se&4P-Vh*=VH=1BQ@8j zt8I*8w59LF`7!9DC16$L=h}POhn3hnc*Y|<|J4q*0&qOTxEWIe^7JqJ)mByWR$JVR zxThLMhn{Db82y67_oEmr$Ebys_-Ms6K1x1J*Ja>LH17qp`uhoK@g|wr*ODCw%DqP`)rNx9$GtCf-MT0&2yF4>>-Y?5APW>SMtRs;)1O*O8}K7|1?tZuUjT z(BBpBNXwbCQyyP2psl(}88;h1f5GQmSSc-imA3jWN9?tq`*gx*Z?;n9-v%RE2oy4c zE9WDRXAe!C$8eYO_K+SLWzh>;W5j_7%voSU>MN|r$?^vo@A9~0*DbU(Rq&e}>lBX` zWW_7$#D51SF|>RzYA^ON8830@+m{tFxGv6|72C)LL6%lUob#`Kb|JTPtu`8XIK!u? z;+c7Yz^~9H6syES#Ra{8(c}hd{_||nodyKZv?gAZ7({4w<>ASz+r>wxE<%Lu&{X&J&lv4e$1SNe_HsV3{#lem?lSFBZ zCm~;}xZ8mBMLJ zv~6ddJ}R^Js=|GKG>6em{lE^#A`che>E~YAOa5f!nbB6X!+DBB`O=|xWwCXE-a zv3A6mQpST7D7=oOgXxjl)s+aqS*tFEf=E%4eQ#|xX>G2DAEreS8(VI}@9bPa%bzWM zGg1w`QFt2^sN|8afJ-onVG(n5pR_{cRx)d9On8pa$@w|TdwcvZ_~zj z+#LkpO;zgEtpp*tmu=F?MmsLsHGN?uF;x2rV|FdzV$*f};!>`%CTu$S9@eyj=y4`c zs?edFGIuu2jfZN<){3&kVzlt^N$%*>gXqH%=c6F%-P>FMOQ+6)U8J2$_r6fL$keEn_hlqAPOs`(9txN7AEm?>OlfHqb%It}*Byq_Pk@8($eJPg+g;iQhmG>YVv`qWn zuSV7$VwsxnEg}P*b_Mq>EvQDG~F0f44rXVWG4qjEMlkQreyevkDg2<>4cjeEha$hs1N?K za?bo)_f@FOkr~YMtK0LLDSKH#G(XD?@d4zPQoyD^iWNED?@0wx6Z=~2u+0ucUT-%z_zmw&cyxahQpVUSBV zKnkR5q3xGXS6n_~<$fy2Pz*+X!HH5uZhi27vWtAe)o<}^tvx3vMYO)MllR*+h!;U2 z@4oL&oTxJV^Fa2mCOhkCR(@Zn((QEb-@cNGKj=(3Urvek>+10T*U(8oJ?S0O8JvLCXHBGl8w=T1N=Cfi4 zXb&G=2jZxV_)##z>4VhD)g=3HamriXu1m#=HFtOcsQ9Dz%!q>36xQQasJ5{oS=qc^ zX(oTU%(@I}!in!Dnvr}aJ^?kUesWm}E_1zj4n{&K3=Em|e_DW@5Dwvp#qx4#?vz#o z(~qp(HH_`DX%2;W*)3N>T64vJ%U5{NQa>Tt_aoU0TZH0gwVSDV+@~~zb1k(8*`iYv zlGO=bo&e>7hOUy4Ab2iJGkThn`n1hq&j3^TSVO!&kcJ}QrCsUO!cSkJtKipprI1#kyU)R%DE9Q%BeLU$7d17($kvh{6JcP{p4oD(<4?{BTe z|LuttypsT4c2;LxqV}ay3Tdlj5c`(ENW&U(;!sB%J0jAhcnI~%p$&t*_1jg3@rh50&!6v9Dkh5*}ZpLtEp)%T#K%i;JS_WlIG+i z!0chKJR*251nZQWcXhC}GC`gr?@IYY%B6xr5u9tDdL0-QB71Rr4dkgW zxyX!_PMp4c`{>6!NbVBd_Hw)Y=hVq2Mf>}5$Ja^BC*>XMK{5Q##pK=x`PO)yu^WXh zQ!s4!Av*xAtVvGt?&Kz%%0G=%a~t|P^1ix~B!e(54UaYDKk{*`3Ev!?z>*gvc z6yOHR)vp#4wyyuEO|H~_w_3BudyO8X@c67Bw;q_K3?HB0v2MbQ^EW^Rgj4o=jRpRu zMZ{p8nv@5UsX(6pZmJN|xeT8>KP2jQwz#)E^-91r<-^ZN0ddYum|L`s|3P|{K25~Eov96Ph4 z8rN^-dX+V*bYBuoA$^neJfmab%koE#KxJ>cvQ}j_4={>sf%ourV*_*FB)5wo;;ugp zKsW=FqD^0#7wJ_9NCQKqH5u;6gPVPjz>>)b;zX#h+6w4$?t5v(Ic35$U-a^e^&OyFNzJp} z%K^Y+cQayazKg!V<_IE29I~Pe0NTaiw!*DV`}e9FL>!g6g;AlW68$&BhCU_*yo9Gb z45cpmGgNEM+w7iW;R_;5$7Zy=dl$Nod?H%h;#`IfkS(V_42%x?;3LO-(V_Z7-%$(W z5VDqAU~A{QdjpAWNe)?h=nLANoYhm+djc0F#o^1^wGmitjm!QirR;)oII&F}qXL*Y zZ1>8RS-%M6N4sk(+KD>={jvhzIV6Oth#glY=c|0~;rXP;x?hu&X?9Kf)r1hHe{g3F zr)LMsM@Hqe4MU%kh9U@}sk|mC({R`x2Y#+tfWM$>J9FKA|J8N~hrI1}VPPRAQXJ5= zcYHB0Fqpv~xL8}H;_1luUJS!SciPI7i6U%iTK5+^MB4$v37Gb$~`H(eF{87J+~@pFMghX?;SQm*zkS$x98B0 z`M#SU2`pp}67%!eo@sDC^!@RDJS^pIW3B7qZ$bTI9x-$!o#b+l`bf(#A>oNmbqm*- z13)geduc5q_xo4krky#HG%68ISs{!AF7Hq<_WmWdg`A}Gea-cA&j>+${l1oq4P1gk z;{aFHw~uGj!E=})wW!ETMBp!`t$s%Z`OFTyh{f#}oy-viQ#u!d6qMwAizHWZ{6=<= z^r1>M&<5;v+nAD24UH41s<$dat72{+CArELW|9h`JRn#vT$%blab*ZuT9bjzW-2+c zTsE{gQh!*NlW4#KkGCB(I9yAGe|X)4rQxkbtLv zAM$S_ghM&eix&uz^sb1CtOcZhLf&$*)be9KOvG<{elU>+8)EHoi$(~mlx0=Mh6Ubr zoz+c>+W-9(dtXcb8w1i~6F^eMjHLqvZs9;(T+%~~${0w6MXc+{K!ij6rhunC`EM1- z^*B?SvZjxX{vN!hAUMVjpSOF@d#Q$C1>gg%g|#2)e&L_G%dR8#FR?L%^72sc4M)fB z13XG@L4z{we8n~+PLu=7f0Qu;+eklnE~D8x3||Skuw{xJua1%Y6YHH!id%e2i4HjV zz6k8}hcb(UB8OWD5z^-ZM8@c*jGO3&g^G;~zfbk5yX#PZ(t9_AhQHT&J_!g-03;$) zA1^_3c`cCGafIF!5GK{f144kiARa*47S$pl@p2)fhzxp<%Nw@$9!u0djv-{z%uNN_ z^-)ma6AE%4(s5EHpf}1230tNiiEX+>c`|$CFdooGQS|hqVK9FH)Ly#-u@ss0o5xY# zF|We3HHnqiodzisZa8v9?s~S9v^1w+0_q}NEpX@ODw!%>OH?vb6vCIc9~q<0Ho+?D z4Vs!=)>@k5H&VoPvKmSw^eo9~#VQ-++5tRKxIgIpkgVx4l&t@n@-(P76^qhS+u-%~ zCluOrq8+~w{`45<0d|qVXD;fIzj^iPK&*WDSP2i!Dgyai^o3)o$-;?=Q3a88x%8Xc z2b24X=A)^>#^+)QpLbuYWrT3hpwUkT0ZPNCLw>0Y@(Vq0P{8hcBZY)XbAop^yiEB$ zhaX;d3EqwH+=oi@cgmyq>(WZjh12-!Y!-l=auOTDYEaNZ)b zlO&c_4G*AEObd~{%-j*^@g63N34eu-G3id-Pon8!QMk>jdyP)l>?gyhN48S5$?cHT zCZoNH@I0n8V{`MQF3F32H}OM(TFjaZ9|$$JCZJY#luYj}Z+N8)$CcHB=VYDC{H=;> z`uozvOq)jiOvEc!5oJ2q(V>?&p|G`q*n2T|t7rav;7*xdJXJL|2Du;+(-fTh#%23s zN4OMi-QOGid?wC>tVQhqh?o?li_ULfzgsae)S5&PS43!J>eX2mvk=XGQV89BP;|@F zFvyc_qSNJTuK`y znJc_r=-Q9QeCZvLAqA^eAk&O1=%6nweI!|t>tM;0<|c&AJcPt_7JCh%kE6AN{#1~@ ztGtm*Vug%EM=fiSsKy`8W^y*KdD$#|dW|U~k=7jy)D46Do-+XzjD1anO5pQZYNxLd zElHs#LVuanDD*!XMSF>8(c)Y|3B3#lq`JmXN_g2aWlui1v`h$3SM=$N+C($-cJh># z=m$vK@iMFIG|T!JC2hu}oXG$}H9qIjK;|Ef`lF=7hf9HJSPGy5SWcJJH0d!UH9827 z2)0?`Tv>#Pj{-qCpBCbui1HHL7u`tbQ-dFh1R~&=3%#e9vUn(l(B5nJ@ud?q?w{rFV_a5|Sjk zb@#pV;%RZE!&lN`8ke+t7zH&CAtD@0Vt^C@kBf7Zv}D*thD`NU^Y`mdX)qgIIS=(5 zsh^8ct&j9iCX$T7f#Qa}_|A*^e6AvgYTY7-aZ*5hL{F(@eK*Y05Rc5`tksGDZawZc!2&NAoR;Nj(5c@C|i^f5-0Zb{!^CW$eYh0FVUL z*~UueRksC;+fex_|C~GlpWA<9x0RR9lEgVoy`LQ^{Si`4EjFw%pqqJnn>sRBHd_ezqq69$$ z#+j!6uXdt7_SN9-pLaz%q;>OD@yiQ8zCmtV0C86;IyB=%!vNT@Szk4x#!;o|^Cil@ zwfCy80Baw)Rgw%P7r;c3UjxLh=2k?8o+d|3M6z0D3VkRRfb!&Bn9c^&awUhZV$=M) zADDsiBF)TqhuMAwaeB>H^*8qff1xZw%447KOLMKiXqRakwyffL-wT(@Y^rMMsJt|W zgJi}gR$iB?ClWEp4TSXK0Dg7FPFFN@xsk z_dGoKLn0MtqZa90V>DKgj>_1&ECrYz6h59DBFn9MQf}RJHMMW{61Pn@9jMzTGU`ib z!`lq2K3e?Gn-Pcm9@j;ID}vd9KM}gyvuGE{{DpzKTI6#1iS~;Z2O0@f=wFSLioMsn zLlh-{`Y;KNjLP0pXWy2IPmKR{D8U5r?4)z}h%>^I91+oHkf}V0pH)?C4{qZbV0%ER zGYnKcqVt16$zt=loMvHC__j$LO~Tc%S1ro8r0-~yqf6jHx`+4lJR1yGVGE#uyY|!d zt^k|Anv{l*DXWN3VT-EdsD4Jo0^U0rk_-zj#MIjDx%9DsJU$b7F?qjq-$9j!~2-h z*;Ef~A54wdI6x^xe%PkW|NGokx9@oICbTHSxyvFtKiv{YZiViHR=ivnDosGUY8zV< z3#&c|1{ElsnDlT;tDWaubDnd1w7Kyzt4bCwYcw=C-W|A*4m{%sD1#Deg>Pmx732); z8j^#T_Rto#`3|x@*3uv6H_c~rW5X1z_?0C|B8C8%hsEsm`C)jf9#>r>wf7^*n9RE( zcKMm@*h_8&qRJzX4kY>j3)?JMuEX=FzXXXp>Ef6bbk)bfb-Qmia%T z0MjSe%n5=q@d1xVEpb<6qf;I(F#UUzA8t0}%z%l*l+$0&Zd;rIm|mw>=XjR?V>Ac@ zL@THEffpW__n?)0<6!S*tT#{>>#ovn)CF*RTpDx}Poe*3>gZ!xB-YOXuAH(CHxOv~ zpTmSir)Oa55*TcJCgecm0ReX~UW3XTma-2F?luK-=8^DESp?k!b^-Shq40KhrYuLv zgsGj9OnYZ}DG@-39o|lm<%)o!)Or7#y_M?qJp5G2=uyL!LYQKm@9{tR6(3}x&2o{M zH_S!=mS;9USMzQcT^&}n0)=i-%0;@3de3(OqdJ-my#>XM%r3> z@o3&5#L%rEKEFrTaQNIf;Y%n0FRvcyrvrEnvzLM}fQ6^OR2g-x#gOq$oYeGT4tqXc zA0{eH-nopjH5E<9*W(FGaE%x62(JPiQlsT*r_0;(tftzyU&P$+JVM9{Lr_}7gXu9M z2Q3YHAiQHJZp_p6*R%F3RazB5ac~6hdH+xy@B(4dARQ*4B}P)w72W=ax%Xj-Wz7%Pp|Q7f#2@4p$3r=(ZLHe?=Gy*fwj9NQ ze#1<31H%&{UWw)djsYOqy1*?4BSP$#O1(!|-EeYe`Gja5rPb^8@O*d#JD7_Vmq|A~ zCROF-6j)lAYe4-rXKVZRP2!Dj#WA?;Vt_0$b;$qeB-P&EXizK)R$U5YjKxq;KaLKF zH}cNPN8zSHk$j~A22Tz`V#BO+)1be>pEM{gP8eW08OtwIM&hWbC0e=Os*bhA-#pka z-k$fxJQB75DXdCo=mo{lI&>3FK?$TW)#dx_VVR=EN4-~Nf3g3C5c>KQ)Ag4Jms2T$ zYx$Y)ZXzLjF5P7~2S3#G*D_OD@{*539L~|$S1KG+ z<>2bhkrKOs$Ft8ZcFT_h*ZF z-~Bu9zPgK~v}J{rr0%?3g8Xz??;Pga(Eju#`7`%@AJtpTLD!^jz$@90A(I%SkMnmH z$kJA@pFTUuIEzKL-|!D(z>XVG`=-c&!ogw>!)hylu_?(l_|Xvc$}I-AmVfF}-&KM7 zGBdpk=?ZAf8jzHfIy;SnVX*o?GO+pRZa;`e&I@K*$;YeJFS+uOs2+4jIq9*c&#zM1Jr~ypqW> z#(lWXD#VV>KPDwphkYRE1DdpQh4NSiEuhXszpXz;p=bC#anWt*BIqD=gi-x~fFp|b zWWiUW+cs6j`raH_SY6V44DI>f3vsUJRs<;@*QAG!lf_y02Nda;3tqKP&adMji)0}6 z)IE^4i}JgplLhqkflPS*>w81$Hd1l2JQ)nMh>Mg?ejRwp?JnvH`<=Cuqg9*id0ni| zGXx!!YSCM&P#*lsA<|Zf@-zy$hN1RcsavP^(S?!zn(d}jdf=4*1NROule@`G&MYuJ zx9W4tFGjAwxYA%in=D28$=2UuzM!q?@Rv9%SzXBp0vlTY)atuukv*3o-0ASY=O)~y zn;#?!Nl%G8-~ihRNMfx{V)gjRvXKA&cGV(C*I_JU(Ud^j z?@E%=#;P{l@4%m-d?=x-s1(WZKQm8uLAON%S{Iv0o~hYp8N&CSvZsg1fVEZca{)B_ZelYQYUCpIw7N{P(vp2tpH= zHIp_(aLnlOG%*ZX2Au2XWOJPu;I?jtX)026UZ11W0#3+?G8fuE6S12dI2&?5Sad4Z z5vn22aH|s!>REaBoIUsa1%JXkUq4E;Z*<{KANwAx_C8tKwHjo8Kg3g46c>Z= z9KAcj(V*3}-71V7)n7SXSL`xgiFW_%F7YP1Z^>N^)76^VeUhP8uYvZzZQFdryI=BO zIzLS5N1ToPFV${UEN5lL0%xGa0GI6JduQMbME~sD=Iixtafm$%5Xn_J)bP8ZtXa R0Us`mf{d#4Pf6o%{{z-!VO{_L literal 0 HcmV?d00001 From fb31837efa73188fcd3f56dd78ecf4bf5d72c75b Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Mon, 6 Dec 2021 14:52:15 +0800 Subject: [PATCH 032/117] added access_control to combinedequipment --- .../combinedequipment.controller.js | 13 ++++++++----- .../combinedequipmentequipment.controller.js | 9 ++++++--- .../combinedequipmentmeter.controller.js | 9 ++++++--- .../combinedequipmentparameter.controller.js | 10 ++++++---- .../combinedequipment.service.js | 12 ++++++------ .../combinedequipmentequipment.service.js | 8 ++++---- .../combinedequipmentmeter.service.js | 8 ++++---- .../combinedequipmentparameter.service.js | 13 +++++++------ myems-api/core/combinedequipment.py | 17 ++++++++++++++++- 9 files changed, 63 insertions(+), 36 deletions(-) diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js index 64f39335..b0307c79 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js @@ -1,7 +1,7 @@ 'use strict'; -app.controller('CombinedEquipmentController', function ($scope, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) { - +app.controller('CombinedEquipmentController', function ($scope, $window, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCombinedEquipments = function () { CombinedEquipmentService.getAllCombinedEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -36,7 +36,8 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib }); modalInstance.result.then(function (combinedequipment) { combinedequipment.cost_center_id = combinedequipment.cost_center.id; - CombinedEquipmentService.addCombinedEquipment(combinedequipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentService.addCombinedEquipment(combinedequipment, headers,function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -76,8 +77,9 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib }); modalInstance.result.then(function (modifiedCombinedEquipment) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; modifiedCombinedEquipment.cost_center_id = modifiedCombinedEquipment.cost_center.id; - CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, function (response) { + CombinedEquipmentService.editCombinedEquipment(modifiedCombinedEquipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -115,7 +117,8 @@ app.controller('CombinedEquipmentController', function ($scope, $translate, $uib }, function (isConfirm) { if (isConfirm) { - CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentService.deleteCombinedEquipment(combinedequipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js index 8448257d..c083c51b 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('CombinedEquipmentEquipmentController', function ($scope, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentEquipmentController', function ($scope, $window, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = {selected:undefined}; $scope.getAllEquipments = function () { @@ -42,7 +43,8 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $transl $scope.pairEquipment = function (dragEl, dropEl) { var equipmentid = angular.element('#' + dragEl).scope().equipment.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; - CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentEquipmentService.addPair(combinedequipmentid, equipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -69,7 +71,8 @@ app.controller('CombinedEquipmentEquipmentController', function ($scope, $transl } var combinedequipmentequipmentid = angular.element('#' + dragEl).scope().combinedequipmentequipment.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; - CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentEquipmentService.deletePair(combinedequipmentid, combinedequipmentequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js index 96a4097c..24d6d6de 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js @@ -1,6 +1,7 @@ 'use strict'; -app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentMeterController', function ($scope, $window, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = { selected: undefined }; $scope.getAllCombinedEquipments = function (id) { @@ -111,7 +112,8 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $ modalInstance.result.then(function (is_output) { var meterid = angular.element('#' + dragEl).scope().meter.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; - CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentMeterService.addPair(combinedequipmentid, meterid, $scope.currentMeterType, is_output, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -141,7 +143,8 @@ app.controller('CombinedEquipmentMeterController', function ($scope, $timeout, $ var combinedequipmentmeterid = angular.element('#' + dragEl).scope().combinedequipmentmeter.id; var combinedequipmentid = $scope.currentCombinedEquipment.id; var metertype = angular.element('#' + dragEl).scope().combinedequipmentmeter.metertype; - CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentMeterService.deletePair(combinedequipmentid, combinedequipmentmeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js index 5455780a..7e73ecdf 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentparameter.controller.js @@ -73,8 +73,8 @@ app.controller('CombinedEquipmentParameterController', function ( if (combinedequipmentparameter.denominator_meter != null) { combinedequipmentparameter.denominator_meter_uuid = combinedequipmentparameter.denominator_meter.uuid; } - - CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentParameterService.addCombinedEquipmentParameter(combinedequipmentid, combinedequipmentparameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -123,7 +123,8 @@ app.controller('CombinedEquipmentParameterController', function ( if (modifiedCombinedEquipmentParameter.denominator_meter != null) { modifiedCombinedEquipmentParameter.denominator_meter_uuid = modifiedCombinedEquipmentParameter.denominator_meter.uuid; } - CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentParameterService.editCombinedEquipmentParameter($scope.currentCombinedEquipment.id, modifiedCombinedEquipmentParameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -160,7 +161,8 @@ app.controller('CombinedEquipmentParameterController', function ( }, function (isConfirm) { if (isConfirm) { - CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CombinedEquipmentParameterService.deleteCombinedEquipmentParameter($scope.currentCombinedEquipment.id, combinedequipmentparameter.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/combinedequipment/combinedequipment.service.js b/admin/app/services/settings/combinedequipment/combinedequipment.service.js index 33c00abb..aff87c4e 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipment.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipment.service.js @@ -17,24 +17,24 @@ app.factory('CombinedEquipmentService', function($http) { callback(response); }); }, - addCombinedEquipment: function(combinedequipment, callback) { - $http.post(getAPI()+'combinedequipments',{data:combinedequipment}) + addCombinedEquipment: function(combinedequipment, headers, callback) { + $http.post(getAPI()+'combinedequipments',{data:combinedequipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editCombinedEquipment: function(combinedequipment, callback) { - $http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment}) + editCombinedEquipment: function(combinedequipment, headers, callback) { + $http.put(getAPI()+'combinedequipments/'+combinedequipment.id,{data:combinedequipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteCombinedEquipment: function(combinedequipment, callback) { - $http.delete(getAPI()+'combinedequipments/'+combinedequipment.id) + deleteCombinedEquipment: function(combinedequipment, headers, callback) { + $http.delete(getAPI()+'combinedequipments/'+combinedequipment.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js index b19ac465..077da20c 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('CombinedEquipmentEquipmentService', function($http) { return { - addPair: function(combinedequipmentID,equipmentID,callback) { - $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}}) + addPair: function(combinedequipmentID,equipmentID, headers, callback) { + $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}} ,{headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('CombinedEquipmentEquipmentService', function($http) { }); }, - deletePair: function(combinedequipmentID, equipmentID, callback) { - $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID) + deletePair: function(combinedequipmentID, equipmentID, headers, callback) { + $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments/'+equipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js index 2ea9305c..8363d429 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentmeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('CombinedEquipmentMeterService', function ($http) { return { - addPair: function (combinedequipmentID, meterID, metertype, is_output, callback) { + addPair: function (combinedequipmentID, meterID, metertype, is_output, headers, callback) { var meter = {}; if (metertype == 'meters') { meter = { 'meter_id': meterID, is_output: is_output }; @@ -10,7 +10,7 @@ app.factory('CombinedEquipmentMeterService', function ($http) { } else { meter = { 'offline_meter_id': meterID, is_output: is_output }; } - $http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter }) + $http.post(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype, { data: meter }, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -18,8 +18,8 @@ app.factory('CombinedEquipmentMeterService', function ($http) { }); }, - deletePair: function (combinedequipmentID, meterID, metertype, callback) { - $http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID) + deletePair: function (combinedequipmentID, meterID, metertype, headers, callback) { + $http.delete(getAPI() + 'combinedequipments/' + combinedequipmentID + '/' + metertype + '/' + meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js index dd32c7e0..1fda1a24 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js @@ -10,16 +10,17 @@ app.factory('CombinedEquipmentParameterService', function($http) { callback(response); }); }, - addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter,callback) { - $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter}) + addCombinedEquipmentParameter: function(combinedequipmentID, combinedequipmentparameter, headers, callback) { + $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters',{data:combinedequipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter,callback) { - $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter}) + editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter, headers, callback) { + $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter} + , {headers}) .then(function (response) { callback(response); }, function (response) { @@ -27,8 +28,8 @@ app.factory('CombinedEquipmentParameterService', function($http) { }); }, - deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, callback) { - $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID) + deleteCombinedEquipmentParameter: function(combinedequipmentID, parameterID, headers, callback) { + $http.delete(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+parameterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/combinedequipment.py b/myems-api/core/combinedequipment.py index e9dc182d..ac737a08 100644 --- a/myems-api/core/combinedequipment.py +++ b/myems-api/core/combinedequipment.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class CombinedEquipmentCollection: @@ -62,6 +62,7 @@ class CombinedEquipmentCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -204,6 +205,7 @@ class CombinedEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -279,6 +281,7 @@ class CombinedEquipmentItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -376,6 +379,7 @@ class CombinedEquipmentItem: @user_logger def on_post(req, resp, id_): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -566,6 +570,7 @@ class CombinedEquipmentEquipmentCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -640,6 +645,7 @@ class CombinedEquipmentEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_, eid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -824,6 +830,7 @@ class CombinedEquipmentParameterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -1132,6 +1139,7 @@ class CombinedEquipmentParameterItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -1180,6 +1188,7 @@ class CombinedEquipmentParameterItem: @user_logger def on_put(req, resp, id_, pid): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -1439,6 +1448,7 @@ class CombinedEquipmentMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1519,6 +1529,7 @@ class CombinedEquipmentMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -1629,6 +1640,7 @@ class CombinedEquipmentOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1710,6 +1722,7 @@ class CombinedEquipmentOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') @@ -1820,6 +1833,7 @@ class CombinedEquipmentVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1901,6 +1915,7 @@ class CombinedEquipmentVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COMBINED_EQUIPMENT_ID') From 0bf0c829d0f8b25b76808fa7893daf06c8dcdff2 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 6 Dec 2021 15:26:27 +0800 Subject: [PATCH 033/117] equipment of access_control --- .../equipment/equipment.controller.js | 21 ++++++++++++++----- .../equipment/equipmentmeter.controller.js | 21 ++++++++++++++++--- .../equipmentparameter.controller.js | 10 +++++---- .../settings/equipment/equipment.service.js | 12 +++++------ .../equipment/equipmentmeter.service.js | 8 +++---- .../equipment/equipmentparameter.service.js | 12 +++++------ myems-api/core/equipment.py | 11 +++++++++- 7 files changed, 66 insertions(+), 29 deletions(-) diff --git a/admin/app/controllers/settings/equipment/equipment.controller.js b/admin/app/controllers/settings/equipment/equipment.controller.js index 09145784..8d6fcf60 100644 --- a/admin/app/controllers/settings/equipment/equipment.controller.js +++ b/admin/app/controllers/settings/equipment/equipment.controller.js @@ -1,7 +1,15 @@ 'use strict'; -app.controller('EquipmentController', function($scope, $translate, $uibModal, EquipmentService, CostCenterService, toaster,SweetAlert) { - +app.controller('EquipmentController', function( + $scope, + $window, + $translate, + $uibModal, + EquipmentService, + CostCenterService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEquipments = function() { EquipmentService.getAllEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -36,7 +44,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq }); modalInstance.result.then(function(equipment) { equipment.cost_center_id = equipment.cost_center.id; - EquipmentService.addEquipment(equipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentService.addEquipment(equipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -77,7 +86,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq modalInstance.result.then(function(modifiedEquipment) { modifiedEquipment.cost_center_id = modifiedEquipment.cost_center.id; - EquipmentService.editEquipment(modifiedEquipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentService.editEquipment(modifiedEquipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -114,7 +124,8 @@ app.controller('EquipmentController', function($scope, $translate, $uibModal, Eq closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - EquipmentService.deleteEquipment(equipment, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentService.deleteEquipment(equipment, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js index d980d6e4..ca146731 100644 --- a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js @@ -1,6 +1,19 @@ 'use strict'; -app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, EquipmentMeterService, EquipmentService, toaster,SweetAlert) { +app.controller('EquipmentMeterController', function( + $scope, + $window, + $timeout, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + EquipmentMeterService, + EquipmentService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentEquipment = {selected:undefined}; $scope.getAllEquipments = function(id) { @@ -111,7 +124,8 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $ modalInstance.result.then(function (is_output) { var meterid=angular.element('#'+dragEl).scope().meter.id; var equipmentid=$scope.currentEquipment.id; - EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentMeterService.addPair(equipmentid, meterid, $scope.currentMeterType, is_output, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -140,7 +154,8 @@ app.controller('EquipmentMeterController', function($scope,$timeout,$uibModal, $ var equipmentmeterid = angular.element('#' + dragEl).scope().equipmentmeter.id; var equipmentid = $scope.currentEquipment.id; var metertype = angular.element('#' + dragEl).scope().equipmentmeter.metertype; - EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentMeterService.deletePair(equipmentid, equipmentmeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js index 09a9a133..5012cb64 100644 --- a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js @@ -73,8 +73,8 @@ app.controller('EquipmentParameterController', function( if (equipmentparameter.denominator_meter != null) { equipmentparameter.denominator_meter_uuid = equipmentparameter.denominator_meter.uuid; } - - EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentParameterService.addEquipmentParameter(equipmentid, equipmentparameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -123,7 +123,8 @@ app.controller('EquipmentParameterController', function( if (modifiedEquipmentParameter.denominator_meter != null) { modifiedEquipmentParameter.denominator_meter_uuid = modifiedEquipmentParameter.denominator_meter.uuid; } - EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -160,7 +161,8 @@ app.controller('EquipmentParameterController', function( }, function(isConfirm) { if (isConfirm) { - EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/equipment/equipment.service.js b/admin/app/services/settings/equipment/equipment.service.js index c90bec6b..cba00419 100644 --- a/admin/app/services/settings/equipment/equipment.service.js +++ b/admin/app/services/settings/equipment/equipment.service.js @@ -17,24 +17,24 @@ app.factory('EquipmentService', function($http) { callback(response); }); }, - addEquipment: function(equipment, callback) { - $http.post(getAPI()+'equipments',{data:equipment}) + addEquipment: function(equipment, headers, callback) { + $http.post(getAPI()+'equipments',{data:equipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEquipment: function(equipment, callback) { - $http.put(getAPI()+'equipments/'+equipment.id,{data:equipment}) + editEquipment: function(equipment, headers, callback) { + $http.put(getAPI()+'equipments/'+equipment.id,{data:equipment}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteEquipment: function(equipment, callback) { - $http.delete(getAPI()+'equipments/'+equipment.id) + deleteEquipment: function(equipment, headers, callback) { + $http.delete(getAPI()+'equipments/'+equipment.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/equipment/equipmentmeter.service.js b/admin/app/services/settings/equipment/equipmentmeter.service.js index 2b54b38a..253964aa 100644 --- a/admin/app/services/settings/equipment/equipmentmeter.service.js +++ b/admin/app/services/settings/equipment/equipmentmeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('EquipmentMeterService', function($http) { return { - addPair: function(equipmentID,meterID,metertype,is_output,callback) { + addPair: function(equipmentID, meterID, metertype, is_output, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID,is_output:is_output}; @@ -10,7 +10,7 @@ app.factory('EquipmentMeterService', function($http) { }else{ meter={'offline_meter_id':meterID,is_output:is_output}; } - $http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'equipments/'+equipmentID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -18,8 +18,8 @@ app.factory('EquipmentMeterService', function($http) { }); }, - deletePair: function(equipmentID,meterID,metertype, callback) { - $http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID) + deletePair: function(equipmentID,meterID,metertype, headers, callback) { + $http.delete(getAPI()+'equipments/'+equipmentID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/equipment/equipmentparameter.service.js b/admin/app/services/settings/equipment/equipmentparameter.service.js index c803bc25..e65b79b8 100644 --- a/admin/app/services/settings/equipment/equipmentparameter.service.js +++ b/admin/app/services/settings/equipment/equipmentparameter.service.js @@ -10,16 +10,16 @@ app.factory('EquipmentParameterService', function($http) { callback(response); }); }, - addEquipmentParameter: function(equipmentID, equipmentparameter,callback) { - $http.post(getAPI()+'equipments/'+equipmentID+'/parameters',{data:equipmentparameter}) + addEquipmentParameter: function(equipmentID, equipmentparameter, headers, callback) { + $http.post(getAPI()+'equipments/'+equipmentID+'/parameters',{data:equipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editEquipmentParameter: function(equipmentID,equipmentparameter,callback) { - $http.put(getAPI()+'equipments/'+equipmentID+'/parameters/'+equipmentparameter.id,{data:equipmentparameter}) + editEquipmentParameter: function(equipmentID, equipmentparameter, headers, callback) { + $http.put(getAPI()+'equipments/'+equipmentID+'/parameters/'+equipmentparameter.id,{data:equipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -27,8 +27,8 @@ app.factory('EquipmentParameterService', function($http) { }); }, - deleteEquipmentParameter: function(equipmentID, parameterID, callback) { - $http.delete(getAPI()+'equipments/'+equipmentID+'/parameters/'+parameterID) + deleteEquipmentParameter: function(equipmentID, parameterID, headers, callback) { + $http.delete(getAPI()+'equipments/'+equipmentID+'/parameters/'+parameterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index cdd2c9cd..ef6877c0 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class EquipmentCollection: @@ -62,6 +62,7 @@ class EquipmentCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -205,6 +206,7 @@ class EquipmentItem: @user_logger @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') @@ -293,6 +295,7 @@ class EquipmentItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') @@ -667,6 +670,7 @@ class EquipmentParameterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') @@ -976,6 +980,7 @@ class EquipmentParameterItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') @@ -1024,6 +1029,7 @@ class EquipmentParameterItem: @user_logger def on_put(req, resp, id_, pid): """Handles PUT requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') @@ -1283,6 +1289,7 @@ class EquipmentMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1307,6 +1314,7 @@ class EquipmentMeterCollection: description='API.INVALID_IS_OUTPUT_VALUE') is_output = new_values['data']['is_output'] + cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db) cursor = cnx.cursor() @@ -1363,6 +1371,7 @@ class EquipmentMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') From 57671aa2b6f2d6e2a688ab3c420e3e569310ff24 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 6 Dec 2021 19:31:51 +0800 Subject: [PATCH 034/117] added access control to combinedequipment in api and admin --- .../combinedequipment.controller.js | 10 +- .../combinedequipmentequipment.controller.js | 10 +- .../combinedequipmentmeter.controller.js | 14 +- .../combinedequipmentequipment.service.js | 2 +- .../combinedequipmentparameter.service.js | 5 +- myems-api/MyEMS.postman_collection.json | 356 +++++++++++++++--- 6 files changed, 330 insertions(+), 67 deletions(-) diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js index b0307c79..15cc7134 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipment.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('CombinedEquipmentController', function ($scope, $window, $translate, $uibModal, CombinedEquipmentService, CostCenterService, toaster, SweetAlert) { +app.controller('CombinedEquipmentController', function ( + $scope, + $window, + $translate, + $uibModal, + CombinedEquipmentService, + CostCenterService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCombinedEquipments = function () { CombinedEquipmentService.getAllCombinedEquipments(function (response) { diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js index c083c51b..fb8a9ccb 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentequipment.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('CombinedEquipmentEquipmentController', function ($scope, $window, $translate, CombinedEquipmentService, EquipmentService, CombinedEquipmentEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentEquipmentController', function ( + $scope, + $window, + $translate, + CombinedEquipmentService, + EquipmentService, + CombinedEquipmentEquipmentService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = {selected:undefined}; diff --git a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js index 24d6d6de..b9ba9b39 100644 --- a/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js +++ b/admin/app/controllers/settings/combinedequipment/combinedequipmentmeter.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('CombinedEquipmentMeterController', function ($scope, $window, $timeout, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, CombinedEquipmentMeterService, CombinedEquipmentService, toaster, SweetAlert) { +app.controller('CombinedEquipmentMeterController', function ( + $scope, + $window, + $timeout, + $uibModal, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + CombinedEquipmentMeterService, + CombinedEquipmentService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentCombinedEquipment = { selected: undefined }; diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js index 077da20c..085c2da5 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentequipment.service.js @@ -2,7 +2,7 @@ app.factory('CombinedEquipmentEquipmentService', function($http) { return { addPair: function(combinedequipmentID,equipmentID, headers, callback) { - $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments',{data:{'equipment_id':equipmentID}} ,{headers}) + $http.post(getAPI()+'combinedequipments/'+combinedequipmentID+'/equipments', {data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js index 1fda1a24..6857677c 100644 --- a/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js +++ b/admin/app/services/settings/combinedequipment/combinedequipmentparameter.service.js @@ -1,7 +1,6 @@ 'use strict'; app.factory('CombinedEquipmentParameterService', function($http) { return { - getParametersByCombinedEquipmentID: function(id, callback) { $http.get(getAPI()+'combinedequipments/'+id+'/parameters') .then(function (response) { @@ -19,8 +18,8 @@ app.factory('CombinedEquipmentParameterService', function($http) { }); }, editCombinedEquipmentParameter: function(combinedequipmentID,combinedequipmentparameter, headers, callback) { - $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id,{data:combinedequipmentparameter} - , {headers}) + $http.put(getAPI()+'combinedequipments/'+combinedequipmentID+'/parameters/'+combinedequipmentparameter.id, + {data:combinedequipmentparameter}, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 086eb3ba..d72b38b0 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -12,14 +12,10 @@ "name": "Combined Equipment", "item": [ { - "name": "POST Create New Combined Equipment", + "name": "GET All Combined Equipments", "request": { - "method": "POST", + "method": "GET", "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"name\":\"MyEMS Chiller Plant\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}" - }, "url": { "raw": "{{base_url}}/combinedequipments", "host": [ @@ -33,10 +29,27 @@ "response": [] }, { - "name": "GET All Combined Equipments", + "name": "POST Create New Combined Equipment", "request": { - "method": "GET", - "header": [], + "method": "POST", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], + "body": { + "mode": "raw", + "raw": "{\"data\":{\"name\":\"MyEMS Chiller Plant\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}" + }, "url": { "raw": "{{base_url}}/combinedequipments", "host": [ @@ -71,7 +84,20 @@ "name": "PUT Update a Combined Equipment by ID", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMS Combined Chiller Plant\", \"is_input_counted\":true, \"is_output_counted\":true, \"cost_center_id\":1, \"description\":\"equipment description\"}}" @@ -93,7 +119,20 @@ "name": "POST Clone a Combined Equipment by ID", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{}}" @@ -115,7 +154,20 @@ "name": "DELETE a Combined Equipment by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/6", "host": [ @@ -133,7 +185,20 @@ "name": "POST Bind an Equipment to a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"equipment_id\":1}}" @@ -175,7 +240,20 @@ "name": "DELETE an Equipment from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/equipments/1", "host": [ @@ -191,29 +269,6 @@ }, "response": [] }, - { - "name": "POST Bind a Meter to a Combined Equipment", - "request": { - "method": "POST", - "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"meter_id\":1, \"is_output\":false}}" - }, - "url": { - "raw": "{{base_url}}/combinedequipments/1/meters", - "host": [ - "{{base_url}}" - ], - "path": [ - "combinedequipments", - "1", - "meters" - ] - } - }, - "response": [] - }, { "name": "GET All Meters of a Combined Equipment", "request": { @@ -233,11 +288,60 @@ }, "response": [] }, + { + "name": "POST Bind a Meter to a Combined Equipment", + "request": { + "method": "POST", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], + "body": { + "mode": "raw", + "raw": "{\"data\":{\"meter_id\":1, \"is_output\":false}}" + }, + "url": { + "raw": "{{base_url}}/combinedequipments/1/meters", + "host": [ + "{{base_url}}" + ], + "path": [ + "combinedequipments", + "1", + "meters" + ] + } + }, + "response": [] + }, { "name": "DELETE a Meter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/meters/1", "host": [ @@ -257,7 +361,20 @@ "name": "POST Bind a Offline Meter to a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1, \"is_output\":false}}" @@ -299,7 +416,20 @@ "name": "DELETE an Offline Meter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/offlinemeters/1", "host": [ @@ -358,7 +488,20 @@ "name": "POST Create a point Parameter for a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"point\", \"constant\":null, \"point_id\":1, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -382,7 +525,20 @@ "name": "PUT Update a point Parameter for a Combined Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"point\", \"constant\":null, \"point_id\":3, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -407,7 +563,20 @@ "name": "POST Create a constant Parameter for a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test constant parameter\", \"parameter_type\":\"constant\", \"constant\":\"test constant\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -431,7 +600,20 @@ "name": "PUT Update a constant Parameter for a Combined Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter1\", \"parameter_type\":\"constant\", \"constant\":\"test constant1\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -456,7 +638,20 @@ "name": "POST Create a fraction Parameter for a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test fraction parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"8449878f-b368-4ad9-a41c-e2c49189297a\", \"denominator_meter_uuid\":\"3f8a66c4-8fbe-4e6d-8b40-15dee5290afd\"}}" @@ -480,7 +675,20 @@ "name": "PUT Update a fraction Parameter for a Combined Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test fraction parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"8449878f-b368-4ad9-a41c-e2c49189297a\", \"denominator_meter_uuid\":\"3f8a66c4-8fbe-4e6d-8b40-15dee5290afd\"}}" @@ -505,7 +713,20 @@ "name": "DELETE a Parameter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/parameters/16", "host": [ @@ -525,7 +746,20 @@ "name": "POST Bind a Virtual Meter to a Combined Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1, \"is_output\":false}}" @@ -567,7 +801,20 @@ "name": "DELETE a Virtual Meter from a Combined Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "c5f872b51ed40ccf55f1c1d6dbd8cb86eefba5d1010e23b2386bd82be431f3eafc0e3360dee18a5327d9e9852e3cf7caad3b81e252f9f311790c22f7a62a90e1", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/combinedequipments/1/virtualmeters/1", "host": [ @@ -582,17 +829,6 @@ } }, "response": [] - }, - { - "name": "New Request", - "request": { - "method": "GET", - "header": [], - "url": { - "raw": "" - } - }, - "response": [] } ] }, From 15cc27ac18119a1cac224539803423b4a535a7da Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Mon, 6 Dec 2021 23:02:27 +0800 Subject: [PATCH 035/117] added access control to equipment in api and admin --- .../equipment/equipmentmeter.controller.js | 2 +- .../equipmentparameter.controller.js | 9 +- admin/nginx.conf | 2 +- myems-api/MyEMS.postman_collection.json | 329 +++++++++++++++--- myems-api/core/costcenter.py | 2 +- myems-api/core/equipment.py | 4 + myems-api/core/offlinemeter.py | 2 +- myems-api/core/rule.py | 4 +- myems-api/core/space.py | 2 +- myems-api/core/tariff.py | 2 +- myems-api/core/virtualmeter.py | 2 +- web/nginx.conf | 2 +- 12 files changed, 295 insertions(+), 67 deletions(-) diff --git a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js index ca146731..9c48c577 100644 --- a/admin/app/controllers/settings/equipment/equipmentmeter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentmeter.controller.js @@ -16,7 +16,7 @@ app.controller('EquipmentMeterController', function( $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.currentEquipment = {selected:undefined}; - $scope.getAllEquipments = function(id) { + $scope.getAllEquipments = function(id) { EquipmentService.getAllEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.equipments = response.data; diff --git a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js index 5012cb64..2b1a326c 100644 --- a/admin/app/controllers/settings/equipment/equipmentparameter.controller.js +++ b/admin/app/controllers/settings/equipment/equipmentparameter.controller.js @@ -124,7 +124,8 @@ app.controller('EquipmentParameterController', function( modifiedEquipmentParameter.denominator_meter_uuid = modifiedEquipmentParameter.denominator_meter.uuid; } let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, modifiedEquipmentParameter, headers, function (response) { + EquipmentParameterService.editEquipmentParameter($scope.currentEquipment.id, + modifiedEquipmentParameter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -162,7 +163,8 @@ app.controller('EquipmentParameterController', function( function(isConfirm) { if (isConfirm) { let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, equipmentparameter.id, headers, function (response) { + EquipmentParameterService.deleteEquipmentParameter($scope.currentEquipment.id, + equipmentparameter.id, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", @@ -181,7 +183,8 @@ app.controller('EquipmentParameterController', function( } }); } - }); + } + ); }; $scope.colorMeterType = function(type) { diff --git a/admin/nginx.conf b/admin/nginx.conf index 1de6c8a0..f238d80f 100644 --- a/admin/nginx.conf +++ b/admin/nginx.conf @@ -46,7 +46,7 @@ http { } location /api { - proxy_pass http://127.0.0.1:8000/; + proxy_pass http://192.168.1.6:8000/; proxy_connect_timeout 75; proxy_read_timeout 600; send_timeout 600; diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index d72b38b0..23bc36c9 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -2886,14 +2886,10 @@ "name": "Equipment", "item": [ { - "name": "POST Create New Equipment", + "name": "GET All Equipments", "request": { - "method": "POST", + "method": "GET", "header": [], - "body": { - "mode": "raw", - "raw": "{\"data\":{\"name\":\"MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}" - }, "url": { "raw": "{{base_url}}/equipments", "host": [ @@ -2907,10 +2903,27 @@ "response": [] }, { - "name": "GET All Equipments", + "name": "POST Create New Equipment", "request": { - "method": "GET", - "header": [], + "method": "POST", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], + "body": { + "mode": "raw", + "raw": "{\"data\":{\"name\":\"MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":false, \"cost_center_id\":1, \"description\":\"equipment description\"}}" + }, "url": { "raw": "{{base_url}}/equipments", "host": [ @@ -2929,13 +2942,13 @@ "method": "GET", "header": [], "url": { - "raw": "{{base_url}}/equipments/3", + "raw": "{{base_url}}/equipments/1", "host": [ "{{base_url}}" ], "path": [ "equipments", - "3" + "1" ] } }, @@ -2945,19 +2958,32 @@ "name": "PUT Update an Equipment by ID", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"name\":\"MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":true, \"cost_center_id\":1, \"description\":\"equipment description\"}}" + "raw": "{\"data\":{\"name\":\"new MyEMS Chiller\", \"is_input_counted\":true, \"is_output_counted\":true, \"cost_center_id\":1, \"description\":\"equipment description\"}}" }, "url": { - "raw": "{{base_url}}/equipments/3", + "raw": "{{base_url}}/equipments/1", "host": [ "{{base_url}}" ], "path": [ "equipments", - "3" + "1" ] } }, @@ -2967,7 +2993,20 @@ "name": "POST Clone an Equipment by ID", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{}}" @@ -2989,15 +3028,28 @@ "name": "DELETE an Equipment by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { - "raw": "{{base_url}}/equipments/2", + "raw": "{{base_url}}/equipments/4", "host": [ "{{base_url}}" ], "path": [ "equipments", - "2" + "4" ] } }, @@ -3007,10 +3059,23 @@ "name": "POST Bind a Meter to an Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"meter_id\":1, \"is_output\":false}}" + "raw": "{\"data\":{\"meter_id\":3, \"is_output\":false}}" }, "url": { "raw": "{{base_url}}/equipments/1/meters", @@ -3045,11 +3110,57 @@ }, "response": [] }, + { + "name": "DELETE a Meter from an Equipment", + "request": { + "method": "DELETE", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], + "url": { + "raw": "{{base_url}}/equipments/1/meters/1", + "host": [ + "{{base_url}}" + ], + "path": [ + "equipments", + "1", + "meters", + "1" + ] + } + }, + "response": [] + }, { "name": "POST Bind a Offline Meter to an Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1, \"is_output\":false}}" @@ -3068,26 +3179,6 @@ }, "response": [] }, - { - "name": "DELETE a Meter from an Equipment", - "request": { - "method": "DELETE", - "header": [], - "url": { - "raw": "{{base_url}}/equipments/1/meters/1", - "host": [ - "{{base_url}}" - ], - "path": [ - "equipments", - "1", - "meters", - "1" - ] - } - }, - "response": [] - }, { "name": "GET All Offline Meters of an Equipment", "request": { @@ -3111,7 +3202,20 @@ "name": "DELETE an Offline Meter from an Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/equipments/1/offlinemeters/1", "host": [ @@ -3152,7 +3256,7 @@ "method": "GET", "header": [], "url": { - "raw": "{{base_url}}/equipments/1/parameters/1", + "raw": "{{base_url}}/equipments/1/parameters/2", "host": [ "{{base_url}}" ], @@ -3160,7 +3264,7 @@ "equipments", "1", "parameters", - "1" + "2" ] } }, @@ -3170,7 +3274,20 @@ "name": "POST Create a point Parameter for an Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"point\", \"constant\":null, \"point_id\":1, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -3194,7 +3311,20 @@ "name": "PUT Update a point Parameter for an Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"point\", \"constant\":null, \"point_id\":3, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -3219,7 +3349,20 @@ "name": "POST Create a constant Parameter for an Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"constant\", \"constant\":\"test constant\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -3243,7 +3386,20 @@ "name": "PUT Update a constant Parameter for an Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter1\", \"parameter_type\":\"constant\", \"constant\":\"test constant1\", \"point_id\":null, \"numerator_meter_uuid\":null, \"denominator_meter_uuid\":null}}" @@ -3268,7 +3424,20 @@ "name": "POST Create a fraction Parameter for an Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"89ff5118-d0c2-4dd8-8098-a8698189b2ea\", \"denominator_meter_uuid\":\"5ca62d2a-908e-40c5-a6b5-a8e436d60db4\"}}" @@ -3292,7 +3461,20 @@ "name": "PUT Update a fraction Parameter for an Equipment", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"test fraction parameter\", \"parameter_type\":\"fraction\", \"constant\":null, \"point_id\":null, \"numerator_meter_uuid\":\"89ff5118-d0c2-4dd8-8098-a8698189b2ea\", \"denominator_meter_uuid\":\"5ca62d2a-908e-40c5-a6b5-a8e436d60db4\"}}" @@ -3317,7 +3499,20 @@ "name": "DELETE a Parameter from an Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/equipments/1/parameters/16", "host": [ @@ -3337,7 +3532,20 @@ "name": "POST Bind a Virtual Meter to an Equipment", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1, \"is_output\":false}}" @@ -3379,7 +3587,20 @@ "name": "DELETE a Virtual Meter from an Equipment", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "96df45542155d4fd65c8234a98fe076232dc09e89238fc2ae3f47cae78960f941e789c72c1ff11b2ba2c2b937631661287150cb1d753b011b7a5500524445b01", + "type": "text", + "description": "Login to get a valid token" + } + ], "url": { "raw": "{{base_url}}/equipments/1/virtualmeters/1", "host": [ diff --git a/myems-api/core/costcenter.py b/myems-api/core/costcenter.py index 8e609bce..78b24a13 100644 --- a/myems-api/core/costcenter.py +++ b/myems-api/core/costcenter.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class CostCenterCollection: diff --git a/myems-api/core/equipment.py b/myems-api/core/equipment.py index ef6877c0..b1250f57 100644 --- a/myems-api/core/equipment.py +++ b/myems-api/core/equipment.py @@ -1481,6 +1481,7 @@ class EquipmentOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1561,6 +1562,7 @@ class EquipmentOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') @@ -1671,6 +1673,7 @@ class EquipmentVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1751,6 +1754,7 @@ class EquipmentVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_EQUIPMENT_ID') diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 4a91a308..2281a9d6 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class OfflineMeterCollection: diff --git a/myems-api/core/rule.py b/myems-api/core/rule.py index c11e7bcf..60246a9f 100644 --- a/myems-api/core/rule.py +++ b/myems-api/core/rule.py @@ -1,10 +1,10 @@ import falcon -import json +import simplejson as json import mysql.connector import uuid from datetime import datetime, timezone, timedelta import config -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class RuleCollection: diff --git a/myems-api/core/space.py b/myems-api/core/space.py index ec22a28a..3fa1f14d 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -6,7 +6,7 @@ import uuid from datetime import datetime from anytree import AnyNode from anytree.exporter import JsonExporter -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class SpaceCollection: diff --git a/myems-api/core/tariff.py b/myems-api/core/tariff.py index dd61168d..b24b4080 100644 --- a/myems-api/core/tariff.py +++ b/myems-api/core/tariff.py @@ -4,7 +4,7 @@ import mysql.connector import config import uuid from datetime import datetime, timedelta, timezone -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class TariffCollection: diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index 800219f1..261a11c2 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class VirtualMeterCollection: diff --git a/web/nginx.conf b/web/nginx.conf index e841df22..39683aaf 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -47,7 +47,7 @@ http { } location /api { - proxy_pass http://127.0.0.1:8000/; + proxy_pass http://192.168.1.6:8000/; proxy_connect_timeout 75; proxy_read_timeout 600; send_timeout 600; From be77f29b3b7c1e35b5710c1c06e21b4323893770 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Tue, 7 Dec 2021 14:35:41 +0800 Subject: [PATCH 036/117] point of access_control --- myems-api/core/point.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/myems-api/core/point.py b/myems-api/core/point.py index dd9c993b..fb7f8eab 100644 --- a/myems-api/core/point.py +++ b/myems-api/core/point.py @@ -64,6 +64,7 @@ class PointCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -255,6 +256,7 @@ class PointItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_POINT_ID') @@ -395,6 +397,7 @@ class PointItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From 8ea1d4a8120f6d04485f86b24ba769f07a57b3e2 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Tue, 7 Dec 2021 15:04:26 +0800 Subject: [PATCH 037/117] added access control to shopfloor tenant and store --- .../settings/shopfloor/shopfloor.controller.js | 13 ++++++++----- .../shopfloor/shopfloorequipment.controller.js | 10 ++++++---- .../shopfloor/shopfloormeter.controller.js | 10 ++++++---- .../shopfloor/shopfloorpoint.controller.js | 6 ++++-- .../shopfloor/shopfloorsensor.controller.js | 10 ++++++---- .../settings/store/store.controller.js | 13 ++++++++----- .../settings/store/storemeter.controller.js | 10 ++++++---- .../settings/store/storepoint.controller.js | 6 ++++-- .../settings/store/storesensor.controller.js | 10 ++++++---- .../settings/tenant/tenant.controller.js | 13 ++++++++----- .../settings/tenant/tenantmeter.controller.js | 10 ++++++---- .../settings/tenant/tenantpoint.controller.js | 6 ++++-- .../settings/tenant/tenantsensor.controller.js | 10 ++++++---- .../settings/shopfloor/shopfloor.service.js | 12 ++++++------ .../shopfloor/shopfloorequipment.service.js | 8 ++++---- .../shopfloor/shopfloormeter.service.js | 8 ++++---- .../shopfloor/shopfloorpoint.service.js | 8 ++++---- .../shopfloor/shopfloorsensor.service.js | 8 ++++---- .../services/settings/store/store.service.js | 12 ++++++------ .../settings/store/storemeter.service.js | 8 ++++---- .../settings/store/storepoint.service.js | 8 ++++---- .../settings/store/storesensor.service.js | 8 ++++---- .../settings/store/storetype.service.js | 12 ++++++------ .../services/settings/tenant/tenant.service.js | 12 ++++++------ .../settings/tenant/tenantmeter.service.js | 8 ++++---- .../settings/tenant/tenantpoint.service.js | 8 ++++---- .../settings/tenant/tenantsensor.service.js | 8 ++++---- .../settings/tenant/tenanttype.service.js | 12 ++++++------ myems-api/core/shopfloor.py | 17 ++++++++++++++++- myems-api/core/store.py | 15 ++++++++++++++- myems-api/core/tenant.py | 15 ++++++++++++++- 31 files changed, 192 insertions(+), 122 deletions(-) diff --git a/admin/app/controllers/settings/shopfloor/shopfloor.controller.js b/admin/app/controllers/settings/shopfloor/shopfloor.controller.js index 8ae47618..f67d9e64 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloor.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloor.controller.js @@ -1,7 +1,7 @@ 'use strict'; -app.controller('ShopfloorController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) { - +app.controller('ShopfloorController', function ($scope, $window, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -53,7 +53,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C if (angular.isDefined(shopfloor.is_input_counted) == false) { shopfloor.is_input_counted = false; } - ShopfloorService.addShopfloor(shopfloor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorService.addShopfloor(shopfloor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -99,7 +100,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C if (angular.isDefined(shopfloor.is_input_counted) == false) { shopfloor.is_input_counted = false; } - ShopfloorService.editShopfloor(modifiedShopfloor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorService.editShopfloor(modifiedShopfloor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -136,7 +138,8 @@ app.controller('ShopfloorController', function ($scope, $translate, $uibModal, C }, function (isConfirm) { if (isConfirm) { - ShopfloorService.deleteShopfloor(shopfloor, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorService.deleteShopfloor(shopfloor, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js index b160c772..b49e6007 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js @@ -1,8 +1,8 @@ 'use strict'; -app.controller('ShopfloorEquipmentController', function ($scope, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) { +app.controller('ShopfloorEquipmentController', function ($scope, $window, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) { $scope.currentShopfloor = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEquipments = function () { EquipmentService.getAllEquipments(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +42,8 @@ app.controller('ShopfloorEquipmentController', function ($scope, $translate, Sho $scope.pairEquipment = function (dragEl, dropEl) { var equipmentid = angular.element('#' + dragEl).scope().equipment.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorEquipmentService.addPair(shopfloorid, equipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +69,8 @@ app.controller('ShopfloorEquipmentController', function ($scope, $translate, Sho } var shopfloorequipmentid = angular.element('#' + dragEl).scope().shopfloorequipment.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorEquipmentService.deletePair(shopfloorid, shopfloorequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js b/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js index cb3a7d25..dea19d21 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, +app.controller('ShopfloorMeterController', function($scope, $window, $timeout, $translate, MeterService, VirtualMeterService, OfflineMeterService, @@ -8,7 +8,7 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, ShopfloorService, toaster) { $scope.currentShopfloor = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllShopfloors = function(id) { ShopfloorService.getAllShopfloors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -106,7 +106,8 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var shopfloorid=$scope.currentShopfloor.id; - ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorMeterService.addPair(shopfloorid, meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -133,7 +134,8 @@ app.controller('ShopfloorMeterController', function($scope,$timeout, $translate, var shopfloormeterid = angular.element('#' + dragEl).scope().shopfloormeter.id; var shopfloorid = $scope.currentShopfloor.id; var metertype = angular.element('#' + dragEl).scope().shopfloormeter.metertype; - ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorMeterService.deletePair(shopfloorid, shopfloormeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js index 09eb88a0..2b67d9c7 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorpoint.controller.js @@ -74,7 +74,8 @@ app.controller('ShopfloorPointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorPointService.addPair(shopfloorid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorPointService.addPair(shopfloorid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -100,7 +101,8 @@ app.controller('ShopfloorPointController', function ( } var shopfloorpointid = angular.element('#' + dragEl).scope().shopfloorpoint.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorPointService.deletePair(shopfloorid, shopfloorpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "error", diff --git a/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js index c2740c93..e95404b4 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js @@ -1,8 +1,8 @@ 'use strict'; -app.controller('ShopfloorSensorController', function ($scope, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) { +app.controller('ShopfloorSensorController', function ($scope, $window, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) { $scope.currentShopfloor = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +42,8 @@ app.controller('ShopfloorSensorController', function ($scope, $translate, Shopfl $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorSensorService.addPair(shopfloorid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorSensorService.addPair(shopfloorid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +69,8 @@ app.controller('ShopfloorSensorController', function ($scope, $translate, Shopfl } var shopfloorsensorid = angular.element('#' + dragEl).scope().shopfloorsensor.id; var shopfloorid = $scope.currentShopfloor.id; - ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + ShopfloorSensorService.deletePair(shopfloorid, shopfloorsensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/store.controller.js b/admin/app/controllers/settings/store/store.controller.js index 23bda2b5..8010bb9e 100644 --- a/admin/app/controllers/settings/store/store.controller.js +++ b/admin/app/controllers/settings/store/store.controller.js @@ -1,7 +1,7 @@ 'use strict'; -app.controller('StoreController', function($scope,$translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) { - +app.controller('StoreController', function($scope, $window, $translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -64,7 +64,8 @@ $scope.getAllStoreTypes = function() { if (angular.isDefined(store.is_input_counted) == false) { store.is_input_counted = false; } - StoreService.addStore(store, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreService.addStore(store, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -111,7 +112,8 @@ $scope.getAllStoreTypes = function() { if (angular.isDefined(store.is_input_counted) == false) { store.is_input_counted = false; } - StoreService.editStore(modifiedStore, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreService.editStore(modifiedStore, headers, function(response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -147,7 +149,8 @@ $scope.getAllStoreTypes = function() { closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - StoreService.deleteStore(store, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreService.deleteStore(store, headers, function(response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/storemeter.controller.js b/admin/app/controllers/settings/store/storemeter.controller.js index 8a9240b8..4ea7539b 100644 --- a/admin/app/controllers/settings/store/storemeter.controller.js +++ b/admin/app/controllers/settings/store/storemeter.controller.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('StoreMeterController', function($scope,$timeout, $translate, +app.controller('StoreMeterController', function($scope, $window, $timeout, $translate, MeterService, VirtualMeterService, OfflineMeterService, @@ -8,7 +8,7 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate, StoreService, toaster) { $scope.currentStore = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllStores = function(id) { StoreService.getAllStores(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -106,7 +106,8 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate, $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var storeid=$scope.currentStore.id; - StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreMeterService.addPair(storeid, meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -133,7 +134,8 @@ app.controller('StoreMeterController', function($scope,$timeout, $translate, var storemeterid = angular.element('#' + dragEl).scope().storemeter.id; var storeid = $scope.currentStore.id; var metertype = angular.element('#' + dragEl).scope().storemeter.metertype; - StoreMeterService.deletePair(storeid, storemeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreMeterService.deletePair(storeid, storemeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/storepoint.controller.js b/admin/app/controllers/settings/store/storepoint.controller.js index d239d6c5..4569dda0 100644 --- a/admin/app/controllers/settings/store/storepoint.controller.js +++ b/admin/app/controllers/settings/store/storepoint.controller.js @@ -74,7 +74,8 @@ app.controller('StorePointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var storeid = $scope.currentStore.id; - StorePointService.addPair(storeid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StorePointService.addPair(storeid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -100,7 +101,8 @@ app.controller('StorePointController', function ( } var storepointid = angular.element('#' + dragEl).scope().storepoint.id; var storeid = $scope.currentStore.id; - StorePointService.deletePair(storeid, storepointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StorePointService.deletePair(storeid, storepointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/store/storesensor.controller.js b/admin/app/controllers/settings/store/storesensor.controller.js index 64366d51..2d4c00a5 100644 --- a/admin/app/controllers/settings/store/storesensor.controller.js +++ b/admin/app/controllers/settings/store/storesensor.controller.js @@ -1,8 +1,8 @@ 'use strict'; -app.controller('StoreSensorController', function ($scope, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) { +app.controller('StoreSensorController', function ($scope, $window, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) { $scope.currentStore = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +42,8 @@ app.controller('StoreSensorController', function ($scope, $translate, StoreServi $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var storeid = $scope.currentStore.id; - StoreSensorService.addPair(storeid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreSensorService.addPair(storeid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +69,8 @@ app.controller('StoreSensorController', function ($scope, $translate, StoreServi } var storesensorid = angular.element('#' + dragEl).scope().storesensor.id; var storeid = $scope.currentStore.id; - StoreSensorService.deletePair(storeid, storesensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + StoreSensorService.deletePair(storeid, storesensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenant.controller.js b/admin/app/controllers/settings/tenant/tenant.controller.js index 8427ddef..35970dcc 100644 --- a/admin/app/controllers/settings/tenant/tenant.controller.js +++ b/admin/app/controllers/settings/tenant/tenant.controller.js @@ -1,7 +1,7 @@ 'use strict'; -app.controller('TenantController', function ($scope, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) { - +app.controller('TenantController', function ($scope, $window, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -70,7 +70,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost if (angular.isDefined(tenant.is_in_lease) == false) { tenant.is_in_lease = false; } - TenantService.addTenant(tenant, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantService.addTenant(tenant, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -123,7 +124,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost if (angular.isDefined(tenant.is_in_lease) == false) { tenant.is_in_lease = false; } - TenantService.editTenant(modifiedTenant, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantService.editTenant(modifiedTenant, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -160,7 +162,8 @@ app.controller('TenantController', function ($scope, $translate, $uibModal, Cost }, function (isConfirm) { if (isConfirm) { - TenantService.deleteTenant(tenant, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantService.deleteTenant(tenant, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenantmeter.controller.js b/admin/app/controllers/settings/tenant/tenantmeter.controller.js index 53983229..6f7c9cbf 100644 --- a/admin/app/controllers/settings/tenant/tenantmeter.controller.js +++ b/admin/app/controllers/settings/tenant/tenantmeter.controller.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('TenantMeterController', function($scope,$timeout, $translate, +app.controller('TenantMeterController', function($scope, $window, $timeout, $translate, MeterService, VirtualMeterService, OfflineMeterService, @@ -8,7 +8,7 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate, TenantService, toaster) { $scope.currentTenant = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllTenants = function(id) { TenantService.getAllTenants(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -106,7 +106,8 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate, $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var tenantid=$scope.currentTenant.id; - TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantMeterService.addPair(tenantid, meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -133,7 +134,8 @@ app.controller('TenantMeterController', function($scope,$timeout, $translate, var tenantmeterid = angular.element('#' + dragEl).scope().tenantmeter.id; var tenantid = $scope.currentTenant.id; var metertype = angular.element('#' + dragEl).scope().tenantmeter.metertype; - TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantMeterService.deletePair(tenantid, tenantmeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenantpoint.controller.js b/admin/app/controllers/settings/tenant/tenantpoint.controller.js index d8c687e2..b88e83fb 100644 --- a/admin/app/controllers/settings/tenant/tenantpoint.controller.js +++ b/admin/app/controllers/settings/tenant/tenantpoint.controller.js @@ -74,7 +74,8 @@ app.controller('TenantPointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var tenantid = $scope.currentTenant.id; - TenantPointService.addPair(tenantid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantPointService.addPair(tenantid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -100,7 +101,8 @@ app.controller('TenantPointController', function ( } var tenantpointid = angular.element('#' + dragEl).scope().tenantpoint.id; var tenantid = $scope.currentTenant.id; - TenantPointService.deletePair(tenantid, tenantpointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantPointService.deletePair(tenantid, tenantpointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tenant/tenantsensor.controller.js b/admin/app/controllers/settings/tenant/tenantsensor.controller.js index ffff1f1f..c37d7d3c 100644 --- a/admin/app/controllers/settings/tenant/tenantsensor.controller.js +++ b/admin/app/controllers/settings/tenant/tenantsensor.controller.js @@ -1,8 +1,8 @@ 'use strict'; -app.controller('TenantSensorController', function ($scope, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) { +app.controller('TenantSensorController', function ($scope, $window, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) { $scope.currentTenant = {selected:undefined}; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +42,8 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var tenantid = $scope.currentTenant.id; - TenantSensorService.addPair(tenantid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantSensorService.addPair(tenantid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -68,7 +69,8 @@ app.controller('TenantSensorController', function ($scope, $translate, TenantSer } var tenantsensorid = angular.element('#' + dragEl).scope().tenantsensor.id; var tenantid = $scope.currentTenant.id; - TenantSensorService.deletePair(tenantid, tenantsensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TenantSensorService.deletePair(tenantid, tenantsensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/shopfloor/shopfloor.service.js b/admin/app/services/settings/shopfloor/shopfloor.service.js index 7abe289a..2680a8ae 100644 --- a/admin/app/services/settings/shopfloor/shopfloor.service.js +++ b/admin/app/services/settings/shopfloor/shopfloor.service.js @@ -25,24 +25,24 @@ app.factory('ShopfloorService', function($http) { callback(response); }); }, - addShopfloor: function(shopfloor, callback) { - $http.post(getAPI()+'shopfloors',{data:shopfloor}) + addShopfloor: function(shopfloor, headers, callback) { + $http.post(getAPI()+'shopfloors',{data:shopfloor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editShopfloor: function(shopfloor, callback) { - $http.put(getAPI()+'shopfloors/'+shopfloor.id,{data:shopfloor}) + editShopfloor: function(shopfloor, headers, callback) { + $http.put(getAPI()+'shopfloors/'+shopfloor.id,{data:shopfloor}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteShopfloor: function(shopfloor, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloor.id) + deleteShopfloor: function(shopfloor, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloor.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloorequipment.service.js b/admin/app/services/settings/shopfloor/shopfloorequipment.service.js index 8f576bab..b2c18f22 100644 --- a/admin/app/services/settings/shopfloor/shopfloorequipment.service.js +++ b/admin/app/services/settings/shopfloor/shopfloorequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('ShopfloorEquipmentService', function($http) { return { - addPair: function(shopfloorID,equipmentID,callback) { - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/equipments',{data:{'equipment_id':equipmentID}}) + addPair: function(shopfloorID,equipmentID, headers, callback) { + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/equipments',{data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('ShopfloorEquipmentService', function($http) { }); }, - deletePair: function(shopfloorID, equipmentID, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/equipments/'+equipmentID) + deletePair: function(shopfloorID, equipmentID, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/equipments/'+equipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloormeter.service.js b/admin/app/services/settings/shopfloor/shopfloormeter.service.js index 9b0823af..509a751f 100644 --- a/admin/app/services/settings/shopfloor/shopfloormeter.service.js +++ b/admin/app/services/settings/shopfloor/shopfloormeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('ShopfloorMeterService', function($http) { return { - addPair: function(shopfloorID,meterID, metertype,callback) { + addPair: function(shopfloorID,meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('ShopfloorMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('ShopfloorMeterService', function($http) { }); }, - deletePair: function(shopfloorID,meterID, metertype, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype+'/'+meterID) + deletePair: function(shopfloorID,meterID, metertype, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloorpoint.service.js b/admin/app/services/settings/shopfloor/shopfloorpoint.service.js index e9cfe09a..6834be32 100644 --- a/admin/app/services/settings/shopfloor/shopfloorpoint.service.js +++ b/admin/app/services/settings/shopfloor/shopfloorpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('ShopfloorPointService', function($http) { return { - addPair: function(shopfloorID,pointID,callback) { - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/points',{data:{'point_id':pointID}}) + addPair: function(shopfloorID,pointID, headers, callback) { + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('ShopfloorPointService', function($http) { }); }, - deletePair: function(shopfloorID,pointID, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/points/'+pointID) + deletePair: function(shopfloorID,pointID, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/shopfloor/shopfloorsensor.service.js b/admin/app/services/settings/shopfloor/shopfloorsensor.service.js index eb6956c1..4d9aa532 100644 --- a/admin/app/services/settings/shopfloor/shopfloorsensor.service.js +++ b/admin/app/services/settings/shopfloor/shopfloorsensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('ShopfloorSensorService', function($http) { return { - addPair: function(shopfloorID,sensorID,callback) { - $http.post(getAPI()+'shopfloors/'+shopfloorID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(shopfloorID,sensorID, headers, callback) { + $http.post(getAPI()+'shopfloors/'+shopfloorID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('ShopfloorSensorService', function($http) { }); }, - deletePair: function(shopfloorID,sensorID, callback) { - $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/sensors/'+sensorID) + deletePair: function(shopfloorID,sensorID, headers, callback) { + $http.delete(getAPI()+'shopfloors/'+shopfloorID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/store.service.js b/admin/app/services/settings/store/store.service.js index 4fea0042..e4844665 100644 --- a/admin/app/services/settings/store/store.service.js +++ b/admin/app/services/settings/store/store.service.js @@ -17,24 +17,24 @@ app.factory('StoreService', function($http) { callback(response); }); }, - addStore: function(store, callback) { - $http.post(getAPI()+'stores',{data:store}) + addStore: function(store, headers, callback) { + $http.post(getAPI()+'stores',{data:store}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editStore: function(store, callback) { - $http.put(getAPI()+'stores/'+store.id,{data:store}) + editStore: function(store, headers, callback) { + $http.put(getAPI()+'stores/'+store.id,{data:store}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteStore: function(store, callback) { - $http.delete(getAPI()+'stores/'+store.id) + deleteStore: function(store, headers, callback) { + $http.delete(getAPI()+'stores/'+store.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storemeter.service.js b/admin/app/services/settings/store/storemeter.service.js index 860ee1e5..a36b3349 100644 --- a/admin/app/services/settings/store/storemeter.service.js +++ b/admin/app/services/settings/store/storemeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('StoreMeterService', function($http) { return { - addPair: function(storeID, meterID, metertype,callback) { + addPair: function(storeID, meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('StoreMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'stores/'+storeID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'stores/'+storeID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('StoreMeterService', function($http) { }); }, - deletePair: function(storeID, meterID, metertype, callback) { - $http.delete(getAPI()+'stores/'+storeID+'/'+metertype+'/'+meterID) + deletePair: function(storeID, meterID, metertype, headers, callback) { + $http.delete(getAPI()+'stores/'+storeID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storepoint.service.js b/admin/app/services/settings/store/storepoint.service.js index 182f3393..bf046bab 100644 --- a/admin/app/services/settings/store/storepoint.service.js +++ b/admin/app/services/settings/store/storepoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('StorePointService', function($http) { return { - addPair: function(storeID,pointID,callback) { - $http.post(getAPI()+'stores/'+storeID+'/points',{data:{'point_id':pointID}}) + addPair: function(storeID,pointID, headers, callback) { + $http.post(getAPI()+'stores/'+storeID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('StorePointService', function($http) { }); }, - deletePair: function(storeID,pointID, callback) { - $http.delete(getAPI()+'stores/'+storeID+'/points/'+pointID) + deletePair: function(storeID,pointID, headers, callback) { + $http.delete(getAPI()+'stores/'+storeID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storesensor.service.js b/admin/app/services/settings/store/storesensor.service.js index 988aa3f2..8d15bef9 100644 --- a/admin/app/services/settings/store/storesensor.service.js +++ b/admin/app/services/settings/store/storesensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('StoreSensorService', function($http) { return { - addPair: function(storeID,sensorID,callback) { - $http.post(getAPI()+'stores/'+storeID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(storeID,sensorID, headers, callback) { + $http.post(getAPI()+'stores/'+storeID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('StoreSensorService', function($http) { }); }, - deletePair: function(storeID,sensorID, callback) { - $http.delete(getAPI()+'stores/'+storeID+'/sensors/'+sensorID) + deletePair: function(storeID,sensorID, headers, callback) { + $http.delete(getAPI()+'stores/'+storeID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/store/storetype.service.js b/admin/app/services/settings/store/storetype.service.js index 50060d1e..9055b6a0 100644 --- a/admin/app/services/settings/store/storetype.service.js +++ b/admin/app/services/settings/store/storetype.service.js @@ -17,24 +17,24 @@ app.factory('StoreTypeService', function($http) { callback(response); }); }, - addStoreType: function(store_type, callback) { - $http.post(getAPI()+'storetypes',{data:store}) + addStoreType: function(store_type, headers, callback) { + $http.post(getAPI()+'storetypes',{data:store}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editStoreType: function(store_type, callback) { - $http.put(getAPI()+'storetypes/'+store_type.id,{data:store_type}) + editStoreType: function(store_type, headers, callback) { + $http.put(getAPI()+'storetypes/'+store_type.id,{data:store_type}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteStoreType: function(store_type, callback) { - $http.delete(getAPI()+'storetypes/'+store_type.id) + deleteStoreType: function(store_type, headers, callback) { + $http.delete(getAPI()+'storetypes/'+store_type.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenant.service.js b/admin/app/services/settings/tenant/tenant.service.js index 547cfaaf..5584813a 100644 --- a/admin/app/services/settings/tenant/tenant.service.js +++ b/admin/app/services/settings/tenant/tenant.service.js @@ -17,24 +17,24 @@ app.factory('TenantService', function($http) { callback(response); }); }, - addTenant: function(tenant, callback) { - $http.post(getAPI()+'tenants',{data:tenant}) + addTenant: function(tenant, headers, callback) { + $http.post(getAPI()+'tenants',{data:tenant}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editTenant: function(tenant, callback) { - $http.put(getAPI()+'tenants/'+tenant.id,{data:tenant}) + editTenant: function(tenant, headers, callback) { + $http.put(getAPI()+'tenants/'+tenant.id,{data:tenant}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteTenant: function(tenant, callback) { - $http.delete(getAPI()+'tenants/'+tenant.id) + deleteTenant: function(tenant, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenant.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenantmeter.service.js b/admin/app/services/settings/tenant/tenantmeter.service.js index 6a4b6394..e4e05b22 100644 --- a/admin/app/services/settings/tenant/tenantmeter.service.js +++ b/admin/app/services/settings/tenant/tenantmeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('TenantMeterService', function($http) { return { - addPair: function(tenantID, meterID, metertype,callback) { + addPair: function(tenantID, meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('TenantMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'tenants/'+tenantID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'tenants/'+tenantID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('TenantMeterService', function($http) { }); }, - deletePair: function(tenantID, meterID, metertype, callback) { - $http.delete(getAPI()+'tenants/'+tenantID+'/'+metertype+'/'+meterID) + deletePair: function(tenantID, meterID, metertype, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenantID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenantpoint.service.js b/admin/app/services/settings/tenant/tenantpoint.service.js index b5146f91..3cadc625 100644 --- a/admin/app/services/settings/tenant/tenantpoint.service.js +++ b/admin/app/services/settings/tenant/tenantpoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('TenantPointService', function($http) { return { - addPair: function(tenantID,pointID,callback) { - $http.post(getAPI()+'tenants/'+tenantID+'/points',{data:{'point_id':pointID}}) + addPair: function(tenantID,pointID, headers, callback) { + $http.post(getAPI()+'tenants/'+tenantID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('TenantPointService', function($http) { }); }, - deletePair: function(tenantID,pointID, callback) { - $http.delete(getAPI()+'tenants/'+tenantID+'/points/'+pointID) + deletePair: function(tenantID,pointID, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenantID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenantsensor.service.js b/admin/app/services/settings/tenant/tenantsensor.service.js index f7e66686..98cdd71b 100644 --- a/admin/app/services/settings/tenant/tenantsensor.service.js +++ b/admin/app/services/settings/tenant/tenantsensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('TenantSensorService', function($http) { return { - addPair: function(tenantID,sensorID,callback) { - $http.post(getAPI()+'tenants/'+tenantID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(tenantID,sensorID, headers, callback) { + $http.post(getAPI()+'tenants/'+tenantID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('TenantSensorService', function($http) { }); }, - deletePair: function(tenantID,sensorID, callback) { - $http.delete(getAPI()+'tenants/'+tenantID+'/sensors/'+sensorID) + deletePair: function(tenantID,sensorID, headers, callback) { + $http.delete(getAPI()+'tenants/'+tenantID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tenant/tenanttype.service.js b/admin/app/services/settings/tenant/tenanttype.service.js index 17e87880..60e83195 100644 --- a/admin/app/services/settings/tenant/tenanttype.service.js +++ b/admin/app/services/settings/tenant/tenanttype.service.js @@ -17,24 +17,24 @@ app.factory('TenantTypeService', function($http) { callback(response); }); }, - addTenantType: function(tenant_type, callback) { - $http.post(getAPI()+'tenanttypes',{data:tenant}) + addTenantType: function(tenant_type, headers, callback) { + $http.post(getAPI()+'tenanttypes',{data:tenant}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editTenantType: function(tenant_type, callback) { - $http.put(getAPI()+'tenanttypes/'+tenant_type.id,{data:tenant_type}) + editTenantType: function(tenant_type, headers, callback) { + $http.put(getAPI()+'tenanttypes/'+tenant_type.id,{data:tenant_type}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteTenantType: function(tenant_type, callback) { - $http.delete(getAPI()+'tenanttypes/'+tenant_type.id) + deleteTenantType: function(tenant_type, headers, callback) { + $http.delete(getAPI()+'tenanttypes/'+tenant_type.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index 2a547307..71cc7dab 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class ShopfloorCollection: @@ -88,6 +88,7 @@ class ShopfloorCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -279,6 +280,7 @@ class ShopfloorItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') @@ -400,6 +402,7 @@ class ShopfloorItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -566,6 +569,7 @@ class ShopfloorEquipmentCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -640,6 +644,7 @@ class ShopfloorEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_, eid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') @@ -749,6 +754,7 @@ class ShopfloorMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -823,6 +829,7 @@ class ShopfloorMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') @@ -931,6 +938,7 @@ class ShopfloorOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1005,6 +1013,7 @@ class ShopfloorOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') @@ -1113,6 +1122,7 @@ class ShopfloorPointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1187,6 +1197,7 @@ class ShopfloorPointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') @@ -1282,6 +1293,7 @@ class ShopfloorSensorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1356,6 +1368,7 @@ class ShopfloorSensorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') @@ -1464,6 +1477,7 @@ class ShopfloorVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1538,6 +1552,7 @@ class ShopfloorVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') diff --git a/myems-api/core/store.py b/myems-api/core/store.py index 1ecc9825..fe614f28 100644 --- a/myems-api/core/store.py +++ b/myems-api/core/store.py @@ -3,7 +3,7 @@ import simplejson as json import mysql.connector import config import uuid -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class StoreCollection: @@ -94,6 +94,7 @@ class StoreCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -335,6 +336,7 @@ class StoreItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_STORE_ID') @@ -440,6 +442,7 @@ class StoreItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -664,6 +667,7 @@ class StoreMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -738,6 +742,7 @@ class StoreMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_STORE_ID') @@ -846,6 +851,7 @@ class StoreOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -920,6 +926,7 @@ class StoreOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_STORE_ID') @@ -1028,6 +1035,7 @@ class StorePointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1102,6 +1110,7 @@ class StorePointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_STORE_ID') @@ -1197,6 +1206,7 @@ class StoreSensorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1271,6 +1281,7 @@ class StoreSensorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_STORE_ID') @@ -1379,6 +1390,7 @@ class StoreVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1453,6 +1465,7 @@ class StoreVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_STORE_ID') diff --git a/myems-api/core/tenant.py b/myems-api/core/tenant.py index b84d5881..493327df 100644 --- a/myems-api/core/tenant.py +++ b/myems-api/core/tenant.py @@ -4,7 +4,7 @@ import mysql.connector import config import uuid from datetime import datetime, timedelta, timezone -from core.useractivity import user_logger +from core.useractivity import user_logger, access_control class TenantCollection: @@ -111,6 +111,7 @@ class TenantCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -402,6 +403,7 @@ class TenantItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TENANT_ID') @@ -507,6 +509,7 @@ class TenantItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -767,6 +770,7 @@ class TenantMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -841,6 +845,7 @@ class TenantMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TENANT_ID') @@ -949,6 +954,7 @@ class TenantOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1023,6 +1029,7 @@ class TenantOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TENANT_ID') @@ -1131,6 +1138,7 @@ class TenantPointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1205,6 +1213,7 @@ class TenantPointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TENANT_ID') @@ -1300,6 +1309,7 @@ class TenantSensorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1374,6 +1384,7 @@ class TenantSensorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TENANT_ID') @@ -1482,6 +1493,7 @@ class TenantVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1556,6 +1568,7 @@ class TenantVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TENANT_ID') From 9c9e316efc0b343f0842be4f0f440e95b8dd5975 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 7 Dec 2021 19:50:37 +0800 Subject: [PATCH 038/117] added access control to point in api and admin --- admin/nginx.conf | 2 +- myems-api/MyEMS.postman_collection.json | 18 +++++++++--------- myems-api/core/point.py | 4 ++++ web/nginx.conf | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/admin/nginx.conf b/admin/nginx.conf index f238d80f..1de6c8a0 100644 --- a/admin/nginx.conf +++ b/admin/nginx.conf @@ -46,7 +46,7 @@ http { } location /api { - proxy_pass http://192.168.1.6:8000/; + proxy_pass http://127.0.0.1:8000/; proxy_connect_timeout 75; proxy_read_timeout 600; send_timeout 600; diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 23bc36c9..0639ac50 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1315,7 +1315,7 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } @@ -1476,7 +1476,7 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } @@ -4758,7 +4758,7 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } @@ -4788,7 +4788,7 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } @@ -4819,7 +4819,7 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } @@ -4853,19 +4853,19 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } ], "url": { - "raw": "{{base_url}}/points/2", + "raw": "{{base_url}}/points/11", "host": [ "{{base_url}}" ], "path": [ "points", - "2" + "11" ] } }, @@ -4884,7 +4884,7 @@ }, { "key": "Token", - "value": "ce8adcab80f37322487df375c3e3923e6febbcfb26d2b654a5814db6874f2b072fb40a85199efa725af7f3aa4f490f9cc833422b793fa85266237dc5278dff9f", + "value": "44e05939a3c8a545fef506ca42d51c13fc934af45b57346247697ac0b4797ca30d3d950f54d5e16d51876abc0f48b8b5db4894841b56dbfdb2ac9b8162c4e6d1", "type": "text", "description": "Login to get a valid token" } diff --git a/myems-api/core/point.py b/myems-api/core/point.py index fb7f8eab..2b0913d7 100644 --- a/myems-api/core/point.py +++ b/myems-api/core/point.py @@ -17,6 +17,8 @@ class PointCollection: @staticmethod def on_get(req, resp): + """Handles GET requests""" + access_control(req) cnx = mysql.connector.connect(**config.myems_system_db) cursor = cnx.cursor(dictionary=True) @@ -207,6 +209,8 @@ class PointItem: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_POINT_ID') diff --git a/web/nginx.conf b/web/nginx.conf index 39683aaf..e841df22 100644 --- a/web/nginx.conf +++ b/web/nginx.conf @@ -47,7 +47,7 @@ http { } location /api { - proxy_pass http://192.168.1.6:8000/; + proxy_pass http://127.0.0.1:8000/; proxy_connect_timeout 75; proxy_read_timeout 600; send_timeout 600; From 167d6a2caa34822a46b358cba880396c2bd09721 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 7 Dec 2021 20:00:28 +0800 Subject: [PATCH 039/117] added access control to point in api and admin --- myems-api/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/myems-api/README.md b/myems-api/README.md index 4205a77e..2904679d 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1190,7 +1190,7 @@ curl -i -X GET {{base_url}}/offlinemeterfiles/{id}/restore * GET Point by ID ```bash -curl -i -X GET {{base_url}}/points/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/points/{id} ``` Result in JSON @@ -1225,7 +1225,7 @@ Result in JSON * GET all Points ```bash -curl -i -X GET {{base_url}}/points +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/points ``` * DELETE Point by ID ```bash From 31b70d4057eced72c716e13aca4bc2157e70a04e Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 8 Dec 2021 10:22:16 +0800 Subject: [PATCH 040/117] added access_control to costcenter and tariff --- .../costcenter/costcenter.controller.js | 20 ++++++++++++---- .../costcenter/costcentertariff.controller.js | 21 ++++++++++------- .../settings/tariff/tariff.controller.js | 23 +++++++++++++++---- .../settings/costcenter/costcenter.service.js | 12 +++++----- .../costcenter/costcentertariff.service.js | 10 ++++---- .../settings/tariff/tariff.service.js | 12 +++++----- myems-api/core/costcenter.py | 5 ++++ myems-api/core/tariff.py | 3 +++ 8 files changed, 71 insertions(+), 35 deletions(-) diff --git a/admin/app/controllers/settings/costcenter/costcenter.controller.js b/admin/app/controllers/settings/costcenter/costcenter.controller.js index 3dac6dae..3610e611 100644 --- a/admin/app/controllers/settings/costcenter/costcenter.controller.js +++ b/admin/app/controllers/settings/costcenter/costcenter.controller.js @@ -1,7 +1,14 @@ 'use strict'; -app.controller('CostCenterController', function($scope, $translate,$uibModal, CostCenterService,toaster,SweetAlert) { - +app.controller('CostCenterController', function( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -19,7 +26,8 @@ app.controller('CostCenterController', function($scope, $translate,$uibModal, Co windowClass: "animated fadeIn", }); modalInstance.result.then(function(costcenter) { - CostCenterService.addCostCenter(costcenter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterService.addCostCenter(costcenter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -59,7 +67,8 @@ app.controller('CostCenterController', function($scope, $translate,$uibModal, Co }); modalInstance.result.then(function (modifiedCostCenter) { - CostCenterService.editCostCenter(modifiedCostCenter, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterService.editCostCenter(modifiedCostCenter, headers, function (response){ if(angular.isDefined(response.status) && response.status === 200){ toaster.pop({ type: "success", @@ -96,7 +105,8 @@ app.controller('CostCenterController', function($scope, $translate,$uibModal, Co closeOnCancel: true }, function (isConfirm) { if (isConfirm) { - CostCenterService.deleteCostCenter(costcenter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterService.deleteCostCenter(costcenter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/costcenter/costcentertariff.controller.js b/admin/app/controllers/settings/costcenter/costcentertariff.controller.js index 242a58f8..67efe1b8 100644 --- a/admin/app/controllers/settings/costcenter/costcentertariff.controller.js +++ b/admin/app/controllers/settings/costcenter/costcentertariff.controller.js @@ -1,11 +1,14 @@ 'use strict'; -app.controller('CostCenterTariffController', function ($scope, $translate, - CostCenterService, - TariffService, - CostCenterTariffService, - toaster) { - +app.controller('CostCenterTariffController', function ( + $scope, + $window, + $translate, + CostCenterService, + TariffService, + CostCenterTariffService, + toaster) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -51,7 +54,8 @@ app.controller('CostCenterTariffController', function ($scope, $translate, $scope.pairTariff = function (dragEl, dropEl) { var tariffid = angular.element('#' + dragEl).scope().tariff.id; var costcenterid = $scope.currentCostCenter.id; - CostCenterTariffService.addPair(costcenterid, tariffid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterTariffService.addPair(costcenterid, tariffid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -77,7 +81,8 @@ app.controller('CostCenterTariffController', function ($scope, $translate, } var costcentertariffid = angular.element('#' + dragEl).scope().costcentertariff.id; var costcenterid = $scope.currentCostCenter.id; - CostCenterTariffService.deletePair(costcenterid, costcentertariffid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + CostCenterTariffService.deletePair(costcenterid, costcentertariffid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/tariff/tariff.controller.js b/admin/app/controllers/settings/tariff/tariff.controller.js index 2b43c4f5..88ecd84c 100644 --- a/admin/app/controllers/settings/tariff/tariff.controller.js +++ b/admin/app/controllers/settings/tariff/tariff.controller.js @@ -1,7 +1,17 @@ 'use strict'; -app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_TYPE, PEAK_TYPE, TariffService, CategoryService, toaster, SweetAlert) { - +app.controller('TariffController', function( + $scope, + $window, + $uibModal, + $translate, + TARIFF_TYPE, + PEAK_TYPE, + TariffService, + CategoryService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCategories = function() { CategoryService.getAllCategories(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -42,7 +52,8 @@ app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_ } }); modalInstance.result.then(function(tariff) { - TariffService.addTariff(tariff, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TariffService.addTariff(tariff, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -82,7 +93,8 @@ app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_ }); modalInstance.result.then(function(modifiedTariff) { - TariffService.editTariff(modifiedTariff, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TariffService.editTariff(modifiedTariff, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -119,7 +131,8 @@ app.controller('TariffController', function($scope,$uibModal,$translate, TARIFF_ }, function(isConfirm) { if (isConfirm) { - TariffService.deleteTariff(tariff, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + TariffService.deleteTariff(tariff, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/costcenter/costcenter.service.js b/admin/app/services/settings/costcenter/costcenter.service.js index 6adc79cf..fc307150 100644 --- a/admin/app/services/settings/costcenter/costcenter.service.js +++ b/admin/app/services/settings/costcenter/costcenter.service.js @@ -17,24 +17,24 @@ app.factory('CostCenterService', function($http) { callback(response); }); }, - addCostCenter: function(costcenter, callback) { - $http.post(getAPI()+'costcenters',{data:costcenter}) + addCostCenter: function(costcenter, headers, callback) { + $http.post(getAPI()+'costcenters',{data:costcenter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editCostCenter: function(costcenter, callback) { - $http.put(getAPI()+'costcenters/'+costcenter.id,{data:costcenter}) + editCostCenter: function(costcenter, headers, callback) { + $http.put(getAPI()+'costcenters/'+costcenter.id,{data:costcenter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteCostCenter: function(costcenter, callback) { - $http.delete(getAPI()+'costcenters/'+costcenter.id) + deleteCostCenter: function(costcenter, headers, callback) { + $http.delete(getAPI()+'costcenters/'+costcenter.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/costcenter/costcentertariff.service.js b/admin/app/services/settings/costcenter/costcentertariff.service.js index 532af9f5..7c121a01 100644 --- a/admin/app/services/settings/costcenter/costcentertariff.service.js +++ b/admin/app/services/settings/costcenter/costcentertariff.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('CostCenterTariffService', function($http) { return { - addPair: function(costcenterid,tariffid,callback) { - $http.post(getAPI()+'costcenters/'+costcenterid+'/tariffs',{data:{'tariff_id':tariffid}}) + addPair: function(costcenterid, tariffid, headers, callback ) { + $http.post(getAPI()+'costcenters/'+costcenterid+'/tariffs',{data:{'tariff_id':tariffid}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('CostCenterTariffService', function($http) { }); }, - deletePair: function(costcenterid,tariffid, callback) { - $http.delete(getAPI()+'costcenters/'+costcenterid+'/tariffs/'+tariffid) + deletePair: function(costcenterid, tariffid, headers, callback) { + $http.delete(getAPI()+'costcenters/'+costcenterid+'/tariffs/'+tariffid, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,7 +19,7 @@ app.factory('CostCenterTariffService', function($http) { }); }, getTariffsByCostCenterID: function(id, callback) { - $http.get(getAPI()+'costcenters/'+id+'/tariffs') + $http.get(getAPI()+'costcenters/'+id+'/tariffs') .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/tariff/tariff.service.js b/admin/app/services/settings/tariff/tariff.service.js index ca4be90f..0848f124 100644 --- a/admin/app/services/settings/tariff/tariff.service.js +++ b/admin/app/services/settings/tariff/tariff.service.js @@ -17,24 +17,24 @@ app.factory('TariffService', function($http) { callback(response); }); }, - addTariff: function(tariff, callback) { - $http.post(getAPI()+'tariffs',{data:tariff}) + addTariff: function(tariff, headers, callback) { + $http.post(getAPI()+'tariffs',{data:tariff}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editTariff: function(tariff, callback) { - $http.put(getAPI()+'tariffs/'+tariff.id,{data:tariff}) + editTariff: function(tariff, headers, callback) { + $http.put(getAPI()+'tariffs/'+tariff.id,{data:tariff}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteTariff: function(tariff, callback) { - $http.delete(getAPI()+'tariffs/'+tariff.id) + deleteTariff: function(tariff, headers, callback) { + $http.delete(getAPI()+'tariffs/'+tariff.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/costcenter.py b/myems-api/core/costcenter.py index 78b24a13..7a4b93f2 100644 --- a/myems-api/core/costcenter.py +++ b/myems-api/core/costcenter.py @@ -41,6 +41,7 @@ class CostCenterCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') @@ -135,6 +136,7 @@ class CostCenterItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COST_CENTER_ID') @@ -282,6 +284,7 @@ class CostCenterItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -410,6 +413,7 @@ class CostCenterTariffCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -478,6 +482,7 @@ class CostCenterTariffItem: @staticmethod @user_logger def on_delete(req, resp, id_, tid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COST_CENTER_ID') diff --git a/myems-api/core/tariff.py b/myems-api/core/tariff.py index b24b4080..23ec0274 100644 --- a/myems-api/core/tariff.py +++ b/myems-api/core/tariff.py @@ -101,6 +101,7 @@ class TariffCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -311,6 +312,7 @@ class TariffItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TARIFF_ID') @@ -369,6 +371,7 @@ class TariffItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From 37a44353a81d91c0f90c23bb5fb8d84258964907 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Wed, 8 Dec 2021 23:28:58 +0800 Subject: [PATCH 041/117] added access control to shopfloor, store and tenant in api and admin --- admin/Dockerfile | 2 +- .../shopfloor/shopfloor.controller.js | 11 +- .../shopfloorequipment.controller.js | 10 +- .../shopfloor/shopfloormeter.controller.js | 19 +- .../shopfloor/shopfloorsensor.controller.js | 10 +- .../settings/store/store.controller.js | 31 +- .../settings/store/storemeter.controller.js | 22 +- .../settings/store/storepoint.controller.js | 10 +- .../settings/store/storesensor.controller.js | 10 +- .../settings/tenant/tenant.controller.js | 12 +- .../tenant/tenant.master.controller.js | 2 - .../settings/tenant/tenantmeter.controller.js | 18 +- .../tenant/tenantsensor.controller.js | 38 +- myems-api/MyEMS.postman_collection.json | 554 ++++++++++++++++-- web/Dockerfile | 2 +- 15 files changed, 640 insertions(+), 111 deletions(-) diff --git a/admin/Dockerfile b/admin/Dockerfile index 2afb2091..171f5b7f 100644 --- a/admin/Dockerfile +++ b/admin/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.21.1 +FROM nginx:1.21.4 # remove the default config RUN rm /etc/nginx/conf.d/default.conf && \ diff --git a/admin/app/controllers/settings/shopfloor/shopfloor.controller.js b/admin/app/controllers/settings/shopfloor/shopfloor.controller.js index f67d9e64..6d7c877c 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloor.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloor.controller.js @@ -1,6 +1,15 @@ 'use strict'; -app.controller('ShopfloorController', function ($scope, $window, $translate, $uibModal, CostCenterService, ContactService, ShopfloorService, toaster, SweetAlert) { +app.controller('ShopfloorController', function ( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + ContactService, + ShopfloorService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { diff --git a/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js index b49e6007..47c1556a 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorequipment.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('ShopfloorEquipmentController', function ($scope, $window, $translate, ShopfloorService, EquipmentService, ShopfloorEquipmentService, toaster, SweetAlert) { +app.controller('ShopfloorEquipmentController', function ( + $scope, + $window, + $translate, + ShopfloorService, + EquipmentService, + ShopfloorEquipmentService, + toaster, + SweetAlert) { $scope.currentShopfloor = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllEquipments = function () { diff --git a/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js b/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js index dea19d21..8fb53d30 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloormeter.controller.js @@ -1,12 +1,16 @@ 'use strict'; -app.controller('ShopfloorMeterController', function($scope, $window, $timeout, $translate, - MeterService, - VirtualMeterService, - OfflineMeterService, - ShopfloorMeterService, - ShopfloorService, - toaster) { +app.controller('ShopfloorMeterController', function( + $scope, + $window, + $timeout, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + ShopfloorMeterService, + ShopfloorService, + toaster) { $scope.currentShopfloor = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllShopfloors = function(id) { @@ -80,7 +84,6 @@ app.controller('ShopfloorMeterController', function($scope, $window, $timeout, $ }; - $scope.getAllOfflineMeters = function() { OfflineMeterService.getAllOfflineMeters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { diff --git a/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js b/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js index e95404b4..76b11a8b 100644 --- a/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js +++ b/admin/app/controllers/settings/shopfloor/shopfloorsensor.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('ShopfloorSensorController', function ($scope, $window, $translate, ShopfloorService, SensorService, ShopfloorSensorService, toaster, SweetAlert) { +app.controller('ShopfloorSensorController', function ( + $scope, + $window, + $translate, + ShopfloorService, + SensorService, + ShopfloorSensorService, + toaster, + SweetAlert) { $scope.currentShopfloor = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { diff --git a/admin/app/controllers/settings/store/store.controller.js b/admin/app/controllers/settings/store/store.controller.js index 8010bb9e..ecd612ff 100644 --- a/admin/app/controllers/settings/store/store.controller.js +++ b/admin/app/controllers/settings/store/store.controller.js @@ -1,6 +1,16 @@ 'use strict'; -app.controller('StoreController', function($scope, $window, $translate,$uibModal, CostCenterService, ContactService, StoreService, StoreTypeService, toaster,SweetAlert) { +app.controller('StoreController', function( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + ContactService, + StoreService, + StoreTypeService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { @@ -32,15 +42,16 @@ app.controller('StoreController', function($scope, $window, $translate,$uibModal }); }; -$scope.getAllStoreTypes = function() { - StoreTypeService.getAllStoreTypes(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.storetypes = response.data; - } else { - $scope.storetypes = []; - } - }); -}; + $scope.getAllStoreTypes = function() { + StoreTypeService.getAllStoreTypes(function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.storetypes = response.data; + } else { + $scope.storetypes = []; + } + }); + }; + $scope.addStore = function() { var modalInstance = $uibModal.open({ templateUrl: 'views/settings/store/store.model.html', diff --git a/admin/app/controllers/settings/store/storemeter.controller.js b/admin/app/controllers/settings/store/storemeter.controller.js index 4ea7539b..5af0572e 100644 --- a/admin/app/controllers/settings/store/storemeter.controller.js +++ b/admin/app/controllers/settings/store/storemeter.controller.js @@ -1,21 +1,25 @@ 'use strict'; -app.controller('StoreMeterController', function($scope, $window, $timeout, $translate, - MeterService, - VirtualMeterService, - OfflineMeterService, - StoreMeterService, - StoreService, - toaster) { +app.controller('StoreMeterController', function( + $scope, + $window, + $timeout, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + StoreMeterService, + StoreService, + toaster) { $scope.currentStore = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllStores = function(id) { StoreService.getAllStores(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.stores = response.data; - } else { + } else { $scope.stores = []; - } + } }); }; diff --git a/admin/app/controllers/settings/store/storepoint.controller.js b/admin/app/controllers/settings/store/storepoint.controller.js index 4569dda0..c06951a1 100644 --- a/admin/app/controllers/settings/store/storepoint.controller.js +++ b/admin/app/controllers/settings/store/storepoint.controller.js @@ -49,11 +49,11 @@ app.controller('StorePointController', function ( }; - $scope.changeStore=function(item,model){ - $scope.currentStore=item; - $scope.currentStore.selected=model; - $scope.getPointsByStoreID($scope.currentStore.id); - }; + $scope.changeStore=function(item,model){ + $scope.currentStore=item; + $scope.currentStore.selected=model; + $scope.getPointsByStoreID($scope.currentStore.id); + }; $scope.changeDataSource = function (item, model) { $scope.currentDataSource = model; diff --git a/admin/app/controllers/settings/store/storesensor.controller.js b/admin/app/controllers/settings/store/storesensor.controller.js index 2d4c00a5..54b9428d 100644 --- a/admin/app/controllers/settings/store/storesensor.controller.js +++ b/admin/app/controllers/settings/store/storesensor.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('StoreSensorController', function ($scope, $window, $translate, StoreService, SensorService, StoreSensorService, toaster, SweetAlert) { +app.controller('StoreSensorController', function ( + $scope, + $window, + $translate, + StoreService, + SensorService, + StoreSensorService, + toaster, + SweetAlert) { $scope.currentStore = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { diff --git a/admin/app/controllers/settings/tenant/tenant.controller.js b/admin/app/controllers/settings/tenant/tenant.controller.js index 35970dcc..21ca44dc 100644 --- a/admin/app/controllers/settings/tenant/tenant.controller.js +++ b/admin/app/controllers/settings/tenant/tenant.controller.js @@ -1,6 +1,16 @@ 'use strict'; -app.controller('TenantController', function ($scope, $window, $translate, $uibModal, CostCenterService, ContactService, TenantService, TenantTypeService, toaster, SweetAlert) { +app.controller('TenantController', function ( + $scope, + $window, + $translate, + $uibModal, + CostCenterService, + ContactService, + TenantService, + TenantTypeService, + toaster, + SweetAlert) { $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { diff --git a/admin/app/controllers/settings/tenant/tenant.master.controller.js b/admin/app/controllers/settings/tenant/tenant.master.controller.js index 03d7471b..9680338c 100644 --- a/admin/app/controllers/settings/tenant/tenant.master.controller.js +++ b/admin/app/controllers/settings/tenant/tenant.master.controller.js @@ -1,8 +1,6 @@ 'use strict'; app.controller('TenantMasterController', function($scope) { - - $scope.$on('handleEmitTenantChanged', function(event) { $scope.$broadcast('handleBroadcastTenantChanged'); }); diff --git a/admin/app/controllers/settings/tenant/tenantmeter.controller.js b/admin/app/controllers/settings/tenant/tenantmeter.controller.js index 6f7c9cbf..397395b9 100644 --- a/admin/app/controllers/settings/tenant/tenantmeter.controller.js +++ b/admin/app/controllers/settings/tenant/tenantmeter.controller.js @@ -1,12 +1,16 @@ 'use strict'; -app.controller('TenantMeterController', function($scope, $window, $timeout, $translate, - MeterService, - VirtualMeterService, - OfflineMeterService, - TenantMeterService, - TenantService, - toaster) { +app.controller('TenantMeterController', function( + $scope, + $window, + $timeout, + $translate, + MeterService, + VirtualMeterService, + OfflineMeterService, + TenantMeterService, + TenantService, + toaster) { $scope.currentTenant = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllTenants = function(id) { diff --git a/admin/app/controllers/settings/tenant/tenantsensor.controller.js b/admin/app/controllers/settings/tenant/tenantsensor.controller.js index c37d7d3c..dbf9a575 100644 --- a/admin/app/controllers/settings/tenant/tenantsensor.controller.js +++ b/admin/app/controllers/settings/tenant/tenantsensor.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('TenantSensorController', function ($scope, $window, $translate, TenantService, SensorService, TenantSensorService, toaster, SweetAlert) { +app.controller('TenantSensorController', function ( + $scope, + $window, + $translate, + TenantService, + SensorService, + TenantSensorService, + toaster, + SweetAlert) { $scope.currentTenant = {selected:undefined}; $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { @@ -23,21 +31,21 @@ app.controller('TenantSensorController', function ($scope, $window, $translate, }); }; - $scope.changeTenant=function(item,model){ - $scope.currentTenant=item; - $scope.currentTenant.selected=model; - $scope.getSensorsByTenantID($scope.currentTenant.id); - }; + $scope.changeTenant=function(item,model){ + $scope.currentTenant=item; + $scope.currentTenant.selected=model; + $scope.getSensorsByTenantID($scope.currentTenant.id); + }; - $scope.getAllTenants = function () { - TenantService.getAllTenants(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.tenants = response.data; - } else { - $scope.tenants = []; - } - }); - }; + $scope.getAllTenants = function () { + TenantService.getAllTenants(function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + $scope.tenants = response.data; + } else { + $scope.tenants = []; + } + }); + }; $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 0639ac50..ed679a2f 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -5401,7 +5401,18 @@ "name": "POST Create New Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMS Shopfloor2\", \"area\":999.99, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Shopfloor description\"}}" @@ -5422,19 +5433,30 @@ "name": "PUT Update a Shopfloor", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMS Shopfloor2\", \"area\":999.99, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Shopfloor description\"}}" }, "url": { - "raw": "{{base_url}}/shopfloors/2", + "raw": "{{base_url}}/shopfloors/3", "host": [ "{{base_url}}" ], "path": [ "shopfloors", - "2" + "3" ] } }, @@ -5444,7 +5466,18 @@ "name": "DELETE a Shopfloor by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/2", "host": [ @@ -5481,7 +5514,18 @@ "name": "POST Bind an Equipment to a Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"equipment_id\":1}}" @@ -5504,7 +5548,18 @@ "name": "DELETE an Equipment from Shopfloor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/1/equipments/1", "host": [ @@ -5543,7 +5598,18 @@ "name": "POST Bind a Meter to a Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"meter_id\":1}}" @@ -5566,7 +5632,18 @@ "name": "DELETE a Meter from Shopfloor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/1/meters/1", "host": [ @@ -5605,7 +5682,18 @@ "name": "POST Bind an OfflineMeter to a Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1}}" @@ -5628,7 +5716,18 @@ "name": "DELETE an Offline Meter from Shopfloor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/1/offlinemeters/1", "host": [ @@ -5667,7 +5766,18 @@ "name": "POST Bind a Point to a Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"point_id\":1}}" @@ -5690,7 +5800,18 @@ "name": "DELETE a Point from Shopfloor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/1/points/1", "host": [ @@ -5729,7 +5850,18 @@ "name": "POST Bind a Sensor to a Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"sensor_id\":1}}" @@ -5752,7 +5884,18 @@ "name": "DELETE a Sensor from Shopfloor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/1/sensors/1", "host": [ @@ -5791,7 +5934,18 @@ "name": "POST Bind a Virtual Meter to a Shopfloor", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1}}" @@ -5814,7 +5968,18 @@ "name": "DELETE a Virtual Meter from Shopfloor", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/shopfloors/1/virtualmeters/1", "host": [ @@ -6643,7 +6808,18 @@ "name": "POST Create New Store", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"麦当劳(新王府井店)\", \"address\":\"北京市东城区王府井大街200号工美大厦1层010-65120499\", \"latitude\":39.909429, \"longitude\":116.416993, \"area\":600.000, \"store_type_id\":1, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Classic, long-running fast-food chain known for its burgers, fries & shakes.\"}}" @@ -6664,19 +6840,30 @@ "name": "PUT Update a Store", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"麦当劳(新王府井店)\", \"address\":\"北京市东城区王府井大街200号工美大厦1层010-65120499\", \"latitude\":39.909429, \"longitude\":116.416993, \"area\":600.000, \"store_type_id\":1, \"is_input_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Classic, long-running fast-food chain known for its burgers, fries & shakes.\"}}" }, "url": { - "raw": "{{base_url}}/stores/2", + "raw": "{{base_url}}/stores/3", "host": [ "{{base_url}}" ], "path": [ "stores", - "2" + "3" ] } }, @@ -6686,15 +6873,26 @@ "name": "DELETE a Store by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { - "raw": "{{base_url}}/stores/2", + "raw": "{{base_url}}/stores/3", "host": [ "{{base_url}}" ], "path": [ "stores", - "2" + "3" ] } }, @@ -6723,7 +6921,18 @@ "name": "POST Bind a Meter to a Store", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"meter_id\":1}}" @@ -6746,7 +6955,18 @@ "name": "DELETE a Meter from Store", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/stores/1/meters/1", "host": [ @@ -6785,7 +7005,18 @@ "name": "POST Bind an OfflineMeter to a Store", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1}}" @@ -6808,7 +7039,18 @@ "name": "DELETE an Offline Meter from Store", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/stores/1/offlinemeters/1", "host": [ @@ -6847,7 +7089,18 @@ "name": "POST Bind a Point to a Store", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"point_id\":1}}" @@ -6870,7 +7123,18 @@ "name": "DELETE a Point from Store", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/stores/1/points/1", "host": [ @@ -6909,7 +7173,18 @@ "name": "POST Bind a Sensor to a Store", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"sensor_id\":1}}" @@ -6932,7 +7207,18 @@ "name": "DELETE a Sensor from Stores", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/stores/1/sensors/1", "host": [ @@ -6971,7 +7257,18 @@ "name": "POST Bind a Virtual Meter to a Store", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1}}" @@ -6994,7 +7291,18 @@ "name": "DELETE a Virtual Meter from Store", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/stores/1/virtualmeters/1", "host": [ @@ -7332,7 +7640,18 @@ "name": "POST Create New Tenant", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"Starbucks\", \"buildings\":\"Building #1\", \"floors\":\"L1 L2 L3\", \"rooms\":\"1201b+2247+3F\", \"area\":418.8, \"tenant_type_id\":9, \"is_input_counted\":true, \"is_key_tenant\":true,\n\"lease_number\":\"6b0da806\", \"lease_start_datetime\":\"2021-01-01T00:00:00\", \"lease_end_datetime\":\"2022-01-01T00:00:00\", \"is_in_lease\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"my description\"}}" @@ -7353,7 +7672,18 @@ "name": "PUT Update a Tenant", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"Hermes 爱马仕\", \"buildings\":\"Building #1\", \"floors\":\"L1 L2 L3 L4 L5\", \"rooms\":\"1201b+2247+3F\", \"area\":818.8, \"tenant_type_id\":9, \"is_input_counted\":true, \"is_key_tenant\":true,\n\"lease_number\":\"6b0da806\", \"lease_start_datetime_utc\":\"2021-01-01T00:00:00\", \"lease_end_datetime_utc\":\"2022-01-01T00:00:00\", \"is_in_lease\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"my description\"}}" @@ -7375,9 +7705,27 @@ "name": "DELETE a Tenant by ID", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { - "raw": "" + "raw": "{{base_url}}/tenants/2", + "host": [ + "{{base_url}}" + ], + "path": [ + "tenants", + "2" + ] } }, "response": [] @@ -7405,7 +7753,18 @@ "name": "POST Bind a Meter to a Tenant", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"meter_id\":1}}" @@ -7428,7 +7787,18 @@ "name": "DELETE a Meter from Tenant", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/tenants/1/meters/1", "host": [ @@ -7467,7 +7837,18 @@ "name": "POST Bind an OfflineMeter to a Tenant", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1}}" @@ -7490,7 +7871,18 @@ "name": "DELETE an Offline Meter from Tenant", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/tenants/1/offlinemeters/1", "host": [ @@ -7529,7 +7921,18 @@ "name": "POST Bind a Point to a Tenant", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"point_id\":1}}" @@ -7552,7 +7955,18 @@ "name": "DELETE a Point from Tenant", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/tenants/1/points/1", "host": [ @@ -7591,7 +8005,18 @@ "name": "POST Bind a Sensor to a Tenant", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"sensor_id\":1}}" @@ -7614,7 +8039,18 @@ "name": "DELETE a Sensor from Tenant", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/tenants/1/sensors/1", "host": [ @@ -7653,7 +8089,18 @@ "name": "POST Bind a Virtual Meter to a Tenant", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1}}" @@ -7676,7 +8123,18 @@ "name": "DELETE a Virtual Meter from Tenant", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "9a3748fadf64270dd4617594939169d0008a1b713e3a5861af384c68de73442b56b56771ce2be1e51ecd7443ec0fc1fbd6dcc3335a2c7518ca12b7a479ccb2e0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/tenants/1/virtualmeters/1", "host": [ diff --git a/web/Dockerfile b/web/Dockerfile index 0df5fdd6..f1d31812 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.21.1 +FROM nginx:1.21.4 # remove the default config RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf From 3e78a06a1d61482283dba65459b8546d26d89d5c Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Thu, 9 Dec 2021 12:04:30 +0800 Subject: [PATCH 042/117] added access control to space virtualmeter and offlinemeter --- .../settings/meter/offlinemeter.controller.js | 23 +++++++++++++++---- .../settings/meter/virtualmeter.controller.js | 13 +++++++---- .../settings/space/space.controller.js | 21 +++++++++++++---- .../spacecombinedequipment.controller.js | 13 +++++++---- .../space/spaceequipment.controller.js | 17 ++++++++++---- .../settings/space/spacemeter.controller.js | 19 +++++++++++---- .../settings/space/spacepoint.controller.js | 6 +++-- .../settings/space/spacesensor.controller.js | 15 +++++++++--- .../space/spaceshopfloor.controller.js | 17 ++++++++++---- .../settings/space/spacestore.controller.js | 15 ++++++++---- .../settings/space/spacetenant.controller.js | 16 +++++++++---- .../settings/meter/offlinemeter.service.js | 12 +++++----- .../settings/meter/virtualmeter.service.js | 12 +++++----- .../services/settings/space/space.service.js | 12 +++++----- .../space/spacecombinedequipment.service.js | 8 +++---- .../settings/space/spaceequipment.service.js | 8 +++---- .../settings/space/spacemeter.service.js | 8 +++---- .../settings/space/spacepoint.service.js | 8 +++---- .../settings/space/spacesensor.service.js | 8 +++---- .../settings/space/spaceshopfloor.service.js | 8 +++---- .../settings/space/spacestore.service.js | 8 +++---- .../settings/space/spacetenant.service.js | 8 +++---- myems-api/core/offlinemeter.py | 3 +++ myems-api/core/space.py | 23 +++++++++++++++++++ myems-api/core/virtualmeter.py | 3 +++ 25 files changed, 212 insertions(+), 92 deletions(-) diff --git a/admin/app/controllers/settings/meter/offlinemeter.controller.js b/admin/app/controllers/settings/meter/offlinemeter.controller.js index 92268a5c..bea62770 100644 --- a/admin/app/controllers/settings/meter/offlinemeter.controller.js +++ b/admin/app/controllers/settings/meter/offlinemeter.controller.js @@ -1,6 +1,18 @@ 'use strict'; -app.controller('OfflineMeterController', function($scope, $translate, $uibModal, OfflineMeterService, CategoryService, EnergyItemService, CostCenterService, toaster, SweetAlert) { +app.controller('OfflineMeterController', function( + $scope, + $window, + $translate, + $uibModal, + OfflineMeterService, + CategoryService, + EnergyItemService, + CostCenterService, + toaster, + SweetAlert) { + + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -66,7 +78,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal, offlinemeter.energy_item_id = undefined; } offlinemeter.cost_center_id = offlinemeter.cost_center.id; - OfflineMeterService.addOfflineMeter(offlinemeter, function(response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + OfflineMeterService.addOfflineMeter(offlinemeter, headers, function(response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -116,7 +129,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal, modifiedOfflineMeter.energy_item_id = undefined; } modifiedOfflineMeter.cost_center_id = modifiedOfflineMeter.cost_center.id; - OfflineMeterService.editOfflineMeter(modifiedOfflineMeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + OfflineMeterService.editOfflineMeter(modifiedOfflineMeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -154,7 +168,8 @@ app.controller('OfflineMeterController', function($scope, $translate, $uibModal, }, function(isConfirm) { if (isConfirm) { - OfflineMeterService.deleteOfflineMeter(offlinemeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + OfflineMeterService.deleteOfflineMeter(offlinemeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/meter/virtualmeter.controller.js b/admin/app/controllers/settings/meter/virtualmeter.controller.js index 8ec4a402..0f929711 100644 --- a/admin/app/controllers/settings/meter/virtualmeter.controller.js +++ b/admin/app/controllers/settings/meter/virtualmeter.controller.js @@ -1,6 +1,6 @@ 'use strict'; -app.controller('VirtualMeterController', function($scope, $uibModal, $translate, +app.controller('VirtualMeterController', function($scope, $window, $uibModal, $translate, MeterService, VirtualMeterService, OfflineMeterService, @@ -9,6 +9,8 @@ app.controller('VirtualMeterController', function($scope, $uibModal, $translate, CostCenterService, toaster, SweetAlert) { + + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function() { CostCenterService.getAllCostCenters(function (response) { if (angular.isDefined(response.status) && response.status === 200) { @@ -96,7 +98,8 @@ $scope.getAllEnergyItems = function() { virtualmeter.energy_item_id = undefined; } virtualmeter.cost_center_id = virtualmeter.cost_center.id; - VirtualMeterService.addVirtualMeter(virtualmeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + VirtualMeterService.addVirtualMeter(virtualmeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -149,7 +152,8 @@ $scope.getAllEnergyItems = function() { modifiedVirtualMeter.energy_item_id = undefined; } modifiedVirtualMeter.cost_center_id = modifiedVirtualMeter.cost_center.id; - VirtualMeterService.editVirtualMeter(modifiedVirtualMeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + VirtualMeterService.editVirtualMeter(modifiedVirtualMeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -187,7 +191,8 @@ $scope.getAllEnergyItems = function() { }, function(isConfirm) { if (isConfirm) { - VirtualMeterService.deleteVirtualMeter(virtualmeter, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + VirtualMeterService.deleteVirtualMeter(virtualmeter, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/space.controller.js b/admin/app/controllers/settings/space/space.controller.js index 054f2bed..0e75215b 100644 --- a/admin/app/controllers/settings/space/space.controller.js +++ b/admin/app/controllers/settings/space/space.controller.js @@ -1,10 +1,20 @@ 'use strict'; -app.controller('SpaceController', function ($scope, $uibModal, SpaceService, CostCenterService, ContactService, toaster, $translate, SweetAlert) { +app.controller('SpaceController', function ( + $scope, + $window, + $uibModal, + SpaceService, + CostCenterService, + ContactService, + toaster, + $translate, + SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.currentSpace = {}; $scope.currentSpaceChildren = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllCostCenters = function () { CostCenterService.getAllCostCenters(function (response) { @@ -141,7 +151,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos if (space.contact != null) { space.contact_id = space.contact.id; } - SpaceService.addSpace(space, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceService.addSpace(space, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -194,7 +205,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos } modifiedSpace.cost_center_id = modifiedSpace.cost_center.id; - SpaceService.editSpace(modifiedSpace, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceService.editSpace(modifiedSpace, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -231,7 +243,8 @@ app.controller('SpaceController', function ($scope, $uibModal, SpaceService, Cos }, function (isConfirm) { if (isConfirm) { - SpaceService.deleteSpace(space, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceService.deleteSpace(space, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js index 5e00dbe1..202473e5 100644 --- a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js +++ b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js @@ -1,6 +1,8 @@ 'use strict'; -app.controller('SpaceCombinedEquipmentController', function($scope, $translate, +app.controller('SpaceCombinedEquipmentController', function($scope, + $window, + $translate, SpaceService, CombinedEquipmentService, SpaceCombinedEquipmentService, @@ -9,7 +11,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, $scope.currentSpaceID = 1; $scope.combinedequipments = []; $scope.spacecombinedequipments = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -69,7 +71,9 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, $scope.pairCombinedEquipment=function(dragEl,dropEl){ var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id; var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); - SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + + SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -95,8 +99,9 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $translate, } var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id; var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, function (response) { + SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spaceequipment.controller.js b/admin/app/controllers/settings/space/spaceequipment.controller.js index f536c873..687cd4db 100644 --- a/admin/app/controllers/settings/space/spaceequipment.controller.js +++ b/admin/app/controllers/settings/space/spaceequipment.controller.js @@ -1,11 +1,18 @@ 'use strict'; -app.controller('SpaceEquipmentController', function($scope, $translate, SpaceService, EquipmentService, SpaceEquipmentService, toaster,SweetAlert) { +app.controller('SpaceEquipmentController', function( + $scope, + $window, + $translate, + SpaceService, + EquipmentService, + SpaceEquipmentService, + toaster,SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.equipments = []; $scope.spaceequipments = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +72,8 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer $scope.pairEquipment=function(dragEl,dropEl){ var equipmentid=angular.element('#'+dragEl).scope().equipment.id; var spaceid=angular.element(spacetreewithequipment).jstree(true).get_top_selected(); - SpaceEquipmentService.addPair(spaceid,equipmentid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceEquipmentService.addPair(spaceid,equipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -91,8 +99,9 @@ app.controller('SpaceEquipmentController', function($scope, $translate, SpaceSer } var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id; var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected(); + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, function (response) { + SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacemeter.controller.js b/admin/app/controllers/settings/space/spacemeter.controller.js index 9ca31c96..10bb0f57 100644 --- a/admin/app/controllers/settings/space/spacemeter.controller.js +++ b/admin/app/controllers/settings/space/spacemeter.controller.js @@ -1,9 +1,18 @@ 'use strict'; -app.controller('SpaceMeterController', function($scope ,$timeout, $translate, SpaceService, MeterService, VirtualMeterService, OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { +app.controller('SpaceMeterController', function( + $scope , + $window, + $timeout, + $translate, + SpaceService, + MeterService, + VirtualMeterService, + OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; - $scope.spacemeters = []; + $scope.spacemeters = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -119,7 +128,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp $scope.pairMeter=function(dragEl,dropEl){ var meterid=angular.element('#'+dragEl).scope().meter.id; var spaceid=angular.element(spacetreewithmeter).jstree(true).get_top_selected(); - SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceMeterService.addPair(spaceid,meterid, $scope.currentMeterType, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -146,7 +156,8 @@ app.controller('SpaceMeterController', function($scope ,$timeout, $translate, Sp var spacemeterid = angular.element('#' + dragEl).scope().spacemeter.id; var spaceid = angular.element(spacetreewithmeter).jstree(true).get_top_selected(); var metertype = angular.element('#' + dragEl).scope().spacemeter.metertype; - SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceMeterService.deletePair(spaceid, spacemeterid, metertype, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacepoint.controller.js b/admin/app/controllers/settings/space/spacepoint.controller.js index c1b50d52..51ff441d 100644 --- a/admin/app/controllers/settings/space/spacepoint.controller.js +++ b/admin/app/controllers/settings/space/spacepoint.controller.js @@ -96,7 +96,8 @@ app.controller('SpacePointController', function ( $scope.pairPoint = function (dragEl, dropEl) { var pointid = angular.element('#' + dragEl).scope().point.id; var spaceid = $scope.currentSpaceID; - SpacePointService.addPair(spaceid, pointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpacePointService.addPair(spaceid, pointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -122,7 +123,8 @@ app.controller('SpacePointController', function ( } var spacepointid = angular.element('#' + dragEl).scope().spacepoint.id; var spaceid = $scope.currentSpaceID; - SpacePointService.deletePair(spaceid, spacepointid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpacePointService.deletePair(spaceid, spacepointid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacesensor.controller.js b/admin/app/controllers/settings/space/spacesensor.controller.js index efecb2db..9a3ddf82 100644 --- a/admin/app/controllers/settings/space/spacesensor.controller.js +++ b/admin/app/controllers/settings/space/spacesensor.controller.js @@ -1,10 +1,17 @@ 'use strict'; -app.controller('SpaceSensorController', function ($scope, $translate, SpaceService, SensorService, SpaceSensorService, toaster, SweetAlert) { +app.controller('SpaceSensorController', function ( + $scope, + $window, + $translate, + SpaceService, + SensorService, + SpaceSensorService, toaster, SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.sensors = []; $scope.spacesensors = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSensors = function () { SensorService.getAllSensors(function (response) { @@ -63,7 +70,8 @@ app.controller('SpaceSensorController', function ($scope, $translate, SpaceServi $scope.pairSensor = function (dragEl, dropEl) { var sensorid = angular.element('#' + dragEl).scope().sensor.id; var spaceid = $scope.currentSpaceID; - SpaceSensorService.addPair(spaceid, sensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceSensorService.addPair(spaceid, sensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -89,7 +97,8 @@ app.controller('SpaceSensorController', function ($scope, $translate, SpaceServi } var spacesensorid = angular.element('#' + dragEl).scope().spacesensor.id; var spaceid = $scope.currentSpaceID; - SpaceSensorService.deletePair(spaceid, spacesensorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceSensorService.deletePair(spaceid, spacesensorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spaceshopfloor.controller.js b/admin/app/controllers/settings/space/spaceshopfloor.controller.js index 1b698149..9bc5510a 100644 --- a/admin/app/controllers/settings/space/spaceshopfloor.controller.js +++ b/admin/app/controllers/settings/space/spaceshopfloor.controller.js @@ -1,11 +1,17 @@ 'use strict'; -app.controller('SpaceShopfloorController', function($scope, $translate, SpaceService, ShopfloorService, SpaceShopfloorService, toaster,SweetAlert) { +app.controller('SpaceShopfloorController', function( + $scope, + $window, + $translate, + SpaceService, + ShopfloorService, + SpaceShopfloorService, toaster,SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.shopfloors = []; $scope.spaceshopfloors = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +71,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer $scope.pairShopfloor=function(dragEl,dropEl){ var shopfloorid=angular.element('#'+dragEl).scope().shopfloor.id; var spaceid=angular.element(spacetreewithshopfloor).jstree(true).get_top_selected(); - SpaceShopfloorService.addPair(spaceid,shopfloorid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceShopfloorService.addPair(spaceid,shopfloorid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -91,8 +98,8 @@ app.controller('SpaceShopfloorController', function($scope, $translate, SpaceSer } var spaceshopfloorid = angular.element('#' + dragEl).scope().spaceshopfloor.id; var spaceid = angular.element(spacetreewithshopfloor).jstree(true).get_top_selected(); - - SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceShopfloorService.deletePair(spaceid, spaceshopfloorid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacestore.controller.js b/admin/app/controllers/settings/space/spacestore.controller.js index b49396d7..bcc02928 100644 --- a/admin/app/controllers/settings/space/spacestore.controller.js +++ b/admin/app/controllers/settings/space/spacestore.controller.js @@ -1,11 +1,16 @@ 'use strict'; -app.controller('SpaceStoreController', function($scope, $translate, SpaceService, StoreService, SpaceStoreService, toaster,SweetAlert) { +app.controller('SpaceStoreController', function( + $scope, + $window, + $translate, + SpaceService, + StoreService, SpaceStoreService, toaster,SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.stores = []; $scope.spacestores = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +70,8 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService $scope.pairStore=function(dragEl,dropEl){ var storeid=angular.element('#'+dragEl).scope().store.id; var spaceid=angular.element(spacetreewithstore).jstree(true).get_top_selected(); - SpaceStoreService.addPair(spaceid,storeid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceStoreService.addPair(spaceid,storeid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -92,8 +98,9 @@ app.controller('SpaceStoreController', function($scope, $translate, SpaceService } var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id; var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected(); + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceStoreService.deletePair(spaceid, spacestoreid, function (response) { + SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/controllers/settings/space/spacetenant.controller.js b/admin/app/controllers/settings/space/spacetenant.controller.js index 37f11561..d1c9de33 100644 --- a/admin/app/controllers/settings/space/spacetenant.controller.js +++ b/admin/app/controllers/settings/space/spacetenant.controller.js @@ -1,11 +1,17 @@ 'use strict'; -app.controller('SpaceTenantController', function($scope, $translate, SpaceService, TenantService, SpaceTenantService, toaster,SweetAlert) { +app.controller('SpaceTenantController', function( + $scope, + $window, + $translate, + SpaceService, + TenantService, + SpaceTenantService, toaster,SweetAlert) { $scope.spaces = []; $scope.currentSpaceID = 1; $scope.tenants = []; $scope.spacetenants = []; - + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { @@ -65,7 +71,8 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic $scope.pairTenant=function(dragEl,dropEl){ var tenantid=angular.element('#'+dragEl).scope().tenant.id; var spaceid=angular.element(spacetreewithtenant).jstree(true).get_top_selected(); - SpaceTenantService.addPair(spaceid,tenantid, function (response){ + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + SpaceTenantService.addPair(spaceid,tenantid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -91,8 +98,9 @@ app.controller('SpaceTenantController', function($scope, $translate, SpaceServic } var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id; var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected(); + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceTenantService.deletePair(spaceid, spacetenantid, function (response) { + SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/settings/meter/offlinemeter.service.js b/admin/app/services/settings/meter/offlinemeter.service.js index 3fd91bd8..be1845d1 100644 --- a/admin/app/services/settings/meter/offlinemeter.service.js +++ b/admin/app/services/settings/meter/offlinemeter.service.js @@ -17,24 +17,24 @@ app.factory('OfflineMeterService', function($http) { callback(response); }); }, - addOfflineMeter: function(offlinemeter, callback) { - $http.post(getAPI()+'offlinemeters',{data:offlinemeter}) + addOfflineMeter: function(offlinemeter, headers, callback) { + $http.post(getAPI()+'offlinemeters',{data:offlinemeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editdOfflineMeter: function(offlinemeter, callback) { - $http.put(getAPI()+'offlinemeters/'+offlinemeter.id,{data:offlinemeter}) + editOfflineMeter: function(offlinemeter, headers, callback) { + $http.put(getAPI()+'offlinemeters/'+offlinemeter.id,{data:offlinemeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteOfflineMeter: function(offlinemeter, callback) { - $http.delete(getAPI()+'offlinemeters/'+offlinemeter.id) + deleteOfflineMeter: function(offlinemeter, headers, callback) { + $http.delete(getAPI()+'offlinemeters/'+offlinemeter.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/meter/virtualmeter.service.js b/admin/app/services/settings/meter/virtualmeter.service.js index afebe297..2cf6eeda 100644 --- a/admin/app/services/settings/meter/virtualmeter.service.js +++ b/admin/app/services/settings/meter/virtualmeter.service.js @@ -17,24 +17,24 @@ app.factory('VirtualMeterService', function($http) { callback(response); }); }, - addVirtualMeter: function(virtualmeter, callback) { - $http.post(getAPI()+'virtualmeters',{data:virtualmeter}) + addVirtualMeter: function(virtualmeter, headers, callback) { + $http.post(getAPI()+'virtualmeters',{data:virtualmeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editVirtualMeter: function(virtualmeter, callback) { - $http.put(getAPI()+'virtualmeters/'+virtualmeter.id,{data:virtualmeter}) + editVirtualMeter: function(virtualmeter, headers, callback) { + $http.put(getAPI()+'virtualmeters/'+virtualmeter.id,{data:virtualmeter}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteVirtualMeter: function(virtualmeter, callback) { - $http.delete(getAPI()+'virtualmeters/'+virtualmeter.id) + deleteVirtualMeter: function(virtualmeter, headers, callback) { + $http.delete(getAPI()+'virtualmeters/'+virtualmeter.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/space.service.js b/admin/app/services/settings/space/space.service.js index b3a440fa..35a32c25 100644 --- a/admin/app/services/settings/space/space.service.js +++ b/admin/app/services/settings/space/space.service.js @@ -33,24 +33,24 @@ app.factory('SpaceService', function($http) { callback(response); }); }, - addSpace: function(space, callback) { - $http.post(getAPI()+'spaces',{data:space}) + addSpace: function(space, headers, callback) { + $http.post(getAPI()+'spaces',{data:space}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editSpace: function(space, callback) { - $http.put(getAPI()+'spaces/'+space.id,{data:space}) + editSpace: function(space, headers, callback) { + $http.put(getAPI()+'spaces/'+space.id,{data:space}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteSpace: function(space, callback) { - $http.delete(getAPI()+'spaces/'+space.id) + deleteSpace: function(space, headers, callback) { + $http.delete(getAPI()+'spaces/'+space.id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacecombinedequipment.service.js b/admin/app/services/settings/space/spacecombinedequipment.service.js index 842b7f4f..0dc0b248 100644 --- a/admin/app/services/settings/space/spacecombinedequipment.service.js +++ b/admin/app/services/settings/space/spacecombinedequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceCombinedEquipmentService', function($http) { return { - addPair: function(spaceID,combinedequipmentID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/combinedequipments',{data:{'combined_equipment_id':combinedequipmentID}}) + addPair: function(spaceID,combinedequipmentID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/combinedequipments',{data:{'combined_equipment_id':combinedequipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceCombinedEquipmentService', function($http) { }); }, - deletePair: function(spaceID, combinedequipmentID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/combinedequipments/'+combinedequipmentID) + deletePair: function(spaceID, combinedequipmentID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/combinedequipments/'+combinedequipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spaceequipment.service.js b/admin/app/services/settings/space/spaceequipment.service.js index beeb4bef..e825206a 100644 --- a/admin/app/services/settings/space/spaceequipment.service.js +++ b/admin/app/services/settings/space/spaceequipment.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceEquipmentService', function($http) { return { - addPair: function(spaceID,equipmentID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/equipments',{data:{'equipment_id':equipmentID}}) + addPair: function(spaceID,equipmentID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/equipments',{data:{'equipment_id':equipmentID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceEquipmentService', function($http) { }); }, - deletePair: function(spaceID, equipmentID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/equipments/'+equipmentID) + deletePair: function(spaceID, equipmentID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/equipments/'+equipmentID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacemeter.service.js b/admin/app/services/settings/space/spacemeter.service.js index 3fdc935b..5c67fe51 100644 --- a/admin/app/services/settings/space/spacemeter.service.js +++ b/admin/app/services/settings/space/spacemeter.service.js @@ -1,7 +1,7 @@ 'use strict'; app.factory('SpaceMeterService', function($http) { return { - addPair: function(spaceID,meterID, metertype,callback) { + addPair: function(spaceID,meterID, metertype, headers, callback) { var meter={}; if(metertype=='meters'){ meter={'meter_id':meterID}; @@ -11,7 +11,7 @@ app.factory('SpaceMeterService', function($http) { meter={'offline_meter_id':meterID}; } - $http.post(getAPI()+'spaces/'+spaceID+'/'+metertype,{data:meter}) + $http.post(getAPI()+'spaces/'+spaceID+'/'+metertype,{data:meter}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -19,8 +19,8 @@ app.factory('SpaceMeterService', function($http) { }); }, - deletePair: function(spaceID,meterID, metertype, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/'+metertype+'/'+meterID) + deletePair: function(spaceID,meterID, metertype, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/'+metertype+'/'+meterID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacepoint.service.js b/admin/app/services/settings/space/spacepoint.service.js index 8bb5f592..dd530fc3 100644 --- a/admin/app/services/settings/space/spacepoint.service.js +++ b/admin/app/services/settings/space/spacepoint.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpacePointService', function($http) { return { - addPair: function(spaceID,pointID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/points',{data:{'point_id':pointID}}) + addPair: function(spaceID,pointID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/points',{data:{'point_id':pointID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpacePointService', function($http) { }); }, - deletePair: function(spaceID,pointID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/points/'+pointID) + deletePair: function(spaceID,pointID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/points/'+pointID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacesensor.service.js b/admin/app/services/settings/space/spacesensor.service.js index ec757386..ab942e83 100644 --- a/admin/app/services/settings/space/spacesensor.service.js +++ b/admin/app/services/settings/space/spacesensor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceSensorService', function($http) { return { - addPair: function(spaceID,sensorID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/sensors',{data:{'sensor_id':sensorID}}) + addPair: function(spaceID,sensorID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/sensors',{data:{'sensor_id':sensorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceSensorService', function($http) { }); }, - deletePair: function(spaceID,sensorID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/sensors/'+sensorID) + deletePair: function(spaceID,sensorID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/sensors/'+sensorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spaceshopfloor.service.js b/admin/app/services/settings/space/spaceshopfloor.service.js index 36d61e16..750768aa 100644 --- a/admin/app/services/settings/space/spaceshopfloor.service.js +++ b/admin/app/services/settings/space/spaceshopfloor.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceShopfloorService', function($http) { return { - addPair: function(spaceID,shopfloorID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/shopfloors',{data:{'shopfloor_id':shopfloorID}}) + addPair: function(spaceID,shopfloorID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/shopfloors',{data:{'shopfloor_id':shopfloorID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceShopfloorService', function($http) { }); }, - deletePair: function(spaceID, shopfloorID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/shopfloors/'+shopfloorID) + deletePair: function(spaceID, shopfloorID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/shopfloors/'+shopfloorID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacestore.service.js b/admin/app/services/settings/space/spacestore.service.js index 2878a8ff..8ce11034 100644 --- a/admin/app/services/settings/space/spacestore.service.js +++ b/admin/app/services/settings/space/spacestore.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceStoreService', function($http) { return { - addPair: function(spaceID,storeID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/stores',{data:{'store_id':storeID}}) + addPair: function(spaceID,storeID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/stores',{data:{'store_id':storeID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceStoreService', function($http) { }); }, - deletePair: function(spaceID, storeID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/stores/'+storeID) + deletePair: function(spaceID, storeID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/stores/'+storeID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/admin/app/services/settings/space/spacetenant.service.js b/admin/app/services/settings/space/spacetenant.service.js index ef52f646..15b93a73 100644 --- a/admin/app/services/settings/space/spacetenant.service.js +++ b/admin/app/services/settings/space/spacetenant.service.js @@ -1,8 +1,8 @@ 'use strict'; app.factory('SpaceTenantService', function($http) { return { - addPair: function(spaceID,tenantID,callback) { - $http.post(getAPI()+'spaces/'+spaceID+'/tenants',{data:{'tenant_id':tenantID}}) + addPair: function(spaceID,tenantID, headers, callback) { + $http.post(getAPI()+'spaces/'+spaceID+'/tenants',{data:{'tenant_id':tenantID}}, {headers}) .then(function (response) { callback(response); }, function (response) { @@ -10,8 +10,8 @@ app.factory('SpaceTenantService', function($http) { }); }, - deletePair: function(spaceID, tenantID, callback) { - $http.delete(getAPI()+'spaces/'+spaceID+'/tenants/'+tenantID) + deletePair: function(spaceID, tenantID, headers, callback) { + $http.delete(getAPI()+'spaces/'+spaceID+'/tenants/'+tenantID, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/offlinemeter.py b/myems-api/core/offlinemeter.py index 2281a9d6..c882a507 100644 --- a/myems-api/core/offlinemeter.py +++ b/myems-api/core/offlinemeter.py @@ -91,6 +91,7 @@ class OfflineMeterCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -318,6 +319,7 @@ class OfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_OFFLINE_METER_ID') @@ -473,6 +475,7 @@ class OfflineMeterItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: diff --git a/myems-api/core/space.py b/myems-api/core/space.py index 3fa1f14d..c655f1b2 100644 --- a/myems-api/core/space.py +++ b/myems-api/core/space.py @@ -108,6 +108,7 @@ class SpaceCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') new_values = json.loads(raw_json) @@ -361,6 +362,7 @@ class SpaceItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -519,6 +521,7 @@ class SpaceItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -863,6 +866,7 @@ class SpaceCombinedEquipmentCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -937,6 +941,7 @@ class SpaceCombinedEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_, eid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1032,6 +1037,7 @@ class SpaceEquipmentCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1106,6 +1112,7 @@ class SpaceEquipmentItem: @staticmethod @user_logger def on_delete(req, resp, id_, eid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1214,6 +1221,7 @@ class SpaceMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1288,6 +1296,7 @@ class SpaceMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1398,6 +1407,7 @@ class SpaceOfflineMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1472,6 +1482,7 @@ class SpaceOfflineMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1580,6 +1591,7 @@ class SpacePointCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1654,6 +1666,7 @@ class SpacePointItem: @staticmethod @user_logger def on_delete(req, resp, id_, pid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1749,6 +1762,7 @@ class SpaceSensorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1823,6 +1837,7 @@ class SpaceSensorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -1917,6 +1932,7 @@ class SpaceShopfloorCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -1991,6 +2007,7 @@ class SpaceShopfloorItem: @staticmethod @user_logger def on_delete(req, resp, id_, sid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -2085,6 +2102,7 @@ class SpaceStoreCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -2159,6 +2177,7 @@ class SpaceStoreItem: @staticmethod @user_logger def on_delete(req, resp, id_, tid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -2253,6 +2272,7 @@ class SpaceTenantCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -2327,6 +2347,7 @@ class SpaceTenantItem: @staticmethod @user_logger def on_delete(req, resp, id_, tid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') @@ -2435,6 +2456,7 @@ class SpaceVirtualMeterCollection: @user_logger def on_post(req, resp, id_): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -2509,6 +2531,7 @@ class SpaceVirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_, mid): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SPACE_ID') diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index 261a11c2..78e720a3 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -142,6 +142,7 @@ class VirtualMeterCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -474,6 +475,7 @@ class VirtualMeterItem: @staticmethod @user_logger def on_delete(req, resp, id_): + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_VIRTUAL_METER_ID') @@ -638,6 +640,7 @@ class VirtualMeterItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From bf6a8ba8eece79e0ae6e61bc84661a2a30e4fbd6 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 9 Dec 2021 12:08:00 +0800 Subject: [PATCH 043/117] added access control to costcenter and tariff in api and admin --- .../settings/tariff/flat.controller.js | 158 ---------------- .../services/settings/tariff/flat.service.js | 53 ------ admin/views/settings/tariff/flat.model.html | 19 -- myems-api/MyEMS.postman_collection.json | 168 +++++++++++++++--- myems-api/README.md | 8 +- myems-api/core/costcenter.py | 5 + myems-api/core/costfile.py | 4 + myems-api/core/tariff.py | 2 + 8 files changed, 158 insertions(+), 259 deletions(-) delete mode 100644 admin/app/controllers/settings/tariff/flat.controller.js delete mode 100644 admin/app/services/settings/tariff/flat.service.js delete mode 100644 admin/views/settings/tariff/flat.model.html diff --git a/admin/app/controllers/settings/tariff/flat.controller.js b/admin/app/controllers/settings/tariff/flat.controller.js deleted file mode 100644 index edfe3e16..00000000 --- a/admin/app/controllers/settings/tariff/flat.controller.js +++ /dev/null @@ -1,158 +0,0 @@ -'use strict'; - -app.controller('FlatController', function($scope,$uibModal,$translate, FlatService,toaster,SweetAlert) { - - - $scope.getAllFlats = function() { - FlatService.getAllFlats(function (response) { - if (angular.isDefined(response.status) && response.status === 200) { - $scope.flats = response.data; - } else { - $scope.flats = []; - } - }); - - }; - - $scope.addFlat = function() { - var modalInstance = $uibModal.open({ - templateUrl: 'views/settings/tariff/flat.model.html', - controller: 'ModalAddFlatCtrl', - windowClass: "animated fadeIn", - resolve: { - params:function(){ - return { - flats:angular.copy($scope.flats) - }; - } - } - }); - modalInstance.result.then(function(flat) { - FlatService.addFlat(flat, function(response) { - if (angular.isDefined(response.status) && response.status === 201) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_ADD_BODY", {template: $translate.instant("TOASTER.FLAT")}), - showCloseButton: true, - }); - $scope.getAllFlats(); - } else { - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_ADD_BODY", {template: $translate.instant("TOASTER.FLAT")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - }, function() { - - }); - }; - - $scope.editFlat=function(flat){ - var modalInstance = $uibModal.open({ - windowClass: "animated fadeIn", - templateUrl: 'views/settings/tariff/flat.model.html', - controller: 'ModalEditFlatCtrl', - resolve: { - params:function(){ - return { - flat:angular.copy(flat), - flats:angular.copy($scope.flats) - }; - } - } - }); - - modalInstance.result.then(function (modifiedFlat) { - FlatService.editFlat(modifiedFlat, function (response) { - if(angular.isDefined(response.status) && response.status === 200){ - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_UPDATE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - showCloseButton: true, - }); - $scope.getAllFlats(); - }else{ - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_UPDATE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - }, function () { - //do nothing; - }); - }; - - $scope.deleteFlat=function(flat){ - SweetAlert.swal({ - title: $translate.instant("SWEET.TITLE"), - text: $translate.instant("SWEET.TEXT"), - type: "warning", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: $translate.instant("SWEET.CONFIRM_BUTTON_TEXT"), - cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"), - closeOnConfirm: true, - closeOnCancel: true }, - function (isConfirm) { - if (isConfirm) { - FlatService.deleteFlat(flat, function (response) { - if (angular.isDefined(response.status) && response.status === 204) { - toaster.pop({ - type: "success", - title: $translate.instant("TOASTER.SUCCESS_TITLE"), - body: $translate.instant("TOASTER.SUCCESS_DELETE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - showCloseButton: true, - }); - $scope.getAllFlats(); - } else { - toaster.pop({ - type: "error", - title: $translate.instant("TOASTER.ERROR_DELETE_BODY", {template: $translate.instant("TOASTER.FLAT")}), - body: $translate.instant(response.data.description), - showCloseButton: true, - }); - } - }); - } - }); - }; - - $scope.getAllFlats(); - - -}); - -app.controller('ModalAddFlatCtrl', function ($scope, $uibModalInstance,params) { - - $scope.operation="添加"; - $scope.flats=params.flats; - $scope.ok = function () { - $uibModalInstance.close($scope.flat); - }; - - $scope.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; -}); - -app.controller('ModalEditFlatCtrl', function ($scope, $uibModalInstance, params) { - $scope.operation="编辑"; - $scope.flat = params.flat; - $scope.flats=params.flats; - - $scope.ok = function () { - $uibModalInstance.close($scope.flat); - }; - - $scope.cancel = function () { - $uibModalInstance.dismiss('cancel'); - }; -}); \ No newline at end of file diff --git a/admin/app/services/settings/tariff/flat.service.js b/admin/app/services/settings/tariff/flat.service.js deleted file mode 100644 index a853302c..00000000 --- a/admin/app/services/settings/tariff/flat.service.js +++ /dev/null @@ -1,53 +0,0 @@ -'use strict'; -app.factory('FlatService', function($http) { - return { - getAllFlats:function(callback){ - $http.get(getAPI()+'flats') - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - searchFlats: function(query, callback) { - $http.get(getAPI()+'flats', { params: { q: query } }) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - addFlat: function(flat, callback) { - $http.post(getAPI()+'flats',{data:flat}) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - editFlat: function(flat, callback) { - $http.put(getAPI()+'flats/'+flat.id,{data:flat}) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - deleteFlat: function(flat, callback) { - $http.delete(getAPI()+'flats/'+flat.id) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - }, - getFlat: function(id, callback) { - $http.get(getAPI()+'flats/'+id) - .then(function (response) { - callback(response); - }, function (response) { - callback(response); - }); - } - }; -}); \ No newline at end of file diff --git a/admin/views/settings/tariff/flat.model.html b/admin/views/settings/tariff/flat.model.html deleted file mode 100644 index 987ab7da..00000000 --- a/admin/views/settings/tariff/flat.model.html +++ /dev/null @@ -1,19 +0,0 @@ -
-
-

{{operation | translate}}

-
-
- -
- -
-
-
- - -
-
- - -
-
diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index ed679a2f..07e24531 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -1017,7 +1017,18 @@ "name": "POST Creat a Cost Center", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"动力中心\", \"external_id\":\"21829198980001\"}}" @@ -1038,7 +1049,18 @@ "name": "PUT Update a Cost Center", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"动力中心2\", \"external_id\":\"21829198980002\"}}" @@ -1060,28 +1082,50 @@ "name": "DELETE a Cost Center by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "url": { - "raw": "{{base_url}}/costcenters/2", + "raw": "{{base_url}}/costcenters/3", "host": [ "{{base_url}}" ], "path": [ "costcenters", - "2" + "3" ] } }, "response": [] }, { - "name": "POST a Cost Center and Tariff Relation", + "name": "POST Bind Tariff to Cost Center", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"tariff_id\":\"1\"}}" + "raw": "{\"data\":{\"tariff_id\":\"3\"}}" }, "url": { "raw": "{{base_url}}/costcenters/1/tariffs", @@ -1103,16 +1147,35 @@ "method": "GET", "header": [], "url": { - "raw": "" + "raw": "{{base_url}}/costcenters/1/tariffs", + "host": [ + "{{base_url}}" + ], + "path": [ + "costcenters", + "1", + "tariffs" + ] } }, "response": [] }, { - "name": "DELETE a Cost Center and Tariff Relation", + "name": "DELETE Unbind Tariff from Cost Center", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/costcenters/1/tariffs/3", "host": [ @@ -7475,10 +7538,21 @@ "response": [] }, { - "name": "POST Create a Tariff (block)", + "name": "POST Create a Tariff (Tiered)", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"new阶梯电价\",\"energy_category\":{\"id\":1}, \"tariff_type\":\"block\", \"unit_of_price\":\"元/千瓦时\", \"valid_from\":\"2020-01-01T00:00:00\", \"valid_through\":\"2021-01-01T00:00:00\", \"block\":[{\"start_amount\":\"0\", \"end_amount\":\"10000\", \"price\":\"0.567\"}, {\"start_amount\":\"10000\", \"end_amount\":\"30000\", \"price\":\"0.678\"}, {\"start_amount\":\"30000\", \"end_amount\":\"100000\", \"price\":\"0.789\"}]}}" @@ -7514,32 +7588,54 @@ "response": [] }, { - "name": "PUT Update a Tariff (block)", + "name": "PUT Update a Tariff (Tiered)", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"new阶梯电价\",\"energy_category\":{\"id\":1}, \"tariff_type\":\"block\", \"unit_of_price\":\"元/千瓦时\", \"valid_from\":\"2020-01-01T00:00:00\", \"valid_through\":\"2021-01-01T00:00:00\", \"block\":[{\"start_amount\":\"0\", \"end_amount\":\"20000\", \"price\":\"0.567\"}, {\"start_amount\":\"20000\", \"end_amount\":\"30000\", \"price\":\"0.678\"}, {\"start_amount\":\"30000\", \"end_amount\":\"100000\", \"price\":\"0.789\"}]}}" }, "url": { - "raw": "{{base_url}}/tariffs/18", + "raw": "{{base_url}}/tariffs/17", "host": [ "{{base_url}}" ], "path": [ "tariffs", - "18" + "17" ] } }, "response": [] }, { - "name": "POST Create a Tariff (time of use)", + "name": "POST Create a Tariff (Time of Use)", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"new2020分时电价1-6\",\"energy_category\":{\"id\":1}, \"tariff_type\":\"timeofuse\", \"unit_of_price\":\"元/千瓦时\", \"valid_from\":\"2020-01-01T00:00:00\", \"valid_through\":\"2020-07-01T00:00:00\", \"timeofuse\":[{\"start_time_of_day\":\"00:00:00\", \"end_time_of_day\":\"05:59:59\", \"peak_type\":\"offpeak\", \"price\":0.345}, {\"start_time_of_day\":\"06:00:00\", \"end_time_of_day\":\"07:59:59\", \"peak_type\":\"midpeak\", \"price\":0.708}, {\"start_time_of_day\":\"08:00:00\", \"end_time_of_day\":\"10:59:59\", \"peak_type\":\"onpeak\", \"price\":1.159}, {\"start_time_of_day\":\"11:00:00\", \"end_time_of_day\":\"17:59:59\", \"peak_type\":\"midpeak\", \"price\":0.708}, {\"start_time_of_day\":\"18:00:00\", \"end_time_of_day\":\"20:59:59\", \"peak_type\":\"onpeak\", \"price\":1.159}, {\"start_time_of_day\":\"21:00:00\", \"end_time_of_day\":\"21:59:59\", \"peak_type\":\"midpeak\", \"price\":0.708}, {\"start_time_of_day\":\"22:00:00\", \"end_time_of_day\":\"23:59:59\", \"peak_type\":\"offpeak\", \"price\":0.345}]}}" @@ -7560,19 +7656,30 @@ "name": "PUT Update a Tariff (time of use)", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"new2020分时电价1-6\",\"energy_category\":{\"id\":1}, \"tariff_type\":\"timeofuse\", \"unit_of_price\":\"元/千瓦时\", \"valid_from\":\"2020-01-01T00:00:00\", \"valid_through\":\"2020-07-01T00:00:00\", \"timeofuse\":[{\"start_time_of_day\":\"00:00:00\", \"end_time_of_day\":\"05:59:59\", \"peak_type\":\"offpeak\", \"price\":0.456}, {\"start_time_of_day\":\"06:00:00\", \"end_time_of_day\":\"07:59:59\", \"peak_type\":\"midpeak\", \"price\":0.708}, {\"start_time_of_day\":\"08:00:00\", \"end_time_of_day\":\"10:59:59\", \"peak_type\":\"onpeak\", \"price\":1.159}, {\"start_time_of_day\":\"11:00:00\", \"end_time_of_day\":\"17:59:59\", \"peak_type\":\"midpeak\", \"price\":0.708}, {\"start_time_of_day\":\"18:00:00\", \"end_time_of_day\":\"20:59:59\", \"peak_type\":\"onpeak\", \"price\":1.159}, {\"start_time_of_day\":\"21:00:00\", \"end_time_of_day\":\"21:59:59\", \"peak_type\":\"midpeak\", \"price\":0.708}, {\"start_time_of_day\":\"22:00:00\", \"end_time_of_day\":\"23:59:59\", \"peak_type\":\"offpeak\", \"price\":0.345}]}}" }, "url": { - "raw": "{{base_url}}/tariffs/19", + "raw": "{{base_url}}/tariffs/18", "host": [ "{{base_url}}" ], "path": [ "tariffs", - "19" + "18" ] } }, @@ -7582,15 +7689,26 @@ "name": "DELETE a Tariff", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "dca233ce58b2bf881e862e994f392dd27dd286c6135eff14da111137023b6c5625864300b269048036dcec310d4f61fa89021e5a3462512de2852493227187a0", + "type": "text" + } + ], "url": { - "raw": "{{base_url}}/tariffs/16", + "raw": "{{base_url}}/tariffs/18", "host": [ "{{base_url}}" ], "path": [ "tariffs", - "16" + "18" ] } }, diff --git a/myems-api/README.md b/myems-api/README.md index 2904679d..dfe26621 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -343,20 +343,20 @@ Result * GET All Cost Files ```bash -curl -i -X GET {{base_url}}/costfiles +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/costfiles ``` * DELETE a Cost File by ID ```bash -curl -i -X DELETE {{base_url}}/costfiles/{id} +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X DELETE {{base_url}}/costfiles/{id} ``` * POST Upload a Cost File (call users login API to get 'User-UUID' and 'Token') ```bash -curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/costfiles +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/TBD" -X POST -d 'file: (binary)' {{base_url}}/costfiles ``` * GET Restore a Cost File by ID from database to disk ```bash -curl -i -X GET {{base_url}}/costfiles/{id}/restore +curl -i -H "User-UUID: dcdb67d1-6116-4987-916f-6fc6cf2bc0e4" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/costfiles/{id}/restore ``` ### Data Source diff --git a/myems-api/core/costcenter.py b/myems-api/core/costcenter.py index 7a4b93f2..84ab1a29 100644 --- a/myems-api/core/costcenter.py +++ b/myems-api/core/costcenter.py @@ -18,6 +18,7 @@ class CostCenterCollection: @staticmethod def on_get(req, resp): + """Handles GET requests""" cnx = mysql.connector.connect(**config.myems_system_db) cursor = cnx.cursor() @@ -111,6 +112,7 @@ class CostCenterItem: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COST_CENTER_ID') @@ -136,6 +138,7 @@ class CostCenterItem: @staticmethod @user_logger def on_delete(req, resp, id_): + """Handles DELETE requests""" access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -379,6 +382,7 @@ class CostCenterTariffCollection: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_COST_CENTER_ID') @@ -482,6 +486,7 @@ class CostCenterTariffItem: @staticmethod @user_logger def on_delete(req, resp, id_, tid): + """Handles DELETE requests""" access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/costfile.py b/myems-api/core/costfile.py index 5ec2852b..b96d87d2 100644 --- a/myems-api/core/costfile.py +++ b/myems-api/core/costfile.py @@ -20,6 +20,7 @@ class CostFileCollection: @staticmethod def on_get(req, resp): + """Handles GET requests""" access_control(req) cnx = mysql.connector.connect(**config.myems_historical_db) cursor = cnx.cursor() @@ -159,6 +160,7 @@ class CostFileItem: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, @@ -194,6 +196,7 @@ class CostFileItem: @staticmethod @user_logger def on_delete(req, resp, id_): + """Handles DELETE requests""" access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -245,6 +248,7 @@ class CostFileRestore: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', diff --git a/myems-api/core/tariff.py b/myems-api/core/tariff.py index 23ec0274..ac852ac3 100644 --- a/myems-api/core/tariff.py +++ b/myems-api/core/tariff.py @@ -233,6 +233,7 @@ class TariffItem: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_TARIFF_ID') @@ -312,6 +313,7 @@ class TariffItem: @staticmethod @user_logger def on_delete(req, resp, id_): + """Handles DELETE requests""" access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', From 806554923f64d5b623aa82b312d2e1b7de097eb8 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 10 Dec 2021 17:22:34 +0800 Subject: [PATCH 044/117] added energy model database added tables to energy baseline database added tables to billing baseline database --- .../install/myems_billing_baseline_db.sql | 39 +++ database/install/myems_energy_baseline_db.sql | 39 +++ database/install/myems_energy_model_db.sql | 257 ++++++++++++++ database/upgrade/upgrade1.4.1.sql | 316 ++++++++++++++++++ 4 files changed, 651 insertions(+) create mode 100644 database/install/myems_energy_model_db.sql create mode 100644 database/upgrade/upgrade1.4.1.sql diff --git a/database/install/myems_billing_baseline_db.sql b/database/install/myems_billing_baseline_db.sql index 8bedbc17..a75070c7 100644 --- a/database/install/myems_billing_baseline_db.sql +++ b/database/install/myems_billing_baseline_db.sql @@ -91,6 +91,32 @@ CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_equipment_output_cat PRIMARY KEY (`id`)); CREATE INDEX `tbl_equipment_output_category_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_equipment_output_category_hourly` (`equipment_id`, `energy_category_id`, `start_datetime_utc`); +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_billing_baseline_db`.`tbl_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_billing_baseline_db`.`tbl_meter_hourly` ; + +CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_meter_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_meter_hourly` (`meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_billing_baseline_db`.`tbl_offline_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_billing_baseline_db`.`tbl_offline_meter_hourly` ; + +CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_offline_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `offline_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_offline_meter_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_offline_meter_hourly` (`offline_meter_id`, `start_datetime_utc`); + -- --------------------------------------------------------------------------------------------------------------------- -- Table `myems_billing_baseline_db`.`tbl_shopfloor_input_category_hourly` -- --------------------------------------------------------------------------------------------------------------------- @@ -216,3 +242,16 @@ CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_tenant_input_item_ho `actual_value` DECIMAL(18, 3) NOT NULL, PRIMARY KEY (`id`)); CREATE INDEX `tbl_tenant_input_item_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_tenant_input_item_hourly` (`tenant_id`, `energy_item_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` ; + +CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `virtual_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` (`virtual_meter_id`, `start_datetime_utc`); diff --git a/database/install/myems_energy_baseline_db.sql b/database/install/myems_energy_baseline_db.sql index caceb28d..5764f203 100644 --- a/database/install/myems_energy_baseline_db.sql +++ b/database/install/myems_energy_baseline_db.sql @@ -91,6 +91,32 @@ CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_equipment_output_cate PRIMARY KEY (`id`)); CREATE INDEX `tbl_equipment_output_category_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_equipment_output_category_hourly` (`equipment_id`, `energy_category_id`, `start_datetime_utc`); +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_baseline_db`.`tbl_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_baseline_db`.`tbl_meter_hourly` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_meter_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_meter_hourly` (`meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_baseline_db`.`tbl_offline_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_baseline_db`.`tbl_offline_meter_hourly` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_offline_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `offline_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_offline_meter_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_offline_meter_hourly` (`offline_meter_id`, `start_datetime_utc`); + -- --------------------------------------------------------------------------------------------------------------------- -- Table `myems_energy_baseline_db`.`tbl_shopfloor_input_category_hourly` -- --------------------------------------------------------------------------------------------------------------------- @@ -216,3 +242,16 @@ CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_tenant_input_item_hou `actual_value` DECIMAL(18, 3) NOT NULL, PRIMARY KEY (`id`)); CREATE INDEX `tbl_tenant_input_item_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_tenant_input_item_hourly` (`tenant_id`, `energy_item_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `virtual_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` (`virtual_meter_id`, `start_datetime_utc`); diff --git a/database/install/myems_energy_model_db.sql b/database/install/myems_energy_model_db.sql new file mode 100644 index 00000000..520c5229 --- /dev/null +++ b/database/install/myems_energy_model_db.sql @@ -0,0 +1,257 @@ +-- MyEMS Energy Model Database +-- store energy consumption models in 8760 hours of year, hour by hour +-- --------------------------------------------------------------------------------------------------------------------- +-- Schema myems_energy_model_db +-- --------------------------------------------------------------------------------------------------------------------- +DROP DATABASE IF EXISTS `myems_energy_model_db` ; +CREATE DATABASE IF NOT EXISTS `myems_energy_model_db` ; +USE `myems_energy_model_db` ; + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `combined_equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_combined_equipment_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` (`combined_equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `combined_equipment_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_combined_equipment_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` (`combined_equipment_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `combined_equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_combined_equipment_output_category_8760_index_1` ON `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` (`combined_equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_equipment_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_equipment_input_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_equipment_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_equipment_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_equipment_input_category_8760` (`equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_equipment_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_equipment_input_item_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_equipment_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `equipment_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_equipment_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_equipment_input_item_8760` (`equipment_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_equipment_output_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_equipment_output_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_equipment_output_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_equipment_output_category_8760_index_1` ON `myems_energy_model_db`.`tbl_equipment_output_category_8760` (`equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_meter_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_meter_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_meter_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `meter_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_meter_8760` (`meter_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_offline_meter_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_offline_meter_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_offline_meter_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `offline_meter_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_offline_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_offline_meter_8760` (`offline_meter_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `shopfloor_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_shopfloor_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` (`shopfloor_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `shopfloor_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_shopfloor_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` (`shopfloor_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_space_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_space_input_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_space_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `space_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_space_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_space_input_category_8760` (`space_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_space_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_space_input_item_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_space_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `space_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_space_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_space_input_item_8760` (`space_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_space_output_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_space_output_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_space_output_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `space_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_space_output_category_8760_index_1` ON `myems_energy_model_db`.`tbl_space_output_category_8760` (`space_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_store_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_store_input_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_store_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `store_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_store_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_store_input_category_8760` (`store_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_store_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_store_input_item_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_store_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `store_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_store_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_store_input_item_8760` (`store_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_tenant_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_tenant_input_category_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_tenant_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `tenant_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_tenant_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_tenant_input_category_8760` (`tenant_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_tenant_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_tenant_input_item_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_tenant_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `tenant_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_tenant_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_tenant_input_item_8760` (`tenant_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_virtual_meter_8760` +-- --------------------------------------------------------------------------------------------------------------------- +DROP TABLE IF EXISTS `myems_energy_model_db`.`tbl_virtual_meter_8760` ; + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_virtual_meter_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `virtual_meter_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_virtual_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_virtual_meter_8760` (`virtual_meter_id`, `hour_of_year`); diff --git a/database/upgrade/upgrade1.4.1.sql b/database/upgrade/upgrade1.4.1.sql new file mode 100644 index 00000000..a7d45651 --- /dev/null +++ b/database/upgrade/upgrade1.4.1.sql @@ -0,0 +1,316 @@ +START TRANSACTION; + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_baseline_db`.`tbl_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_meter_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_meter_hourly` (`meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_baseline_db`.`tbl_offline_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_offline_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `offline_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_offline_meter_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_offline_meter_hourly` (`offline_meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `virtual_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON `myems_energy_baseline_db`.`tbl_virtual_meter_hourly` (`virtual_meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_billing_baseline_db`.`tbl_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_meter_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_meter_hourly` (`meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_billing_baseline_db`.`tbl_offline_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_offline_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `offline_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_offline_meter_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_offline_meter_hourly` (`offline_meter_id`, `start_datetime_utc`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` +-- --------------------------------------------------------------------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `virtual_meter_id` BIGINT NOT NULL, + `start_datetime_utc` DATETIME NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_virtual_meter_hourly_index_1` ON `myems_billing_baseline_db`.`tbl_virtual_meter_hourly` (`virtual_meter_id`, `start_datetime_utc`); + +-- MyEMS Energy Model Database +-- store energy consumption models in 8760 hours of year, hour by hour +-- --------------------------------------------------------------------------------------------------------------------- +-- Schema myems_energy_model_db +-- --------------------------------------------------------------------------------------------------------------------- +CREATE DATABASE IF NOT EXISTS `myems_energy_model_db` ; + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `combined_equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_combined_equipment_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_combined_equipment_input_category_8760` (`combined_equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `combined_equipment_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_combined_equipment_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_combined_equipment_input_item_8760` (`combined_equipment_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `combined_equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_combined_equipment_output_category_8760_index_1` ON `myems_energy_model_db`.`tbl_combined_equipment_output_category_8760` (`combined_equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_equipment_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_equipment_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_equipment_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_equipment_input_category_8760` (`equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_equipment_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_equipment_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `equipment_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_equipment_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_equipment_input_item_8760` (`equipment_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_equipment_output_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_equipment_output_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `equipment_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_equipment_output_category_8760_index_1` ON `myems_energy_model_db`.`tbl_equipment_output_category_8760` (`equipment_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_meter_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_meter_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `meter_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_meter_8760` (`meter_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_offline_meter_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_offline_meter_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `offline_meter_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_offline_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_offline_meter_8760` (`offline_meter_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `shopfloor_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_shopfloor_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_shopfloor_input_category_8760` (`shopfloor_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `shopfloor_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_shopfloor_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_shopfloor_input_item_8760` (`shopfloor_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_space_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_space_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `space_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_space_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_space_input_category_8760` (`space_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_space_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_space_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `space_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_space_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_space_input_item_8760` (`space_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_space_output_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_space_output_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `space_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_space_output_category_8760_index_1` ON `myems_energy_model_db`.`tbl_space_output_category_8760` (`space_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_store_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_store_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `store_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_store_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_store_input_category_8760` (`store_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_store_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_store_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `store_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_store_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_store_input_item_8760` (`store_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_tenant_input_category_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_tenant_input_category_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `tenant_id` BIGINT NOT NULL, + `energy_category_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_tenant_input_category_8760_index_1` ON `myems_energy_model_db`.`tbl_tenant_input_category_8760` (`tenant_id`, `energy_category_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_tenant_input_item_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_tenant_input_item_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `tenant_id` BIGINT NOT NULL, + `energy_item_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_tenant_input_item_8760_index_1` ON `myems_energy_model_db`.`tbl_tenant_input_item_8760` (`tenant_id`, `energy_item_id`, `hour_of_year`); + +-- --------------------------------------------------------------------------------------------------------------------- +-- Table `myems_energy_model_db`.`tbl_virtual_meter_8760` +-- --------------------------------------------------------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS `myems_energy_model_db`.`tbl_virtual_meter_8760` ( + `id` BIGINT NOT NULL AUTO_INCREMENT, + `virtual_meter_id` BIGINT NOT NULL, + `hour_of_year` INT NOT NULL, + `actual_value` DECIMAL(18, 3) NOT NULL, + PRIMARY KEY (`id`)); +CREATE INDEX `tbl_virtual_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_virtual_meter_8760` (`virtual_meter_id`, `hour_of_year`); + + +-- UPDATE VERSION NUMBER +UPDATE myems_system_db.tbl_versions SET version='1.4.1', release_date='2021-12-12' WHERE id=1; + +COMMIT; From d3519bf39cb7d47887445b0b20685836f1a4b43d Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 10 Dec 2021 17:58:42 +0800 Subject: [PATCH 045/117] added access control to rule in api and admin --- .../controllers/fdd/rule/rule.controller.js | 22 ++++-- admin/app/services/fdd/rule.service.js | 24 +++---- myems-api/MyEMS.postman_collection.json | 69 +++++++++++++++++-- myems-api/README.md | 4 +- myems-api/core/rule.py | 8 +++ 5 files changed, 101 insertions(+), 26 deletions(-) diff --git a/admin/app/controllers/fdd/rule/rule.controller.js b/admin/app/controllers/fdd/rule/rule.controller.js index 9719b295..d85c5be8 100644 --- a/admin/app/controllers/fdd/rule/rule.controller.js +++ b/admin/app/controllers/fdd/rule/rule.controller.js @@ -1,6 +1,14 @@ 'use strict'; -app.controller('RuleController', function($scope, $uibModal, $translate, RuleService, toaster, SweetAlert) { +app.controller('RuleController', function( + $scope, + $window, + $uibModal, + $translate, + RuleService, + toaster, + SweetAlert) { + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); $scope.initExpression = [{ "sample_object_id": 1, @@ -13,7 +21,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer $scope.initMessageTemplate = 'This a sample template. Use %s for substitution. You can use multiple %s s in the template.'; $scope.getAllRules = function() { - RuleService.getAllRules(function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.getAllRules(headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.rules = response.data; } else { @@ -40,7 +49,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer } }); modalInstance.result.then(function(rule) { - RuleService.addRule(rule, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.addRule(rule, headers, function (response) { if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ type: "success", @@ -79,7 +89,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer }); modalInstance.result.then(function(modifiedRule) { - RuleService.editRule(modifiedRule, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.editRule(modifiedRule, headers, function (response) { if (angular.isDefined(response.status) && response.status === 200) { toaster.pop({ type: "success", @@ -117,7 +128,8 @@ app.controller('RuleController', function($scope, $uibModal, $translate, RuleSer }, function(isConfirm) { if (isConfirm) { - RuleService.deleteRule(rule, function (response) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + RuleService.deleteRule(rule, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ type: "success", diff --git a/admin/app/services/fdd/rule.service.js b/admin/app/services/fdd/rule.service.js index e4c92e65..266b05ae 100644 --- a/admin/app/services/fdd/rule.service.js +++ b/admin/app/services/fdd/rule.service.js @@ -1,48 +1,48 @@ 'use strict'; app.factory('RuleService', function($http) { return { - getAllRules:function(callback){ - $http.get(getAPI()+'rules') + getAllRules:function(headers, callback){ + $http.get(getAPI()+'rules', {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - searchRules: function(query, callback) { - $http.get(getAPI()+'rules', { params: { q: query } }) + searchRules: function(query, headers, callback) { + $http.get(getAPI()+'rules', { params: { q: query } }, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - addRule: function(rule, callback) { - $http.post(getAPI()+'rules',{data:rule}) + addRule: function(rule, headers, callback) { + $http.post(getAPI()+'rules', {data:rule}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - editRule: function(rule, callback) { - $http.put(getAPI()+'rules/'+rule.id,{data:rule}) + editRule: function(rule, headers, callback) { + $http.put(getAPI()+'rules/'+rule.id,{data:rule}, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - deleteRule: function(rule, callback) { - $http.delete(getAPI()+'rules/'+rule.id) + deleteRule: function(rule, headers, callback) { + $http.delete(getAPI()+'rules/'+rule.id, {headers}) .then(function (response) { callback(response); }, function (response) { callback(response); }); }, - getRule: function(id, callback) { - $http.get(getAPI()+'rules/'+id) + getRule: function(id, headers, callback) { + $http.get(getAPI()+'rules/'+id, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index 07e24531..c2514164 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -5100,7 +5100,18 @@ "name": "GET All Rules", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/rules", "host": [ @@ -5117,7 +5128,18 @@ "name": "GET a Rule by ID ", "request": { "method": "GET", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/rules/1", "host": [ @@ -5135,7 +5157,18 @@ "name": "POST Create New Rule", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"Space Energy Consumption Over Limit\", \"fdd_code\":\"SPACE01\", \"category\":\"SPACE\", \"priority\":\"HIGH\", \"channel\":\"WEB\", \"expression\":\"{\\\"space_id\\\":1, \\\"high_limit\\\":1000.000}\", \"message_template\":\"%s截止到目前电耗%s，超标%s。\", \"is_enabled\":true}}" @@ -5156,19 +5189,30 @@ "name": "PUT Update a Rule", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"Space Energy Consumption Over Limit\", \"fdd_code\":\"SPACE01\", \"category\":\"SPACE\", \"priority\":\"HIGH\", \"channel\":\"WEB\", \"expression\":\"{\\\"space_id\\\":1, \\\"high_limit\\\":1000.000}\", \"message_template\":\"%s截止到目前电耗%s，超标%s。\", \"is_enabled\":true}}" }, "url": { - "raw": "{{base_url}}/rules/1", + "raw": "{{base_url}}/rules/2", "host": [ "{{base_url}}" ], "path": [ "rules", - "1" + "2" ] } }, @@ -5178,7 +5222,18 @@ "name": "DELETE a Rule by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/rules/2", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index dfe26621..71fdd398 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1283,11 +1283,11 @@ Result in JSON | next_run_datetime | float | null, or the next run datetime string in local timezone | ```bash -curl -i -X GET {{base_url}}/rules/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/rules/{id} ``` * GET All Rules ```bash -curl -i -X GET {{base_url}}/rules +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/rules ``` * DELETE a Rule by ID ```bash diff --git a/myems-api/core/rule.py b/myems-api/core/rule.py index 60246a9f..3601be71 100644 --- a/myems-api/core/rule.py +++ b/myems-api/core/rule.py @@ -19,6 +19,8 @@ class RuleCollection: @staticmethod def on_get(req, resp): + """Handles GET requests""" + access_control(req) cnx = mysql.connector.connect(**config.myems_fdd_db) cursor = cnx.cursor(dictionary=True) @@ -70,6 +72,7 @@ class RuleCollection: @user_logger def on_post(req, resp): """Handles POST requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: @@ -194,6 +197,8 @@ class RuleItem: @staticmethod def on_get(req, resp, id_): + """Handles GET requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_RULE_ID') @@ -245,6 +250,8 @@ class RuleItem: @staticmethod @user_logger def on_delete(req, resp, id_): + """Handles DELETE requests""" + access_control(req) if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_RULE_ID') @@ -274,6 +281,7 @@ class RuleItem: @user_logger def on_put(req, resp, id_): """Handles PUT requests""" + access_control(req) try: raw_json = req.stream.read().decode('utf-8') except Exception as ex: From af7157fff92e30ccf79fc5f22097d3b4d97902ac Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 10 Dec 2021 19:24:49 +0800 Subject: [PATCH 046/117] added access control to space, offline meter and virtual meter in api and admin --- .../spacecombinedequipment.controller.js | 28 ++++++------- .../space/spaceequipment.controller.js | 29 +++++++------- .../settings/space/spacemeter.controller.js | 40 +++++++++---------- .../space/spaceshopfloor.controller.js | 28 ++++++------- .../settings/space/spacestore.controller.js | 25 ++++++------ .../settings/space/spacetenant.controller.js | 35 ++++++++-------- 6 files changed, 90 insertions(+), 95 deletions(-) diff --git a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js index 202473e5..1761a6c8 100644 --- a/admin/app/controllers/settings/space/spacecombinedequipment.controller.js +++ b/admin/app/controllers/settings/space/spacecombinedequipment.controller.js @@ -1,19 +1,19 @@ 'use strict'; app.controller('SpaceCombinedEquipmentController', function($scope, - $window, - $translate, - SpaceService, - CombinedEquipmentService, - SpaceCombinedEquipmentService, - toaster) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.combinedequipments = []; - $scope.spacecombinedequipments = []; - $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); + $window, + $translate, + SpaceService, + CombinedEquipmentService, + SpaceCombinedEquipmentService, + toaster) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.combinedequipments = []; + $scope.spacecombinedequipments = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -45,7 +45,7 @@ app.controller('SpaceCombinedEquipmentController', function($scope, $scope.getCombinedEquipmentsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getCombinedEquipmentsBySpaceID = function(id) { $scope.spacecombinedequipments=[]; @@ -72,7 +72,6 @@ app.controller('SpaceCombinedEquipmentController', function($scope, var combinedequipmentid=angular.element('#'+dragEl).scope().combinedequipment.id; var spaceid=angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceCombinedEquipmentService.addPair(spaceid,combinedequipmentid, headers, function (response){ if (angular.isDefined(response.status) && response.status === 201) { toaster.pop({ @@ -100,7 +99,6 @@ app.controller('SpaceCombinedEquipmentController', function($scope, var spacecombinedequipmentid = angular.element('#' + dragEl).scope().spacecombinedequipment.id; var spaceid = angular.element(spacetreewithcombinedequipment).jstree(true).get_top_selected(); let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceCombinedEquipmentService.deletePair(spaceid, spacecombinedequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ diff --git a/admin/app/controllers/settings/space/spaceequipment.controller.js b/admin/app/controllers/settings/space/spaceequipment.controller.js index 687cd4db..799a90a0 100644 --- a/admin/app/controllers/settings/space/spaceequipment.controller.js +++ b/admin/app/controllers/settings/space/spaceequipment.controller.js @@ -1,20 +1,20 @@ 'use strict'; app.controller('SpaceEquipmentController', function( - $scope, - $window, - $translate, - SpaceService, - EquipmentService, - SpaceEquipmentService, - toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.equipments = []; - $scope.spaceequipments = []; - $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); + $scope, + $window, + $translate, + SpaceService, + EquipmentService, + SpaceEquipmentService, + toaster,SweetAlert) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.equipments = []; + $scope.spaceequipments = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -46,7 +46,7 @@ app.controller('SpaceEquipmentController', function( $scope.getEquipmentsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getEquipmentsBySpaceID = function(id) { $scope.spaceequipments=[]; @@ -100,7 +100,6 @@ app.controller('SpaceEquipmentController', function( var spaceequipmentid = angular.element('#' + dragEl).scope().spaceequipment.id; var spaceid = angular.element(spacetreewithequipment).jstree(true).get_top_selected(); let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceEquipmentService.deletePair(spaceid, spaceequipmentid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ diff --git a/admin/app/controllers/settings/space/spacemeter.controller.js b/admin/app/controllers/settings/space/spacemeter.controller.js index 10bb0f57..05c4b73e 100644 --- a/admin/app/controllers/settings/space/spacemeter.controller.js +++ b/admin/app/controllers/settings/space/spacemeter.controller.js @@ -1,20 +1,20 @@ 'use strict'; app.controller('SpaceMeterController', function( - $scope , - $window, - $timeout, - $translate, - SpaceService, - MeterService, - VirtualMeterService, - OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.spacemeters = []; - $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); + $scope , + $window, + $timeout, + $translate, + SpaceService, + MeterService, + VirtualMeterService, + OfflineMeterService, SpaceMeterService, toaster,SweetAlert) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.spacemeters = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -47,7 +47,7 @@ app.controller('SpaceMeterController', function( $scope.getMetersBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getMetersBySpaceID = function(id) { var metertypes=['meters','virtualmeters','offlinemeters']; @@ -177,12 +177,12 @@ app.controller('SpaceMeterController', function( }); }; - $scope.getAllSpaces(); - $scope.getAllMeters(); - $scope.getAllVirtualMeters(); - $scope.getAllOfflineMeters(); + $scope.getAllSpaces(); + $scope.getAllMeters(); + $scope.getAllVirtualMeters(); + $scope.getAllOfflineMeters(); - $scope.refreshSpaceTree = function() { + $scope.refreshSpaceTree = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -210,7 +210,7 @@ app.controller('SpaceMeterController', function( angular.element(spacetreewithmeter).jstree(true).settings.core.data = treedata['core']['data']; angular.element(spacetreewithmeter).jstree(true).refresh(); }); - }; + }; $scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.spacemeters = []; diff --git a/admin/app/controllers/settings/space/spaceshopfloor.controller.js b/admin/app/controllers/settings/space/spaceshopfloor.controller.js index 9bc5510a..c114d6af 100644 --- a/admin/app/controllers/settings/space/spaceshopfloor.controller.js +++ b/admin/app/controllers/settings/space/spaceshopfloor.controller.js @@ -1,19 +1,19 @@ 'use strict'; app.controller('SpaceShopfloorController', function( - $scope, - $window, - $translate, - SpaceService, - ShopfloorService, - SpaceShopfloorService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.shopfloors = []; - $scope.spaceshopfloors = []; - $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); + $scope, + $window, + $translate, + SpaceService, + ShopfloorService, + SpaceShopfloorService, toaster,SweetAlert) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.shopfloors = []; + $scope.spaceshopfloors = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -45,7 +45,7 @@ app.controller('SpaceShopfloorController', function( $scope.getShopfloorsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getShopfloorsBySpaceID = function(id) { $scope.spaceshopfloors=[]; @@ -119,7 +119,7 @@ app.controller('SpaceShopfloorController', function( }); }; - $scope.getAllSpaces(); + $scope.getAllSpaces(); $scope.getAllShopfloors(); $scope.refreshSpaceTree = function() { diff --git a/admin/app/controllers/settings/space/spacestore.controller.js b/admin/app/controllers/settings/space/spacestore.controller.js index bcc02928..41d26a9c 100644 --- a/admin/app/controllers/settings/space/spacestore.controller.js +++ b/admin/app/controllers/settings/space/spacestore.controller.js @@ -1,18 +1,18 @@ 'use strict'; app.controller('SpaceStoreController', function( - $scope, - $window, - $translate, - SpaceService, - StoreService, SpaceStoreService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.stores = []; - $scope.spacestores = []; - $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); + $scope, + $window, + $translate, + SpaceService, + StoreService, SpaceStoreService, toaster,SweetAlert) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.stores = []; + $scope.spacestores = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -44,7 +44,7 @@ app.controller('SpaceStoreController', function( $scope.getStoresBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getStoresBySpaceID = function(id) { $scope.spacestores=[]; @@ -99,7 +99,6 @@ app.controller('SpaceStoreController', function( var spacestoreid = angular.element('#' + dragEl).scope().spacestore.id; var spaceid = angular.element(spacetreewithstore).jstree(true).get_top_selected(); let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceStoreService.deletePair(spaceid, spacestoreid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ diff --git a/admin/app/controllers/settings/space/spacetenant.controller.js b/admin/app/controllers/settings/space/spacetenant.controller.js index d1c9de33..3f76a07e 100644 --- a/admin/app/controllers/settings/space/spacetenant.controller.js +++ b/admin/app/controllers/settings/space/spacetenant.controller.js @@ -1,19 +1,19 @@ 'use strict'; app.controller('SpaceTenantController', function( - $scope, - $window, - $translate, - SpaceService, - TenantService, - SpaceTenantService, toaster,SweetAlert) { - $scope.spaces = []; - $scope.currentSpaceID = 1; - $scope.tenants = []; - $scope.spacetenants = []; - $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); + $scope, + $window, + $translate, + SpaceService, + TenantService, + SpaceTenantService, toaster,SweetAlert) { + $scope.spaces = []; + $scope.currentSpaceID = 1; + $scope.tenants = []; + $scope.spacetenants = []; + $scope.cur_user = JSON.parse($window.localStorage.getItem("myems_admin_ui_current_user")); - $scope.getAllSpaces = function() { + $scope.getAllSpaces = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -45,7 +45,7 @@ app.controller('SpaceTenantController', function( $scope.getTenantsBySpaceID($scope.currentSpaceID); }); }); - }; + }; $scope.getTenantsBySpaceID = function(id) { $scope.spacetenants=[]; @@ -99,7 +99,6 @@ app.controller('SpaceTenantController', function( var spacetenantid = angular.element('#' + dragEl).scope().spacetenant.id; var spaceid = angular.element(spacetreewithtenant).jstree(true).get_top_selected(); let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; - SpaceTenantService.deletePair(spaceid, spacetenantid, headers, function (response) { if (angular.isDefined(response.status) && response.status === 204) { toaster.pop({ @@ -120,10 +119,10 @@ app.controller('SpaceTenantController', function( }); }; - $scope.getAllSpaces(); - $scope.getAllTenants(); + $scope.getAllSpaces(); + $scope.getAllTenants(); - $scope.refreshSpaceTree = function() { + $scope.refreshSpaceTree = function() { SpaceService.getAllSpaces(function (response) { if (angular.isDefined(response.status) && response.status === 200) { $scope.spaces = response.data; @@ -151,7 +150,7 @@ app.controller('SpaceTenantController', function( angular.element(spacetreewithtenant).jstree(true).settings.core.data = treedata['core']['data']; angular.element(spacetreewithtenant).jstree(true).refresh(); }); - }; + }; $scope.$on('handleBroadcastSpaceChanged', function(event) { $scope.spacetenants = []; From a31d040f856e00f04b66877ef6642f32e25fb2a5 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 11 Dec 2021 21:26:36 +0800 Subject: [PATCH 047/117] updated README --- README.md | 10 +++++----- README_DE.md | 26 +++++++++++++------------- README_EN.md | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 290dc82d..ebf33012 100644 --- a/README.md +++ b/README.md @@ -40,10 +40,10 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可 | 功能 |社区版 | 说明 | | :--- | :----- | :----- | -| 开源 | ✔️ | | +| 开源 | ✔️ | MIT License | | 价格 | 免费 | | -| 更换品牌名称与标志LOGO | ❌ | | -| Modbus TCP 协议 | ✔️ | 采集数据 https://modbus.org/ | +| 更换品牌名称与标志LOGO | ❌ | | +| Modbus TCP 协议 | ✔️ | 采集数据 https://modbus.org/ | | 数据点数量 | 无限制 | 实际数量受限于服务器资源上限| | 计量表数量 | 无限制 | 实际数量受限于服务器资源上限| | 空间数量 | 无限制 | 实际数量受限于服务器资源上限| @@ -121,10 +121,10 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可 | 组合设备数据/批量分析 | ✔️ | 按空间层级筛选、空间向下递归查询、按报告期查询全部能耗分类数据、导出Excel | | 能流图分析 | ✔️ | 表示能源流动状况、节点显示用能单位、链接显示本月能源总量 | | 配电系统分析 | ✔️ | 高中低压配电系统、实时数据、配电系统图 | -| RESTful API | ✔️ | 基于Python开发，提供系统配置、能源报告、Excel导出接口 | +| RESTful API | ✔️ | 基于Python开发，提供系统配置、能源报告、Excel导出接口 | | Web UI | ✔️ | 基于ReactJS开发，用于能源数据分析 | | Admin UI | ✔️ | 基于AngularJS (version 1.x)开发，用于系统配置管理 | -| 在线社区技术支持 | ✔️ | | +| 在线社区技术支持 | ✔️ | | ## MyEMS企业版功能 diff --git a/README_DE.md b/README_DE.md index 15f66141..a3b129ca 100644 --- a/README_DE.md +++ b/README_DE.md @@ -40,18 +40,18 @@ MyEMS wird von einem erfahrenen Entwicklungsteam entwickelt und gewartet, und de | Eigenschaften | Gemeinschaftsausgabe | Erläuterung | | :--- | :----: | :----: | -| Open Source | ✔️ | | -| Pricing | Free | | -| Change Name and Logo | ️❌ | | -| Modbus TCP | ✔️ | | -| Number of Data Points | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Meters | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Spaces | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Equipments | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Tenants | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Stores | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Number of Shop Floors | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | -| Combined Equipments Number | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Open Source | ✔️ | MIT License | +| Pricing | Free | | +| Change Name and Logo | ️❌ | | +| Modbus TCP | ✔️ | | +| Number of Data Points | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Meters | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Spaces | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Equipments | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Tenants | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Stores | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Number of Shop Floors | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | +| Combined Equipments Number | Unbegrenzt | Die tatsächliche Zahl ist durch die obere Grenze der Serverressourcen begrenzt | | Docker | ✔️ | https://hub.docker.com/u/myems | | MySQL | ✔️ | http://mysql.com/ | | MariaDB | ✔️ | https://mariadb.org/ | @@ -62,7 +62,7 @@ MyEMS wird von einem erfahrenen Entwicklungsteam entwickelt und gewartet, und de | Private Cloud | ✔️ | | | Data Comparison | ✔️ | Jahr für Jahr, Monat für Monat, Freier Vergleich, Kein Vergleich | | Excel Exporter | ✔️ | Echte Excel-Datei, keine CSV-Datei, Tabellen, Liniendiagramme, Säulendiagramme, Kreisdiagramme | -| Meter/Energy Data | ✔️ | | +| Meter/Energy Data | ✔️ | Cascade select Space, Multiple Compare Types, Multiple Period Types, Reporting Period Total Consumption, Base Period Total Consumption, Reporting Period Ton of Standard Coal, Reporting Period Ton of Carbon Dioxide Emissions, Reporting Period Trend, Related Parameters Data, Detailed Data, Export to Excel | | Meter/Cost Data | ✔️ | | | Meter/Trend Data | ✔️ | | | Meter/Realtime Data | ✔️ | | diff --git a/README_EN.md b/README_EN.md index 5d50117f..720a3c0c 100644 --- a/README_EN.md +++ b/README_EN.md @@ -40,7 +40,7 @@ MyEMS is being developed and maintained by an experienced development team, and | Features | Community Edition | Explanation | | :--- | :----: | :----: | -| Open Source | ✔️ | | +| Open Source | ✔️ | MIT License | | Pricing | Free | | | Change Name and Logo | ❌️ | | | Modbus TCP | ✔️ | | @@ -62,7 +62,7 @@ MyEMS is being developed and maintained by an experienced development team, and | Private Cloud | ✔️ | | | Data Comparison | ✔️ | Year-on-Year, Month-on-Month, Free Comparison, None Comparison | | Excel Exporter | ✔️ | Real Excel file, not CSV file. Tables, Line Charts, Column Charts, Pie Charts | -| Meter/Energy Data | ✔️ | | +| Meter/Energy Data | ✔️ | Cascade select Space, Multiple Compare Types, Multiple Period Types, Reporting Period Total Consumption, Base Period Total Consumption, Reporting Period Ton of Standard Coal, Reporting Period Ton of Carbon Dioxide Emissions, Reporting Period Trend, Related Parameters Data, Detailed Data, Export to Excel | | Meter/Cost Data | ✔️ | | | Meter/Trend Data | ✔️ | | | Meter/Realtime Data | ✔️ | | From 56c4c6b188dee4b5310e0cdf6023cc7c269ac0fa Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 12 Dec 2021 17:40:07 +0800 Subject: [PATCH 048/117] upgraded version number to v1.5.0 --- CHANGELOG.md | 20 +- admin/views/common/footer-login.html | 2 +- admin/views/common/footer.html | 2 +- database/install/myems_system_db.sql | 2 +- .../{upgrade1.4.1.sql => upgrade1.5.0.sql} | 2 +- myems-api/core/version.py | 4 +- web/package-lock.json | 1056 +++++++++-------- web/package.json | 2 +- web/src/config.js | 2 +- 9 files changed, 614 insertions(+), 478 deletions(-) rename database/upgrade/{upgrade1.4.1.sql => upgrade1.5.0.sql} (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 302a1138..97a76850 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Removed - None. +## [v1.5.0] - 2021-12-12 +### Added +- Added energy model database +- Added access control to all core entities in api and admin ui. + +### Changed +- Updated notification(web message) in web and api +- Updated command of myems-api service in docker-compose. +- Updated Dockerfile of myems-api. +- Updated virtual meter procedure in normalization service. + +### Fixed +- None. + +### Removed +- None. + ## [v1.4.0] - 2021-11-14 ### Added - added installation on docker to myems-modbus-tcp. @@ -571,7 +588,8 @@ 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.4.0...HEAD +[Unreleased]: https://github.com/MyEMS/myems/compare/v1.5.0...HEAD +[v1.5.0]: https://github.com/MyEMS/myems/compare/v1.4.0...v1.5.0 [v1.4.0]: https://github.com/MyEMS/myems/compare/v1.3.4...v1.4.0 [v1.3.4]: https://github.com/MyEMS/myems/compare/v1.3.3...v1.3.4 [v1.3.3]: https://github.com/MyEMS/myems/compare/v1.3.2...v1.3.3 diff --git a/admin/views/common/footer-login.html b/admin/views/common/footer-login.html index 78e1d487..4a15c76a 100644 --- a/admin/views/common/footer-login.html +++ b/admin/views/common/footer-login.html @@ -1,5 +1,5 @@ diff --git a/admin/views/common/footer.html b/admin/views/common/footer.html index b620758c..360c5ff1 100644 --- a/admin/views/common/footer.html +++ b/admin/views/common/footer.html @@ -3,6 +3,6 @@ https://myems.io
- {{'MY_EMS_NAME' | translate}} v1.4.0 + {{'MY_EMS_NAME' | translate}} v1.5.0
diff --git a/database/install/myems_system_db.sql b/database/install/myems_system_db.sql index cccddaa7..5158d4f6 100644 --- a/database/install/myems_system_db.sql +++ b/database/install/myems_system_db.sql @@ -1246,6 +1246,6 @@ USE `myems_system_db`; INSERT INTO `myems_system_db`.`tbl_versions` (`id`, `version`, `release_date`) VALUES -(1, '1.4.0', '2021-11-14'); +(1, '1.5.0', '2021-12-12'); COMMIT; diff --git a/database/upgrade/upgrade1.4.1.sql b/database/upgrade/upgrade1.5.0.sql similarity index 99% rename from database/upgrade/upgrade1.4.1.sql rename to database/upgrade/upgrade1.5.0.sql index a7d45651..a723f7ce 100644 --- a/database/upgrade/upgrade1.4.1.sql +++ b/database/upgrade/upgrade1.5.0.sql @@ -311,6 +311,6 @@ CREATE INDEX `tbl_virtual_meter_8760_index_1` ON `myems_energy_model_db`.`tbl_v -- UPDATE VERSION NUMBER -UPDATE myems_system_db.tbl_versions SET version='1.4.1', release_date='2021-12-12' WHERE id=1; +UPDATE myems_system_db.tbl_versions SET version='1.5.0', release_date='2021-12-12' WHERE id=1; COMMIT; diff --git a/myems-api/core/version.py b/myems-api/core/version.py index 4bb57482..e9dc6bdc 100644 --- a/myems-api/core/version.py +++ b/myems-api/core/version.py @@ -15,8 +15,8 @@ class VersionItem: @staticmethod def on_get(req, resp): - result = {"version": 'MyEMS v1.4.0', - "release-date": '2021-11-14', + result = {"version": 'MyEMS v1.5.0 Community Edition', + "release-date": '2021-12-12', "website": "https://myems.io"} resp.text = json.dumps(result) diff --git a/web/package-lock.json b/web/package-lock.json index 1be1a523..af31d7e5 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -1,12 +1,12 @@ { "name": "myems", - "version": "1.4.0", + "version": "1.5.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "myems", - "version": "1.4.0", + "version": "1.5.0", "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", "@fortawesome/fontawesome-svg-core": "^1.2.30", @@ -110,9 +110,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz", - "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz", + "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==", "engines": { "node": ">=6.9.0" } @@ -148,9 +148,9 @@ } }, "node_modules/@babel/core/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -292,9 +292,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz", - "integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz", + "integrity": "sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==", "dependencies": { "@babel/helper-compilation-targets": "^7.13.0", "@babel/helper-module-imports": "^7.12.13", @@ -310,9 +310,9 @@ } }, "node_modules/@babel/helper-define-polyfill-provider/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -448,9 +448,9 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz", - "integrity": "sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz", + "integrity": "sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA==", "dependencies": { "@babel/helper-annotate-as-pure": "^7.16.0", "@babel/helper-wrap-function": "^7.16.0", @@ -599,9 +599,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz", - "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", + "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==", "bin": { "parser": "bin/babel-parser.js" }, @@ -640,12 +640,12 @@ } }, "node_modules/@babel/plugin-proposal-async-generator-functions": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz", - "integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz", + "integrity": "sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg==", "dependencies": { "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-remap-async-to-generator": "^7.16.0", + "@babel/helper-remap-async-to-generator": "^7.16.4", "@babel/plugin-syntax-async-generators": "^7.8.4" }, "engines": { @@ -1742,17 +1742,17 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz", - "integrity": "sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.4.tgz", + "integrity": "sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA==", "dependencies": { - "@babel/compat-data": "^7.16.0", - "@babel/helper-compilation-targets": "^7.16.0", + "@babel/compat-data": "^7.16.4", + "@babel/helper-compilation-targets": "^7.16.3", "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.0", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.2", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.0", - "@babel/plugin-proposal-async-generator-functions": "^7.16.0", + "@babel/plugin-proposal-async-generator-functions": "^7.16.4", "@babel/plugin-proposal-class-properties": "^7.16.0", "@babel/plugin-proposal-class-static-block": "^7.16.0", "@babel/plugin-proposal-dynamic-import": "^7.16.0", @@ -1802,7 +1802,7 @@ "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.0", "@babel/plugin-transform-new-target": "^7.16.0", "@babel/plugin-transform-object-super": "^7.16.0", - "@babel/plugin-transform-parameters": "^7.16.0", + "@babel/plugin-transform-parameters": "^7.16.3", "@babel/plugin-transform-property-literals": "^7.16.0", "@babel/plugin-transform-regenerator": "^7.16.0", "@babel/plugin-transform-reserved-words": "^7.16.0", @@ -1815,10 +1815,10 @@ "@babel/plugin-transform-unicode-regex": "^7.16.0", "@babel/preset-modules": "^0.1.5", "@babel/types": "^7.16.0", - "babel-plugin-polyfill-corejs2": "^0.2.3", - "babel-plugin-polyfill-corejs3": "^0.3.0", - "babel-plugin-polyfill-regenerator": "^0.2.3", - "core-js-compat": "^3.19.0", + "babel-plugin-polyfill-corejs2": "^0.3.0", + "babel-plugin-polyfill-corejs3": "^0.4.0", + "babel-plugin-polyfill-regenerator": "^0.3.0", + "core-js-compat": "^3.19.1", "semver": "^6.3.0" }, "engines": { @@ -1930,9 +1930,9 @@ } }, "node_modules/@babel/traverse/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -2014,9 +2014,9 @@ } }, "node_modules/@emotion/core": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz", - "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.3.1.tgz", + "integrity": "sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww==", "dependencies": { "@babel/runtime": "^7.5.5", "@emotion/cache": "^10.0.27", @@ -2999,9 +2999,9 @@ } }, "node_modules/@loadable/component": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/@loadable/component/-/component-5.15.0.tgz", - "integrity": "sha512-g63rQzypPOZi0BeGsK4ST2MYhsFR+i7bhL8k/McUoWDNMDuTTdUlQ2GACKxqh5sI/dNC/6nVoPrycMnSylnAgQ==", + "version": "5.15.2", + "resolved": "https://registry.npmjs.org/@loadable/component/-/component-5.15.2.tgz", + "integrity": "sha512-ryFAZOX5P2vFkUdzaAtTG88IGnr9qxSdvLRvJySXcUA4B4xVWurUNADu3AnKPksxOZajljqTrDEDcYjeL4lvLw==", "dependencies": { "@babel/runtime": "^7.7.7", "hoist-non-react-statics": "^3.3.1", @@ -3252,9 +3252,9 @@ } }, "node_modules/@types/babel__core": { - "version": "7.1.16", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz", - "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==", + "version": "7.1.17", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz", + "integrity": "sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0", @@ -3356,9 +3356,9 @@ } }, "node_modules/@types/lodash": { - "version": "4.14.176", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz", - "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==" + "version": "4.14.178", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz", + "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==" }, "node_modules/@types/minimatch": { "version": "3.0.5", @@ -3371,9 +3371,9 @@ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" }, "node_modules/@types/node": { - "version": "16.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", - "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" + "version": "16.11.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", + "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==" }, "node_modules/@types/normalize-package-data": { "version": "2.4.1", @@ -3404,9 +3404,9 @@ } }, "node_modules/@types/react": { - "version": "17.0.34", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz", - "integrity": "sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==", + "version": "17.0.37", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.37.tgz", + "integrity": "sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -3433,9 +3433,9 @@ } }, "node_modules/@types/react/node_modules/csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "node_modules/@types/scheduler": { "version": "0.16.2", @@ -3561,9 +3561,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -4833,12 +4833,12 @@ } }, "node_modules/babel-plugin-polyfill-corejs2": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz", - "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz", + "integrity": "sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==", "dependencies": { "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.4", + "@babel/helper-define-polyfill-provider": "^0.3.0", "semver": "^6.1.1" }, "peerDependencies": { @@ -4846,11 +4846,11 @@ } }, "node_modules/babel-plugin-polyfill-corejs3": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz", - "integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz", + "integrity": "sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.4", + "@babel/helper-define-polyfill-provider": "^0.3.0", "core-js-compat": "^3.18.0" }, "peerDependencies": { @@ -4858,11 +4858,11 @@ } }, "node_modules/babel-plugin-polyfill-regenerator": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz", - "integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz", + "integrity": "sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==", "dependencies": { - "@babel/helper-define-polyfill-provider": "^0.2.4" + "@babel/helper-define-polyfill-provider": "^0.3.0" }, "peerDependencies": { "@babel/core": "^7.0.0-0" @@ -5289,6 +5289,14 @@ "node": ">= 0.8" } }, + "node_modules/body-parser/node_modules/bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "engines": { + "node": ">= 0.8" + } + }, "node_modules/body-parser/node_modules/http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", @@ -5331,6 +5339,11 @@ "node": ">= 0.8" } }, + "node_modules/body-parser/node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, "node_modules/body-parser/node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -5339,6 +5352,14 @@ "node": ">= 0.6" } }, + "node_modules/body-parser/node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, "node_modules/bonjour": { "version": "3.5.0", "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", @@ -5591,9 +5612,9 @@ } }, "node_modules/browserslist": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz", - "integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz", + "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==", "dependencies": { "caniuse-lite": "^1.0.30001280", "electron-to-chromium": "^1.3.896", @@ -5733,9 +5754,10 @@ "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "node_modules/bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz", + "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==", + "dev": true, "engines": { "node": ">= 0.8" } @@ -5908,9 +5930,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001280", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz", - "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==", + "version": "1.0.30001286", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz", + "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==", "funding": { "type": "opencollective", "url": "https://opencollective.com/browserslist" @@ -6445,9 +6467,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/color-string": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz", - "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", + "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", "dependencies": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -6479,9 +6501,9 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "node_modules/common-tags": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.1.tgz", - "integrity": "sha512-uOZd85rJqrdEIE/JjhW5YAeatX8iqjjvVzIyfx7JL7G5r9Tep6YpYT9gEJWhWpVyDQEyzukWd6p2qULpJ8tmBw==", + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", "engines": { "node": ">=4.0.0" } @@ -6716,9 +6738,9 @@ } }, "node_modules/core-js": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz", - "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.3.tgz", + "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -6726,11 +6748,11 @@ } }, "node_modules/core-js-compat": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz", - "integrity": "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz", + "integrity": "sha512-59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA==", "dependencies": { - "browserslist": "^4.17.6", + "browserslist": "^4.18.1", "semver": "7.0.0" }, "funding": { @@ -6747,9 +6769,9 @@ } }, "node_modules/core-js-pure": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz", - "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", + "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -7195,9 +7217,9 @@ } }, "node_modules/csstype": { - "version": "2.6.18", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", - "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" + "version": "2.6.19", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz", + "integrity": "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==" }, "node_modules/custom-event-polyfill": { "version": "1.0.7", @@ -7709,9 +7731,9 @@ } }, "node_modules/domhandler": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz", - "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", + "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", "dependencies": { "domelementtype": "^2.2.0" }, @@ -7875,9 +7897,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "node_modules/electron-to-chromium": { - "version": "1.3.896", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz", - "integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==" + "version": "1.4.16", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.16.tgz", + "integrity": "sha512-BQb7FgYwnu6haWLU63/CdVW+9xhmHls3RCQUFiV4lvw3wimEHTVcUk2hkuZo76QhR8nnDdfZE7evJIZqijwPdA==" }, "node_modules/element-resize-event": { "version": "3.0.6", @@ -8775,9 +8797,9 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz", - "integrity": "sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz", + "integrity": "sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==", "dev": true, "dependencies": { "array-includes": "^3.1.4", @@ -8911,9 +8933,9 @@ } }, "node_modules/eslint/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -9505,6 +9527,21 @@ "node": ">= 0.8" } }, + "node_modules/express/node_modules/http-errors": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "dependencies": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/express/node_modules/mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -9571,6 +9608,11 @@ "node": ">= 0.8.0" } }, + "node_modules/express/node_modules/setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, "node_modules/express/node_modules/statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", @@ -9579,6 +9621,14 @@ "node": ">= 0.6" } }, + "node_modules/express/node_modules/toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "engines": { + "node": ">=0.6" + } + }, "node_modules/ext": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz", @@ -10324,9 +10374,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", + "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==", "funding": [ { "type": "individual", @@ -12376,15 +12426,16 @@ "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" }, "node_modules/http-errors": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", - "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dev": true, "dependencies": { "depd": "~1.1.2", "inherits": "2.0.4", - "setprototypeof": "1.1.1", + "setprototypeof": "1.2.0", "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "toidentifier": "1.0.1" }, "engines": { "node": ">= 0.6" @@ -12394,6 +12445,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "dev": true, "engines": { "node": ">= 0.6" } @@ -13308,9 +13360,9 @@ } }, "node_modules/is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "engines": { "node": ">= 0.4" }, @@ -13535,11 +13587,11 @@ } }, "node_modules/is-weakref": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", - "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dependencies": { - "call-bind": "^1.0.0" + "call-bind": "^1.0.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13658,9 +13710,9 @@ } }, "node_modules/istanbul-lib-source-maps/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -15553,9 +15605,9 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "node_modules/json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, "node_modules/json-schema-traverse": { "version": "0.4.1", @@ -15625,17 +15677,17 @@ } }, "node_modules/jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "engines": [ - "node >=0.6.0" - ], + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.2.3", + "json-schema": "0.4.0", "verror": "1.10.0" + }, + "engines": { + "node": ">=0.6.0" } }, "node_modules/jss": { @@ -15830,9 +15882,9 @@ "dev": true }, "node_modules/keycode": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", - "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", + "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, "node_modules/killable": { "version": "1.0.1", @@ -16027,9 +16079,9 @@ "dev": true }, "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, "node_modules/load-json-file": { "version": "2.0.0", @@ -16401,9 +16453,9 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "node_modules/loglevel": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", - "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz", + "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==", "engines": { "node": ">= 0.6.0" }, @@ -17048,9 +17100,9 @@ } }, "node_modules/minipass": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", - "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", + "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", "dependencies": { "yallist": "^4.0.0" }, @@ -17431,14 +17483,6 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" }, - "node_modules/node-modules-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", - "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/node-notifier": { "version": "5.4.5", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.5.tgz", @@ -17763,9 +17807,9 @@ } }, "node_modules/object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -18499,12 +18543,9 @@ } }, "node_modules/pirates": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", - "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", - "dependencies": { - "node-modules-regexp": "^1.0.0" - }, + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz", + "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==", "engines": { "node": ">= 6" } @@ -19723,9 +19764,9 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz", + "integrity": "sha512-U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA==", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -19766,9 +19807,9 @@ } }, "node_modules/postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "node_modules/postcss-values-parser": { "version": "2.0.1", @@ -19784,9 +19825,9 @@ } }, "node_modules/preact": { - "version": "10.5.15", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.15.tgz", - "integrity": "sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==", + "version": "10.6.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.4.tgz", + "integrity": "sha512-WyosM7pxGcndU8hY0OQlLd54tOU+qmG45QXj2dAYrL11HoyU/EzOSTlpJsirbBr1QW7lICxSsVJJmcmUglovHQ==", "funding": { "type": "opencollective", "url": "https://opencollective.com/preact" @@ -20195,13 +20236,13 @@ "integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==" }, "node_modules/raw-body": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", - "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz", + "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==", "dev": true, "dependencies": { - "bytes": "3.1.0", - "http-errors": "1.7.3", + "bytes": "3.1.1", + "http-errors": "1.8.1", "iconv-lite": "0.4.24", "unpipe": "1.0.0" }, @@ -20276,9 +20317,9 @@ } }, "node_modules/rc-util": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.15.0.tgz", - "integrity": "sha512-8RI8sjOCXD3FhD3dzQNBQetpGol6BBd3sHQ/8jSGk9NPT0CH3JGtBfPODnASyE7AdDpCFQMOmgcp9CBs3S/1hg==", + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.16.1.tgz", + "integrity": "sha512-kSCyytvdb3aRxQacS/71ta6c+kBWvM1v8/2h9d/HaNWauc3qB8pLnF20PJ8NajkNN8gb+rR1l0eWO+D4Pz+LLQ==", "dependencies": { "@babel/runtime": "^7.12.5", "react-is": "^16.12.0", @@ -20831,11 +20872,12 @@ } }, "node_modules/react-i18next": { - "version": "11.14.2", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.14.2.tgz", - "integrity": "sha512-fmDhwNA0zDmSEL3BBT5qwNMvxrKu25oXDDAZyHprfB0AHZmWXfBmRLf8MX8i1iBd2I2C2vsA2D9wxYBIwzooEQ==", + "version": "11.15.0", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.15.0.tgz", + "integrity": "sha512-7JOIO7KkKSxB7Ycof6ilx9aQ/tviInTqN2sqHyKrjd5MKHyFyKyXVkYrb7KmG/ISFPA4ugWwor5Qsq8IVyQ/Cg==", "dependencies": { "@babel/runtime": "^7.14.5", + "html-escaper": "^2.0.2", "html-parse-stringify": "^3.0.1" }, "peerDependencies": { @@ -21031,9 +21073,9 @@ } }, "node_modules/react-onclickoutside": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.0.tgz", - "integrity": "sha512-oPlOTYcISLHfpMog2lUZMFSbqOs4LFcA4+vo7fpfevB5v9Z0D5VBDBkfeO5lv+hpEcGoaGk67braLT+QT+eICA==", + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz", + "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==", "funding": { "type": "individual", "url": "https://github.com/Pomax/react-onclickoutside/blob/master/FUNDING.md" @@ -21089,9 +21131,9 @@ } }, "node_modules/react-rating/node_modules/@types/react": { - "version": "16.14.20", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.20.tgz", - "integrity": "sha512-SV7TaVc8e9E/5Xuv6TIyJ5VhQpZoVFJqX6IZgj5HZoFCtIDCArE3qXkcHlc6O/Ud4UwcMoX+tlvDA95YrKdLgA==", + "version": "16.14.21", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz", + "integrity": "sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -21099,9 +21141,9 @@ } }, "node_modules/react-rating/node_modules/csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "node_modules/react-redux": { "version": "7.2.6", @@ -21402,9 +21444,9 @@ } }, "node_modules/react-select/node_modules/csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "node_modules/react-select/node_modules/dom-helpers": { "version": "5.2.1", @@ -21471,9 +21513,9 @@ } }, "node_modules/react-toastify/node_modules/csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "node_modules/react-toastify/node_modules/dom-helpers": { "version": "5.2.1", @@ -22786,12 +22828,14 @@ "integrity": "sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg==" }, "node_modules/sass": { - "version": "1.43.4", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz", - "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==", + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.0.tgz", + "integrity": "sha512-ONy5bjppoohtNkFJRqdz1gscXamMzN3wQy1YH9qO2FiNpgjLhpz/IPRGg0PpCjyz/pWfCOaNEaiEGCcjOFAjqw==", "dev": true, "dependencies": { - "chokidar": ">=3.0.0 <4.0.0" + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" }, "bin": { "sass": "sass.js" @@ -22993,6 +23037,12 @@ "node": ">=8" } }, + "node_modules/sass/node_modules/immutable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", + "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", + "dev": true + }, "node_modules/sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -23289,9 +23339,10 @@ "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "node_modules/setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true }, "node_modules/sha.js": { "version": "2.4.11", @@ -23381,9 +23432,12 @@ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==" }, "node_modules/shifty": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/shifty/-/shifty-2.16.0.tgz", - "integrity": "sha512-hmaxYxbunTNYGcoMS9OGvgjymPP29HWaWc0k+Dv16zo9PhjRGdTbPCT/uH75DDuRbwP4RW9D9e/HhxkyoTQm8Q==" + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/shifty/-/shifty-2.17.1.tgz", + "integrity": "sha512-ime0aar6UX4OHG8WjC84ThqLU6PWf/6UdSLCMJFvWmeYx1PmuxvRNwiJom4py7GVLv10xRfDKt0MssotIxkYhQ==", + "optionalDependencies": { + "fsevents": "^2.3.2" + } }, "node_modules/side-channel": { "version": "1.0.4", @@ -23399,9 +23453,9 @@ } }, "node_modules/signal-exit": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", - "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==" + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" }, "node_modules/simple-swizzle": { "version": "0.2.2", @@ -23824,6 +23878,15 @@ "node": ">=0.10.0" } }, + "node_modules/source-map-js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", + "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -23837,9 +23900,9 @@ } }, "node_modules/source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -23888,9 +23951,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", - "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==" + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" }, "node_modules/spdy": { "version": "4.0.2", @@ -23921,9 +23984,9 @@ } }, "node_modules/spdy-transport/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -23955,9 +24018,9 @@ } }, "node_modules/spdy/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -25204,9 +25267,10 @@ } }, "node_modules/toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, "engines": { "node": ">=0.6" } @@ -26569,9 +26633,9 @@ } }, "node_modules/webpack-dev-server/node_modules/debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dependencies": { "ms": "2.1.2" }, @@ -27840,9 +27904,9 @@ } }, "@babel/compat-data": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.0.tgz", - "integrity": "sha512-DGjt2QZse5SGd9nfOSqO4WLJ8NN/oHkijbXbPrxuoJO3oIPJL3TciZs9FX+cOHNiY9E9l0opL8g7BmLe3T+9ew==" + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz", + "integrity": "sha512-1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q==" }, "@babel/core": { "version": "7.9.0", @@ -27868,9 +27932,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -27969,9 +28033,9 @@ } }, "@babel/helper-define-polyfill-provider": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.4.tgz", - "integrity": "sha512-OrpPZ97s+aPi6h2n1OXzdhVis1SGSsMU2aMHgLcOKfsp4/v1NWpx3CWT3lBj5eeBq9cDkPkh+YCfdF7O12uNDQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz", + "integrity": "sha512-7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg==", "requires": { "@babel/helper-compilation-targets": "^7.13.0", "@babel/helper-module-imports": "^7.12.13", @@ -27984,9 +28048,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -28086,9 +28150,9 @@ "integrity": "sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==" }, "@babel/helper-remap-async-to-generator": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.0.tgz", - "integrity": "sha512-MLM1IOMe9aQBqMWxcRw8dcb9jlM86NIw7KA0Wri91Xkfied+dE0QuBFSBjMNvqzmS0OSIDsMNC24dBEkPUi7ew==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.4.tgz", + "integrity": "sha512-vGERmmhR+s7eH5Y/cp8PCVzj4XEjerq8jooMfxFdA5xVtAk9Sh4AQsrWgiErUEBjtGrBtOFKDUcWQFW4/dFwMA==", "requires": { "@babel/helper-annotate-as-pure": "^7.16.0", "@babel/helper-wrap-function": "^7.16.0", @@ -28200,9 +28264,9 @@ } }, "@babel/parser": { - "version": "7.16.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.3.tgz", - "integrity": "sha512-dcNwU1O4sx57ClvLBVFbEgx0UZWfd0JQX5X6fxFRCLHelFBGXFfSz6Y0FAq2PEwUqlqLkdVjVr4VASEOuUnLJw==" + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz", + "integrity": "sha512-6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.16.2", @@ -28223,12 +28287,12 @@ } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.0.tgz", - "integrity": "sha512-nyYmIo7ZqKsY6P4lnVmBlxp9B3a96CscbLotlsNuktMHahkDwoPYEjXrZHU0Tj844Z9f1IthVxQln57mhkcExw==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.4.tgz", + "integrity": "sha512-/CUekqaAaZCQHleSK/9HajvcD/zdnJiKRiuUFq8ITE+0HsPzquf53cpFiqAwl/UfmJbR6n5uGPQSPdrmKOvHHg==", "requires": { "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-remap-async-to-generator": "^7.16.0", + "@babel/helper-remap-async-to-generator": "^7.16.4", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, @@ -28907,17 +28971,17 @@ } }, "@babel/preset-env": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.0.tgz", - "integrity": "sha512-cdTu/W0IrviamtnZiTfixPfIncr2M1VqRrkjzZWlr1B4TVYimCFK5jkyOdP4qw2MrlKHi+b3ORj6x8GoCew8Dg==", + "version": "7.16.4", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.4.tgz", + "integrity": "sha512-v0QtNd81v/xKj4gNKeuAerQ/azeNn/G1B1qMLeXOcV8+4TWlD2j3NV1u8q29SDFBXx/NBq5kyEAO+0mpRgacjA==", "requires": { - "@babel/compat-data": "^7.16.0", - "@babel/helper-compilation-targets": "^7.16.0", + "@babel/compat-data": "^7.16.4", + "@babel/helper-compilation-targets": "^7.16.3", "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.0", + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.16.2", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.16.0", - "@babel/plugin-proposal-async-generator-functions": "^7.16.0", + "@babel/plugin-proposal-async-generator-functions": "^7.16.4", "@babel/plugin-proposal-class-properties": "^7.16.0", "@babel/plugin-proposal-class-static-block": "^7.16.0", "@babel/plugin-proposal-dynamic-import": "^7.16.0", @@ -28967,7 +29031,7 @@ "@babel/plugin-transform-named-capturing-groups-regex": "^7.16.0", "@babel/plugin-transform-new-target": "^7.16.0", "@babel/plugin-transform-object-super": "^7.16.0", - "@babel/plugin-transform-parameters": "^7.16.0", + "@babel/plugin-transform-parameters": "^7.16.3", "@babel/plugin-transform-property-literals": "^7.16.0", "@babel/plugin-transform-regenerator": "^7.16.0", "@babel/plugin-transform-reserved-words": "^7.16.0", @@ -28980,10 +29044,10 @@ "@babel/plugin-transform-unicode-regex": "^7.16.0", "@babel/preset-modules": "^0.1.5", "@babel/types": "^7.16.0", - "babel-plugin-polyfill-corejs2": "^0.2.3", - "babel-plugin-polyfill-corejs3": "^0.3.0", - "babel-plugin-polyfill-regenerator": "^0.2.3", - "core-js-compat": "^3.19.0", + "babel-plugin-polyfill-corejs2": "^0.3.0", + "babel-plugin-polyfill-corejs3": "^0.4.0", + "babel-plugin-polyfill-regenerator": "^0.3.0", + "core-js-compat": "^3.19.1", "semver": "^6.3.0" } }, @@ -29065,9 +29129,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -29128,9 +29192,9 @@ } }, "@emotion/core": { - "version": "10.1.1", - "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.1.1.tgz", - "integrity": "sha512-ZMLG6qpXR8x031NXD8HJqugy/AZSkAuMxxqB46pmAR7ze47MhNJ56cdoX243QPZdGctrdfo+s08yZTiwaUcRKA==", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@emotion/core/-/core-10.3.1.tgz", + "integrity": "sha512-447aUEjPIm0MnE6QYIaFz9VQOHSXf4Iu6EWOIqq11EAPqinkSZmfymPTmlOE3QjLv846lH4JVZBUOtwGbuQoww==", "requires": { "@babel/runtime": "^7.5.5", "@emotion/cache": "^10.0.27", @@ -29942,9 +30006,9 @@ } }, "@loadable/component": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/@loadable/component/-/component-5.15.0.tgz", - "integrity": "sha512-g63rQzypPOZi0BeGsK4ST2MYhsFR+i7bhL8k/McUoWDNMDuTTdUlQ2GACKxqh5sI/dNC/6nVoPrycMnSylnAgQ==", + "version": "5.15.2", + "resolved": "https://registry.npmjs.org/@loadable/component/-/component-5.15.2.tgz", + "integrity": "sha512-ryFAZOX5P2vFkUdzaAtTG88IGnr9qxSdvLRvJySXcUA4B4xVWurUNADu3AnKPksxOZajljqTrDEDcYjeL4lvLw==", "requires": { "@babel/runtime": "^7.7.7", "hoist-non-react-statics": "^3.3.1", @@ -30124,9 +30188,9 @@ } }, "@types/babel__core": { - "version": "7.1.16", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz", - "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==", + "version": "7.1.17", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz", + "integrity": "sha512-6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A==", "requires": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0", @@ -30228,9 +30292,9 @@ } }, "@types/lodash": { - "version": "4.14.176", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.176.tgz", - "integrity": "sha512-xZmuPTa3rlZoIbtDUyJKZQimJV3bxCmzMIO2c9Pz9afyDro6kr7R79GwcB6mRhuoPmV2p1Vb66WOJH7F886WKQ==" + "version": "4.14.178", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.178.tgz", + "integrity": "sha512-0d5Wd09ItQWH1qFbEyQ7oTQ3GZrMfth5JkbN3EvTKLXcHLRDSXeLnlvlOn0wvxVIwK5o2M8JzP/OWz7T3NRsbw==" }, "@types/minimatch": { "version": "3.0.5", @@ -30243,9 +30307,9 @@ "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==" }, "@types/node": { - "version": "16.11.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.7.tgz", - "integrity": "sha512-QB5D2sqfSjCmTuWcBWyJ+/44bcjO7VbjSbOE0ucoVbAsSNQc4Lt6QkgkVXkTDwkL4z/beecZNDvVX15D4P8Jbw==" + "version": "16.11.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.12.tgz", + "integrity": "sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==" }, "@types/normalize-package-data": { "version": "2.4.1", @@ -30276,9 +30340,9 @@ } }, "@types/react": { - "version": "17.0.34", - "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.34.tgz", - "integrity": "sha512-46FEGrMjc2+8XhHXILr+3+/sTe3OfzSPU9YGKILLrUYbQ1CLQC9Daqo1KzENGXAWwrFwiY0l4ZbF20gRvgpWTg==", + "version": "17.0.37", + "resolved": "https://registry.npmjs.org/@types/react/-/react-17.0.37.tgz", + "integrity": "sha512-2FS1oTqBGcH/s0E+CjrCCR9+JMpsu9b69RTFO+40ua43ZqP5MmQ4iUde/dMjWR909KxZwmOQIFq6AV6NjEG5xg==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -30286,9 +30350,9 @@ }, "dependencies": { "csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" } } }, @@ -30382,9 +30446,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -31400,30 +31464,30 @@ "integrity": "sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw==" }, "babel-plugin-polyfill-corejs2": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.3.tgz", - "integrity": "sha512-NDZ0auNRzmAfE1oDDPW2JhzIMXUk+FFe2ICejmt5T4ocKgiQx3e0VCRx9NCAidcMtL2RUZaWtXnmjTCkx0tcbA==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz", + "integrity": "sha512-wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA==", "requires": { "@babel/compat-data": "^7.13.11", - "@babel/helper-define-polyfill-provider": "^0.2.4", + "@babel/helper-define-polyfill-provider": "^0.3.0", "semver": "^6.1.1" } }, "babel-plugin-polyfill-corejs3": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.3.0.tgz", - "integrity": "sha512-JLwi9vloVdXLjzACL80j24bG6/T1gYxwowG44dg6HN/7aTPdyPbJJidf6ajoA3RPHHtW0j9KMrSOLpIZpAnPpg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz", + "integrity": "sha512-YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw==", "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.4", + "@babel/helper-define-polyfill-provider": "^0.3.0", "core-js-compat": "^3.18.0" } }, "babel-plugin-polyfill-regenerator": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.3.tgz", - "integrity": "sha512-JVE78oRZPKFIeUqFGrSORNzQnrDwZR16oiWeGM8ZyjBn2XAT5OjP+wXx5ESuo33nUsFUEJYjtklnsKbxW5L+7g==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz", + "integrity": "sha512-dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg==", "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.4" + "@babel/helper-define-polyfill-provider": "^0.3.0" } }, "babel-plugin-syntax-jsx": { @@ -31780,6 +31844,11 @@ "type-is": "~1.6.17" }, "dependencies": { + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, "http-errors": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", @@ -31813,10 +31882,20 @@ "unpipe": "1.0.0" } }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" } } }, @@ -32039,9 +32118,9 @@ } }, "browserslist": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.0.tgz", - "integrity": "sha512-ER2M0g5iAR84fS/zjBDqEgU6iO5fS9JI2EkHr5zxDxYEFk3LjhU9Vpp/INb6RMQphxko7PDV1FH38H/qVP5yCA==", + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.18.1.tgz", + "integrity": "sha512-8ScCzdpPwR2wQh8IT82CA2VgDwjHyqMovPBZSNH54+tm4Jk2pCuv90gmAdH6J84OCRWi0b4gMe6O6XPXuJnjgQ==", "requires": { "caniuse-lite": "^1.0.30001280", "electron-to-chromium": "^1.3.896", @@ -32162,9 +32241,10 @@ "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=" }, "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.1.tgz", + "integrity": "sha512-dWe4nWO/ruEOY7HkUJ5gFt1DCFV9zPRoJr8pV0/ASQermOZjtq8jMjOprC0Kd10GLN+l7xaUPvxzJFWtxGu8Fg==", + "dev": true }, "cacache": { "version": "13.0.1", @@ -32306,9 +32386,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001280", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001280.tgz", - "integrity": "sha512-kFXwYvHe5rix25uwueBxC569o53J6TpnGu0BEEn+6Lhl2vsnAumRFWEBhDft1fwyo6m1r4i+RqA4+163FpeFcA==" + "version": "1.0.30001286", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001286.tgz", + "integrity": "sha512-zaEMRH6xg8ESMi2eQ3R4eZ5qw/hJiVsO/HlLwniIwErij0JDr9P+8V4dtx1l+kLq6j3yy8l8W4fst1lBnat5wQ==" }, "capture-exit": { "version": "2.0.0", @@ -32738,9 +32818,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "color-string": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz", - "integrity": "sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz", + "integrity": "sha512-9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ==", "requires": { "color-name": "^1.0.0", "simple-swizzle": "^0.2.2" @@ -32766,9 +32846,9 @@ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" }, "common-tags": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.1.tgz", - "integrity": "sha512-uOZd85rJqrdEIE/JjhW5YAeatX8iqjjvVzIyfx7JL7G5r9Tep6YpYT9gEJWhWpVyDQEyzukWd6p2qULpJ8tmBw==" + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==" }, "commondir": { "version": "1.0.1", @@ -32968,16 +33048,16 @@ } }, "core-js": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.1.tgz", - "integrity": "sha512-Tnc7E9iKd/b/ff7GFbhwPVzJzPztGrChB8X8GLqoYGdEOG8IpLnK1xPyo3ZoO3HsK6TodJS58VGPOxA+hLHQMg==" + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.19.3.tgz", + "integrity": "sha512-LeLBMgEGSsG7giquSzvgBrTS7V5UL6ks3eQlUSbN8dJStlLFiRzUm5iqsRyzUB8carhfKjkJ2vzKqE6z1Vga9g==" }, "core-js-compat": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.1.tgz", - "integrity": "sha512-Q/VJ7jAF/y68+aUsQJ/afPOewdsGkDtcMb40J8MbuWKlK3Y+wtHq8bTHKPj2WKWLIqmS5JhHs4CzHtz6pT2W6g==", + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.19.3.tgz", + "integrity": "sha512-59tYzuWgEEVU9r+SRgceIGXSSUn47JknoiXW6Oq7RW8QHjXWz3/vp8pa7dbtuVu40sewz3OP3JmQEcDdztrLhA==", "requires": { - "browserslist": "^4.17.6", + "browserslist": "^4.18.1", "semver": "7.0.0" }, "dependencies": { @@ -32989,9 +33069,9 @@ } }, "core-js-pure": { - "version": "3.19.1", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.1.tgz", - "integrity": "sha512-Q0Knr8Es84vtv62ei6/6jXH/7izKmOrtrxH9WJTHLCMAVeU+8TF8z8Nr08CsH4Ot0oJKzBzJJL9SJBYIv7WlfQ==" + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.19.3.tgz", + "integrity": "sha512-N3JruInmCyt7EJj5mAq3csCgGYgiSqu7p7TQp2KOztr180/OAIxyIvL1FCjzgmQk/t3Yniua50Fsak7FShI9lA==" }, "core-util-is": { "version": "1.0.3", @@ -33344,9 +33424,9 @@ } }, "csstype": { - "version": "2.6.18", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.18.tgz", - "integrity": "sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ==" + "version": "2.6.19", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.19.tgz", + "integrity": "sha512-ZVxXaNy28/k3kJg0Fou5MiYpp88j7H9hLZp8PDC3jV0WFjfH5E9xHb56L0W59cPbKbcHXeP4qyT8PrHp8t6LcQ==" }, "custom-event-polyfill": { "version": "1.0.7", @@ -33772,9 +33852,9 @@ } }, "domhandler": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.2.2.tgz", - "integrity": "sha512-PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.0.tgz", + "integrity": "sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==", "requires": { "domelementtype": "^2.2.0" } @@ -33910,9 +33990,9 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" }, "electron-to-chromium": { - "version": "1.3.896", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz", - "integrity": "sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA==" + "version": "1.4.16", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.16.tgz", + "integrity": "sha512-BQb7FgYwnu6haWLU63/CdVW+9xhmHls3RCQUFiV4lvw3wimEHTVcUk2hkuZo76QhR8nnDdfZE7evJIZqijwPdA==" }, "element-resize-event": { "version": "3.0.6", @@ -34334,9 +34414,9 @@ } }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -34763,9 +34843,9 @@ } }, "eslint-plugin-react": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.0.tgz", - "integrity": "sha512-0Ut+CkzpppgFtoIhdzi2LpdpxxBvgFf99eFqWxJnUrO7mMe0eOiNpou6rvNYeVVV6lWZvTah0BFne7k5xHjARg==", + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.27.1.tgz", + "integrity": "sha512-meyunDjMMYeWr/4EBLTV1op3iSG3mjT/pz5gti38UzfM4OPpNc2m0t2xvKCOMU5D6FSdd34BIMFOvQbW+i8GAA==", "dev": true, "requires": { "array-includes": "^3.1.4", @@ -35158,6 +35238,18 @@ "unpipe": "~1.0.0" } }, + "http-errors": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", + "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.4", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -35209,10 +35301,20 @@ "send": "0.17.1" } }, + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" } } }, @@ -35834,9 +35936,9 @@ } }, "follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" + "version": "1.14.6", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz", + "integrity": "sha512-fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A==" }, "for-in": { "version": "1.0.2", @@ -37481,21 +37583,23 @@ "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=" }, "http-errors": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz", - "integrity": "sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", + "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "dev": true, "requires": { "depd": "~1.1.2", "inherits": "2.0.4", - "setprototypeof": "1.1.1", + "setprototypeof": "1.2.0", "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "toidentifier": "1.0.1" }, "dependencies": { "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", + "dev": true } } }, @@ -38186,9 +38290,9 @@ "dev": true }, "is-negative-zero": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.1.tgz", - "integrity": "sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==" }, "is-number": { "version": "7.0.0", @@ -38341,11 +38445,11 @@ "dev": true }, "is-weakref": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.1.tgz", - "integrity": "sha512-b2jKc2pQZjaeFYWEf7ScFj+Be1I+PXmlu572Q8coTXZ+LD/QQZ7ShPMst8h16riVgyXTQwUsFEl74mDvc/3MHQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "requires": { - "call-bind": "^1.0.0" + "call-bind": "^1.0.2" } }, "is-windows": { @@ -38439,9 +38543,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -39968,9 +40072,9 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" }, "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", + "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==" }, "json-schema-traverse": { "version": "0.4.1", @@ -40031,13 +40135,13 @@ "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" }, "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", + "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", - "json-schema": "0.2.3", + "json-schema": "0.4.0", "verror": "1.10.0" } }, @@ -40203,9 +40307,9 @@ "dev": true }, "keycode": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", - "integrity": "sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=" + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", + "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" }, "killable": { "version": "1.0.1", @@ -40359,9 +40463,9 @@ "dev": true }, "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==" }, "load-json-file": { "version": "2.0.0", @@ -40661,9 +40765,9 @@ "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=" }, "loglevel": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.7.1.tgz", - "integrity": "sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw==" + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.8.0.tgz", + "integrity": "sha512-G6A/nJLRgWOuuwdNuA6koovfEV1YpqqAG4pRUlFaz3jj2QNZ8M4vBqnVA+HBTmU/AMNUtlOsMmSpF6NyOjztbA==" }, "loose-envify": { "version": "1.4.0", @@ -41185,9 +41289,9 @@ } }, "minipass": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.5.tgz", - "integrity": "sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==", + "version": "3.1.6", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", + "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", "requires": { "yallist": "^4.0.0" } @@ -41508,11 +41612,6 @@ } } }, - "node-modules-regexp": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", - "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=" - }, "node-notifier": { "version": "5.4.5", "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.5.tgz", @@ -41764,9 +41863,9 @@ "integrity": "sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==" }, "object-inspect": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz", - "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==" + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.1.tgz", + "integrity": "sha512-If7BjFlpkzzBeV1cqgT3OSWT3azyoxDGajR+iGnFBfVV2EWyDyWaZZW2ERDjUaY2QM8i5jI3Sj7mhsM4DDAqWA==" }, "object-is": { "version": "1.1.5", @@ -42320,12 +42419,9 @@ } }, "pirates": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", - "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", - "requires": { - "node-modules-regexp": "^1.0.0" - } + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz", + "integrity": "sha512-ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw==" }, "pkg-dir": { "version": "2.0.0", @@ -43329,9 +43425,9 @@ } }, "postcss-selector-parser": { - "version": "6.0.6", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz", - "integrity": "sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==", + "version": "6.0.7", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.7.tgz", + "integrity": "sha512-U+b/Deoi4I/UmE6KOVPpnhS7I7AYdKbhGcat+qTQ27gycvaACvNEw11ba6RrkwVmDVRW7sigWgLj4/KbbJjeDA==", "requires": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -43365,9 +43461,9 @@ } }, "postcss-value-parser": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz", - "integrity": "sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==" + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==" }, "postcss-values-parser": { "version": "2.0.1", @@ -43380,9 +43476,9 @@ } }, "preact": { - "version": "10.5.15", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.15.tgz", - "integrity": "sha512-5chK29n6QcJc3m1lVrKQSQ+V7K1Gb8HeQY6FViQ5AxCAEGu3DaHffWNDkC9+miZgsLvbvU9rxbV1qinGHMHzqA==" + "version": "10.6.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.6.4.tgz", + "integrity": "sha512-WyosM7pxGcndU8hY0OQlLd54tOU+qmG45QXj2dAYrL11HoyU/EzOSTlpJsirbBr1QW7lICxSsVJJmcmUglovHQ==" }, "prelude-ls": { "version": "1.1.2", @@ -43720,13 +43816,13 @@ "integrity": "sha512-sln+pNSc8NGaHoLzwNBssFSf/rSYkqeBXzX1AtJlkJiUaVSJSbRAWJk+4omsXkN+EJalzkZhWQ3th1m0FpR5xA==" }, "raw-body": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", - "integrity": "sha512-9WmIKF6mkvA0SLmA2Knm9+qj89e+j1zqgyn8aXGd7+nAduPoqgI9lO57SAZNn/Byzo5P7JhXTyg9PzaJbH73bA==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.2.tgz", + "integrity": "sha512-RPMAFUJP19WIet/99ngh6Iv8fzAbqum4Li7AD6DtGaW2RpMB/11xDoalPiJMTbu6I3hkbMVkATvZrqb9EEqeeQ==", "dev": true, "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.3", + "bytes": "3.1.1", + "http-errors": "1.8.1", "iconv-lite": "0.4.24", "unpipe": "1.0.0" } @@ -43779,9 +43875,9 @@ } }, "rc-util": { - "version": "5.15.0", - "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.15.0.tgz", - "integrity": "sha512-8RI8sjOCXD3FhD3dzQNBQetpGol6BBd3sHQ/8jSGk9NPT0CH3JGtBfPODnASyE7AdDpCFQMOmgcp9CBs3S/1hg==", + "version": "5.16.1", + "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.16.1.tgz", + "integrity": "sha512-kSCyytvdb3aRxQacS/71ta6c+kBWvM1v8/2h9d/HaNWauc3qB8pLnF20PJ8NajkNN8gb+rR1l0eWO+D4Pz+LLQ==", "requires": { "@babel/runtime": "^7.12.5", "react-is": "^16.12.0", @@ -44205,11 +44301,12 @@ "integrity": "sha512-Ule/KqHBwUvuubqGC4WDvOARS6VjlULSS+WHspgQ5FhFKR4ytHDc4AMpjVfnv+Wbz2TEbMp9/ZHmuZsUksPCiA==" }, "react-i18next": { - "version": "11.14.2", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.14.2.tgz", - "integrity": "sha512-fmDhwNA0zDmSEL3BBT5qwNMvxrKu25oXDDAZyHprfB0AHZmWXfBmRLf8MX8i1iBd2I2C2vsA2D9wxYBIwzooEQ==", + "version": "11.15.0", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-11.15.0.tgz", + "integrity": "sha512-7JOIO7KkKSxB7Ycof6ilx9aQ/tviInTqN2sqHyKrjd5MKHyFyKyXVkYrb7KmG/ISFPA4ugWwor5Qsq8IVyQ/Cg==", "requires": { "@babel/runtime": "^7.14.5", + "html-escaper": "^2.0.2", "html-parse-stringify": "^3.0.1" } }, @@ -44360,9 +44457,9 @@ } }, "react-onclickoutside": { - "version": "6.12.0", - "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.0.tgz", - "integrity": "sha512-oPlOTYcISLHfpMog2lUZMFSbqOs4LFcA4+vo7fpfevB5v9Z0D5VBDBkfeO5lv+hpEcGoaGk67braLT+QT+eICA==" + "version": "6.12.1", + "resolved": "https://registry.npmjs.org/react-onclickoutside/-/react-onclickoutside-6.12.1.tgz", + "integrity": "sha512-a5Q7CkWznBRUWPmocCvE8b6lEYw1s6+opp/60dCunhO+G6E4tDTO2Sd2jKE+leEnnrLAE2Wj5DlDHNqj5wPv1Q==" }, "react-popper": { "version": "0.10.4", @@ -44396,9 +44493,9 @@ }, "dependencies": { "@types/react": { - "version": "16.14.20", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.20.tgz", - "integrity": "sha512-SV7TaVc8e9E/5Xuv6TIyJ5VhQpZoVFJqX6IZgj5HZoFCtIDCArE3qXkcHlc6O/Ud4UwcMoX+tlvDA95YrKdLgA==", + "version": "16.14.21", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.14.21.tgz", + "integrity": "sha512-rY4DzPKK/4aohyWiDRHS2fotN5rhBSK6/rz1X37KzNna9HJyqtaGAbq9fVttrEPWF5ywpfIP1ITL8Xi2QZn6Eg==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -44406,9 +44503,9 @@ } }, "csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" } } }, @@ -44639,9 +44736,9 @@ }, "dependencies": { "csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "dom-helpers": { "version": "5.2.1", @@ -44694,9 +44791,9 @@ }, "dependencies": { "csstype": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.9.tgz", - "integrity": "sha512-rpw6JPxK6Rfg1zLOYCSwle2GFOOsnjmDYDaBwEcwoOg4qlsIVCN789VkBZDJAGi4T07gI4YSutR43t9Zz4Lzuw==" + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.10.tgz", + "integrity": "sha512-2u44ZG2OcNUO9HDp/Jl8C07x6pU/eTR3ncV91SiK3dhG9TWvRVsCoJw14Ckx5DgWkzGA3waZWO3d7pgqpUI/XA==" }, "dom-helpers": { "version": "5.2.1", @@ -45755,12 +45852,22 @@ "integrity": "sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg==" }, "sass": { - "version": "1.43.4", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.43.4.tgz", - "integrity": "sha512-/ptG7KE9lxpGSYiXn7Ar+lKOv37xfWsZRtFYal2QHNigyVQDx685VFT/h7ejVr+R8w7H4tmUgtulsKl5YpveOg==", + "version": "1.45.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.45.0.tgz", + "integrity": "sha512-ONy5bjppoohtNkFJRqdz1gscXamMzN3wQy1YH9qO2FiNpgjLhpz/IPRGg0PpCjyz/pWfCOaNEaiEGCcjOFAjqw==", "dev": true, "requires": { - "chokidar": ">=3.0.0 <4.0.0" + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "dependencies": { + "immutable": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz", + "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==", + "dev": true + } } }, "sass-graph": { @@ -46155,9 +46262,10 @@ "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true }, "sha.js": { "version": "2.4.11", @@ -46228,9 +46336,12 @@ "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==" }, "shifty": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/shifty/-/shifty-2.16.0.tgz", - "integrity": "sha512-hmaxYxbunTNYGcoMS9OGvgjymPP29HWaWc0k+Dv16zo9PhjRGdTbPCT/uH75DDuRbwP4RW9D9e/HhxkyoTQm8Q==" + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/shifty/-/shifty-2.17.1.tgz", + "integrity": "sha512-ime0aar6UX4OHG8WjC84ThqLU6PWf/6UdSLCMJFvWmeYx1PmuxvRNwiJom4py7GVLv10xRfDKt0MssotIxkYhQ==", + "requires": { + "fsevents": "^2.3.2" + } }, "side-channel": { "version": "1.0.4", @@ -46243,9 +46354,9 @@ } }, "signal-exit": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.5.tgz", - "integrity": "sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==" + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", + "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==" }, "simple-swizzle": { "version": "0.2.2", @@ -46622,6 +46733,12 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" }, + "source-map-js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", + "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", + "dev": true + }, "source-map-resolve": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", @@ -46635,9 +46752,9 @@ } }, "source-map-support": { - "version": "0.5.20", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", - "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "requires": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -46683,9 +46800,9 @@ } }, "spdx-license-ids": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz", - "integrity": "sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA==" + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", + "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==" }, "spdy": { "version": "4.0.2", @@ -46700,9 +46817,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -46728,9 +46845,9 @@ }, "dependencies": { "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } @@ -47732,9 +47849,10 @@ } }, "toidentifier": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true }, "tough-cookie": { "version": "2.5.0", @@ -49054,9 +49172,9 @@ } }, "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", + "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "requires": { "ms": "2.1.2" } diff --git a/web/package.json b/web/package.json index 86348b67..816c60c2 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "myems", - "version": "1.4.0", + "version": "1.5.0", "private": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", diff --git a/web/src/config.js b/web/src/config.js index a6a98629..007d85e6 100644 --- a/web/src/config.js +++ b/web/src/config.js @@ -1,4 +1,4 @@ -export const version = '1.4.0'; +export const version = '1.5.0'; export const navbarBreakPoint = 'xl'; // Vertical navbar breakpoint export const topNavbarBreakpoint = 'lg'; //export const APIBaseURL = 'http://127.0.0.1:8000'; From 905cd6f870692d6c21d79ce05e5656f9cd505d48 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 13 Dec 2021 17:07:52 +0800 Subject: [PATCH 049/117] EmailMessages interface is modified --- .../fdd/emailmessage/emailmessageoption.controller.js | 7 ++++--- admin/app/services/fdd/emailmessageanalysis.service.js | 2 +- myems-api/app.py | 2 +- myems-api/core/emailmessage.py | 7 +++++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 06195354..98d7bc87 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -30,11 +30,12 @@ app.controller('EmailMessageOptionController', function( }; $scope.execute = function() { - var datestart, dateend; + var startdatetime, dateend; var query = { - datestart: $scope.daterange.startDate.format().slice(0, 10), - dateend: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 10), + enddatetime: $scope.daterange.endDate.format().slice(0, 10) }; + console.log(query.startdatetime,query.enddatetime) $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessageanalysis.service.js index be596a7a..3f81cb6e 100644 --- a/admin/app/services/fdd/emailmessageanalysis.service.js +++ b/admin/app/services/fdd/emailmessageanalysis.service.js @@ -3,7 +3,7 @@ app.factory('EmailMessageAnalysisService', function($http) { return { getAnalysisResult: function(query, headers, callback) { - $http.get(getAPI()+"emailmessages"+"/from/"+query.datestart+"/to/"+query.dateend, {headers}) + $http.get(getAPI()+"emailmessages", { params: {startdatetime: query.startdatetime, enddatetime: query.enddatetime}} , {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/app.py b/myems-api/app.py index abadcf81..e54d4210 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -170,7 +170,7 @@ api.add_route('/distributionsystems/{id_}', api.add_route('/distributionsystems/{id_}/distributioncircuits', distributionsystem.DistributionSystemDistributionCircuitCollection()) -api.add_route('/emailmessages/from/{startdate}/to/{enddate}', +api.add_route('/emailmessages', emailmessage.EmailMessageCollection()) api.add_route('/emailmessages/{id_}', emailmessage.EmailMessageItem()) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index eab41ee5..73bd3cce 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -17,8 +17,11 @@ class EmailMessageCollection: resp.status = falcon.HTTP_200 @staticmethod - def on_get(req, resp, startdate, enddate): - access_control(req) + def on_get(req, resp): + # access_control(req) + print(req.params) + startdate = req.params.get('startdatetime') + enddate = req.params.get('enddatetime') try: start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') except Exception: From 45e9bd9e7e13b0dcc186cbbb3960532816eb418c Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 13 Dec 2021 17:13:11 +0800 Subject: [PATCH 050/117] Modified the EmailMessages interface --- .../fdd/emailmessage/emailmessageoption.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 98d7bc87..71ccea0f 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -30,12 +30,12 @@ app.controller('EmailMessageOptionController', function( }; $scope.execute = function() { - var startdatetime, dateend; + var startdatetime, enddatetime; var query = { startdatetime: $scope.daterange.startDate.format().slice(0, 10), enddatetime: $scope.daterange.endDate.format().slice(0, 10) }; - console.log(query.startdatetime,query.enddatetime) + $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod From 3cc2c929ec30811285780017014da8f53c612859 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Mon, 13 Dec 2021 17:28:20 +0800 Subject: [PATCH 051/117] Modified the EmailMessages interface --- myems-api/core/emailmessage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 73bd3cce..07e5830f 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -18,7 +18,7 @@ class EmailMessageCollection: @staticmethod def on_get(req, resp): - # access_control(req) + access_control(req) print(req.params) startdate = req.params.get('startdatetime') enddate = req.params.get('enddatetime') From d387684a782dcd15065c701fbbcc9fd9d2770eaf Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Mon, 13 Dec 2021 20:15:41 +0800 Subject: [PATCH 052/117] lock user --- admin/app/api.js | 2 +- .../controllers/users/user/user.controller.js | 35 +++++++ admin/app/services/users/user/user.service.js | 8 ++ admin/app/translations.js | 5 + admin/views/users/user/user.html | 1 + myems-api/app.py | 2 + myems-api/core/user.py | 93 ++++++++++++++++++- 7 files changed, 141 insertions(+), 5 deletions(-) diff --git a/admin/app/api.js b/admin/app/api.js index 89aa9e28..ae9f7569 100644 --- a/admin/app/api.js +++ b/admin/app/api.js @@ -1,6 +1,6 @@ //Switch Classes Function function getAPI(){ - //return "http://127.0.0.1:8000/"; + // return "http://127.0.0.1:8000/"; // to avoid CORS issue, use Nginx to proxy myems-api to path /api with the same ip and port as myems-web return window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/api/"; } diff --git a/admin/app/controllers/users/user/user.controller.js b/admin/app/controllers/users/user/user.controller.js index 71063a83..a062907d 100644 --- a/admin/app/controllers/users/user/user.controller.js +++ b/admin/app/controllers/users/user/user.controller.js @@ -186,6 +186,41 @@ app.controller('UserController', function ($scope, }); }; + $scope.unlockUser = function (user){ + SweetAlert.swal({ + title: $translate.instant("SWEET.UNLOCK_TITLE"), + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: $translate.instant("SWEET.UNLOCK_CONFIRM_BUTTON_TEXT"), + cancelButtonText: $translate.instant("SWEET.CANCEL_BUTTON_TEXT"), + closeOnConfirm: true, + closeOnCancel: true + },function (isConfirm) { + if (isConfirm) { + let headers = { "User-UUID": $scope.cur_user.uuid, "Token": $scope.cur_user.token }; + UserService.unlockUser(user, headers, function (response) { + if (angular.isDefined(response.status) && response.status === 200) { + toaster.pop({ + type: "success", + title: $translate.instant("TOASTER.SUCCESS_TITLE"), + body: $translate.instant("TOASTER.SUCCESS_UNLOCK_BODY", { template: $translate.instant("SETTING.USER") }), + showCloseButton: true, + }); + $scope.getAllUsers(); + } else { + toaster.pop({ + type: "error", + title: $translate.instant("TOASTER.ERROR_UNLOCK_BODY", { template: $translate.instant("SETTING.USER") }), + body: $translate.instant(response.data.description), + showCloseButton: true, + }); + } + }); + } + }); + }; + $scope.getAllUsers(); $scope.getAllPrivileges(); diff --git a/admin/app/services/users/user/user.service.js b/admin/app/services/users/user/user.service.js index 29d39962..be8b2c02 100644 --- a/admin/app/services/users/user/user.service.js +++ b/admin/app/services/users/user/user.service.js @@ -64,6 +64,14 @@ app.factory('UserService', function($http) { }, function (response) { callback(response); }); + }, + unlockUser: function(user, headers, callback){ + $http.put(getAPI()+'users/unlock/'+ user.id, {user}, {headers}) + .then(function (response) { + callback(response); + }, function (response) { + callback(response); + }); } }; }); \ No newline at end of file diff --git a/admin/app/translations.js b/admin/app/translations.js index 5251e020..61e516c9 100644 --- a/admin/app/translations.js +++ b/admin/app/translations.js @@ -1107,6 +1107,7 @@ function config($translateProvider) { BIND_PROPERTY: '绑定属性', EDIT: '修改', DELETE: '删除', + UNLOCK: '解锁', SELECT: '选择', RESET: '重置', SAVE: '保存', @@ -1544,9 +1545,11 @@ function config($translateProvider) { SUCCESS_ADD_BODY: '添加 {{template}} 成功', SUCCESS_UPDATE_BODY: '更新 {{template}} 成功', SUCCESS_DELETE_BODY: '删除 {{template}} 成功', + SUCCESS_UNLOCK_BODY: '解锁 {{template}} 成功', ERROR_ADD_BODY: '添加 {{template}} 失败', ERROR_UPDATE_BODY: '更新 {{template}} 失败', ERROR_DELETE_BODY: '删除 {{template}} 失败', + ERROR_UNLOCK_BODY: '解锁 {{template}} 失败', USER_PASSWORD: '用户密码', BIND_METER_SUCCESS: '绑定计量表成功', @@ -1573,6 +1576,8 @@ function config($translateProvider) { TEXT: '删除该条也会删除所有与其相关数据!', CONFIRM_BUTTON_TEXT: '确认删除', CANCEL_BUTTON_TEXT: '取消', + UNLOCK_TITLE: '请确认是否解锁该用户登录权限', + UNLOCK_CONFIRM_BUTTON_TEXT: '确认解锁' }, API: { ADMINISTRATOR_SESSION_NOT_FOUND: 'Administrator Session Not Found', diff --git a/admin/views/users/user/user.html b/admin/views/users/user/user.html index 9ea9b675..41c399bc 100644 --- a/admin/views/users/user/user.html +++ b/admin/views/users/user/user.html @@ -36,6 +36,7 @@ {{'SETTING.EDIT' | translate}} {{'USER.RESET_PASSWORD' | translate}} {{'SETTING.DELETE' | translate}} + {{'SETTING.UNLOCK' | translate}} diff --git a/myems-api/app.py b/myems-api/app.py index abadcf81..a6bf2b8e 100644 --- a/myems-api/app.py +++ b/myems-api/app.py @@ -464,6 +464,8 @@ api.add_route('/users/resetpassword', user.ResetPassword()) api.add_route('/users/changepassword', user.ChangePassword()) +api.add_route('/users/unlock/{id_}', + user.Unlock()) api.add_route('/virtualmeters', virtualmeter.VirtualMeterCollection()) diff --git a/myems-api/core/user.py b/myems-api/core/user.py index 8c8fd9f5..c95a409e 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -444,7 +444,7 @@ class UserLogin: description='API.INVALID_USER_NAME') query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, " - " account_expiration_datetime_utc, password_expiration_datetime_utc " + " account_expiration_datetime_utc, password_expiration_datetime_utc, login_counter " " FROM tbl_users " " WHERE name = %s ") cursor.execute(query, (str.strip(new_values['data']['name']).lower(),)) @@ -463,7 +463,8 @@ class UserLogin: "password": row[6], "is_admin": True if row[7] else False, "account_expiration_datetime_utc": row[8], - "password_expiration_datetime_utc": row[9]} + "password_expiration_datetime_utc": row[9], + "login_counter": row[10]} elif 'email' in new_values['data']: if not isinstance(new_values['data']['email'], str) or \ @@ -472,7 +473,7 @@ class UserLogin: description='API.INVALID_EMAIL') query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, " - " account_expiration_datetime_utc, password_expiration_datetime_utc " + " account_expiration_datetime_utc, password_expiration_datetime_utc,login_counter " " FROM tbl_users " " WHERE email = %s ") cursor.execute(query, (str.strip(new_values['data']['email']).lower(),)) @@ -491,18 +492,33 @@ class UserLogin: "password": row[6], "is_admin": True if row[7] else False, "account_expiration_datetime_utc": row[8], - "password_expiration_datetime_utc": row[9]} + "password_expiration_datetime_utc": row[9], + "login_counter": row[10]} + else: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_USER_NAME_OR_EMAIL') + login_counter = result['login_counter'] + + if login_counter >= 3: + cursor.close() + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_HAS_BEEN_LOCKED') + salt = result['salt'] password = str.strip(new_values['data']['password']) hashed_password = hashlib.sha512(salt.encode() + password.encode()).hexdigest() if hashed_password != result['password']: + update_login_counter = (" UPDATE tbl_users " + " SET login_counter = %s " + " WHERE uuid = %s ") + user_uuid = result['uuid'] + cursor.execute(update_login_counter, (login_counter + 1, user_uuid)) + cnx.commit() cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_PASSWORD') @@ -828,3 +844,72 @@ class ResetPassword: resp.status = falcon.HTTP_200 write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='ResetPassword', resource_id=user_id, request_body=None) + + +class Unlock: + @staticmethod + def __init__(): + """Initializes Class""" + pass + + @staticmethod + def on_options(req, resp): + resp.status = falcon.HTTP_200 + + @staticmethod + def on_put(req, resp, id_): + """Handles PUT requests""" + if 'USER-UUID' not in req.headers or \ + not isinstance(req.headers['USER-UUID'], str) or \ + len(str.strip(req.headers['USER-UUID'])) == 0: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_UUID') + admin_user_uuid = str.strip(req.headers['USER-UUID']) + + if not id_.isdigit() or int(id_) <= 0: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description='API.INVALID_USER_ID') + + Id = id_ + + cnx = mysql.connector.connect(**config.myems_user_db) + cursor = cnx.cursor() + + query = (" SELECT login_counter " + " FROM tbl_users " + " WHERE id = %s ") + cursor.execute(query, (Id,)) + row = cursor.fetchone() + if row is None: + cursor.close() + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_Id') + + login_counter = row[0] + if login_counter < 3: + cursor.close() + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_IS_NOT_LOCKED') + + update_user = (" UPDATE tbl_users " + " SET login_counter = 0" + " WHERE id = %s ") + cursor.execute(update_user, (Id, )) + cnx.commit() + + query = (" SELECT login_counter " + " FROM tbl_users " + " WHERE id = %s ") + cursor.execute(query, (Id,)) + row = cursor.fetchone() + if row is None or row[0] != 0: + cursor.close() + cnx.disconnect() + raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.ACCOUNT_UNLOCK_FAILED') + + cursor.close() + cnx.disconnect() + resp.text = json.dumps("OK") + resp.status = falcon.HTTP_200 + write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='UnlockUser', + resource_id=Id, request_body=None) From d56f839e2111a7e321fda06eb52203bb7ddd84ec Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 14 Dec 2021 23:17:48 +0800 Subject: [PATCH 053/117] added failed_login_count to user database --- database/install/myems_user_db.sql | 5 +++-- database/upgrade/upgrade1.5.1.sql | 6 ++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 database/upgrade/upgrade1.5.1.sql diff --git a/database/install/myems_user_db.sql b/database/install/myems_user_db.sql index 9c96ef78..253f8b79 100644 --- a/database/install/myems_user_db.sql +++ b/database/install/myems_user_db.sql @@ -24,6 +24,7 @@ CREATE TABLE IF NOT EXISTS `myems_user_db`.`tbl_users` ( `privilege_id` BIGINT NULL, `account_expiration_datetime_utc` DATETIME NOT NULL, `password_expiration_datetime_utc` DATETIME NOT NULL, + `failed_login_count` INT NOT NULL, PRIMARY KEY (`id`)); -- -------------------------------------------------------------------------------------------------------------------- @@ -33,9 +34,9 @@ START TRANSACTION; USE `myems_user_db`; -- default username: administrator -- default password: !MyEMS1 -INSERT INTO `myems_user_db`.`tbl_users`(`id`, `name`, `uuid`, `display_name`, `email`, `salt`, `password`, `is_admin`, `privilege_id`, `account_expiration_datetime_utc`, `password_expiration_datetime_utc`) +INSERT INTO `myems_user_db`.`tbl_users`(`id`, `name`, `uuid`, `display_name`, `email`, `salt`, `password`, `is_admin`, `privilege_id`, `account_expiration_datetime_utc`, `password_expiration_datetime_utc`, `failed_login_count`) VALUES -(1, 'administrator', 'dcdb67d1-6116-4987-916f-6fc6cf2bc0e4', 'Administrator', 'administrator@myems.io', 'adfd6fb6d78d4e3780ebdd6afdec2c3a', 'bc00df65270b1a72b9ed37136fa95a695896edc8c114391821f5edc6b1bbdbabc3d449962f8d1c7a4ec3f2d0a1a79055623963d88ecb9b778423194ff7b6be42', 1, NULL, '2099-12-31 16:00:00', '2099-12-31 16:00:00'); +(1, 'administrator', 'dcdb67d1-6116-4987-916f-6fc6cf2bc0e4', 'Administrator', 'administrator@myems.io', 'adfd6fb6d78d4e3780ebdd6afdec2c3a', 'bc00df65270b1a72b9ed37136fa95a695896edc8c114391821f5edc6b1bbdbabc3d449962f8d1c7a4ec3f2d0a1a79055623963d88ecb9b778423194ff7b6be42', 1, NULL, '2099-12-31 16:00:00', '2099-12-31 16:00:00', 0); COMMIT; -- --------------------------------------------------------------------------------------------------------------------- diff --git a/database/upgrade/upgrade1.5.1.sql b/database/upgrade/upgrade1.5.1.sql new file mode 100644 index 00000000..b07acf01 --- /dev/null +++ b/database/upgrade/upgrade1.5.1.sql @@ -0,0 +1,6 @@ + +ALTER TABLE `myems_user_db`.`tbl_users` ADD `failed_login_count` INT NOT NULL DEFAULT 0 AFTER password_expiration_datetime_utc; + + +-- UPDATE VERSION NUMBER +UPDATE myems_system_db.tbl_versions SET version='1.5.1', release_date='2021-12-18' WHERE id=1; From 952e9dd2780d267c8866fdb937ff8c666ec12163 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 15 Dec 2021 09:49:38 +0800 Subject: [PATCH 054/117] Modified the EmailMessages interface3 --- .../fdd/emailmessageanalysis.service.js | 2 +- myems-api/core/emailmessage.py | 48 +++++++++++-------- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/admin/app/services/fdd/emailmessageanalysis.service.js b/admin/app/services/fdd/emailmessageanalysis.service.js index 3f81cb6e..be0a6ab9 100644 --- a/admin/app/services/fdd/emailmessageanalysis.service.js +++ b/admin/app/services/fdd/emailmessageanalysis.service.js @@ -3,7 +3,7 @@ app.factory('EmailMessageAnalysisService', function($http) { return { getAnalysisResult: function(query, headers, callback) { - $http.get(getAPI()+"emailmessages", { params: {startdatetime: query.startdatetime, enddatetime: query.enddatetime}} , {headers}) + $http.get(getAPI()+"emailmessages?" + 'startdatetime=' + query.startdatetime + '&enddatetime=' + query.enddatetime, {headers}) .then(function (response) { callback(response); }, function (response) { diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 07e5830f..a34ab3d8 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -13,38 +13,46 @@ class EmailMessageCollection: pass @staticmethod - def on_options(req, resp, startdate, enddate): + def on_options(req, resp): resp.status = falcon.HTTP_200 @staticmethod def on_get(req, resp): access_control(req) print(req.params) - startdate = req.params.get('startdatetime') - enddate = req.params.get('enddatetime') - try: - start_datetime_local = datetime.strptime(startdate, '%Y-%m-%d') - except Exception: - raise falcon.HTTPError(falcon.HTTP_400, - title='API.BAD_REQUEST', - description='API.INVALID_START_DATE_FORMAT') - try: - end_datetime_local = datetime.strptime(enddate, '%Y-%m-%d') - except Exception: - raise falcon.HTTPError(falcon.HTTP_400, - title='API.BAD_REQUEST', - description='API.INVALID_END_DATE_FORMAT') + start_datetime_local = req.params.get('startdatetime') + end_datetime_local = req.params.get('enddatetime') timezone_offset = int(config.utc_offset[1:3]) * 60 + int(config.utc_offset[4:6]) if config.utc_offset[0] == '-': timezone_offset = -timezone_offset - start_datetime_utc = start_datetime_local.replace(tzinfo=timezone.utc) - start_datetime_utc -= timedelta(minutes=timezone_offset) + if start_datetime_local is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_START_DATE_FORMAT") + else: + start_datetime_local = str.strip(start_datetime_local) + try: + start_datetime_utc = datetime.strptime(start_datetime_local, + '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + timedelta(minutes=timezone_offset) + except ValueError: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_START_DATE_FORMAT") - end_datetime_utc = end_datetime_local.replace(tzinfo=timezone.utc) - end_datetime_utc -= timedelta(minutes=timezone_offset) - end_datetime_utc += timedelta(days=1) + if end_datetime_local is None: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_END_DATE_FORMAT") + else: + end_datetime_local = str.strip(end_datetime_local) + try: + end_datetime_utc = datetime.strptime(end_datetime_local, + '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + timedelta(minutes=timezone_offset) + end_datetime_utc += timedelta(days=1) + except ValueError: + raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', + description="API.INVALID_END_DATE_FORMAT") if start_datetime_utc >= end_datetime_utc: raise falcon.HTTPError(falcon.HTTP_400, From a581caa2fa833ea8c914bbfa57d70669d87eaf8a Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 15 Dec 2021 09:52:55 +0800 Subject: [PATCH 055/117] Modified the EmailMessages interface4 --- myems-api/core/emailmessage.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index a34ab3d8..4b5b0ed3 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -29,7 +29,7 @@ class EmailMessageCollection: if start_datetime_local is None: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_START_DATE_FORMAT") + description="API.INVALID_START_DATETIME_FORMAT") else: start_datetime_local = str.strip(start_datetime_local) try: @@ -38,11 +38,11 @@ class EmailMessageCollection: timedelta(minutes=timezone_offset) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_START_DATE_FORMAT") + description="API.INVALID_START_DATETIME_FORMAT") if end_datetime_local is None: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_END_DATE_FORMAT") + description="API.INVALID_END_DATETIME_FORMAT") else: end_datetime_local = str.strip(end_datetime_local) try: @@ -52,7 +52,7 @@ class EmailMessageCollection: end_datetime_utc += timedelta(days=1) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description="API.INVALID_END_DATE_FORMAT") + description="API.INVALID_END_DATETIME_FORMAT") if start_datetime_utc >= end_datetime_utc: raise falcon.HTTPError(falcon.HTTP_400, From 3810b0cf3078dca31d4d6516af88a890a5aa0bae Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Wed, 15 Dec 2021 11:48:06 +0800 Subject: [PATCH 056/117] modified login_counter to failed_login_count --- myems-api/core/user.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/myems-api/core/user.py b/myems-api/core/user.py index c95a409e..69df28de 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -444,7 +444,7 @@ class UserLogin: description='API.INVALID_USER_NAME') query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, " - " account_expiration_datetime_utc, password_expiration_datetime_utc, login_counter " + " account_expiration_datetime_utc, password_expiration_datetime_utc, failed_login_count " " FROM tbl_users " " WHERE name = %s ") cursor.execute(query, (str.strip(new_values['data']['name']).lower(),)) @@ -464,7 +464,7 @@ class UserLogin: "is_admin": True if row[7] else False, "account_expiration_datetime_utc": row[8], "password_expiration_datetime_utc": row[9], - "login_counter": row[10]} + "failed_login_count": row[10]} elif 'email' in new_values['data']: if not isinstance(new_values['data']['email'], str) or \ @@ -473,7 +473,7 @@ class UserLogin: description='API.INVALID_EMAIL') query = (" SELECT id, name, uuid, display_name, email, salt, password, is_admin, " - " account_expiration_datetime_utc, password_expiration_datetime_utc,login_counter " + " account_expiration_datetime_utc, password_expiration_datetime_utc,failed_login_count " " FROM tbl_users " " WHERE email = %s ") cursor.execute(query, (str.strip(new_values['data']['email']).lower(),)) @@ -493,7 +493,7 @@ class UserLogin: "is_admin": True if row[7] else False, "account_expiration_datetime_utc": row[8], "password_expiration_datetime_utc": row[9], - "login_counter": row[10]} + "failed_login_count": row[10]} else: cursor.close() @@ -501,9 +501,9 @@ class UserLogin: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_USER_NAME_OR_EMAIL') - login_counter = result['login_counter'] + failed_login_count = result['failed_login_count'] - if login_counter >= 3: + if failed_login_count >= 3: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_HAS_BEEN_LOCKED') @@ -513,11 +513,11 @@ class UserLogin: hashed_password = hashlib.sha512(salt.encode() + password.encode()).hexdigest() if hashed_password != result['password']: - update_login_counter = (" UPDATE tbl_users " - " SET login_counter = %s " + update_failed_login_count = (" UPDATE tbl_users " + " SET failed_login_count = %s " " WHERE uuid = %s ") user_uuid = result['uuid'] - cursor.execute(update_login_counter, (login_counter + 1, user_uuid)) + cursor.execute(update_failed_login_count, (failed_login_count + 1, user_uuid)) cnx.commit() cursor.close() cnx.disconnect() @@ -875,7 +875,7 @@ class Unlock: cnx = mysql.connector.connect(**config.myems_user_db) cursor = cnx.cursor() - query = (" SELECT login_counter " + query = (" SELECT failed_login_count " " FROM tbl_users " " WHERE id = %s ") cursor.execute(query, (Id,)) @@ -885,19 +885,19 @@ class Unlock: cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_Id') - login_counter = row[0] - if login_counter < 3: + failed_login_count = row[0] + if failed_login_count < 3: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_IS_NOT_LOCKED') update_user = (" UPDATE tbl_users " - " SET login_counter = 0" + " SET failed_login_count = 0" " WHERE id = %s ") cursor.execute(update_user, (Id, )) cnx.commit() - query = (" SELECT login_counter " + query = (" SELECT failed_login_count " " FROM tbl_users " " WHERE id = %s ") cursor.execute(query, (Id,)) From 747daab4cbd94a1d20fb86d7def7377d5ede233a Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Wed, 15 Dec 2021 11:49:46 +0800 Subject: [PATCH 057/117] 2021/12/15 11:49 --- admin/app/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/app/api.js b/admin/app/api.js index ae9f7569..89aa9e28 100644 --- a/admin/app/api.js +++ b/admin/app/api.js @@ -1,6 +1,6 @@ //Switch Classes Function function getAPI(){ - // return "http://127.0.0.1:8000/"; + //return "http://127.0.0.1:8000/"; // to avoid CORS issue, use Nginx to proxy myems-api to path /api with the same ip and port as myems-web return window.location.protocol+"//"+window.location.hostname+":"+window.location.port+"/api/"; } From 83758854681c7be2c102dabc1de7df2a19d1f8d5 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Wed, 15 Dec 2021 14:40:13 +0800 Subject: [PATCH 058/117] If the login is successful, failed login count is cleared --- admin/views/users/user/user.html | 2 +- myems-api/core/user.py | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/admin/views/users/user/user.html b/admin/views/users/user/user.html index 41c399bc..eae9dd2d 100644 --- a/admin/views/users/user/user.html +++ b/admin/views/users/user/user.html @@ -36,7 +36,7 @@ {{'SETTING.EDIT' | translate}} {{'USER.RESET_PASSWORD' | translate}} {{'SETTING.DELETE' | translate}} - {{'SETTING.UNLOCK' | translate}} + {{'SETTING.UNLOCK' | translate}} diff --git a/myems-api/core/user.py b/myems-api/core/user.py index 69df28de..fae74f6a 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -27,7 +27,7 @@ class UserCollection: cursor = cnx.cursor() query = (" SELECT u.id, u.name, u.display_name, u.uuid, " " u.email, u.is_admin, p.id, p.name, " - " u.account_expiration_datetime_utc, u.password_expiration_datetime_utc " + " u.account_expiration_datetime_utc, u.password_expiration_datetime_utc, u.failed_login_count " " FROM tbl_users u " " LEFT JOIN tbl_privileges p ON u.privilege_id = p.id " " ORDER BY u.name ") @@ -59,7 +59,8 @@ class UserCollection: "account_expiration_datetime": account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "password_expiration_datetime": - password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')} + password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), + "failed_login_count": row[10]} result.append(meta_result) resp.text = json.dumps(result) @@ -523,6 +524,14 @@ class UserLogin: cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_PASSWORD') + if failed_login_count != 0: + update_failed_login_count = (" UPDATE tbl_users " + " SET failed_login_count = 0 " + " WHERE uuid = %s ") + user_uuid = result['uuid'] + cursor.execute(update_failed_login_count, (user_uuid, )) + cnx.commit() + if result['account_expiration_datetime_utc'] <= datetime.utcnow(): cursor.close() cnx.disconnect() From 9086a2c7676bbf4b98fdf73ed5cfbc4e4d28a6c4 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Wed, 15 Dec 2021 15:13:52 +0800 Subject: [PATCH 059/117] Modified the EmailMessages interface 5 --- .../fdd/emailmessage/emailmessageoption.controller.js | 10 +++++----- myems-api/core/emailmessage.py | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js index 71ccea0f..970be75a 100644 --- a/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js +++ b/admin/app/controllers/fdd/emailmessage/emailmessageoption.controller.js @@ -11,14 +11,14 @@ app.controller('EmailMessageOptionController', function( endDate: moment() }; $scope.dtOptions = { - timePicker: false, + timePicker: true, timePicker24Hour: true, timePickerIncrement: 1, timePickerSeconds: true, startView:2, autoApply: true, locale:{ - format: 'YYYY-MM-DD', + format: 'YYYY-MM-DDTHH:mm:ss', applyLabel: "OK", cancelLabel: "Cancel", }, @@ -32,10 +32,10 @@ app.controller('EmailMessageOptionController', function( $scope.execute = function() { var startdatetime, enddatetime; var query = { - startdatetime: $scope.daterange.startDate.format().slice(0, 10), - enddatetime: $scope.daterange.endDate.format().slice(0, 10) + startdatetime: $scope.daterange.startDate.format().slice(0, 19), + enddatetime: $scope.daterange.endDate.format().slice(0, 19) }; - + $scope.$emit('handleEmitEmailMessageOptionChanged', { load: true, period:$scope.currentPeriod diff --git a/myems-api/core/emailmessage.py b/myems-api/core/emailmessage.py index 4b5b0ed3..050dbfbb 100644 --- a/myems-api/core/emailmessage.py +++ b/myems-api/core/emailmessage.py @@ -34,7 +34,7 @@ class EmailMessageCollection: start_datetime_local = str.strip(start_datetime_local) try: start_datetime_utc = datetime.strptime(start_datetime_local, - '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + '%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \ timedelta(minutes=timezone_offset) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', @@ -47,9 +47,8 @@ class EmailMessageCollection: end_datetime_local = str.strip(end_datetime_local) try: end_datetime_utc = datetime.strptime(end_datetime_local, - '%Y-%m-%d').replace(tzinfo=timezone.utc) - \ + '%Y-%m-%dT%H:%M:%S').replace(tzinfo=timezone.utc) - \ timedelta(minutes=timezone_offset) - end_datetime_utc += timedelta(days=1) except ValueError: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description="API.INVALID_END_DATETIME_FORMAT") From 82a9735a776b9ac4d9353041ec3d306b4c6dd89c Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 16 Dec 2021 21:57:16 +0800 Subject: [PATCH 060/117] added maximum_failed_login_count to config in api --- myems-api/config.py | 163 ++++++++++++++--------------------------- myems-api/core/user.py | 8 +- 2 files changed, 57 insertions(+), 114 deletions(-) diff --git a/myems-api/config.py b/myems-api/config.py index 29b019ae..3a9bb99b 100644 --- a/myems-api/config.py +++ b/myems-api/config.py @@ -1,154 +1,97 @@ from decouple import config -MYEMS_SYSTEM_DB_HOST = config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1') -MYEMS_SYSTEM_DB_PORT = config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int) -MYEMS_SYSTEM_DB_DATABASE = config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db') -MYEMS_SYSTEM_DB_USER = config('MYEMS_SYSTEM_DB_USER', default='root') -MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1') - -MYEMS_ENERGY_DB_HOST = config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1') -MYEMS_ENERGY_DB_PORT = config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int) -MYEMS_ENERGY_DB_DATABASE = config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db') -MYEMS_ENERGY_DB_USER = config('MYEMS_ENERGY_DB_USER', default='root') -MYEMS_ENERGY_DB_PASSWORD = config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1') - -MYEMS_ENERGY_BASELINE_DB_HOST = config('MYEMS_ENERGY_BASELINE_DB_HOST', default='127.0.0.1') -MYEMS_ENERGY_BASELINE_DB_PORT = config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int) -MYEMS_ENERGY_BASELINE_DB_DATABASE = config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db') -MYEMS_ENERGY_BASELINE_DB_USER = config('MYEMS_ENERGY_BASELINE_DB_USER', default='root') -MYEMS_ENERGY_BASELINE_DB_PASSWORD = config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1') - -MYEMS_BILLING_DB_HOST = config('MYEMS_BILLING_DB_HOST', default='127.0.0.1') -MYEMS_BILLING_DB_PORT = config('MYEMS_BILLING_DB_PORT', default=3306, cast=int) -MYEMS_BILLING_DB_DATABASE = config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db') -MYEMS_BILLING_DB_USER = config('MYEMS_BILLING_DB_USER', default='root') -MYEMS_BILLING_DB_PASSWORD = config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1') - -MYEMS_BILLING_BASELINE_DB_HOST = config('MYEMS_BILLING_BASELINE_DB_HOST', default='127.0.0.1') -MYEMS_BILLING_BASELINE_DB_PORT = config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int) -MYEMS_BILLING_BASELINE_DB_DATABASE = config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db') -MYEMS_BILLING_BASELINE_DB_USER = config('MYEMS_BILLING_BASELINE_DB_USER', default='root') -MYEMS_BILLING_BASELINE_DB_PASSWORD = config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1') - -MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1') -MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int) -MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db') -MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root') -MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1') - -MYEMS_USER_DB_HOST = config('MYEMS_USER_DB_HOST', default='127.0.0.1') -MYEMS_USER_DB_PORT = config('MYEMS_USER_DB_PORT', default=3306, cast=int) -MYEMS_USER_DB_DATABASE = config('MYEMS_USER_DB_DATABASE', default='myems_user_db') -MYEMS_USER_DB_USER = config('MYEMS_USER_DB_USER', default='root') -MYEMS_USER_DB_PASSWORD = config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1') - -MYEMS_FDD_DB_HOST = config('MYEMS_FDD_DB_HOST', default='127.0.0.1') -MYEMS_FDD_DB_PORT = config('MYEMS_FDD_DB_PORT', default=3306, cast=int) -MYEMS_FDD_DB_DATABASE = config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db') -MYEMS_FDD_DB_USER = config('MYEMS_FDD_DB_USER', default='root') -MYEMS_FDD_DB_PASSWORD = config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1') - -MYEMS_REPORTING_DB_HOST = config('MYEMS_REPORTING_DB_HOST', default='127.0.0.1') -MYEMS_REPORTING_DB_PORT = config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int) -MYEMS_REPORTING_DB_DATABASE = config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db') -MYEMS_REPORTING_DB_USER = config('MYEMS_REPORTING_DB_USER', default='root') -MYEMS_REPORTING_DB_PASSWORD = config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1') - -MINUTES_TO_COUNT = config('MINUTES_TO_COUNT', default=60, cast=int) -UTC_OFFSET = config('UTC_OFFSET', default='+08:00') -WORKING_DAY_START_TIME_LOCAL = config('WORKING_DAY_START_TIME_LOCAL', default='00:00:00') -UPLOAD_PATH = config('UPLOAD_PATH', default='/var/www/html/admin/upload/') -CURRENCY_UNIT = config('CURRENCY_UNIT', default='CNY') - myems_system_db = { - 'host': MYEMS_SYSTEM_DB_HOST, - 'port': MYEMS_SYSTEM_DB_PORT, - 'database': MYEMS_SYSTEM_DB_DATABASE, - 'user': MYEMS_SYSTEM_DB_USER, - 'password': MYEMS_SYSTEM_DB_PASSWORD, + 'host': config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'), + 'user': config('MYEMS_SYSTEM_DB_USER', default='root'), + 'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'), } myems_energy_db = { - 'host': MYEMS_ENERGY_DB_HOST, - 'port': MYEMS_ENERGY_DB_PORT, - 'database': MYEMS_ENERGY_DB_DATABASE, - 'user': MYEMS_ENERGY_DB_USER, - 'password': MYEMS_ENERGY_DB_PASSWORD, + 'host': config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'), + 'user': config('MYEMS_ENERGY_DB_USER', default='root'), + 'password': config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1'), } myems_energy_baseline_db = { - 'host': MYEMS_ENERGY_BASELINE_DB_HOST, - 'port': MYEMS_ENERGY_BASELINE_DB_PORT, - 'database': MYEMS_ENERGY_BASELINE_DB_DATABASE, - 'user': MYEMS_ENERGY_BASELINE_DB_USER, - 'password': MYEMS_ENERGY_BASELINE_DB_PASSWORD, + 'host': config('MYEMS_ENERGY_BASELINE_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db'), + 'user': config('MYEMS_ENERGY_BASELINE_DB_USER', default='root'), + 'password': config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1'), } myems_billing_db = { - 'host': MYEMS_BILLING_DB_HOST, - 'port': MYEMS_BILLING_DB_PORT, - 'database': MYEMS_BILLING_DB_DATABASE, - 'user': MYEMS_BILLING_DB_USER, - 'password': MYEMS_BILLING_DB_PASSWORD, + 'host': config('MYEMS_BILLING_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_BILLING_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db'), + 'user': config('MYEMS_BILLING_DB_USER', default='root'), + 'password': config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1'), } myems_billing_baseline_db = { - 'host': MYEMS_BILLING_BASELINE_DB_HOST, - 'port': MYEMS_BILLING_BASELINE_DB_PORT, - 'database': MYEMS_BILLING_BASELINE_DB_DATABASE, - 'user': MYEMS_BILLING_BASELINE_DB_USER, - 'password': MYEMS_BILLING_BASELINE_DB_PASSWORD, + 'host': config('MYEMS_BILLING_BASELINE_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db'), + 'user': config('MYEMS_BILLING_BASELINE_DB_USER', default='root'), + 'password': config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1'), } myems_historical_db = { - 'host': MYEMS_HISTORICAL_DB_HOST, - 'port': MYEMS_HISTORICAL_DB_PORT, - 'database': MYEMS_HISTORICAL_DB_DATABASE, - 'user': MYEMS_HISTORICAL_DB_USER, - 'password': MYEMS_HISTORICAL_DB_PASSWORD, + 'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'), + 'user': config('MYEMS_HISTORICAL_DB_USER', default='root'), + 'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'), } myems_user_db = { - 'host': MYEMS_USER_DB_HOST, - 'port': MYEMS_USER_DB_PORT, - 'database': MYEMS_USER_DB_DATABASE, - 'user': MYEMS_USER_DB_USER, - 'password': MYEMS_USER_DB_PASSWORD, + 'host': config('MYEMS_USER_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_USER_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_USER_DB_DATABASE', default='myems_user_db'), + 'user': config('MYEMS_USER_DB_USER', default='root'), + 'password': config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1'), } myems_fdd_db = { - 'host': MYEMS_FDD_DB_HOST, - 'port': MYEMS_FDD_DB_PORT, - 'database': MYEMS_FDD_DB_DATABASE, - 'user': MYEMS_FDD_DB_USER, - 'password': MYEMS_FDD_DB_PASSWORD, + 'host': config('MYEMS_FDD_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_FDD_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db'), + 'user': config('MYEMS_FDD_DB_USER', default='root'), + 'password': config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1'), } myems_reporting_db = { - 'host': MYEMS_REPORTING_DB_HOST, - 'port': MYEMS_REPORTING_DB_PORT, - 'database': MYEMS_REPORTING_DB_DATABASE, - 'user': MYEMS_REPORTING_DB_USER, - 'password': MYEMS_REPORTING_DB_PASSWORD, + 'host': config('MYEMS_REPORTING_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db'), + 'user': config('MYEMS_REPORTING_DB_USER', default='root'), + 'password': config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1'), } # indicated in how many minutes to calculate meter energy consumption # 30 for half hourly period # 60 for hourly period -minutes_to_count = MINUTES_TO_COUNT +minutes_to_count = config('MINUTES_TO_COUNT', default=60, cast=int) # indicates the project's time zone offset from UTC -utc_offset = UTC_OFFSET +utc_offset = config('UTC_OFFSET', default='+08:00') # indicates from when ( in local timezone) of the day to calculate working days -working_day_start_time_local = WORKING_DAY_START_TIME_LOCAL +working_day_start_time_local = config('WORKING_DAY_START_TIME_LOCAL', default='00:00:00') # indicates where user uploaded files will be saved to # must use the root folder of myems-admin web application # for example if you serve myems-admin at /var/www/html/admin # you should set the upload_path as below -upload_path = UPLOAD_PATH +upload_path = config('UPLOAD_PATH', default='/var/www/html/admin/upload/') # main currency unit -currency_unit = CURRENCY_UNIT +currency_unit = config('CURRENCY_UNIT', default='CNY') + +# maximum failed login count, otherwise the user should be locked +maximum_failed_login_count = config('MAXIMUM_FAILED_LOGIN_COUNT', default=6, cast=int) diff --git a/myems-api/core/user.py b/myems-api/core/user.py index fae74f6a..aefd2e83 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -504,7 +504,7 @@ class UserLogin: failed_login_count = result['failed_login_count'] - if failed_login_count >= 3: + if failed_login_count >= config.maximum_failed_login_count: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_HAS_BEEN_LOCKED') @@ -515,8 +515,8 @@ class UserLogin: if hashed_password != result['password']: update_failed_login_count = (" UPDATE tbl_users " - " SET failed_login_count = %s " - " WHERE uuid = %s ") + " SET failed_login_count = %s " + " WHERE uuid = %s ") user_uuid = result['uuid'] cursor.execute(update_failed_login_count, (failed_login_count + 1, user_uuid)) cnx.commit() @@ -895,7 +895,7 @@ class Unlock: raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_Id') failed_login_count = row[0] - if failed_login_count < 3: + if failed_login_count < config.maximum_failed_login_count: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_IS_NOT_LOCKED') From 33e6c24e286cc6f47d2ef632a4412419f744c7c2 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 16 Dec 2021 22:24:04 +0800 Subject: [PATCH 061/117] added unlock user into api and admin --- myems-api/MyEMS.postman_collection.json | 481 +++++++++++++++++++++--- myems-api/README.md | 8 +- myems-api/config.py | 2 +- 3 files changed, 439 insertions(+), 52 deletions(-) diff --git a/myems-api/MyEMS.postman_collection.json b/myems-api/MyEMS.postman_collection.json index c2514164..9700132c 100644 --- a/myems-api/MyEMS.postman_collection.json +++ b/myems-api/MyEMS.postman_collection.json @@ -4577,7 +4577,19 @@ "name": "POST Create New Offline Meter", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"OfflinePM21\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"空调用电\"}}" @@ -4598,19 +4610,31 @@ "name": "PUT Update a Offline Meter", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"OfflinePM201\", \"energy_category_id\":1, \"hourly_low_limit\":0.000, \"hourly_high_limit\":999.99, \"is_counted\":true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"空调用电\"}}" }, "url": { - "raw": "{{base_url}}/offlinemeters/6", + "raw": "{{base_url}}/offlinemeters/3", "host": [ "{{base_url}}" ], "path": [ "offlinemeters", - "6" + "3" ] } }, @@ -4620,15 +4644,27 @@ "name": "DELETE Offline Meter by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { - "raw": "{{base_url}}/offlinemeters/2", + "raw": "{{base_url}}/offlinemeters/3", "host": [ "{{base_url}}" ], "path": [ "offlinemeters", - "2" + "3" ] } }, @@ -5161,7 +5197,8 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any Admin User's UUID" }, { "key": "Token", @@ -5193,7 +5230,8 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any Admin User's UUID" }, { "key": "Token", @@ -5226,7 +5264,8 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any Admin User's UUID" }, { "key": "Token", @@ -6157,7 +6196,19 @@ "name": "POST Create New Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMSSpace\", \"parent_space_id\":1, \"area\":999.99, \"timezone_id\":56, \"is_input_counted\":true, \"is_output_counted\":false, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Space description\"}}" @@ -6178,7 +6229,19 @@ "name": "PUT Update a Space", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"name\":\"MyEMSSpace\", \"parent_space_id\":2, \"area\":999.99, \"timezone_id\":56, \"is_input_counted\":true, \"is_output_counted\":true, \"contact_id\":1, \"cost_center_id\":1, \"description\":\"Space description\"}}" @@ -6200,7 +6263,19 @@ "name": "DELETE a Space by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/57", "host": [ @@ -6256,7 +6331,19 @@ "name": "POST Bind a Combined Equipment to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"combined_equipment_id\":1}}" @@ -6279,7 +6366,19 @@ "name": "DELETE a Combined Equipment from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/combinedequipments/1", "host": [ @@ -6318,7 +6417,19 @@ "name": "POST Bind an Equipment to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"equipment_id\":1}}" @@ -6341,7 +6452,19 @@ "name": "DELETE an Equipment from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/equipments/1", "host": [ @@ -6380,7 +6503,18 @@ "name": "POST Bind a Meter to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"meter_id\":1}}" @@ -6400,10 +6534,22 @@ "response": [] }, { - "name": "DELETE a Meter from Space", + "name": "DELETE Unbind a Meter from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/meters/1", "host": [ @@ -6442,7 +6588,19 @@ "name": "POST Bind an OfflineMeter to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"offline_meter_id\":1}}" @@ -6462,10 +6620,22 @@ "response": [] }, { - "name": "DELETE an Offline Meter from Space", + "name": "DELETE Unbind an Offline Meter from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/offlinemeters/1", "host": [ @@ -6504,7 +6674,19 @@ "name": "POST Bind a Point to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"point_id\":1}}" @@ -6524,10 +6706,22 @@ "response": [] }, { - "name": "DELETE a Point from Space", + "name": "DELETE Unbind a Point from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/points/3", "host": [ @@ -6566,7 +6760,19 @@ "name": "POST Bind a Sensor to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"sensor_id\":1}}" @@ -6586,10 +6792,22 @@ "response": [] }, { - "name": "DELETE a Sensor from Space", + "name": "DELETE Unbind a Sensor from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/sensors/1", "host": [ @@ -6628,7 +6846,19 @@ "name": "POST Bind a Shopfloor to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"shopfloor_id\":1}}" @@ -6648,10 +6878,22 @@ "response": [] }, { - "name": "DELETE a Shopfloor from a Space", + "name": "DELETE Unbind a Shopfloor from a Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/shopfloors/1", "host": [ @@ -6690,7 +6932,19 @@ "name": "POST Bind a Store to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"store_id\":1}}" @@ -6710,10 +6964,22 @@ "response": [] }, { - "name": "DELETE a Store from Space", + "name": "DELETE Unbind a Store from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/stores/1", "host": [ @@ -6752,7 +7018,19 @@ "name": "POST Bind a Tenant to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"tenant_id\":1}}" @@ -6772,10 +7050,22 @@ "response": [] }, { - "name": "DELETE a Tenant from Space", + "name": "DELETE Unbind a Tenant from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/tenants/1", "host": [ @@ -6814,7 +7104,19 @@ "name": "POST Bind a Virtual Meter to a Space", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", "raw": "{\"data\":{\"virtual_meter_id\":1}}" @@ -6834,10 +7136,22 @@ "response": [] }, { - "name": "DELETE a Virtual Meter from Space", + "name": "DELETE Unbind a Virtual Meter from Space", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/spaces/1/virtualmeters/1", "host": [ @@ -6861,11 +7175,12 @@ { "key": "User-UUID", "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", - "type": "text" + "type": "text", + "description": "Any User's UUID" }, { "key": "Token", - "value": "e1879592cb12e4cbf0e1762ed42edde699499cd9", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", "type": "text" } ], @@ -8721,7 +9036,7 @@ }, { "key": "Token", - "value": "50bc979c9181699bc33927aa04a453fd83e2b8e8280544bfc3807fdedf2645201676fe474787e0ea3024502659a2ab4b1905c6ca4f444ffdba764a603c4eb691", + "value": "6c32302cb46cae4236fe9d04ccb21f950bce593267f33dc169e700bb98ea5c3446521251a1b4078ebcbe51b4ca4ba59ac01b395e0f69ef42fa0bc36d6bd5683c", "description": "Login to get a valid token", "type": "text" } @@ -9030,6 +9345,38 @@ } }, "response": [] + }, + { + "name": "PUT Unlock User", + "request": { + "method": "PUT", + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4", + "type": "text", + "description": "Any admin users' UUID" + }, + { + "key": "Token", + "value": "6c32302cb46cae4236fe9d04ccb21f950bce593267f33dc169e700bb98ea5c3446521251a1b4078ebcbe51b4ca4ba59ac01b395e0f69ef42fa0bc36d6bd5683c", + "type": "text", + "description": "Login to get a valid token" + } + ], + "url": { + "raw": "{{base_url}}/users/unlock/2", + "host": [ + "{{base_url}}" + ], + "path": [ + "users", + "unlock", + "2" + ] + } + }, + "response": [] } ] }, @@ -9075,10 +9422,22 @@ "name": "POST Create New Virtual Meter", "request": { "method": "POST", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"name\":\"VM10\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1+x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":3},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":4},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":5}] } }}" + "raw": "{\"data\":{\"name\":\"VM10\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1+x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":1},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":2},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":3}] } }}" }, "url": { "raw": "{{base_url}}/virtualmeters", @@ -9096,10 +9455,22 @@ "name": "PUT Update a Virtual Meter by ID", "request": { "method": "PUT", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "body": { "mode": "raw", - "raw": "{\"data\":{\"name\":\"VM51\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1-x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":3},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":4},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":5}] } }}" + "raw": "{\"data\":{\"name\":\"VM11\", \"energy_category_id\":1, \"is_counted\": true, \"cost_center_id\":1, \"energy_item_id\":1, \"description\":\"virtual description\", \"expression\": {\"equation\":\"x1+x2-x3\", \"variables\":[{\"name\":\"x1\", \"meter_type\":\"meter\", \"meter_id\":1},{\"name\":\"x2\", \"meter_type\":\"meter\", \"meter_id\":2},{\"name\":\"x3\", \"meter_type\":\"meter\", \"meter_id\":3}] } }}" }, "url": { "raw": "{{base_url}}/virtualmeters/3", @@ -9118,7 +9489,19 @@ "name": "DELETE a Virtual Meter by ID", "request": { "method": "DELETE", - "header": [], + "header": [ + { + "key": "User-UUID", + "value": "dcdb67d1-6116-4987-916f-6fc6cf2bc0e4 ", + "type": "text", + "description": "Any Admin User's UUID" + }, + { + "key": "Token", + "value": "2ac29271a9c58218ba88928dd13bccb3662f2b320152cc5ef52f76f2c2450f48c12bad4fbd4c7b03bd35686c70909894e5e3637b67198108f3e403d4a6ca8f55", + "type": "text" + } + ], "url": { "raw": "{{base_url}}/virtualmeters/3", "host": [ diff --git a/myems-api/README.md b/myems-api/README.md index 71fdd398..b7688aa0 100644 --- a/myems-api/README.md +++ b/myems-api/README.md @@ -1981,11 +1981,11 @@ curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKE ### User * GET All Users ```bash -curl -i -X GET {{base_url}}/users +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/users ``` * GET a User by ID ```bash -curl -i -X GET {{base_url}}/users/{id} +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -X GET {{base_url}}/users/{id} ``` * DELETE User by id ```bash @@ -2019,6 +2019,10 @@ curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKE ```bash curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT -d '{"data":{"name":"johnson","password":"NewPassword1"}}' {{base_url}}/users/resetpassword ``` +* PUT User Unlock +```bash +curl -i -H "User-UUID: 793f1bb4-6e25-4242-8cdc-2f662b25484f" -H "Token: GET-TOKEN-AFTER-LOGIN" -H "Content-Type: application/json" -X PUT {{base_url}}/users/unlock/{id} +``` ### Virtual Meter * GET a Virtual Meter by ID diff --git a/myems-api/config.py b/myems-api/config.py index 3a9bb99b..30a590f2 100644 --- a/myems-api/config.py +++ b/myems-api/config.py @@ -94,4 +94,4 @@ upload_path = config('UPLOAD_PATH', default='/var/www/html/admin/upload/') currency_unit = config('CURRENCY_UNIT', default='CNY') # maximum failed login count, otherwise the user should be locked -maximum_failed_login_count = config('MAXIMUM_FAILED_LOGIN_COUNT', default=6, cast=int) +maximum_failed_login_count = config('MAXIMUM_FAILED_LOGIN_COUNT', default=3, cast=int) From 273ab4cdab5ece0146e5d80561316cfa8ea105db Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Fri, 17 Dec 2021 09:45:10 +0800 Subject: [PATCH 062/117] avoid merge conflict --- myems-api/config.py | 163 ++++++++++++++--------------------------- myems-api/core/user.py | 23 ++++-- 2 files changed, 69 insertions(+), 117 deletions(-) diff --git a/myems-api/config.py b/myems-api/config.py index 29b019ae..c9ad8e57 100644 --- a/myems-api/config.py +++ b/myems-api/config.py @@ -1,154 +1,97 @@ from decouple import config -MYEMS_SYSTEM_DB_HOST = config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1') -MYEMS_SYSTEM_DB_PORT = config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int) -MYEMS_SYSTEM_DB_DATABASE = config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db') -MYEMS_SYSTEM_DB_USER = config('MYEMS_SYSTEM_DB_USER', default='root') -MYEMS_SYSTEM_DB_PASSWORD = config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1') - -MYEMS_ENERGY_DB_HOST = config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1') -MYEMS_ENERGY_DB_PORT = config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int) -MYEMS_ENERGY_DB_DATABASE = config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db') -MYEMS_ENERGY_DB_USER = config('MYEMS_ENERGY_DB_USER', default='root') -MYEMS_ENERGY_DB_PASSWORD = config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1') - -MYEMS_ENERGY_BASELINE_DB_HOST = config('MYEMS_ENERGY_BASELINE_DB_HOST', default='127.0.0.1') -MYEMS_ENERGY_BASELINE_DB_PORT = config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int) -MYEMS_ENERGY_BASELINE_DB_DATABASE = config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db') -MYEMS_ENERGY_BASELINE_DB_USER = config('MYEMS_ENERGY_BASELINE_DB_USER', default='root') -MYEMS_ENERGY_BASELINE_DB_PASSWORD = config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1') - -MYEMS_BILLING_DB_HOST = config('MYEMS_BILLING_DB_HOST', default='127.0.0.1') -MYEMS_BILLING_DB_PORT = config('MYEMS_BILLING_DB_PORT', default=3306, cast=int) -MYEMS_BILLING_DB_DATABASE = config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db') -MYEMS_BILLING_DB_USER = config('MYEMS_BILLING_DB_USER', default='root') -MYEMS_BILLING_DB_PASSWORD = config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1') - -MYEMS_BILLING_BASELINE_DB_HOST = config('MYEMS_BILLING_BASELINE_DB_HOST', default='127.0.0.1') -MYEMS_BILLING_BASELINE_DB_PORT = config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int) -MYEMS_BILLING_BASELINE_DB_DATABASE = config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db') -MYEMS_BILLING_BASELINE_DB_USER = config('MYEMS_BILLING_BASELINE_DB_USER', default='root') -MYEMS_BILLING_BASELINE_DB_PASSWORD = config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1') - -MYEMS_HISTORICAL_DB_HOST = config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1') -MYEMS_HISTORICAL_DB_PORT = config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int) -MYEMS_HISTORICAL_DB_DATABASE = config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db') -MYEMS_HISTORICAL_DB_USER = config('MYEMS_HISTORICAL_DB_USER', default='root') -MYEMS_HISTORICAL_DB_PASSWORD = config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1') - -MYEMS_USER_DB_HOST = config('MYEMS_USER_DB_HOST', default='127.0.0.1') -MYEMS_USER_DB_PORT = config('MYEMS_USER_DB_PORT', default=3306, cast=int) -MYEMS_USER_DB_DATABASE = config('MYEMS_USER_DB_DATABASE', default='myems_user_db') -MYEMS_USER_DB_USER = config('MYEMS_USER_DB_USER', default='root') -MYEMS_USER_DB_PASSWORD = config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1') - -MYEMS_FDD_DB_HOST = config('MYEMS_FDD_DB_HOST', default='127.0.0.1') -MYEMS_FDD_DB_PORT = config('MYEMS_FDD_DB_PORT', default=3306, cast=int) -MYEMS_FDD_DB_DATABASE = config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db') -MYEMS_FDD_DB_USER = config('MYEMS_FDD_DB_USER', default='root') -MYEMS_FDD_DB_PASSWORD = config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1') - -MYEMS_REPORTING_DB_HOST = config('MYEMS_REPORTING_DB_HOST', default='127.0.0.1') -MYEMS_REPORTING_DB_PORT = config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int) -MYEMS_REPORTING_DB_DATABASE = config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db') -MYEMS_REPORTING_DB_USER = config('MYEMS_REPORTING_DB_USER', default='root') -MYEMS_REPORTING_DB_PASSWORD = config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1') - -MINUTES_TO_COUNT = config('MINUTES_TO_COUNT', default=60, cast=int) -UTC_OFFSET = config('UTC_OFFSET', default='+08:00') -WORKING_DAY_START_TIME_LOCAL = config('WORKING_DAY_START_TIME_LOCAL', default='00:00:00') -UPLOAD_PATH = config('UPLOAD_PATH', default='/var/www/html/admin/upload/') -CURRENCY_UNIT = config('CURRENCY_UNIT', default='CNY') - myems_system_db = { - 'host': MYEMS_SYSTEM_DB_HOST, - 'port': MYEMS_SYSTEM_DB_PORT, - 'database': MYEMS_SYSTEM_DB_DATABASE, - 'user': MYEMS_SYSTEM_DB_USER, - 'password': MYEMS_SYSTEM_DB_PASSWORD, + 'host': config('MYEMS_SYSTEM_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_SYSTEM_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_SYSTEM_DB_DATABASE', default='myems_system_db'), + 'user': config('MYEMS_SYSTEM_DB_USER', default='root'), + 'password': config('MYEMS_SYSTEM_DB_PASSWORD', default='!MyEMS1'), } myems_energy_db = { - 'host': MYEMS_ENERGY_DB_HOST, - 'port': MYEMS_ENERGY_DB_PORT, - 'database': MYEMS_ENERGY_DB_DATABASE, - 'user': MYEMS_ENERGY_DB_USER, - 'password': MYEMS_ENERGY_DB_PASSWORD, + 'host': config('MYEMS_ENERGY_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_ENERGY_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_ENERGY_DB_DATABASE', default='myems_energy_db'), + 'user': config('MYEMS_ENERGY_DB_USER', default='root'), + 'password': config('MYEMS_ENERGY_DB_PASSWORD', default='!MyEMS1'), } myems_energy_baseline_db = { - 'host': MYEMS_ENERGY_BASELINE_DB_HOST, - 'port': MYEMS_ENERGY_BASELINE_DB_PORT, - 'database': MYEMS_ENERGY_BASELINE_DB_DATABASE, - 'user': MYEMS_ENERGY_BASELINE_DB_USER, - 'password': MYEMS_ENERGY_BASELINE_DB_PASSWORD, + 'host': config('MYEMS_ENERGY_BASELINE_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_ENERGY_BASELINE_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_ENERGY_BASELINE_DB_DATABASE', default='myems_energy_baseline_db'), + 'user': config('MYEMS_ENERGY_BASELINE_DB_USER', default='root'), + 'password': config('MYEMS_ENERGY_BASELINE_DB_PASSWORD', default='!MyEMS1'), } myems_billing_db = { - 'host': MYEMS_BILLING_DB_HOST, - 'port': MYEMS_BILLING_DB_PORT, - 'database': MYEMS_BILLING_DB_DATABASE, - 'user': MYEMS_BILLING_DB_USER, - 'password': MYEMS_BILLING_DB_PASSWORD, + 'host': config('MYEMS_BILLING_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_BILLING_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_BILLING_DB_DATABASE', default='myems_billing_db'), + 'user': config('MYEMS_BILLING_DB_USER', default='root'), + 'password': config('MYEMS_BILLING_DB_PASSWORD', default='!MyEMS1'), } myems_billing_baseline_db = { - 'host': MYEMS_BILLING_BASELINE_DB_HOST, - 'port': MYEMS_BILLING_BASELINE_DB_PORT, - 'database': MYEMS_BILLING_BASELINE_DB_DATABASE, - 'user': MYEMS_BILLING_BASELINE_DB_USER, - 'password': MYEMS_BILLING_BASELINE_DB_PASSWORD, + 'host': config('MYEMS_BILLING_BASELINE_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_BILLING_BASELINE_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_BILLING_BASELINE_DB_DATABASE', default='myems_billing_baseline_db'), + 'user': config('MYEMS_BILLING_BASELINE_DB_USER', default='root'), + 'password': config('MYEMS_BILLING_BASELINE_DB_PASSWORD', default='!MyEMS1'), } myems_historical_db = { - 'host': MYEMS_HISTORICAL_DB_HOST, - 'port': MYEMS_HISTORICAL_DB_PORT, - 'database': MYEMS_HISTORICAL_DB_DATABASE, - 'user': MYEMS_HISTORICAL_DB_USER, - 'password': MYEMS_HISTORICAL_DB_PASSWORD, + 'host': config('MYEMS_HISTORICAL_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_HISTORICAL_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_HISTORICAL_DB_DATABASE', default='myems_historical_db'), + 'user': config('MYEMS_HISTORICAL_DB_USER', default='root'), + 'password': config('MYEMS_HISTORICAL_DB_PASSWORD', default='!MyEMS1'), } myems_user_db = { - 'host': MYEMS_USER_DB_HOST, - 'port': MYEMS_USER_DB_PORT, - 'database': MYEMS_USER_DB_DATABASE, - 'user': MYEMS_USER_DB_USER, - 'password': MYEMS_USER_DB_PASSWORD, + 'host': config('MYEMS_USER_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_USER_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_USER_DB_DATABASE', default='myems_user_db'), + 'user': config('MYEMS_USER_DB_USER', default='root'), + 'password': config('MYEMS_USER_DB_PASSWORD', default='!MyEMS1'), } myems_fdd_db = { - 'host': MYEMS_FDD_DB_HOST, - 'port': MYEMS_FDD_DB_PORT, - 'database': MYEMS_FDD_DB_DATABASE, - 'user': MYEMS_FDD_DB_USER, - 'password': MYEMS_FDD_DB_PASSWORD, + 'host': config('MYEMS_FDD_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_FDD_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_FDD_DB_DATABASE', default='myems_fdd_db'), + 'user': config('MYEMS_FDD_DB_USER', default='root'), + 'password': config('MYEMS_FDD_DB_PASSWORD', default='!MyEMS1'), } myems_reporting_db = { - 'host': MYEMS_REPORTING_DB_HOST, - 'port': MYEMS_REPORTING_DB_PORT, - 'database': MYEMS_REPORTING_DB_DATABASE, - 'user': MYEMS_REPORTING_DB_USER, - 'password': MYEMS_REPORTING_DB_PASSWORD, + 'host': config('MYEMS_REPORTING_DB_HOST', default='127.0.0.1'), + 'port': config('MYEMS_REPORTING_DB_PORT', default=3306, cast=int), + 'database': config('MYEMS_REPORTING_DB_DATABASE', default='myems_reporting_db'), + 'user': config('MYEMS_REPORTING_DB_USER', default='root'), + 'password': config('MYEMS_REPORTING_DB_PASSWORD', default='!MyEMS1'), } # indicated in how many minutes to calculate meter energy consumption # 30 for half hourly period # 60 for hourly period -minutes_to_count = MINUTES_TO_COUNT +minutes_to_count = config('MINUTES_TO_COUNT', default=60, cast=int) # indicates the project's time zone offset from UTC -utc_offset = UTC_OFFSET +utc_offset = config('UTC_OFFSET', default='+08:00') # indicates from when ( in local timezone) of the day to calculate working days -working_day_start_time_local = WORKING_DAY_START_TIME_LOCAL +working_day_start_time_local = config('WORKING_DAY_START_TIME_LOCAL', default='00:00:00') # indicates where user uploaded files will be saved to # must use the root folder of myems-admin web application # for example if you serve myems-admin at /var/www/html/admin # you should set the upload_path as below -upload_path = UPLOAD_PATH +upload_path = config('UPLOAD_PATH', default='/var/www/html/admin/upload/') # main currency unit -currency_unit = CURRENCY_UNIT +currency_unit = config('CURRENCY_UNIT', default='CNY') + +# maximum failed login count, otherwise the user should be locked +maximum_failed_login_count = config('MAXIMUM_FAILED_LOGIN_COUNT', default=3, cast=int) \ No newline at end of file diff --git a/myems-api/core/user.py b/myems-api/core/user.py index 69df28de..6444a3ad 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -27,7 +27,7 @@ class UserCollection: cursor = cnx.cursor() query = (" SELECT u.id, u.name, u.display_name, u.uuid, " " u.email, u.is_admin, p.id, p.name, " - " u.account_expiration_datetime_utc, u.password_expiration_datetime_utc " + " u.account_expiration_datetime_utc, u.password_expiration_datetime_utc, u.failed_login_count " " FROM tbl_users u " " LEFT JOIN tbl_privileges p ON u.privilege_id = p.id " " ORDER BY u.name ") @@ -59,7 +59,8 @@ class UserCollection: "account_expiration_datetime": account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "password_expiration_datetime": - password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S')} + password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), + "failed_login_count": row[10]} result.append(meta_result) resp.text = json.dumps(result) @@ -503,7 +504,7 @@ class UserLogin: failed_login_count = result['failed_login_count'] - if failed_login_count >= 3: + if failed_login_count >= config.maximum_failed_login_count: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_HAS_BEEN_LOCKED') @@ -514,8 +515,8 @@ class UserLogin: if hashed_password != result['password']: update_failed_login_count = (" UPDATE tbl_users " - " SET failed_login_count = %s " - " WHERE uuid = %s ") + " SET failed_login_count = %s " + " WHERE uuid = %s ") user_uuid = result['uuid'] cursor.execute(update_failed_login_count, (failed_login_count + 1, user_uuid)) cnx.commit() @@ -523,6 +524,14 @@ class UserLogin: cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_PASSWORD') + if failed_login_count != 0: + update_failed_login_count = (" UPDATE tbl_users " + " SET failed_login_count = 0 " + " WHERE uuid = %s ") + user_uuid = result['uuid'] + cursor.execute(update_failed_login_count, (user_uuid, )) + cnx.commit() + if result['account_expiration_datetime_utc'] <= datetime.utcnow(): cursor.close() cnx.disconnect() @@ -886,7 +895,7 @@ class Unlock: raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.INVALID_Id') failed_login_count = row[0] - if failed_login_count < 3: + if failed_login_count < config.maximum_failed_login_count: cursor.close() cnx.disconnect() raise falcon.HTTPError(falcon.HTTP_400, 'API.BAD_REQUEST', 'API.USER_ACCOUNT_IS_NOT_LOCKED') @@ -912,4 +921,4 @@ class Unlock: resp.text = json.dumps("OK") resp.status = falcon.HTTP_200 write_log(user_uuid=admin_user_uuid, request_method='PUT', resource_type='UnlockUser', - resource_id=Id, request_body=None) + resource_id=Id, request_body=None) \ No newline at end of file From 1b1afa7de1c6ff45aea35e9815e81a14864fe63d Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Fri, 17 Dec 2021 10:19:06 +0800 Subject: [PATCH 063/117] The step of judging the number of 'failed login count' moves to myems-api --- admin/views/users/user/user.html | 2 +- myems-api/core/user.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/views/users/user/user.html b/admin/views/users/user/user.html index eae9dd2d..9d92622a 100644 --- a/admin/views/users/user/user.html +++ b/admin/views/users/user/user.html @@ -36,7 +36,7 @@ {{'SETTING.EDIT' | translate}} {{'USER.RESET_PASSWORD' | translate}} {{'SETTING.DELETE' | translate}} - {{'SETTING.UNLOCK' | translate}} + {{'SETTING.UNLOCK' | translate}} diff --git a/myems-api/core/user.py b/myems-api/core/user.py index 6444a3ad..99116de0 100644 --- a/myems-api/core/user.py +++ b/myems-api/core/user.py @@ -60,7 +60,7 @@ class UserCollection: account_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), "password_expiration_datetime": password_expiration_datetime_local.strftime('%Y-%m-%dT%H:%M:%S'), - "failed_login_count": row[10]} + "failed_login_count": True if row[10] < 3 else False} result.append(meta_result) resp.text = json.dumps(result) From 01e894eaeafc51867a4d106ef339df5b09a0beaa Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 17 Dec 2021 20:51:48 +0800 Subject: [PATCH 064/117] changed codechina to gitcode in README --- README.md | 2 +- README_DE.md | 2 +- README_EN.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ebf33012..b9fbc2bc 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,7 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可 [4]. [Gitlab](https://gitlab.com/myems/myems) https://gitlab.com/myems/myems -[5]. [CODE CHINA](https://codechina.csdn.net/myems/myems) https://codechina.csdn.net/myems/myems +[5]. [GitCode](https://gitcode.net/myems/myems) https://gitcode.net/myems/myems ## MyEMS安装(社区版) diff --git a/README_DE.md b/README_DE.md index a3b129ca..39d21f53 100644 --- a/README_DE.md +++ b/README_DE.md @@ -139,7 +139,7 @@ Sehen [Funktionen der MyEMS Enterprise Edition](./enterprise-edition-de.md) [4]. [Gitlab](https://gitlab.com/myems/myems) https://gitlab.com/myems/myems -[5]. [CODE CHINA](https://codechina.csdn.net/myems/myems) https://codechina.csdn.net/myems/myems +[5]. [GitCode](https://gitcode.net/myems/myems) https://gitcode.net/myems/myems ## MyEMS Installation (Community Edition) diff --git a/README_EN.md b/README_EN.md index 720a3c0c..7003d671 100644 --- a/README_EN.md +++ b/README_EN.md @@ -142,7 +142,7 @@ See [Features of MyEMS Enterprise Edition](./enterprise-edition-en.md) [4]. [Gitlab](https://gitlab.com/myems/myems) https://gitlab.com/myems/myems -[5]. [CODE CHINA](https://codechina.csdn.net/myems/myems) https://codechina.csdn.net/myems/myems +[5]. [GitCode](https://gitcode.net/myems/myems) https://gitcode.net/myems/myems ## MyEMS Installation (Community Edition) From 6e4fd346519fc69beb9597824990286da31f8af1 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Fri, 17 Dec 2021 22:34:24 +0800 Subject: [PATCH 065/117] updated date-range-picker of emailmessage view in admin --- admin/views/fdd/emailmessage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/views/fdd/emailmessage.html b/admin/views/fdd/emailmessage.html index d1ce6262..a052bfb0 100644 --- a/admin/views/fdd/emailmessage.html +++ b/admin/views/fdd/emailmessage.html @@ -4,8 +4,8 @@
-