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

feat: 网站选择证书可以通过 acme 账号过滤 (#1530)

Browse source
This commit is contained in:
zhengkunwang223 2023-07-04 16:14:11 +08:00 committed by GitHub
parent 6fea06729e
commit f70b0049d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 90 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/app/api/v1/website_ssl.go
View file

@ -35,7 +35,7 @@ func (b *BaseApi) PageWebsiteSSL(c *gin.Context) {
Items: accounts,
})
} else {
list, err := websiteSSLService.Search()
list, err := websiteSSLService.Search(req)
if err != nil {
helper.ErrorWithDetail(c, constant.CodeErrInternalServer, constant.ErrTypeInternalServer, err)
return

1
backend/app/dto/request/website_ssl.go
View file

@ -4,6 +4,7 @@ import "github.com/1Panel-dev/1Panel/backend/app/dto"
type WebsiteSSLSearch struct {
dto.PageInfo
AcmeAccountID uint `json:"acmeAccountId"`
}
type WebsiteSSLCreate struct {

36
backend/app/service/website_ssl.go
View file

@ -7,6 +7,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/app/dto/request"
"github.com/1Panel-dev/1Panel/backend/app/dto/response"
"github.com/1Panel-dev/1Panel/backend/app/model"
"github.com/1Panel-dev/1Panel/backend/app/repo"
"github.com/1Panel-dev/1Panel/backend/buserr"
"github.com/1Panel-dev/1Panel/backend/constant"
"github.com/1Panel-dev/1Panel/backend/global"
@ -21,7 +22,7 @@ type WebsiteSSLService struct {
type IWebsiteSSLService interface {
Page(search request.WebsiteSSLSearch) (int64, []response.WebsiteSSLDTO, error)
GetSSL(id uint) (*response.WebsiteSSLDTO, error)
Search() ([]response.WebsiteSSLDTO, error)
Search(req request.WebsiteSSLSearch) ([]response.WebsiteSSLDTO, error)
Create(create request.WebsiteSSLCreate) (request.WebsiteSSLCreate, error)
Renew(sslId uint) error
GetDNSResolve(req request.WebsiteDNSReq) ([]response.WebsiteDNSRes, error)
@ -35,17 +36,19 @@ func NewIWebsiteSSLService() IWebsiteSSLService {
}
func (w WebsiteSSLService) Page(search request.WebsiteSSLSearch) (int64, []response.WebsiteSSLDTO, error) {
var (
result []response.WebsiteSSLDTO
)
total, sslList, err := websiteSSLRepo.Page(search.Page, search.PageSize, commonRepo.WithOrderBy("created_at desc"))
if err != nil {
return 0, nil, err
}
var sslDTOs []response.WebsiteSSLDTO
for _, ssl := range sslList {
sslDTOs = append(sslDTOs, response.WebsiteSSLDTO{
WebsiteSSL: ssl,
for _, sslModel := range sslList {
result = append(result, response.WebsiteSSLDTO{
WebsiteSSL: sslModel,
})
}
return total, sslDTOs, err
return total, result, err
}
func (w WebsiteSSLService) GetSSL(id uint) (*response.WebsiteSSLDTO, error) {
@ -58,18 +61,25 @@ func (w WebsiteSSLService) GetSSL(id uint) (*response.WebsiteSSLDTO, error) {
return &res, nil
}
func (w WebsiteSSLService) Search() ([]response.WebsiteSSLDTO, error) {
sslList, err := websiteSSLRepo.List()
func (w WebsiteSSLService) Search(search request.WebsiteSSLSearch) ([]response.WebsiteSSLDTO, error) {
var (
opts []repo.DBOption
result []response.WebsiteSSLDTO
)
opts = append(opts, commonRepo.WithOrderBy("created_at desc"))
if search.AcmeAccountID >= 0 {
opts = append(opts, websiteSSLRepo.WithByAcmeAccountId(search.AcmeAccountID))
}
sslList, err := websiteSSLRepo.List(opts...)
if err != nil {
return nil, err
}
var sslDTOs []response.WebsiteSSLDTO
for _, ssl := range sslList {
sslDTOs = append(sslDTOs, response.WebsiteSSLDTO{
WebsiteSSL: ssl,
for _, sslModel := range sslList {
result = append(result, response.WebsiteSSLDTO{
WebsiteSSL: sslModel,
})
}
return sslDTOs, err
return result, err
}
func (w WebsiteSSLService) Create(create request.WebsiteSSLCreate) (request.WebsiteSSLCreate, error) {

2
frontend/src/api/interface/website.ts
View file

@ -160,6 +160,7 @@ export namespace Website {
provider: string;
websites?: Website.Website[];
autoRenew: boolean;
acmeAccountId?: number;
}
export interface SSLCreate {
@ -207,6 +208,7 @@ export namespace Website {
export interface SSLReq {
name?: string;
acmeAccountID?: number;
}
export interface HTTPSReq {

2
frontend/src/lang/modules/en.ts
View file

@ -1412,6 +1412,8 @@ const message = {
disableLeech: 'Disable anti-leech',
ipv6: 'Listen IPV6',
leechReturnError: 'Please fill in the HTTP status code',
selectAcme: 'Select Acme account',
localSSL: 'Imported',
},
php: {
short_open_tag: 'Short tag support',

2
frontend/src/lang/modules/tw.ts
View file

@ -1339,6 +1339,8 @@ const message = {
disableLeech: '禁用防盜鏈',
ipv6: '監聽 IPV6 端口',
leechReturnError: '請填寫 HTTP 狀態碼',
selectAcme: '選擇 Acme 賬號',
localSSL: '已導入',
},
php: {
short_open_tag: '短標簽支持',

2
frontend/src/lang/modules/zh.ts
View file

@ -1345,6 +1345,8 @@ const message = {
disableLeech: '禁用防盗链',
ipv6: '监听 IPV6 端口',
leechReturnError: '请填写 HTTP 状态码',
selectAcme: '选择 acme 账号',
localSSL: '已导入',
},
php: {
short_open_tag: '短标签支持',

80
frontend/src/views/website/website/config/basic/https/index.vue
View file

@ -27,25 +27,37 @@
<el-option :label="$t('website.manualSSL')" :value="'manual'"></el-option>
</el-select>
</el-form-item>
<el-form-item
:label="$t('website.ssl')"
prop="websiteSSLId"
v-if="form.type === 'existed'"
:hide-required-asterisk="true"
>
<el-select
v-model="form.websiteSSLId"
:placeholder="$t('website.selectSSL')"
@change="changeSSl(form.websiteSSLId)"
>
<el-option
v-for="(ssl, index) in ssls"
:key="index"
:label="ssl.primaryDomain"
:value="ssl.id"
></el-option>
</el-select>
</el-form-item>
<div v-if="form.type === 'existed'">
<el-form-item :label="$t('website.acmeAccountManage')" prop="acmeAccountID">
<el-select
v-model="form.acmeAccountID"
:placeholder="$t('website.selectAcme')"
@change="listSSL"
>
<el-option :key="0" :label="$t('website.localSSL')" :value="0"></el-option>
<el-option
v-for="(acme, index) in acmeAccounts"
:key="index"
:label="acme.email"
:value="acme.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('website.ssl')" prop="websiteSSLId" :hide-required-asterisk="true">
<el-select
v-model="form.websiteSSLId"
:placeholder="$t('website.selectSSL')"
@change="changeSSl(form.websiteSSLId)"
>
<el-option
v-for="(ssl, index) in ssls"
:key="index"
:label="ssl.primaryDomain"
:value="ssl.id"
></el-option>
</el-select>
</el-form-item>
</div>
<div v-if="form.type === 'manual'">
<el-form-item :label="$t('website.privateKey')" prop="privateKey">
<el-input v-model="form.privateKey" :rows="6" type="textarea" />
@ -118,7 +130,7 @@
</template>
<script lang="ts" setup>
import { Website } from '@/api/interface/website';
import { GetHTTPSConfig, ListSSL, UpdateHTTPSConfig } from '@/api/modules/website';
import { GetHTTPSConfig, ListSSL, SearchAcmeAccount, UpdateHTTPSConfig } from '@/api/modules/website';
import { ElMessageBox, FormInstance } from 'element-plus';
import { computed, onMounted, reactive, ref } from 'vue';
import i18n from '@/lang';
@ -137,6 +149,7 @@ const id = computed(() => {
});
const httpsForm = ref<FormInstance>();
const form = reactive({
acmeAccountID: 0,
enable: false,
websiteId: id.value,
websiteSSLId: undefined,
@ -150,6 +163,7 @@ const form = reactive({
});
const loading = ref(false);
const ssls = ref();
const acmeAccounts = ref();
const websiteSSL = ref();
const rules = ref({
type: [Rules.requiredSelect],
@ -159,13 +173,30 @@ const rules = ref({
httpConfig: [Rules.requiredSelect],
SSLProtocol: [Rules.requiredSelect],
algorithm: [Rules.requiredInput],
acmeAccountID: [Rules.requiredInput],
});
const resData = ref();
const sslReq = reactive({
acmeAccountID: 0,
});
const listSSL = () => {
ListSSL({}).then((res) => {
ssls.value = res.data;
changeSSl(form.websiteSSLId);
sslReq.acmeAccountID = form.acmeAccountID;
ListSSL(sslReq).then((res) => {
ssls.value = res.data || [];
if (ssls.value.length > 0) {
form.websiteSSLId = ssls.value[0].id;
changeSSl(form.websiteSSLId);
} else {
websiteSSL.value = {};
form.websiteSSLId = undefined;
}
});
};
const listAcmeAccount = () => {
SearchAcmeAccount({ page: 1, pageSize: 100 }).then((res) => {
acmeAccounts.value = res.data.items || [];
});
};
@ -200,9 +231,12 @@ const get = () => {
if (res.data.SSL && res.data.SSL.id > 0) {
form.websiteSSLId = res.data.SSL.id;
websiteSSL.value = res.data.SSL;
sslReq.acmeAccountID = res.data.SSL.acmeAccountId;
form.acmeAccountID = res.data.SSL.acmeAccountId;
}
}
listSSL();
listAcmeAccount();
});
};
const submit = async (formEl: FormInstance | undefined) => {