1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-13 13:10:49 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 解决 CloudFlare 申请证书失败的BUG

Browse source
This commit is contained in:
zhengkunwang223 2022-12-29 15:11:58 +08:00 • committed by zhengkunwang223
parent a4e6ca01a7
commit b406ee1f10
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/utils/ssl/client.go
View file

@ -65,7 +65,7 @@ type DnsType string
const ( const (
DnsPod DnsType = "DnsPod" DnsPod DnsType = "DnsPod"
AliYun DnsType = "AliYun" AliYun DnsType = "AliYun"
Cloudflare DnsType = "Cloudflare" CloudFlare DnsType = "CloudFlare"
) )
type DNSParam struct { type DNSParam struct {
@ -103,7 +103,7 @@ func (c *AcmeClient) UseDns(dnsType DnsType, params string) error {
return err return err
} }
} }
if dnsType == Cloudflare { if dnsType == CloudFlare {
cloudflareConfig := cloudflare.NewDefaultConfig() cloudflareConfig := cloudflare.NewDefaultConfig()
cloudflareConfig.AuthEmail = param.Email cloudflareConfig.AuthEmail = param.Email
cloudflareConfig.AuthKey = param.APIkey cloudflareConfig.AuthKey = param.APIkey

9
frontend/src/views/website/ssl/create/index.vue
View file

@ -32,7 +32,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('website.provider')" prop="provider"> <el-form-item :label="$t('website.provider')" prop="provider">
<el-radio-group v-model="ssl.provider"> <el-radio-group v-model="ssl.provider" @change="changeProvider()">
<el-radio label="dnsAccount">{{ $t('website.dnsAccount') }}</el-radio> <el-radio label="dnsAccount">{{ $t('website.dnsAccount') }}</el-radio>
<el-radio label="dnsManual">{{ $t('website.dnsCommon') }}</el-radio> <el-radio label="dnsManual">{{ $t('website.dnsCommon') }}</el-radio>
<el-radio label="http">HTTP</el-radio> <el-radio label="http">HTTP</el-radio>
@ -48,7 +48,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="dnsResolve.length > 0"> <el-form-item v-if="ssl.provider === 'dnsManual' && dnsResolve.length > 0">
<span>{{ $t('ssl.dnsResolveHelper') }}</span> <span>{{ $t('ssl.dnsResolveHelper') }}</span>
<div v-for="(re, index) in dnsResolve" :key="index"> <div v-for="(re, index) in dnsResolve" :key="index">
<el-descriptions direction="vertical" :column="4" border> <el-descriptions direction="vertical" :column="4" border>
@ -135,6 +135,7 @@ const handleClose = () => {
}; };
const resetForm = () => { const resetForm = () => {
sslForm.value?.resetFields(); sslForm.value?.resetFields();
dnsResolve.value = [];
ssl.value = { ssl.value = {
primaryDomain: '', primaryDomain: '',
otherDomains: '', otherDomains: '',
@ -169,6 +170,10 @@ const getDnsAccounts = async () => {
} }
}; };
const changeProvider = () => {
dnsResolve.value = [];
};
const getDnsResolve = async (acmeAccountId: number, domains: string[]) => { const getDnsResolve = async (acmeAccountId: number, domains: string[]) => {
hasResolve.value = false; hasResolve.value = false;
loading.value = true; loading.value = true;