diff --git a/src/i18n/langs/en.json b/src/i18n/langs/en.json
index 6c70d9c2a..0e5321ef6 100644
--- a/src/i18n/langs/en.json
+++ b/src/i18n/langs/en.json
@@ -918,10 +918,11 @@
"EnableKoKoSSHHelpText": "Enabled, connect assets to display SSH Client pull-up method",
"SettingInEndpointHelpText": "Configure the service address and port in System Settings / Terminal Settings / Service Endpoints",
"Feature": "Feature",
- "SMSProvider": "SMS provider",
+ "SMSProvider": "SMS provider / Protocol",
"SMS": "SMS",
"AlibabaCloud": "Alibaba cloud",
"TencentCloud": "Tencent cloud",
+ "CMPP2": "CMPP v2.0",
"VerifySignTmpl": "Verification code template",
"Radius": "Radius",
"Enable": "Enable",
diff --git a/src/i18n/langs/ja.json b/src/i18n/langs/ja.json
index 01e25636b..b5b21fc96 100644
--- a/src/i18n/langs/ja.json
+++ b/src/i18n/langs/ja.json
@@ -941,6 +941,7 @@
"Feature": "機能",
"AlibabaCloud": "Alibaba cloud",
"TencentCloud": "テンセント雲",
+ "CMPP2": "CMPP v2.0",
"Radius": "Radius",
"VerifySignTmpl": "認証コードメールテンプレート",
"Enable": "有効化",
@@ -1129,7 +1130,7 @@
"SMS": "SMS設定",
"feiShuTest": "テスト",
"setting": "設定",
- "SMSProvider": "メールサービス業者"
+ "SMSProvider": "メールサービス業者 / プロトコル"
},
"tickets": {
"OneAssigneeType": "一次受付者タイプ",
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index 565b472f3..15d302a57 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -943,6 +943,7 @@
"Feature": "功能",
"AlibabaCloud": "阿里云",
"TencentCloud": "腾讯云",
+ "CMPP2": "CMPP v2.0",
"Radius": "Radius",
"VerifySignTmpl": "验证码短信模板",
"Enable": "启用",
@@ -1130,7 +1131,7 @@
"SMS": "短信设置",
"feiShuTest": "测试",
"setting": "设置",
- "SMSProvider": "短信服务商"
+ "SMSProvider": "短信服务商 / 协议"
},
"tickets": {
"OneAssigneeType": "一级受理人类型",
diff --git a/src/views/settings/SMS/CMPP2.vue b/src/views/settings/SMS/CMPP2.vue
new file mode 100644
index 000000000..729745ebf
--- /dev/null
+++ b/src/views/settings/SMS/CMPP2.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
diff --git a/src/views/settings/SMS/SMSAlibaba.vue b/src/views/settings/SMS/SMSAlibaba.vue
index a29e11e6f..fe87b96cb 100644
--- a/src/views/settings/SMS/SMSAlibaba.vue
+++ b/src/views/settings/SMS/SMSAlibaba.vue
@@ -24,7 +24,7 @@ export default {
callback: function(value, form, btn) {
btn.loading = true
vm.$axios.post(
- `/api/v1/settings/alibaba/testing/`,
+ `/api/v1/settings/sms/alibaba/testing/`,
value
).then(res => {
vm.$message.success(res['msg'])
diff --git a/src/views/settings/SMS/SMSTencent.vue b/src/views/settings/SMS/SMSTencent.vue
index b6e93f974..61ea646a9 100644
--- a/src/views/settings/SMS/SMSTencent.vue
+++ b/src/views/settings/SMS/SMSTencent.vue
@@ -24,7 +24,7 @@ export default {
callback: function(value, form, btn) {
btn.loading = true
vm.$axios.post(
- `/api/v1/settings/tencent/testing/`,
+ `/api/v1/settings/sms/tencent/testing/`,
value
).then(res => {
vm.$message.success(res['msg'])
diff --git a/src/views/settings/SMS/index.vue b/src/views/settings/SMS/index.vue
index 29b49faef..6e46d57c3 100644
--- a/src/views/settings/SMS/index.vue
+++ b/src/views/settings/SMS/index.vue
@@ -6,6 +6,7 @@
import GenericCreateUpdatePage from '@/layout/components/GenericCreateUpdatePage'
import SMSAlibaba from './SMSAlibaba'
import SMSTencent from './SMSTencent'
+import CMPP2 from './CMPP2'
export default {
name: 'Auth',
@@ -23,7 +24,7 @@ export default {
],
[
this.$t('setting.SMSProvider'), [
- 'ALIYUN', 'QCLOUD'
+ 'ALIYUN', 'QCLOUD', 'CMPP2'
]
]
],
@@ -41,6 +42,13 @@ export default {
hidden: (form) => {
return form['SMS_BACKEND'] !== 'tencent'
}
+ },
+ CMPP2: {
+ label: this.$t('setting.CMPP2'),
+ component: CMPP2,
+ hidden: (form) => {
+ return form['SMS_BACKEND'] !== 'cmpp2'
+ }
}
},
submitMethod() {