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

Merge pull request #240 from wsczx/dev 

修复腾讯云因DNS解析生效时间导致无法成功申请证书的bug
This commit is contained in:
bjdgyc 2023-05-15 09:45:40 +08:00 committed by GitHub
parent 50bc864fdd c63e4f33d5
commit 92de727db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/dbdata/cert.go
View File

@ -64,8 +64,7 @@ type DNSProvider struct {
SecretKey string `json:"secretKey"`
} `json:"txcloud"`
CfCloud struct {
AuthEmail string `json:"authEmail"`
AuthKey string `json:"authKey"`
AuthToken string `json:"authToken"`
} `json:"cfcloud"`
}
type LegoUserData struct {
@ -89,15 +88,15 @@ type LeGoClient struct {
func GetDNSProvider(l *SettingLetsEncrypt) (Provider challenge.Provider, err error) {
switch l.Name {
case "aliyun":
if Provider, err = alidns.NewDNSProviderConfig(&alidns.Config{APIKey: l.DNSProvider.AliYun.APIKey, SecretKey: l.DNSProvider.AliYun.SecretKey, TTL: 600}); err != nil {
if Provider, err = alidns.NewDNSProviderConfig(&alidns.Config{APIKey: l.DNSProvider.AliYun.APIKey, SecretKey: l.DNSProvider.AliYun.SecretKey, PropagationTimeout: 60 * time.Second, PollingInterval: 2 * time.Second, TTL: 600}); err != nil {
return
}
case "txcloud":
if Provider, err = tencentcloud.NewDNSProviderConfig(&tencentcloud.Config{SecretID: l.DNSProvider.TXCloud.SecretID, SecretKey: l.DNSProvider.TXCloud.SecretKey, 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: 2 * 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, PropagationTimeout: 60 * time.Second, PollingInterval: 2 * time.Second, TTL: 600}); err != nil {
return
}
}

5
server/dbdata/db.go
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 {

23
web/src/pages/set/Other.vue
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",
},
},
@ -551,12 +544,20 @@ export default {
});
break;
case "letsCert":
var loading = this.$loading({
lock: true,
text: "证书申请中...",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
});
axios.post("/set/other/createcert", this.letsCert).then((resp) => {
var rdata = resp.data;
console.log(rdata);
if (rdata.code === 0) {
loading.close();
this.$message.success(rdata.msg);
} else {
loading.close();
this.$message.error(rdata.msg);
}
});