13621160019@163.com
|
01e894eaea
|
changed codechina to gitcode in README
|
2021-12-17 20:51:48 +08:00 |
|
13621160019@163.com
|
d7101d3c34
|
Merge branch 'PR' into develop
|
2021-12-17 19:32:47 +08:00 |
|
Caozhenhui
|
1b1afa7de1
|
The step of judging the number of 'failed login count' moves to myems-api
|
2021-12-17 10:19:06 +08:00 |
|
Caozhenhui
|
7534e7a019
|
avoid merge conflict
|
2021-12-17 09:52:42 +08:00 |
|
Caozhenhui
|
273ab4cdab
|
avoid merge conflict
|
2021-12-17 09:45:10 +08:00 |
|
13621160019@163.com
|
33e6c24e28
|
added unlock user into api and admin
|
2021-12-16 22:24:04 +08:00 |
|
13621160019@163.com
|
9af6a90a86
|
Merge branch 'PR' into develop
|
2021-12-16 21:57:33 +08:00 |
|
13621160019@163.com
|
82a9735a77
|
added maximum_failed_login_count to config in api
|
2021-12-16 21:57:16 +08:00 |
|
Caozhenhui
|
8375885468
|
If the login is successful, failed login count is cleared
|
2021-12-15 14:40:13 +08:00 |
|
Caozhenhui
|
747daab4cb
|
2021/12/15 11:49
|
2021-12-15 11:49:46 +08:00 |
|
Caozhenhui
|
3810b0cf30
|
modified login_counter to failed_login_count
|
2021-12-15 11:48:06 +08:00 |
|
Caozhenhui
|
7303ebdc58
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2021-12-15 11:36:04 +08:00 |
|
13621160019@163.com
|
d56f839e21
|
added failed_login_count to user database
|
2021-12-14 23:17:48 +08:00 |
|
Caozhenhui
|
d387684a78
|
lock user
|
2021-12-13 20:15:41 +08:00 |
|
13621160019@163.com
|
56c4c6b188
|
upgraded version number to v1.5.0
|
2021-12-12 17:40:07 +08:00 |
|
13621160019@163.com
|
a31d040f85
|
updated README
|
2021-12-11 21:26:36 +08:00 |
|
13621160019@163.com
|
af7157fff9
|
added access control to space, offline meter and virtual meter in api and admin
|
2021-12-10 19:24:49 +08:00 |
|
13621160019@163.com
|
849934afa3
|
Merge branch 'PR' into develop
|
2021-12-10 18:22:39 +08:00 |
|
13621160019@163.com
|
d3519bf39c
|
added access control to rule in api and admin
|
2021-12-10 17:58:42 +08:00 |
|
13621160019@163.com
|
806554923f
|
added energy model database
added tables to energy baseline database
added tables to billing baseline database
|
2021-12-10 17:22:34 +08:00 |
|
13621160019@163.com
|
bf6a8ba8ee
|
added access control to costcenter and tariff in api and admin
|
2021-12-09 12:08:00 +08:00 |
|
Caozhenhui
|
3e78a06a1d
|
added access control to space virtualmeter and offlinemeter
|
2021-12-09 12:04:30 +08:00 |
|
13621160019@163.com
|
4d9b60af3d
|
Merge branch 'PR' into develop
|
2021-12-09 11:20:33 +08:00 |
|
13621160019@163.com
|
37a44353a8
|
added access control to shopfloor, store and tenant in api and admin
|
2021-12-08 23:28:58 +08:00 |
|
tianlinzhong
|
31b70d4057
|
added access_control to costcenter and tariff
|
2021-12-08 10:22:16 +08:00 |
|
13621160019@163.com
|
95c8dd95d5
|
Merge branch 'PR' into develop
|
2021-12-07 20:14:55 +08:00 |
|
13621160019@163.com
|
167d6a2caa
|
added access control to point in api and admin
|
2021-12-07 20:00:28 +08:00 |
|
13621160019@163.com
|
9c9e316efc
|
added access control to point in api and admin
|
2021-12-07 19:50:37 +08:00 |
|
13621160019@163.com
|
043416500a
|
Merge branch 'PR' into develop
|
2021-12-07 19:38:09 +08:00 |
|
Caozhenhui
|
8ea1d4a812
|
added access control to shopfloor tenant and store
|
2021-12-07 15:04:26 +08:00 |
|
tianlinzhong
|
be77f29b3b
|
point of access_control
|
2021-12-07 14:35:41 +08:00 |
|
13621160019@163.com
|
15cc27ac18
|
added access control to equipment in api and admin
|
2021-12-06 23:02:27 +08:00 |
|
13621160019@163.com
|
9b417d0648
|
Merge branch 'PR' into develop
|
2021-12-06 22:17:44 +08:00 |
|
13621160019@163.com
|
57671aa2b6
|
added access control to combinedequipment in api and admin
|
2021-12-06 19:31:51 +08:00 |
|
13621160019@163.com
|
a8ef300a08
|
Merge branch 'PR89' into develop
|
2021-12-06 19:05:00 +08:00 |
|
tianlinzhong
|
0bf0c829d0
|
equipment of access_control
|
2021-12-06 15:26:27 +08:00 |
|
Caozhenhui
|
fb31837efa
|
added access_control to combinedequipment
|
2021-12-06 14:52:15 +08:00 |
|
13621160019@163.com
|
b9de4e3c43
|
added qq group qr code
|
2021-12-06 11:20:24 +08:00 |
|
13621160019@163.com
|
5d1e469894
|
updated nofification(web message) in web and api
|
2021-12-05 22:37:59 +08:00 |
|
13621160019@163.com
|
cd94e31a98
|
added user varification to webmessage in admin and api
|
2021-12-05 18:06:50 +08:00 |
|
13621160019@163.com
|
996f7066e1
|
added access control to wechat message in api and admin
|
2021-12-05 12:37:42 +08:00 |
|
13621160019@163.com
|
65565a5351
|
added access control to text message in api and admin
|
2021-12-04 20:48:56 +08:00 |
|
13621160019@163.com
|
3e536d503e
|
added access control to email message in api and admin
|
2021-12-04 19:52:12 +08:00 |
|
13621160019@163.com
|
3ec50fab0d
|
added access control to sersor in api and admin
|
2021-12-03 19:53:12 +08:00 |
|
13621160019@163.com
|
b10cc91a3a
|
Merge branch 'PR89' into develop
|
2021-12-03 19:21:08 +08:00 |
|
13621160019@163.com
|
4e0961e5fb
|
added access control to distribution system in api and admin
|
2021-12-03 19:09:39 +08:00 |
|
13621160019@163.com
|
05b5631408
|
Merge branch 'PR88' into develop
|
2021-12-03 17:01:21 +08:00 |
|
Caozhenhui
|
0edaf58aee
|
added access control to sensorpoint
|
2021-12-03 16:42:18 +08:00 |
|
Caozhenhui
|
2eaa8df6c6
|
added access control to sensor
|
2021-12-03 16:36:48 +08:00 |
|
tianlinzhong
|
469c21672b
|
distrbutioncircuit/distributionsystem of access_control
|
2021-12-03 14:58:04 +08:00 |