suguo
/
jetlinks-community
mirror of https://gitee.com/jetlinks/jetlinks-community.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(通知模块): 重构用户个人通知订阅

This commit is contained in:
tancongsir 2023-07-24 16:09:32 +08:00
parent d0484545c4
commit ccc8ea41c2
3 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jetlinks-components/notify-component/notify-email/src/main/java/org/jetlinks/community/notify/email/embedded/DefaultEmailNotifier.java
View File

@ -143,7 +143,11 @@ public class DefaultEmailNotifier extends AbstractNotifier<EmailTemplate> {
MimeMessage mimeMessage = this.javaMailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true, "utf-8");
helper.setFrom(this.sender);
if (StringUtils.isNotBlank(this.username)) {
helper.setFrom(this.sender + '<' + this.username + '>');
} else {
helper.setFrom(this.sender);
}
helper.setTo(template.getSendTo().toArray(new String[0]));
helper.setSubject(template.getSubject());
helper.setText(new String(template.getText().getBytes(), StandardCharsets.UTF_8), true);

50
jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmOrgProvider.java
View File

@ -1,50 +0,0 @@
package org.jetlinks.community.notify.manager.subscriber.providers;
import lombok.extern.slf4j.Slf4j;
import org.hswebframework.web.authorization.Authentication;
import org.jetlinks.core.event.EventBus;
import org.jetlinks.core.metadata.PropertyMetadata;
import org.jetlinks.core.metadata.SimplePropertyMetadata;
import org.jetlinks.core.metadata.types.StringType;
import org.jetlinks.community.notify.manager.subscriber.Subscriber;
import org.jetlinks.community.topic.Topics;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import java.util.Map;
@Component
@Slf4j
public class AlarmOrgProvider extends AlarmProvider {
public AlarmOrgProvider(EventBus eventBus) {
super(eventBus);
}
@Override
public String getId() {
return "alarm-org";
}
@Override
public String getName() {
return "部门告警";
}
@Override
public Mono<Subscriber> createSubscriber(String id, Authentication authentication, Map<String, Object> config) {
String topic = Topics.alarm(TargetType.org.name(), "*", getAlarmId(config));
return doCreateSubscriber(id, authentication, topic);
}
@Override
public Flux<PropertyMetadata> getDetailProperties(Map<String, Object> config) {
return super.getDetailProperties(config)
.concatWith(Flux.just(
SimplePropertyMetadata.of("targetId", "组织ID", StringType.GLOBAL),
SimplePropertyMetadata.of("targetName", "组织名称", StringType.GLOBAL)
));
}
}

1
jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/subscriber/providers/AlarmProvider.java
View File

@ -132,7 +132,6 @@ public class AlarmProvider implements SubscriberProvider {
enum TargetType {
device("设备"),
product("产品"),
org("组织"),
other("其它");
private final String text;