From fe9b84ce98b574023f7895b45ddef309828194ca Mon Sep 17 00:00:00 2001
From: wsczx <wsc@wsczx.com>
Date: Thu, 4 May 2023 19:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9cf=E4=BD=BF=E7=94=A8authToken?=
 =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=E7=94=B3=E8=AF=B7=E8=AF=81=E4=B9=A6?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=9B=A0=E5=89=8D=E5=90=8E=E7=AB=AF?=
 =?UTF-8?q?cf=E5=90=8D=E7=A7=B0=E4=B8=8D=E4=B8=80=E8=87=B4=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/dbdata/cert.go       |  8 ++++----
 server/dbdata/db.go         |  5 ++---
 web/src/pages/set/Other.vue | 15 ++++-----------
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/server/dbdata/cert.go b/server/dbdata/cert.go
index 635a5ee..88769b1 100644
--- a/server/dbdata/cert.go
+++ b/server/dbdata/cert.go
@@ -61,8 +61,8 @@ type DNSProvider struct {
 		SecretKey string `json:"secretKey"`
 	} `json:"txcloud"`
 	CfCloud struct {
-		AuthEmail string `json:"authEmail"`
-		AuthKey   string `json:"authKey"`
+		// AuthEmail string `json:"authEmail"`
+		AuthToken string `json:"authToken"`
 	} `json:"cfcloud"`
 }
 type LegoUserData struct {
@@ -93,8 +93,8 @@ func GetDNSProvider(l *SettingLetsEncrypt) (Provider challenge.Provider, err err
 		if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 10 * time.Second, TTL: 600}); err != nil {
 			return
 		}
-	case "cloudflare":
-		if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthEmail: l.DNSProvider.CfCloud.AuthEmail, AuthKey: l.DNSProvider.CfCloud.AuthKey, TTL: 600}); err != nil {
+	case "cfcloud":
+		if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthToken: l.DNSProvider.CfCloud.AuthToken, TTL: 600}); err != nil {
 			return
 		}
 	}
diff --git a/server/dbdata/db.go b/server/dbdata/db.go
index 293e9b8..bfb023e 100644
--- a/server/dbdata/db.go
+++ b/server/dbdata/db.go
@@ -115,9 +115,8 @@ func addInitData() error {
 				SecretKey string `json:"secretKey"`
 			}{SecretID: "", SecretKey: ""},
 			CfCloud: struct {
-				AuthEmail string `json:"authEmail"`
-				AuthKey   string `json:"authKey"`
-			}{AuthEmail: "", AuthKey: ""}},
+				AuthToken string `json:"authToken"`
+			}{AuthToken: ""}},
 	}
 	err = SettingSessAdd(sess, provider)
 	if err != nil {
diff --git a/web/src/pages/set/Other.vue b/web/src/pages/set/Other.vue
index 04a0e9b..0574a09 100644
--- a/web/src/pages/set/Other.vue
+++ b/web/src/pages/set/Other.vue
@@ -318,8 +318,7 @@ export default {
           secretKey: "",
         },
         cfcloud: {
-          authEmail: "",
-          authKey: "",
+          authToken: "",
         },
       },
       customCert: { cert: "", key: "" },
@@ -399,19 +398,13 @@ export default {
         ],
         cfcloud: [
           {
-            label: "Email",
-            prop: "email",
-            component: "el-input",
-            type: "text",
-          },
-          {
-            label: "AuthKey",
-            prop: "authKey",
+            label: "AuthToken",
+            prop: "authToken",
             component: "el-input",
             type: "password",
             rules: {
               required: true,
-              message: "请输入正确的APIKey",
+              message: "请输入正确的AuthToken",
               trigger: "blur",
             },
           },