Commit Graph

148 Commits (c45e4a84e3fef4ca0a6de2d0b0f78ba7e49cb96c)

Author SHA1 Message Date
tianlinzhong c45e4a84e3 Modified the TextMessages webmessage wechatmessage interface 2021-12-20 11:55:16 +08:00
13621160019@163.com 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
13621160019@163.com 1d1775a7aa Merge branch 'PR' into develop 2021-12-17 22:34:37 +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 273ab4cdab avoid merge conflict 2021-12-17 09:45:10 +08:00
tianlinzhong 9086a2c767 Modified the EmailMessages interface 5 2021-12-15 15:13:52 +08:00
Caozhenhui 3810b0cf30 modified login_counter to failed_login_count 2021-12-15 11:48:06 +08:00
tianlinzhong a581caa2fa Modified the EmailMessages interface4 2021-12-15 09:52:55 +08:00
tianlinzhong 952e9dd278 Modified the EmailMessages interface3 2021-12-15 09:49:38 +08:00
Caozhenhui d387684a78 lock user 2021-12-13 20:15:41 +08:00
tianlinzhong 3cc2c929ec Modified the EmailMessages interface 2021-12-13 17:28:20 +08:00
tianlinzhong 905cd6f870 EmailMessages interface is modified 2021-12-13 17:07:52 +08:00
13621160019@163.com 56c4c6b188 upgraded version number to v1.5.0 2021-12-12 17:40:07 +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 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
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 9c9e316efc added access control to point in api and admin 2021-12-07 19:50:37 +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
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 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 b10cc91a3a Merge branch 'PR89' into develop 2021-12-03 19:21:08 +08:00
13621160019@163.com 05b5631408 Merge branch 'PR88' into develop 2021-12-03 17:01:21 +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
13621160019@163.com 624e4f7e3b Merge branch 'PR87' into develop 2021-12-03 14:00:48 +08:00
Caozhenhui 8dd998ed0c added access_control to privilege 2021-12-02 10:43:32 +08:00
tianlinzhong 62312e8c54 energyflowdiagram of access_control2 2021-12-02 09:56:13 +08:00
tianlinzhong f685728985 Merge remote-tracking branch 'origin/develop' into develop 2021-12-02 09:09:38 +08:00
13621160019@163.com 213f669924 added access control to energyitem in api and admin 2021-12-01 22:16:11 +08:00
tianlinzhong c7fe4dea79 energyflowdiagram of access_control 2021-12-01 14:21:38 +08:00
Caozhenhui 16c7e858fb added access control to EnergyItem 2021-11-30 10:00:38 +08:00
tianlinzhong 9304225419 contact of access_control 2021-11-29 18:48:29 +08:00
tianlinzhong 7a2d2a3f1d menu of access_control 2021-11-29 16:07:31 +08:00
13621160019@163.com 3b0d4a13f5 added access control to meter in api and admin 2021-11-27 21:15:43 +08:00
guangyuzhang 8e0bb54616 Merge branch 'PR81' into develop 2021-11-23 23:16:24 +08:00
tianlinzhong d7cad1d6e0 added access control to energycategory 2021-11-23 11:29:36 +08:00
tianlinzhong a8fec3a7dd added access control to energycategory 2021-11-23 11:19:38 +08:00
Caozhenhui 365a0a903c added access control to meter 2021-11-23 11:08:29 +08:00