From e6d0540813a5a7d8ea6cf8cd275cce624a41b696 Mon Sep 17 00:00:00 2001
From: tomsun28 <tomsun28@outlook.com>
Date: Sat, 19 Feb 2022 14:32:07 +0800
Subject: [PATCH] =?UTF-8?q?[web-app]fix=20receiver=E7=9A=84email=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E9=94=99=E8=AF=AF=EF=BC=8C=E8=B0=83=E6=95=B4=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=A1=86=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/sureness.yml                           | 49 +++++++++++++++++++
 web-app/src/app/pojo/NoticeReceiver.ts        |  2 +-
 .../alert-notice/alert-notice.component.html  |  4 +-
 3 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 script/sureness.yml

diff --git a/script/sureness.yml b/script/sureness.yml
new file mode 100644
index 0000000..96dde7b
--- /dev/null
+++ b/script/sureness.yml
@@ -0,0 +1,49 @@
+## -- sureness.yml文本数据源 -- ##
+
+# 加载到匹配字典的资源,也就是需要被保护的,设置了所支持角色访问的资源
+# 没有配置的资源也默认被认证保护,但不鉴权
+# eg: /api/v1/source1===get===[role2] 表示 /api/v2/host===post 这条资源支持 role2 这一种角色访问
+# eg: /api/v1/source2===get===[] 表示 /api/v1/source2===get 这条资源不支持任何角色访问
+resourceRole:
+  - /account/auth/refresh===post===[role1,role2,role3,role4]
+
+# 需要被过滤保护的资源,不认证鉴权直接访问
+# /api/v1/source3===get 表示 /api/v1/source3===get 可以被任何人访问 无需登录认证鉴权
+excludedResource:
+  - /account/auth/**===*
+  - /===get
+  - /i18n/**===get
+  # web ui 静态资源
+  - /console/**===get
+  - /**/*.html===get
+  - /**/*.js===get
+  - /**/*.css===get
+  - /**/*.ico===get
+  - /**/*.ttf===get
+  - /**/*.png===get
+  - /**/*.gif===get
+    - /**/*.png===*
+  # swagger ui 资源
+  - /swagger-resources/**===get
+  - /v2/api-docs===get
+  - /v3/api-docs===get
+
+# 用户账户信息
+# 下面有 admin root tom三个账户
+# eg: admin 拥有[role1,role2]角色,明文密码为admin,加盐密码为0192023A7BBD73250516F069DF18B500
+# eg: root 拥有[role1],密码为明文23456
+# eg: tom 拥有[role3],密码为明文32113
+account:
+  - appId: admin
+    credential: admin
+    role: [role1,role2]
+  - appId: tom
+    credential: tom@123
+    role: [role1,role2,role3]
+  - appId: lili
+    # 注意 Digest认证不支持加盐加密的密码账户
+    # 加盐加密的密码，通过 MD5(password+salt)计算
+    # 此账户的原始密码为 lili
+    credential: 1A676730B0C7F54654B0E09184448289
+    salt: 123
+    role: [role1,role2]
diff --git a/web-app/src/app/pojo/NoticeReceiver.ts b/web-app/src/app/pojo/NoticeReceiver.ts
index 334d7ed..0742ff1 100644
--- a/web-app/src/app/pojo/NoticeReceiver.ts
+++ b/web-app/src/app/pojo/NoticeReceiver.ts
@@ -4,7 +4,7 @@ export class NoticeReceiver {
   // 通知信息方式: 0-手机短信 1-邮箱 2-webhook 3-微信公众号
   type: number = 1;
   phone!: string;
-  email!: number;
+  email!: string;
   hookUrl!: string;
   wechatId!: string;
   creator!: string;
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 e45ab99..0561ba5 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
@@ -151,7 +151,7 @@
   (nzOnCancel)="onManageReceiverModalCancel()"
   (nzOnOk)="onManageReceiverModalOk()"
   nzMaskClosable="false"
-  nzWidth="60%"
+  nzWidth="40%"
   [nzOkLoading]="isManageReceiverModalOkLoading"
 >
   <div *nzModalContent class="-inner-content">
@@ -216,7 +216,7 @@
   (nzOnCancel)="onManageRuleModalCancel()"
   (nzOnOk)="onManageRuleModalOk()"
   nzMaskClosable="false"
-  nzWidth="60%"
+  nzWidth="40%"
   [nzOkLoading]="isManageRuleModalOkLoading"
 >
   <div *nzModalContent class="-inner-content">