OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	manager/src/main/java/com/usthe/manager/component/alerter/DispatchAlarm.java
This commit is contained in:
chenghua
2022-02-22 11:29:57 +08:00
parent f2f5b2b680 ac66499bf3
commit 53fc4358ea
7 changed files with 105 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java
View File

@@ -46,9 +46,9 @@ public class NoticeReceiver {
@NotNull
private String name;
@ApiModelProperty(value = "通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号", accessMode = READ_WRITE, position = 2)
@ApiModelProperty(value = "通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号 4-企业微信机器人 5-钉钉机器人", accessMode = READ_WRITE, position = 2)
@Min(0)
@Max(3)
@Max(8)
@NotNull
private Byte type;
@@ -61,13 +61,17 @@ public class NoticeReceiver {
private String email;
@ApiModelProperty(value = "URL地址, 通知方式为webhook有效", example = "https://www.tancloud.cn", accessMode = READ_WRITE, position = 5)
@Length(max = 100)
@Length(max = 300)
private String hookUrl;
@ApiModelProperty(value = "wechat用户openId, 通知方式为微信公众号有效", example = "343432", accessMode = READ_WRITE, position = 6)
@Length(max = 100)
@ApiModelProperty(value = "openId, 通知方式为微信公众号或企业微信机器人有效", example = "343432", accessMode = READ_WRITE, position = 6)
@Length(max = 300)
private String wechatId;
@ApiModelProperty(value = "访问token, 通知方式为钉钉机器人有效", example = "34823984635647", accessMode = READ_WRITE, position = 7)
@Length(max = 300)
private String accessToken;
@ApiModelProperty(value = "此条记录创建者", example = "tom", accessMode = READ_ONLY, position = 7)
private String creator;