Remove regionId for SMS providers.

go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/casbin/casbin/v2 v2.30.1
 	github.com/casbin/xorm-adapter/v2 v2.3.1
-	github.com/casdoor/go-sms-sender v0.0.4
+	github.com/casdoor/go-sms-sender v0.0.5
 	github.com/dchest/captcha v0.0.0-20200903113550-03f5f0333e1f
 	github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
 	github.com/go-ldap/ldap/v3 v3.3.0

go.sum

@@ -75,8 +75,8 @@ github.com/casbin/casbin/v2 v2.30.1 h1:P5HWadDL7olwUXNdcuKUBk+x75Y2eitFxYTcLNKeK
 github.com/casbin/casbin/v2 v2.30.1/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
 github.com/casbin/xorm-adapter/v2 v2.3.1 h1:RVGsM6KYFP9s4OQJXrP/gv56Wmt5P40mzvcyXgv5xeg=
 github.com/casbin/xorm-adapter/v2 v2.3.1/go.mod h1:GZ+nlIdasVFunQ71SlvkL/HcQQBvFncphDf+2Yl167c=
-github.com/casdoor/go-sms-sender v0.0.4 h1:UekC70YueeA5E2LrKJVQKCGntdTlYwal/7og4vao66U=
+github.com/casdoor/go-sms-sender v0.0.5 h1:9qhlMM+UoSOvvY7puUULqSHBBA7fbe02Px/tzchQboo=
-github.com/casdoor/go-sms-sender v0.0.4/go.mod h1:TMM/BsZQAa+7JVDXl2KqgxnzZgCjmHEX5MBN662mM5M=
+github.com/casdoor/go-sms-sender v0.0.5/go.mod h1:TMM/BsZQAa+7JVDXl2KqgxnzZgCjmHEX5MBN662mM5M=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

object/sms.go

@@ -17,7 +17,7 @@ package object
 import "github.com/casdoor/go-sms-sender"
 
 func SendSms(provider *Provider, content string, phoneNumbers ...string) error {
-	client, err := go_sms_sender.NewSmsClient(provider.Type, provider.ClientId, provider.ClientSecret, provider.SignName, provider.RegionId, provider.TemplateCode, provider.AppId)
+	client, err := go_sms_sender.NewSmsClient(provider.Type, provider.ClientId, provider.ClientSecret, provider.SignName, provider.TemplateCode, provider.AppId)
 	if err != nil {
 		return err
 	}

web/src/ProviderEditPage.js

@@ -302,7 +302,7 @@ class ProviderEditPage extends React.Component {
             {this.state.provider.type === "AWSS3" ? (
               <Row style={{marginTop: '20px'}} >
                 <Col style={{marginTop: '5px'}} span={2}>
-                  {Setting.getLabel(i18next.t("provider:Region"), i18next.t("provider:Region - Tooltip"))} :
+                  {Setting.getLabel(i18next.t("provider:Region ID"), i18next.t("provider:Region ID - Tooltip"))} :
                 </Col>
                 <Col span={22} >
                   <Input value={this.state.provider.regionId} onChange={e => {
@@ -359,16 +359,6 @@ class ProviderEditPage extends React.Component {
             </React.Fragment>
           ) : this.state.provider.category === "SMS" ? (
             <React.Fragment>
-              <Row style={{marginTop: '20px'}} >
-                <Col style={{marginTop: '5px'}} span={(Setting.isMobile()) ? 22 : 2}>
-                  {Setting.getLabel(i18next.t("provider:Region ID"), i18next.t("provider:Region ID - Tooltip"))} :
-                </Col>
-                <Col span={22} >
-                  <Input value={this.state.provider.regionId} onChange={e => {
-                    this.updateProviderField('regionId', e.target.value);
-                  }} />
-                </Col>
-              </Row>
               <Row style={{marginTop: '20px'}} >
                 <Col style={{marginTop: '5px'}} span={(Setting.isMobile()) ? 22 : 2}>
                   {Setting.getLabel(i18next.t("provider:Sign Name"), i18next.t("provider:Sign Name - Tooltip"))} :

web/src/locales/de/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "Account",
     "Change Password": "Change Password",
+    "Choose email or phone": "Choose email or phone",
     "Confirm": "Confirm",
     "Next Step": "Next Step",
     "Password": "Password",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "Unique string-style identifier",
     "Provider URL": "Provider URL",
     "Provider URL - Tooltip": "Unique string-style identifier",
-    "Region": "Region",
-    "Region - Tooltip": "Storage region",
     "Region ID": "Region ID",
     "Region ID - Tooltip": "Region ID - Tooltip",
     "Secret access key": "Secret access key",

web/src/locales/en/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "Account",
     "Change Password": "Change Password",
+    "Choose email or phone": "Choose email or phone",
     "Confirm": "Confirm",
     "Next Step": "Next Step",
     "Password": "Password",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "Port - Tooltip",
     "Provider URL": "Provider URL",
     "Provider URL - Tooltip": "Provider URL - Tooltip",
-    "Region": "Region",
-    "Region - Tooltip": "Region - Tooltip",
     "Region ID": "Region ID",
     "Region ID - Tooltip": "Region ID - Tooltip",
     "Secret access key": "Secret access key",

web/src/locales/fr/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "Account",
     "Change Password": "Change Password",
+    "Choose email or phone": "Choose email or phone",
     "Confirm": "Confirm",
     "Next Step": "Next Step",
     "Password": "Password",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "Unique string-style identifier",
     "Provider URL": "Provider URL",
     "Provider URL - Tooltip": "Unique string-style identifier",
-    "Region": "Region",
-    "Region - Tooltip": "Storage region",
     "Region ID": "Region ID",
     "Region ID - Tooltip": "Region ID - Tooltip",
     "Secret access key": "Secret access key",

web/src/locales/ja/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "Account",
     "Change Password": "Change Password",
+    "Choose email or phone": "Choose email or phone",
     "Confirm": "Confirm",
     "Next Step": "Next Step",
     "Password": "Password",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "Unique string-style identifier",
     "Provider URL": "Provider URL",
     "Provider URL - Tooltip": "Unique string-style identifier",
-    "Region": "Region",
-    "Region - Tooltip": "Storage region",
     "Region ID": "Region ID",
     "Region ID - Tooltip": "Region ID - Tooltip",
     "Secret access key": "Secret access key",

web/src/locales/ko/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "Account",
     "Change Password": "Change Password",
+    "Choose email or phone": "Choose email or phone",
     "Confirm": "Confirm",
     "Next Step": "Next Step",
     "Password": "Password",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "Unique string-style identifier",
     "Provider URL": "Provider URL",
     "Provider URL - Tooltip": "Unique string-style identifier",
-    "Region": "Region",
-    "Region - Tooltip": "Storage region",
     "Region ID": "Region ID",
     "Region ID - Tooltip": "Region ID - Tooltip",
     "Secret access key": "Secret access key",

web/src/locales/ru/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "Account",
     "Change Password": "Change Password",
+    "Choose email or phone": "Choose email or phone",
     "Confirm": "Confirm",
     "Next Step": "Next Step",
     "Password": "Password",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "Unique string-style identifier",
     "Provider URL": "Provider URL",
     "Provider URL - Tooltip": "Unique string-style identifier",
-    "Region": "Region",
-    "Region - Tooltip": "Storage region",
     "Region ID": "Region ID",
     "Region ID - Tooltip": "Region ID - Tooltip",
     "Secret access key": "Secret access key",

web/src/locales/zh/data.json

@@ -38,6 +38,7 @@
   "forget": {
     "Account": "账号",
     "Change Password": "修改密码",
+    "Choose email or phone": "请选择邮箱或手机号验证",
     "Confirm": "验证密码",
     "Next Step": "下一步",
     "Password": "密码",
@@ -193,8 +194,8 @@
   "provider": {
     "Access key": "Access key",
     "Access key - Tooltip": "Access key",
-    "Bucket": "存储桶",
+    "Bucket": "Bucket",
-    "Bucket - Tooltip": "存储桶名称",
+    "Bucket - Tooltip": "Bucket名称",
     "Category": "分类",
     "Category - Tooltip": "分类",
     "Client ID": "Client ID",
@@ -208,8 +209,8 @@
     "Email Content - Tooltip": "邮件内容",
     "Email Title": "邮件标题",
     "Email Title - Tooltip": "邮件标题",
-    "Endpoint": "节点",
+    "Endpoint": "Endpoint",
-    "Endpoint - Tooltip": "Storage bucket endpoint",
+    "Endpoint - Tooltip": "地域节点地址",
     "Host": "主机",
     "Host - Tooltip": "主机",
     "Method": "方式",
@@ -219,8 +220,6 @@
     "Port - Tooltip": "端口号",
     "Provider URL": "提供商URL",
     "Provider URL - Tooltip": "提供商URL",
-    "Region": "地区",
-    "Region - Tooltip": "存储区域",
     "Region ID": "地域ID",
     "Region ID - Tooltip": "地域ID",
     "Secret access key": "Secret access key",