Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jul 24, 2023

Conversation

tancongsir
Copy link
Contributor

No description provided.

@zhou-hao zhou-hao changed the title feat(订阅模块): 企业版订阅模块迁移 feat(通知模块): 重构用户个人通知订阅 Jul 24, 2023
Comment on lines 145 to 146
if (StringUtils.isNotBlank(this.username)) {
helper.setFrom(this.sender + '<' + this.username + '>');
} else {
helper.setFrom(this.sender);
}

helper.setFrom(this.sender);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个删了干嘛

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

企业版是没有这个判断

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

在企业版加上,提个PR。看看逻辑赛,也不一定都是企业版为主

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的

@@ -121,6 +132,7 @@ public Flux<PropertyMetadata> getDetailProperties(Map<String, Object> config) {
enum TargetType {
device("设备"),
product("产品"),
org("组织"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

社区版不支持组织维度的告警

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的

@@ -0,0 +1,50 @@
package org.jetlinks.community.notify.manager.subscriber.providers;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

社区版不支持部门告警

@bestfeng1020 bestfeng1020 merged commit ba1d08c into jetlinks:master Jul 24, 2023
1 check passed
@tancongsir tancongsir deleted the move-notify-manager branch August 7, 2023 01:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants