diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java b/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java index 00db632..fa561cb 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/mqtt/MqttService.java @@ -64,8 +64,9 @@ public class MqttService implements MqttCallback { .orElse(null); if (existingConfig != null) { - log.info("复用已有MQTT连接:{} 账号:{}", config.getServerUrl(), config.getUsername()); + existingConfig.client.subscribe(config.getTopicFilter()); clientConfigs.add(new ClientConfig(existingConfig.client, config)); + log.info("复用已有MQTT连接:{} 账号:{}", config.getServerUrl(), config.getUsername()); continue; } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java index 3777fa7..ddde9f1 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/qywx/template/dto/QyTemplateDTO.java @@ -18,11 +18,6 @@ public class QyTemplateDTO { if (entity != null) { BeanUtil.copyProperties(entity, this); - /*SysUserEntity creator = CacheCenter.userCache.getObjectById(entity.getOperId()); - if (creator != null) { - this.operator = creator.getUsername(); - }*/ - this.enableStatus = "1".equals(entity.getEnable()) ? "启用" : "停用"; this.gettokenTimeStr = DateUtil.format(entity.getGettokenTime(), "yyyy-MM-dd HH:mm:ss"); } @@ -55,9 +50,6 @@ public class QyTemplateDTO { @ExcelColumn(name = "凭证有效期(秒)") private Integer expiresIn; - @ExcelColumn(name = "操作人") - private String operator; - @ExcelColumn(name = "状态") private String enableStatus;