Merge remote-tracking branch 'origin/master'

ruoyi-modules/hw-mqtt-broker/src/main/java/com/hw/mqtt/auth/MqttAuthHandler.java

@@ -85,9 +85,8 @@ public class MqttAuthHandler implements IMqttServerAuthHandler {
 					DeviceInfoDto deviceInfo = optionalDeviceInfoDto.get();
 					return checkDeviceInfo(deviceInfo,clientId,userName,password);
 				}
-			}else {
-				return NoDeviceInfoEvent(clientId,userName,password);
 			}
+			return NoDeviceInfoEvent(clientId,userName,password);
 		}catch (Exception ex){
 			logger.error("客户端认证逻辑处理异常："+ex.getMessage());
 		}

ruoyi-modules/hw-mqtt-broker/src/main/resources/bootstrap.yml

@@ -24,12 +24,12 @@ spring:
     name: hw-mqtt-broker
   profiles:
     # 环境配置
-    active: dev
+    active: prod
   cloud:
     nacos:
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 124.70.63.37:8848
         # 配置文件格式
         file-extension: yml
         # 共享配置