diff --git a/server/notification-providers/aliyun-sms.js b/server/notification-providers/aliyun-sms.js index e91d47b11..52eb2198e 100644 --- a/server/notification-providers/aliyun-sms.js +++ b/server/notification-providers/aliyun-sms.js @@ -19,7 +19,9 @@ class AliyunSMS extends NotificationProvider { name: monitorJSON["name"], time: heartbeatJSON["localDateTime"], status: this.statusToString(heartbeatJSON["status"]), - msg: this.removeIpAndDomain(heartbeatJSON["msg"]), + ...(notification.optionalParameters && { + msg: this.removeIpAndDomain(heartbeatJSON["msg"]), + }), }); if (await this.sendSms(notification, msgBody)) { return okMsg; @@ -29,7 +31,9 @@ class AliyunSMS extends NotificationProvider { name: "", time: "", status: "", - msg: this.removeIpAndDomain(msg), + ...(notification.optionalParameters && { + msg: this.removeIpAndDomain(msg), + }), }); if (await this.sendSms(notification, msgBody)) { return okMsg; diff --git a/src/components/notifications/AliyunSms.vue b/src/components/notifications/AliyunSms.vue index c03325872..a031fdd0e 100644 --- a/src/components/notifications/AliyunSms.vue +++ b/src/components/notifications/AliyunSms.vue @@ -4,25 +4,34 @@ {{ $t("AccessKeyId") }} * - + - + :required="true" + autocomplete="new-password" + > - + - +
+ + +
{{ $t("aliyun_enable_optional_variables_at_the_risk_of_non_delivery") }}
+
+
-

- {{ $t("Sms template must contain parameters: ") }} -
- ${name} ${time} ${status} ${msg} -

+ + + + + + https://help.aliyun.com/document_detail/101414.html @@ -56,3 +80,12 @@
+ diff --git a/src/lang/en.json b/src/lang/en.json index 7463c89d1..94a980ac7 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -737,7 +737,10 @@ "PhoneNumbers": "PhoneNumbers", "TemplateCode": "TemplateCode", "SignName": "SignName", - "Sms template must contain parameters: ": "Sms template must contain parameters: ", + "OptionalParameters": "Optional Parameters", + "aliyun_enable_optional_variables_at_the_risk_of_non_delivery": "Due to carrier restrictions, enable optional variables at the risk of non-delivery", + "aliyun-template-requirements-and-parameters": "The aliyun SMS template must contain parameters: {parameters}", + "aliyun-template-optional-parameters": "Optional parameters: {parameters}", "Bark API Version": "Bark API Version", "Bark Endpoint": "Bark Endpoint", "Bark Group": "Bark Group",