修改cf使用authToken的方式申请证书,修复因前后端cf名称不一致导致的指针错误

This commit is contained in:
wsczx 2023-05-04 19:08:40 +08:00
parent fd5ec7f86a
commit fe9b84ce98
3 changed files with 10 additions and 18 deletions

View File

@ -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
}
}

View File

@ -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 {

View File

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