diff --git a/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java b/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java index 9293a60..7f91223 100644 --- a/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java +++ b/common/src/main/java/com/usthe/common/entity/manager/NoticeReceiver.java @@ -48,7 +48,7 @@ public class NoticeReceiver { @ApiModelProperty(value = "通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号 4-企业微信机器人 5-钉钉机器人", accessMode = READ_WRITE, position = 2) @Min(0) - @Max(3) + @Max(8) @NotNull private Byte type; diff --git a/web-app/src/app/pojo/NoticeReceiver.ts b/web-app/src/app/pojo/NoticeReceiver.ts index 0742ff1..67d2bc1 100644 --- a/web-app/src/app/pojo/NoticeReceiver.ts +++ b/web-app/src/app/pojo/NoticeReceiver.ts @@ -7,6 +7,7 @@ export class NoticeReceiver { email!: string; hookUrl!: string; wechatId!: string; + accessToken!: string; creator!: string; modifier!: string; gmtCreate!: number; diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html index 0561ba5..d0f0fab 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.html @@ -60,12 +60,17 @@ 微信公众号 + + + 企业微信机器人 + {{ data.phone }} {{ data.email }} {{ data.hookUrl }} {{ data.wechatId }} + {{ data.wechatId }} {{ data.gmtUpdate ? data.gmtUpdate : data.gmtCreate }} @@ -158,24 +163,25 @@
接收人名称 - + 通知方式 - + + 手机号 - + 邮箱 - + URL地址 - + 微信OPENID - - + + + + + + 企业微信机器人KEY + + diff --git a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts index 1523ed1..6ecca0a 100644 --- a/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts +++ b/web-app/src/app/routes/alert/alert-notice/alert-notice.component.ts @@ -259,6 +259,8 @@ export class AlertNoticeComponent implements OnInit { case 3: label = `${label}WeChat`; break; + case 4: + label = `${label}WeWorkRobot`; } this.receiversOption.push({ value: item.id,