Merge remote-tracking branch 'origin/master'

dev
xins 12 months ago
commit 562c96c91c

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

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

Loading…
Cancel
Save