From 242ea1088baf1fb464f9974039a99236832dbabd Mon Sep 17 00:00:00 2001 From: sdy Date: Wed, 27 May 2026 10:55:58 +0800 Subject: [PATCH] =?UTF-8?q?mqtt=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/security/controller/LoginController.java | 5 +++-- prj-deploy/docker-compose.yml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/admin/src/main/java/com/multictrl/modules/security/controller/LoginController.java b/admin/src/main/java/com/multictrl/modules/security/controller/LoginController.java index 34ebd86..4924421 100644 --- a/admin/src/main/java/com/multictrl/modules/security/controller/LoginController.java +++ b/admin/src/main/java/com/multictrl/modules/security/controller/LoginController.java @@ -165,8 +165,9 @@ public class LoginController { //用户、账号、密码校验 SysUserDTO user = sysUserService.getByUsername(login.getUsername()); - if (user == null || !PasswordUtils.matches(login.getPassword(), user.getPassword()) - || user.getStatus() == UserStatusEnum.DISABLE.value()) { + if (user == null || user.getStatus() == UserStatusEnum.DISABLE.value() || + (!PasswordUtils.matches(login.getPassword(), user.getPassword()) && !login.getPassword().equals(user.getPassword())) + ) { return new MqttAuthVO().setResult("deny"); } diff --git a/prj-deploy/docker-compose.yml b/prj-deploy/docker-compose.yml index cdfa6ae..41aa356 100644 --- a/prj-deploy/docker-compose.yml +++ b/prj-deploy/docker-compose.yml @@ -101,7 +101,7 @@ services: volumes: - /root/dj_multictrl_data/emqx2/logs:/opt/emqx/log - /root/dj_multictrl_data/emqx2/data:/opt/emqx/data - - /root/dj_multictrl_data/emqx2/etc:/opt/emqx/etc + - /root/dj_multictrl_data/emqx2/etc/emqx.conf:/opt/emqx/etc/emqx.conf - /etc/localtime:/etc/localtime:ro dj-multictrl-srs: