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", }, },