Commit Graph

601 Commits (a4a1cfaa2ab448def7f2dfb99f014d14ca598e35)

Author SHA1 Message Date
13621160019@163.com 1a97d02fcd updated README 2022-01-07 21:55:16 +08:00
13621160019@163.com 7459c37ea1 improved virtual meter editor in admin ui 2022-01-04 22:21:18 +08:00
tianlinzhong 3f096b592d Improved Virtual Meter Editor 2022-01-04 15:34:12 +08:00
13621160019@163.com 23412c2817 added docker image immigration to readme 2022-01-03 22:56:45 +08:00
13621160019@163.com f26d96d1b6 updated Dockerfiles 2022-01-02 19:30:01 +08:00
13621160019@163.com 169b09a386 updated readme 2022-01-01 18:36:14 +08:00
13621160019@163.com 35d2d7306a updated version number to v1.6.0 2021-12-31 12:47:17 +08:00
tianlinzhong 60c37b7a2f Added Energy Input & Output Values to Detailed Data of CombinedEquipment Efficiency Report 2021-12-30 22:02:49 +08:00
tianlinzhong 8803fc4559 Added Energy Input & Output Values to Detailed Data of Equipment Efficiency Repor 2021-12-29 18:54:00 +08:00
13621160019@163.com e31307dfd9 added PUT actions to text/wechat/email messages in api 2021-12-28 14:57:22 +08:00
tianlinzhong be7c51b2c1 Added Put Update New EmailMessage API and text message and wechat message 2021-12-27 16:03:13 +08:00
13621160019@163.com abadf16516 added bind-mount upload file folder to containers of myems-api and admin 2021-12-25 21:28:29 +08:00
13621160019@163.com d0e06e122e added POST actions to create new email/wechat/text messages 2021-12-24 19:54:22 +08:00
tianlinzhong 289a6439e8 Added POST Create New WechatMessage API 2 2021-12-23 16:11:54 +08:00
tianlinzhong 1d88799907 Added POST Create New EmailMessage API 2 2021-12-22 10:47:49 +08:00
tianlinzhong d66cdd54d0 Added POST Create New EmailMessage API and text message and wechat message 2021-12-21 15:29:37 +08:00
tianlinzhong 043c39b81a Added POST Create New EmailMessage API and text message and wechat message 2021-12-21 15:04:09 +08:00
13621160019@163.com 907a582c48 updated get messages by date range in admin and api 2021-12-20 21:15:26 +08:00
13621160019@163.com 3045e8d4f0 Merge branch 'PR' into develop 2021-12-20 20:25:40 +08:00
13621160019@163.com 75ea44dd84 added locl/unlock user who faied login some times to admin and api 2021-12-20 20:00:48 +08:00
Caozhenhui 545ea96fee use config.maximum failed login count instead of 3 2021-12-20 19:25:02 +08:00
Caozhenhui 3d26c687fd Solved two problems of the last PR 2021-12-20 14:21:32 +08:00
tianlinzhong c45e4a84e3 Modified the TextMessages webmessage wechatmessage interface 2021-12-20 11:55:16 +08:00
13621160019@163.com 4f414cb34a updated get emailmessages api in postman and readme 2021-12-20 09:24:39 +08:00
13621160019@163.com 04b9849141 updated example.env in api 2021-12-18 20:52:27 +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 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 82a9735a77 added maximum_failed_login_count to config in api 2021-12-16 21:57:16 +08:00
tianlinzhong 9086a2c767 Modified the EmailMessages interface 5 2021-12-15 15:13:52 +08:00
Caozhenhui 8375885468 If the login is successful, failed login count is cleared 2021-12-15 14:40:13 +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
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