7x31
/
anylink
mirror of https://github.com/bjdgyc/anylink.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修改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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/dbdata/cert.go
View File

@ -61,8 +61,8 @@ type DNSProvider struct {
SecretKey string `json:"secretKey"` SecretKey string `json:"secretKey"`
} `json:"txcloud"` } `json:"txcloud"`
CfCloud struct { CfCloud struct {
AuthEmail string `json:"authEmail"` // AuthEmail string `json:"authEmail"`
AuthKey string `json:"authKey"` AuthToken string `json:"authToken"`
} `json:"cfcloud"` } `json:"cfcloud"`
} }
type LegoUserData struct { 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 { 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 return
} }
case "cloudflare": case "cfcloud":
if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthEmail: l.DNSProvider.CfCloud.AuthEmail, AuthKey: l.DNSProvider.CfCloud.AuthKey, TTL: 600}); err != nil { if Provider, err = cloudflare.NewDNSProviderConfig(&cloudflare.Config{AuthToken: l.DNSProvider.CfCloud.AuthToken, TTL: 600}); err != nil {
return return
} }
} }

5
server/dbdata/db.go
View File

@ -115,9 +115,8 @@ func addInitData() error {
SecretKey string `json:"secretKey"` SecretKey string `json:"secretKey"`
}{SecretID: "", SecretKey: ""}, }{SecretID: "", SecretKey: ""},
CfCloud: struct { CfCloud: struct {
AuthEmail string `json:"authEmail"` AuthToken string `json:"authToken"`
AuthKey string `json:"authKey"` }{AuthToken: ""}},
}{AuthEmail: "", AuthKey: ""}},
} }
err = SettingSessAdd(sess, provider) err = SettingSessAdd(sess, provider)
if err != nil { if err != nil {

15
web/src/pages/set/Other.vue
View File

@ -318,8 +318,7 @@ export default {
secretKey: "", secretKey: "",
}, },
cfcloud: { cfcloud: {
authEmail: "", authToken: "",
authKey: "",
}, },
}, },
customCert: { cert: "", key: "" }, customCert: { cert: "", key: "" },
@ -399,19 +398,13 @@ export default {
], ],
cfcloud: [ cfcloud: [
{ {
label: "Email", label: "AuthToken",
prop: "email", prop: "authToken",
component: "el-input",
type: "text",
},
{
label: "AuthKey",
prop: "authKey",
component: "el-input", component: "el-input",
type: "password", type: "password",
rules: { rules: {
required: true, required: true,
message: "请输入正确的APIKey", message: "请输入正确的AuthToken",
trigger: "blur", trigger: "blur",
}, },
}, },