907a582c48
updated get messages by date range in admin and api
2021-12-20 21:15:26 +08:00
3045e8d4f0
Merge branch 'PR' into develop
2021-12-20 20:25:40 +08:00
75ea44dd84
added locl/unlock user who faied login some times to admin and api
2021-12-20 20:00:48 +08:00
545ea96fee
use config.maximum failed login count instead of 3
2021-12-20 19:25:02 +08:00
3d26c687fd
Solved two problems of the last PR
2021-12-20 14:21:32 +08:00
c45e4a84e3
Modified the TextMessages webmessage wechatmessage interface
2021-12-20 11:55:16 +08:00
cdaa3fd186
changed all datatype JSON columns to datatype LONGTEXT in database
...
upgrade version number to v1.5.1
2021-12-18 17:11:11 +08:00
1d1775a7aa
Merge branch 'PR' into develop
2021-12-17 22:34:37 +08:00
1b1afa7de1
The step of judging the number of 'failed login count' moves to myems-api
2021-12-17 10:19:06 +08:00
273ab4cdab
avoid merge conflict
2021-12-17 09:45:10 +08:00
9086a2c767
Modified the EmailMessages interface 5
2021-12-15 15:13:52 +08:00
3810b0cf30
modified login_counter to failed_login_count
2021-12-15 11:48:06 +08:00
a581caa2fa
Modified the EmailMessages interface4
2021-12-15 09:52:55 +08:00
952e9dd278
Modified the EmailMessages interface3
2021-12-15 09:49:38 +08:00
d387684a78
lock user
2021-12-13 20:15:41 +08:00
3cc2c929ec
Modified the EmailMessages interface
2021-12-13 17:28:20 +08:00
905cd6f870
EmailMessages interface is modified
2021-12-13 17:07:52 +08:00
56c4c6b188
upgraded version number to v1.5.0
2021-12-12 17:40:07 +08:00
849934afa3
Merge branch 'PR' into develop
2021-12-10 18:22:39 +08:00
d3519bf39c
added access control to rule in api and admin
2021-12-10 17:58:42 +08:00
bf6a8ba8ee
added access control to costcenter and tariff in api and admin
2021-12-09 12:08:00 +08:00
3e78a06a1d
added access control to space virtualmeter and offlinemeter
2021-12-09 12:04:30 +08:00
4d9b60af3d
Merge branch 'PR' into develop
2021-12-09 11:20:33 +08:00
31b70d4057
added access_control to costcenter and tariff
2021-12-08 10:22:16 +08:00
95c8dd95d5
Merge branch 'PR' into develop
2021-12-07 20:14:55 +08:00
9c9e316efc
added access control to point in api and admin
2021-12-07 19:50:37 +08:00
8ea1d4a812
added access control to shopfloor tenant and store
2021-12-07 15:04:26 +08:00
be77f29b3b
point of access_control
2021-12-07 14:35:41 +08:00
15cc27ac18
added access control to equipment in api and admin
2021-12-06 23:02:27 +08:00
9b417d0648
Merge branch 'PR' into develop
2021-12-06 22:17:44 +08:00
0bf0c829d0
equipment of access_control
2021-12-06 15:26:27 +08:00
fb31837efa
added access_control to combinedequipment
2021-12-06 14:52:15 +08:00
5d1e469894
updated nofification(web message) in web and api
2021-12-05 22:37:59 +08:00
cd94e31a98
added user varification to webmessage in admin and api
2021-12-05 18:06:50 +08:00
996f7066e1
added access control to wechat message in api and admin
2021-12-05 12:37:42 +08:00
65565a5351
added access control to text message in api and admin
2021-12-04 20:48:56 +08:00
3e536d503e
added access control to email message in api and admin
2021-12-04 19:52:12 +08:00
b10cc91a3a
Merge branch 'PR89' into develop
2021-12-03 19:21:08 +08:00
05b5631408
Merge branch 'PR88' into develop
2021-12-03 17:01:21 +08:00
2eaa8df6c6
added access control to sensor
2021-12-03 16:36:48 +08:00
469c21672b
distrbutioncircuit/distributionsystem of access_control
2021-12-03 14:58:04 +08:00
624e4f7e3b
Merge branch 'PR87' into develop
2021-12-03 14:00:48 +08:00
8dd998ed0c
added access_control to privilege
2021-12-02 10:43:32 +08:00
62312e8c54
energyflowdiagram of access_control2
2021-12-02 09:56:13 +08:00
f685728985
Merge remote-tracking branch 'origin/develop' into develop
2021-12-02 09:09:38 +08:00
213f669924
added access control to energyitem in api and admin
2021-12-01 22:16:11 +08:00
c7fe4dea79
energyflowdiagram of access_control
2021-12-01 14:21:38 +08:00
16c7e858fb
added access control to EnergyItem
2021-11-30 10:00:38 +08:00
9304225419
contact of access_control
2021-11-29 18:48:29 +08:00
7a2d2a3f1d
menu of access_control
2021-11-29 16:07:31 +08:00
3b0d4a13f5
added access control to meter in api and admin
2021-11-27 21:15:43 +08:00
8e0bb54616
Merge branch 'PR81' into develop
2021-11-23 23:16:24 +08:00
d7cad1d6e0
added access control to energycategory
2021-11-23 11:29:36 +08:00
a8fec3a7dd
added access control to energycategory
2021-11-23 11:19:38 +08:00
365a0a903c
added access control to meter
2021-11-23 11:08:29 +08:00
566b57843a
added access control to gateway, datasource and point
2021-11-20 21:51:38 +08:00
d5155c04b8
added access control to offline meter file
2021-11-19 22:49:54 +08:00
d15fef3b52
added access control to knowledge file
2021-11-19 22:10:59 +08:00
2245dee31e
added access control to cost file
2021-11-18 22:51:01 +08:00
9937d0d051
added access control to email server
2021-11-17 22:58:24 +08:00
cda9381ec1
added access control to POST/PUT/DELETE of storetype in api
2021-11-17 13:32:23 +08:00
9d17baff1c
added access control to tenanttype POST/PUT/DELETE actions in api
2021-11-16 21:42:41 +08:00
aac085d160
added access control to timezone PUT action in api
2021-11-16 21:20:26 +08:00
ef7c602508
upgraded version number to v1.4.0
...
Upgrade procedure for this change:
1. Stop the myems-normalization service or container.
2. Backup your database.
3. Upgrade myems/admin, myems/myems-api, and myems/myems-normalization source code,
and keep previous .env files unchanged.
4. Run database/upgrade/upgrade1.4.0.sql to merge expression into virtual meter
5. Check the virtual meters in Admin UI.
6. Start the myems-normalization service or container.
2021-11-14 17:15:17 +08:00
6856423ed1
Merged expression table into virtual meter table in database
2021-11-14 16:40:58 +08:00
dd279ba548
added access control to actions of user in api
2021-11-10 18:04:15 +08:00
72484ea920
added access control to GET all users in API
2021-11-10 16:19:46 +08:00
5c900e9a82
fixed issue in on_delete of gateway in API
2021-11-10 12:25:05 +08:00
738f91d181
modified falcon.API to falcon.App and CORS to falcon.CORSmiddleware
2021-11-08 09:37:26 +08:00
e2234902a2
updated version number to v1.3.4
2021-11-06 15:44:05 +08:00
cfe749e44d
added weekly to i18n of Web UI
2021-11-04 21:18:50 +08:00
2c748d2eee
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
2021-11-04 20:24:51 +08:00
bffef535ea
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
2021-11-04 19:50:44 +08:00
67f22d2dd3
Modified the current_datetime_utcvariable in the statistics_hourly_data_by_period method
2021-11-04 19:49:23 +08:00
caa65ef136
Added the time scale of weekly in statistics_hourly_data_by_period
2021-11-04 16:24:23 +08:00
88e33fa9c6
Added the time scale of weekly
2021-11-03 11:09:48 +08:00
4a44727a0a
Added the time scale of weekly
2021-11-03 11:00:17 +08:00
3fc620b596
Added the time scale of weekly
2021-11-03 10:32:16 +08:00
70151b020f
updated version number to v1.3.3
2021-10-30 16:11:12 +08:00
f3cda07639
added new period type 'weekly' to meterenergy and aggregate_hourly_data_by_period in API
...
Merge branch 'PR76' into develop
2021-10-28 21:53:41 +08:00
5f285d7939
updated commments in aggregate_hourly_data_by_period of API
2021-10-28 21:53:24 +08:00
8353ca2b88
updated myems-api installation
2021-10-28 12:23:27 +08:00
0c1a2d9ab8
Modified comments
2021-10-27 10:05:35 +08:00
fedcb71d3f
Modified comments
2021-10-27 09:54:59 +08:00
21901667cb
simplified code
2021-10-27 09:51:34 +08:00
88eb2dfc07
simplified code
2021-10-27 09:29:33 +08:00
7f212e209d
Added the time scale of weekly to meterenergy
2021-10-26 19:35:10 +08:00
32256396ac
added validation for area of shopfloor, space, store and tenant in API
2021-10-19 18:45:17 +08:00
b29d8d1e9b
removed gsmmodem and aliyun sms api from API & Admin UI
2021-09-22 22:42:37 +08:00
02caabc640
changed start&end datetime formater for tariff from timestamp to strftime
2021-09-22 18:09:13 +08:00
efda021649
changed lease start&end datetime formater for tenant from timestamp to strftime
2021-09-22 16:07:38 +08:00
dec9bc6e87
changed last run datetime and next run datetime formater for rule from timestamp to strftime
2021-09-22 15:44:28 +08:00
15ca471b83
changed last seen datetime formater for gateway from timestamp to strftime
2021-09-22 15:25:30 +08:00
9624b75414
changed last seen datetime formater of datasource from timestamp to strftime
2021-09-22 14:50:41 +08:00
f27b95adee
changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime;
2021-09-22 13:55:50 +08:00
6962c65aab
changed cost file upload datetime formatter from timestamp to strftime
2021-09-22 12:41:12 +08:00
0ac76ccd96
added expiration datetimes to User in Admin UI
2021-09-22 11:28:33 +08:00
01b6dabb31
added expiration datetimes to user actions in API
2021-09-21 16:03:39 +08:00
b25559414d
added new protocols of datasource into API
2021-09-14 15:30:47 +08:00
982b71f1a4
added new datasource protocols to API
2021-09-14 11:10:18 +08:00
13621160019@163.com