diff --git a/document/message.png b/document/message.png
index 10b05510..cee726b1 100644
Binary files a/document/message.png and b/document/message.png differ
diff --git a/springboot/wumei-admin/src/main/resources/application-druid-docker.yml b/springboot/wumei-admin/src/main/resources/application-druid-docker.yml
index 2cb4c8a1..3294cab8 100644
--- a/springboot/wumei-admin/src/main/resources/application-druid-docker.yml
+++ b/springboot/wumei-admin/src/main/resources/application-druid-docker.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://${DB_HOST}/${DB_NAME}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: ${DB_USER}
-                password: ${DB_PASSWORD}
+                url: jdbc:mysql://{DB_HOST}/{DB_NAME}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: {DB_USER}
+                password: {DB_PASSWORD}
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
index 592ceedb..0c89b617 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
@@ -133,7 +133,9 @@ public class ToolController extends BaseController {
                 String[] clientInfo = clientid.split("&");
                 if (clientInfo.length != 2) {
                     // 设备未加密认证
-                    if (mqttConfig.getusername().equals(username) && mqttConfig.getpassword().equals(password)) {
+                    String deviceNum = clientInfo[0];
+                    Device device = deviceService.selectShortDeviceBySerialNumber(deviceNum);
+                    if (device !=null && mqttConfig.getusername().equals(username) && mqttConfig.getpassword().equals(password)) {
                         System.out.println("-----------认证成功,clientId:" + clientid + "---------------");
                         return ResponseEntity.ok().body("ok");
                     }
@@ -204,12 +206,12 @@ public class ToolController extends BaseController {
 
     @ApiOperation("mqtt钩子处理")
     @PostMapping("/mqtt/webhook")
-    public AjaxResult webHookProcess(@RequestBody MqttClientConnectModel model) {
+    public void webHookProcess(@RequestBody MqttClientConnectModel model) {
         try {
             System.out.println("webhook:" + model.getAction());
             // 过滤服务端、web端和手机端
             if (model.getClientid().startsWith("server") || model.getClientid().startsWith("web") || model.getClientid().startsWith("phone")) {
-                return AjaxResult.success();
+                return;
             }
             String[] clientInfo = model.getClientid().split("&");
             String deviceNum = clientInfo[0];
@@ -243,7 +245,6 @@ public class ToolController extends BaseController {
             ex.printStackTrace();
             log.error("发生错误：" + ex.getMessage());
         }
-        return AjaxResult.success();
     }