mirror of https://github.com/usual2970/certimate
feat: support multiple sites on deployment to baotapanel site
parent
03d2f4ca32
commit
c451bf5e03
|
@ -258,9 +258,11 @@ func createDeployer(options *deployerOptions) (deployer.Deployer, logger.Logger,
|
||||||
|
|
||||||
case domain.DeployProviderTypeBaotaPanelSite:
|
case domain.DeployProviderTypeBaotaPanelSite:
|
||||||
deployer, err := pBaotaPanelSite.NewWithLogger(&pBaotaPanelSite.BaotaPanelSiteDeployerConfig{
|
deployer, err := pBaotaPanelSite.NewWithLogger(&pBaotaPanelSite.BaotaPanelSiteDeployerConfig{
|
||||||
ApiUrl: access.ApiUrl,
|
ApiUrl: access.ApiUrl,
|
||||||
ApiKey: access.ApiKey,
|
ApiKey: access.ApiKey,
|
||||||
SiteName: maps.GetValueAsString(options.ProviderDeployConfig, "siteName"),
|
SiteType: maps.GetValueOrDefaultAsString(options.ProviderDeployConfig, "siteType", "other"),
|
||||||
|
SiteName: maps.GetValueAsString(options.ProviderDeployConfig, "siteName"),
|
||||||
|
SiteNames: slices.Filter(strings.Split(maps.GetValueAsString(options.ProviderDeployConfig, "siteNames"), ";"), func(s string) bool { return s != "" }),
|
||||||
}, logger)
|
}, logger)
|
||||||
return deployer, logger, err
|
return deployer, logger, err
|
||||||
|
|
||||||
|
|
|
@ -3,12 +3,14 @@
|
||||||
import (
|
import (
|
||||||
"context"
|
"context"
|
||||||
"errors"
|
"errors"
|
||||||
|
"fmt"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
|
||||||
xerrors "github.com/pkg/errors"
|
xerrors "github.com/pkg/errors"
|
||||||
|
|
||||||
"github.com/usual2970/certimate/internal/pkg/core/deployer"
|
"github.com/usual2970/certimate/internal/pkg/core/deployer"
|
||||||
"github.com/usual2970/certimate/internal/pkg/core/logger"
|
"github.com/usual2970/certimate/internal/pkg/core/logger"
|
||||||
|
"github.com/usual2970/certimate/internal/pkg/utils/slices"
|
||||||
btsdk "github.com/usual2970/certimate/internal/pkg/vendors/btpanel-sdk"
|
btsdk "github.com/usual2970/certimate/internal/pkg/vendors/btpanel-sdk"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -17,8 +19,12 @@ type BaotaPanelSiteDeployerConfig struct {
|
||||||
ApiUrl string `json:"apiUrl"`
|
ApiUrl string `json:"apiUrl"`
|
||||||
// 宝塔面板接口密钥。
|
// 宝塔面板接口密钥。
|
||||||
ApiKey string `json:"apiKey"`
|
ApiKey string `json:"apiKey"`
|
||||||
// 站点名称。
|
// 站点类型。
|
||||||
SiteName string `json:"siteName"`
|
SiteType string `json:"siteType"`
|
||||||
|
// 站点名称(单个)。
|
||||||
|
SiteName string `json:"siteName,omitempty"`
|
||||||
|
// 站点名称(多个)。
|
||||||
|
SiteNames []string `json:"siteNames,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type BaotaPanelSiteDeployer struct {
|
type BaotaPanelSiteDeployer struct {
|
||||||
|
@ -55,22 +61,65 @@ func NewWithLogger(config *BaotaPanelSiteDeployerConfig, logger logger.Logger) (
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *BaotaPanelSiteDeployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) {
|
func (d *BaotaPanelSiteDeployer) Deploy(ctx context.Context, certPem string, privkeyPem string) (*deployer.DeployResult, error) {
|
||||||
if d.config.SiteName == "" {
|
switch d.config.SiteType {
|
||||||
return nil, errors.New("config `siteName` is required")
|
case "php":
|
||||||
}
|
{
|
||||||
|
if d.config.SiteName == "" {
|
||||||
|
return nil, errors.New("config `siteName` is required")
|
||||||
|
}
|
||||||
|
|
||||||
// 设置站点 SSL 证书
|
// 设置站点 SSL 证书
|
||||||
siteSetSSLReq := &btsdk.SiteSetSSLRequest{
|
siteSetSSLReq := &btsdk.SiteSetSSLRequest{
|
||||||
SiteName: d.config.SiteName,
|
SiteName: d.config.SiteName,
|
||||||
Type: "0",
|
Type: "0",
|
||||||
PrivateKey: privkeyPem,
|
Certificate: certPem,
|
||||||
Certificate: certPem,
|
PrivateKey: privkeyPem,
|
||||||
}
|
}
|
||||||
siteSetSSLResp, err := d.sdkClient.SiteSetSSL(siteSetSSLReq)
|
siteSetSSLResp, err := d.sdkClient.SiteSetSSL(siteSetSSLReq)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SiteSetSSL'")
|
return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SiteSetSSL'")
|
||||||
} else {
|
} else {
|
||||||
d.logger.Logt("已设置站点 SSL 证书", siteSetSSLResp)
|
d.logger.Logt("已设置站点证书", siteSetSSLResp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
case "other":
|
||||||
|
{
|
||||||
|
if len(d.config.SiteNames) == 0 {
|
||||||
|
return nil, errors.New("config `siteNames` is required")
|
||||||
|
}
|
||||||
|
|
||||||
|
// 上传证书
|
||||||
|
sslCertSaveCertReq := &btsdk.SSLCertSaveCertRequest{
|
||||||
|
Certificate: certPem,
|
||||||
|
PrivateKey: privkeyPem,
|
||||||
|
}
|
||||||
|
sslCertSaveCertResp, err := d.sdkClient.SSLCertSaveCert(sslCertSaveCertReq)
|
||||||
|
if err != nil {
|
||||||
|
return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SSLCertSaveCert'")
|
||||||
|
} else {
|
||||||
|
d.logger.Logt("已上传证书", sslCertSaveCertResp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 设置站点证书
|
||||||
|
sslSetBatchCertToSiteReq := &btsdk.SSLSetBatchCertToSiteRequest{
|
||||||
|
BatchInfo: slices.Map(d.config.SiteNames, func(siteName string) *btsdk.SSLSetBatchCertToSiteRequestBatchInfo {
|
||||||
|
return &btsdk.SSLSetBatchCertToSiteRequestBatchInfo{
|
||||||
|
SiteName: siteName,
|
||||||
|
SSLHash: sslCertSaveCertResp.SSLHash,
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
sslSetBatchCertToSiteResp, err := d.sdkClient.SSLSetBatchCertToSite(sslSetBatchCertToSiteReq)
|
||||||
|
if err != nil {
|
||||||
|
return nil, xerrors.Wrap(err, "failed to execute sdk request 'bt.SSLSetBatchCertToSite'")
|
||||||
|
} else {
|
||||||
|
d.logger.Logt("已设置站点证书", sslSetBatchCertToSiteResp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
default:
|
||||||
|
return nil, fmt.Errorf("unsupported site type: %s", d.config.SiteType)
|
||||||
}
|
}
|
||||||
|
|
||||||
return &deployer.DeployResult{}, nil
|
return &deployer.DeployResult{}, nil
|
||||||
|
|
|
@ -16,6 +16,7 @@ var (
|
||||||
fInputKeyPath string
|
fInputKeyPath string
|
||||||
fApiUrl string
|
fApiUrl string
|
||||||
fApiKey string
|
fApiKey string
|
||||||
|
fSiteType string
|
||||||
fSiteName string
|
fSiteName string
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -26,6 +27,7 @@ func init() {
|
||||||
flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
|
flag.StringVar(&fInputKeyPath, argsPrefix+"INPUTKEYPATH", "", "")
|
||||||
flag.StringVar(&fApiUrl, argsPrefix+"APIURL", "", "")
|
flag.StringVar(&fApiUrl, argsPrefix+"APIURL", "", "")
|
||||||
flag.StringVar(&fApiKey, argsPrefix+"APIKEY", "", "")
|
flag.StringVar(&fApiKey, argsPrefix+"APIKEY", "", "")
|
||||||
|
flag.StringVar(&fSiteType, argsPrefix+"SITETYPE", "", "")
|
||||||
flag.StringVar(&fSiteName, argsPrefix+"SITENAME", "", "")
|
flag.StringVar(&fSiteName, argsPrefix+"SITENAME", "", "")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +39,7 @@ Shell command to run this test:
|
||||||
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_INPUTKEYPATH="/path/to/your-input-key.pem" \
|
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_INPUTKEYPATH="/path/to/your-input-key.pem" \
|
||||||
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_APIURL="http://127.0.0.1:8888" \
|
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_APIURL="http://127.0.0.1:8888" \
|
||||||
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_APIKEY="your-api-key" \
|
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_APIKEY="your-api-key" \
|
||||||
|
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_SITETYPE="php" \
|
||||||
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_SITENAME="your-site-name"
|
--CERTIMATE_DEPLOYER_BAOTAPANELSITE_SITENAME="your-site-name"
|
||||||
*/
|
*/
|
||||||
func TestDeploy(t *testing.T) {
|
func TestDeploy(t *testing.T) {
|
||||||
|
@ -49,6 +52,7 @@ func TestDeploy(t *testing.T) {
|
||||||
fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath),
|
fmt.Sprintf("INPUTKEYPATH: %v", fInputKeyPath),
|
||||||
fmt.Sprintf("APIURL: %v", fApiUrl),
|
fmt.Sprintf("APIURL: %v", fApiUrl),
|
||||||
fmt.Sprintf("APIKEY: %v", fApiKey),
|
fmt.Sprintf("APIKEY: %v", fApiKey),
|
||||||
|
fmt.Sprintf("SITETYPE: %v", fSiteType),
|
||||||
fmt.Sprintf("SITENAME: %v", fSiteName),
|
fmt.Sprintf("SITENAME: %v", fSiteName),
|
||||||
}, "\n"))
|
}, "\n"))
|
||||||
|
|
||||||
|
|
|
@ -42,3 +42,29 @@ func (c *Client) SystemServiceAdmin(req *SystemServiceAdminRequest) (*SystemServ
|
||||||
}
|
}
|
||||||
return &result, nil
|
return &result, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (c *Client) SSLCertSaveCert(req *SSLCertSaveCertRequest) (*SSLCertSaveCertResponse, error) {
|
||||||
|
params := make(map[string]any)
|
||||||
|
jsonData, _ := json.Marshal(req)
|
||||||
|
json.Unmarshal(jsonData, ¶ms)
|
||||||
|
|
||||||
|
result := SSLCertSaveCertResponse{}
|
||||||
|
err := c.sendRequestWithResult("/ssl/cert/save_cert", params, &result)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &result, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *Client) SSLSetBatchCertToSite(req *SSLSetBatchCertToSiteRequest) (*SSLSetBatchCertToSiteResponse, error) {
|
||||||
|
params := make(map[string]any)
|
||||||
|
jsonData, _ := json.Marshal(req)
|
||||||
|
json.Unmarshal(jsonData, ¶ms)
|
||||||
|
|
||||||
|
result := SSLSetBatchCertToSiteResponse{}
|
||||||
|
err := c.sendRequestWithResult("/ssl?action=SetBatchCertToSite", params, &result)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return &result, nil
|
||||||
|
}
|
||||||
|
|
|
@ -74,10 +74,10 @@ func (c *Client) sendRequestWithResult(path string, params map[string]any, resul
|
||||||
if err := json.Unmarshal(resp.Body(), &result); err != nil {
|
if err := json.Unmarshal(resp.Body(), &result); err != nil {
|
||||||
return fmt.Errorf("baota api error: failed to parse response: %w", err)
|
return fmt.Errorf("baota api error: failed to parse response: %w", err)
|
||||||
} else if errstatus := result.GetStatus(); errstatus != nil && !*errstatus {
|
} else if errstatus := result.GetStatus(); errstatus != nil && !*errstatus {
|
||||||
if result.GetMsg() == nil {
|
if result.GetMessage() == nil {
|
||||||
return fmt.Errorf("baota api error: unknown error")
|
return fmt.Errorf("baota api error: unknown error")
|
||||||
} else {
|
} else {
|
||||||
return fmt.Errorf("baota api error: %s", *result.GetMsg())
|
return fmt.Errorf("baota api error: %s", *result.GetMessage())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2,20 +2,20 @@ package btpanelsdk
|
||||||
|
|
||||||
type BaseResponse interface {
|
type BaseResponse interface {
|
||||||
GetStatus() *bool
|
GetStatus() *bool
|
||||||
GetMsg() *string
|
GetMessage() *string
|
||||||
}
|
}
|
||||||
|
|
||||||
type baseResponse struct {
|
type baseResponse struct {
|
||||||
Status *bool `json:"status,omitempty"`
|
Status *bool `json:"status,omitempty"`
|
||||||
Msg *string `json:"msg,omitempty"`
|
Message *string `json:"msg,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *baseResponse) GetStatus() *bool {
|
func (r *baseResponse) GetStatus() *bool {
|
||||||
return r.Status
|
return r.Status
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *baseResponse) GetMsg() *string {
|
func (r *baseResponse) GetMessage() *string {
|
||||||
return r.Msg
|
return r.Message
|
||||||
}
|
}
|
||||||
|
|
||||||
type ConfigSavePanelSSLRequest struct {
|
type ConfigSavePanelSSLRequest struct {
|
||||||
|
@ -46,3 +46,30 @@ type SystemServiceAdminRequest struct {
|
||||||
type SystemServiceAdminResponse struct {
|
type SystemServiceAdminResponse struct {
|
||||||
baseResponse
|
baseResponse
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type SSLCertSaveCertRequest struct {
|
||||||
|
PrivateKey string `json:"key"`
|
||||||
|
Certificate string `json:"csr"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SSLCertSaveCertResponse struct {
|
||||||
|
baseResponse
|
||||||
|
SSLHash string `json:"ssl_hash"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SSLSetBatchCertToSiteRequest struct {
|
||||||
|
BatchInfo []*SSLSetBatchCertToSiteRequestBatchInfo `json:"BatchInfo"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SSLSetBatchCertToSiteRequestBatchInfo struct {
|
||||||
|
SSLHash string `json:"ssl_hash"`
|
||||||
|
SiteName string `json:"siteName"`
|
||||||
|
CertName string `json:"certName"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type SSLSetBatchCertToSiteResponse struct {
|
||||||
|
baseResponse
|
||||||
|
TotalCount int32 `json:"total"`
|
||||||
|
SuccessCount int32 `json:"success"`
|
||||||
|
FailedCount int32 `json:"faild"`
|
||||||
|
}
|
||||||
|
|
|
@ -70,6 +70,7 @@ const ApplyNodeConfigForm = forwardRef<ApplyNodeConfigFormInstance, ApplyNodeCon
|
||||||
|
|
||||||
const formSchema = z.object({
|
const formSchema = z.object({
|
||||||
domains: z.string({ message: t("workflow_node.apply.form.domains.placeholder") }).refine((v) => {
|
domains: z.string({ message: t("workflow_node.apply.form.domains.placeholder") }).refine((v) => {
|
||||||
|
if (!v) return false;
|
||||||
return String(v)
|
return String(v)
|
||||||
.split(MULTIPLE_INPUT_DELIMITER)
|
.split(MULTIPLE_INPUT_DELIMITER)
|
||||||
.every((e) => validDomainName(e, { allowWildcard: true }));
|
.every((e) => validDomainName(e, { allowWildcard: true }));
|
||||||
|
|
|
@ -44,6 +44,7 @@ const DeployNodeConfigFormAliyunCASDeployConfig = ({
|
||||||
.nonempty(t("workflow_node.deploy.form.aliyun_cas_deploy_region.placeholder"))
|
.nonempty(t("workflow_node.deploy.form.aliyun_cas_deploy_region.placeholder"))
|
||||||
.trim(),
|
.trim(),
|
||||||
resourceIds: z.string({ message: t("workflow_node.deploy.form.aliyun_cas_deploy_resource_ids.placeholder") }).refine((v) => {
|
resourceIds: z.string({ message: t("workflow_node.deploy.form.aliyun_cas_deploy_resource_ids.placeholder") }).refine((v) => {
|
||||||
|
if (!v) return false;
|
||||||
return String(v)
|
return String(v)
|
||||||
.split(MULTIPLE_INPUT_DELIMITER)
|
.split(MULTIPLE_INPUT_DELIMITER)
|
||||||
.every((e) => /^[1-9]\d*$/.test(e));
|
.every((e) => /^[1-9]\d*$/.test(e));
|
||||||
|
|
|
@ -1,10 +1,19 @@
|
||||||
|
import { memo } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { Form, type FormInstance, Input } from "antd";
|
import { FormOutlined as FormOutlinedIcon } from "@ant-design/icons";
|
||||||
|
import { Button, Form, type FormInstance, Input, Select, Space } from "antd";
|
||||||
import { createSchemaFieldRule } from "antd-zod";
|
import { createSchemaFieldRule } from "antd-zod";
|
||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
|
|
||||||
|
import ModalForm from "@/components/ModalForm";
|
||||||
|
import MultipleInput from "@/components/MultipleInput";
|
||||||
|
import Show from "@/components/Show";
|
||||||
|
import { useAntdForm } from "@/hooks";
|
||||||
|
|
||||||
type DeployNodeConfigFormBaotaPanelSiteConfigFieldValues = Nullish<{
|
type DeployNodeConfigFormBaotaPanelSiteConfigFieldValues = Nullish<{
|
||||||
siteName: string;
|
siteType: string;
|
||||||
|
siteName?: string;
|
||||||
|
siteNames?: string;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
export type DeployNodeConfigFormBaotaPanelSiteConfigProps = {
|
export type DeployNodeConfigFormBaotaPanelSiteConfigProps = {
|
||||||
|
@ -15,8 +24,17 @@ export type DeployNodeConfigFormBaotaPanelSiteConfigProps = {
|
||||||
onValuesChange?: (values: DeployNodeConfigFormBaotaPanelSiteConfigFieldValues) => void;
|
onValuesChange?: (values: DeployNodeConfigFormBaotaPanelSiteConfigFieldValues) => void;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const SITE_TYPE_PHP = "php";
|
||||||
|
const SITE_TYPE_OTHER = "other";
|
||||||
|
|
||||||
|
const MULTIPLE_INPUT_DELIMITER = ";";
|
||||||
|
|
||||||
const initFormModel = (): DeployNodeConfigFormBaotaPanelSiteConfigFieldValues => {
|
const initFormModel = (): DeployNodeConfigFormBaotaPanelSiteConfigFieldValues => {
|
||||||
return {};
|
return {
|
||||||
|
siteType: SITE_TYPE_OTHER,
|
||||||
|
siteName: "",
|
||||||
|
siteNames: "",
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
const DeployNodeConfigFormBaotaPanelSiteConfig = ({
|
const DeployNodeConfigFormBaotaPanelSiteConfig = ({
|
||||||
|
@ -29,13 +47,32 @@ const DeployNodeConfigFormBaotaPanelSiteConfig = ({
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
const formSchema = z.object({
|
const formSchema = z.object({
|
||||||
|
siteType: z.union([z.literal(SITE_TYPE_PHP), z.literal(SITE_TYPE_OTHER)], {
|
||||||
|
message: t("workflow_node.deploy.form.baotapanel_site_type.placeholder"),
|
||||||
|
}),
|
||||||
siteName: z
|
siteName: z
|
||||||
.string({ message: t("workflow_node.deploy.form.baotapanel_site_name.placeholder") })
|
.string()
|
||||||
.nonempty(t("workflow_node.deploy.form.baotapanel_site_name.placeholder"))
|
.nullish()
|
||||||
.trim(),
|
.refine((v) => {
|
||||||
|
if (fieldSiteType !== SITE_TYPE_PHP) return true;
|
||||||
|
return !!v?.trim();
|
||||||
|
}, t("workflow_node.deploy.form.baotapanel_site_name.placeholder")),
|
||||||
|
siteNames: z
|
||||||
|
.string()
|
||||||
|
.nullish()
|
||||||
|
.refine((v) => {
|
||||||
|
if (fieldSiteType !== SITE_TYPE_OTHER) return true;
|
||||||
|
if (!v) return false;
|
||||||
|
return String(v)
|
||||||
|
.split(MULTIPLE_INPUT_DELIMITER)
|
||||||
|
.every((e) => !!e.trim());
|
||||||
|
}, t("workflow_node.deploy.form.baotapanel_site_names.placeholder")),
|
||||||
});
|
});
|
||||||
const formRule = createSchemaFieldRule(formSchema);
|
const formRule = createSchemaFieldRule(formSchema);
|
||||||
|
|
||||||
|
const fieldSiteType = Form.useWatch<string>("siteType", formInst);
|
||||||
|
const fieldSiteNames = Form.useWatch<string>("siteNames", formInst);
|
||||||
|
|
||||||
const handleFormChange = (_: unknown, values: z.infer<typeof formSchema>) => {
|
const handleFormChange = (_: unknown, values: z.infer<typeof formSchema>) => {
|
||||||
onValuesChange?.(values);
|
onValuesChange?.(values);
|
||||||
};
|
};
|
||||||
|
@ -49,16 +86,101 @@ const DeployNodeConfigFormBaotaPanelSiteConfig = ({
|
||||||
name={formName}
|
name={formName}
|
||||||
onValuesChange={handleFormChange}
|
onValuesChange={handleFormChange}
|
||||||
>
|
>
|
||||||
<Form.Item
|
<Form.Item name="siteType" label={t("workflow_node.deploy.form.baotapanel_site_type.label")} rules={[formRule]}>
|
||||||
name="siteName"
|
<Select placeholder={t("workflow_node.deploy.form.baotapanel_site_type.placeholder")}>
|
||||||
label={t("workflow_node.deploy.form.baotapanel_site_name.label")}
|
<Select.Option key={SITE_TYPE_PHP} value={SITE_TYPE_PHP}>
|
||||||
rules={[formRule]}
|
{t("workflow_node.deploy.form.baotapanel_site_type.option.php.label")}
|
||||||
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.deploy.form.baotapanel_site_name.tooltip") }}></span>}
|
</Select.Option>
|
||||||
>
|
<Select.Option key={SITE_TYPE_OTHER} value={SITE_TYPE_OTHER}>
|
||||||
<Input placeholder={t("workflow_node.deploy.form.baotapanel_site_name.placeholder")} />
|
{t("workflow_node.deploy.form.baotapanel_site_type.option.other.label")}
|
||||||
|
</Select.Option>
|
||||||
|
</Select>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
|
|
||||||
|
<Show when={fieldSiteType === SITE_TYPE_PHP}>
|
||||||
|
<Form.Item
|
||||||
|
name="siteName"
|
||||||
|
label={t("workflow_node.deploy.form.baotapanel_site_name.label")}
|
||||||
|
rules={[formRule]}
|
||||||
|
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.deploy.form.baotapanel_site_name.tooltip") }}></span>}
|
||||||
|
>
|
||||||
|
<Input placeholder={t("workflow_node.deploy.form.baotapanel_site_name.placeholder")} />
|
||||||
|
</Form.Item>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<Show when={fieldSiteType === SITE_TYPE_OTHER}>
|
||||||
|
<Form.Item
|
||||||
|
label={t("workflow_node.deploy.form.baotapanel_site_names.label")}
|
||||||
|
tooltip={<span dangerouslySetInnerHTML={{ __html: t("workflow_node.deploy.form.baotapanel_site_names.tooltip") }}></span>}
|
||||||
|
>
|
||||||
|
<Space.Compact style={{ width: "100%" }}>
|
||||||
|
<Form.Item name="siteNames" noStyle rules={[formRule]}>
|
||||||
|
<Input
|
||||||
|
allowClear
|
||||||
|
disabled={disabled}
|
||||||
|
value={fieldSiteNames}
|
||||||
|
placeholder={t("workflow_node.deploy.form.baotapanel_site_names.placeholder")}
|
||||||
|
onChange={(e) => {
|
||||||
|
formInst.setFieldValue("siteNames", e.target.value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Form.Item>
|
||||||
|
<SiteNamesModalInput
|
||||||
|
value={fieldSiteNames}
|
||||||
|
trigger={
|
||||||
|
<Button disabled={disabled}>
|
||||||
|
<FormOutlinedIcon />
|
||||||
|
</Button>
|
||||||
|
}
|
||||||
|
onChange={(value) => {
|
||||||
|
formInst.setFieldValue("siteNames", value);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Space.Compact>
|
||||||
|
</Form.Item>
|
||||||
|
</Show>
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const SiteNamesModalInput = memo(({ value, trigger, onChange }: { value?: string; trigger?: React.ReactNode; onChange?: (value: string) => void }) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const formSchema = z.object({
|
||||||
|
siteNames: z.array(z.string()).refine((v) => {
|
||||||
|
return v.every((e) => !!e?.trim());
|
||||||
|
}, t("workflow_node.deploy.form.baotapanel_site_names.errmsg.invalid")),
|
||||||
|
});
|
||||||
|
const formRule = createSchemaFieldRule(formSchema);
|
||||||
|
const { form: formInst, formProps } = useAntdForm({
|
||||||
|
name: "workflowNodeDeployConfigFormBaotaPanelSiteNamesModalInput",
|
||||||
|
initialValues: { siteNames: value?.split(MULTIPLE_INPUT_DELIMITER) },
|
||||||
|
onSubmit: (values) => {
|
||||||
|
onChange?.(
|
||||||
|
values.siteNames
|
||||||
|
.map((e) => e.trim())
|
||||||
|
.filter((e) => !!e)
|
||||||
|
.join(MULTIPLE_INPUT_DELIMITER)
|
||||||
|
);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<ModalForm
|
||||||
|
{...formProps}
|
||||||
|
layout="vertical"
|
||||||
|
form={formInst}
|
||||||
|
modalProps={{ destroyOnClose: true }}
|
||||||
|
title={t("workflow_node.deploy.form.baotapanel_site_names.multiple_input_modal.title")}
|
||||||
|
trigger={trigger}
|
||||||
|
validateTrigger="onSubmit"
|
||||||
|
width={480}
|
||||||
|
>
|
||||||
|
<Form.Item name="siteNames" rules={[formRule]}>
|
||||||
|
<MultipleInput placeholder={t("workflow_node.deploy.form.baotapanel_site_names.multiple_input_modal.placeholder")} />
|
||||||
|
</Form.Item>
|
||||||
|
</ModalForm>
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
export default DeployNodeConfigFormBaotaPanelSiteConfig;
|
export default DeployNodeConfigFormBaotaPanelSiteConfig;
|
||||||
|
|
|
@ -48,6 +48,7 @@ const DeployNodeConfigFormTencentCloudSSLDeployConfig = ({
|
||||||
.nonempty(t("workflow_node.deploy.form.tencentcloud_ssl_deploy_resource_type.placeholder"))
|
.nonempty(t("workflow_node.deploy.form.tencentcloud_ssl_deploy_resource_type.placeholder"))
|
||||||
.trim(),
|
.trim(),
|
||||||
resourceIds: z.string({ message: t("workflow_node.deploy.form.tencentcloud_ssl_deploy_resource_ids.placeholder") }).refine((v) => {
|
resourceIds: z.string({ message: t("workflow_node.deploy.form.tencentcloud_ssl_deploy_resource_ids.placeholder") }).refine((v) => {
|
||||||
|
if (!v) return false;
|
||||||
return String(v)
|
return String(v)
|
||||||
.split(MULTIPLE_INPUT_DELIMITER)
|
.split(MULTIPLE_INPUT_DELIMITER)
|
||||||
.every((e) => /^[A-Za-z0-9._-]+$/.test(e));
|
.every((e) => /^[A-Za-z0-9._-]+$/.test(e));
|
||||||
|
|
|
@ -194,9 +194,19 @@
|
||||||
"workflow_node.deploy.form.baishan_cdn_domain.placeholder": "Please enter Baishan CDN domain name",
|
"workflow_node.deploy.form.baishan_cdn_domain.placeholder": "Please enter Baishan CDN domain name",
|
||||||
"workflow_node.deploy.form.baishan_cdn_domain.tooltip": "For more information, see <a href=\"https://cdnx.console.baishan.com\" target=\"_blank\">https://cdnx.console.baishan.com</a>",
|
"workflow_node.deploy.form.baishan_cdn_domain.tooltip": "For more information, see <a href=\"https://cdnx.console.baishan.com\" target=\"_blank\">https://cdnx.console.baishan.com</a>",
|
||||||
"workflow_node.deploy.form.baotapanel_console_auto_restart.label": "Auto restart after deployment",
|
"workflow_node.deploy.form.baotapanel_console_auto_restart.label": "Auto restart after deployment",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.label": "BaoTa Panel site type",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.placeholder": "Please select BaoTa Panel site type",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.option.php.label": "PHP sites",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.option.other.label": "Other sites",
|
||||||
"workflow_node.deploy.form.baotapanel_site_name.label": "BaoTa Panel site name",
|
"workflow_node.deploy.form.baotapanel_site_name.label": "BaoTa Panel site name",
|
||||||
"workflow_node.deploy.form.baotapanel_site_name.placeholder": "Please enter BaoTa Panel site name",
|
"workflow_node.deploy.form.baotapanel_site_name.placeholder": "Please enter BaoTa Panel site name",
|
||||||
"workflow_node.deploy.form.baotapanel_site_name.tooltip": "Usually equal to the website domain name.",
|
"workflow_node.deploy.form.baotapanel_site_name.tooltip": "Usually equal to the website domain name.",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.label": "BaoTa Panel site names",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.placeholder": "Please enter BaoTa Panel site names (separated by semicolons)",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.errmsg.invalid": "Please enter a valid BaoTa Panel site name",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.tooltip": "Usually equal to the websites domain name.",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.multiple_input_modal.title": "Change BaoTa Panel site names",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.multiple_input_modal.placeholder": "Please enter BaoTa Panel site name",
|
||||||
"workflow_node.deploy.form.byteplus_cdn_domain.label": "BytePlus CDN domain",
|
"workflow_node.deploy.form.byteplus_cdn_domain.label": "BytePlus CDN domain",
|
||||||
"workflow_node.deploy.form.byteplus_cdn_domain.placeholder": "Please enter BytePlus CDN domain name",
|
"workflow_node.deploy.form.byteplus_cdn_domain.placeholder": "Please enter BytePlus CDN domain name",
|
||||||
"workflow_node.deploy.form.byteplus_cdn_domain.tooltip": "For more information, see <a href=\"https://console.byteplus.com/cdn\" target=\"_blank\">https://console.byteplus.com/cdn</a>",
|
"workflow_node.deploy.form.byteplus_cdn_domain.tooltip": "For more information, see <a href=\"https://console.byteplus.com/cdn\" target=\"_blank\">https://console.byteplus.com/cdn</a>",
|
||||||
|
|
|
@ -194,9 +194,19 @@
|
||||||
"workflow_node.deploy.form.baishan_cdn_domain.placeholder": "请输入白山云 CDN 加速域名",
|
"workflow_node.deploy.form.baishan_cdn_domain.placeholder": "请输入白山云 CDN 加速域名",
|
||||||
"workflow_node.deploy.form.baishan_cdn_domain.tooltip": "这是什么?请参阅 <a href=\"https://cdnx.console.baishan.com\" target=\"_blank\">https://cdnx.console.baishan.com</a>",
|
"workflow_node.deploy.form.baishan_cdn_domain.tooltip": "这是什么?请参阅 <a href=\"https://cdnx.console.baishan.com\" target=\"_blank\">https://cdnx.console.baishan.com</a>",
|
||||||
"workflow_node.deploy.form.baotapanel_console_auto_restart.label": "部署后自动重启面板服务",
|
"workflow_node.deploy.form.baotapanel_console_auto_restart.label": "部署后自动重启面板服务",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.label": "宝塔面板网站类型",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.placeholder": "请选择宝塔面板网站类型",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.option.php.label": "PHP",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_type.option.other.label": "其他",
|
||||||
"workflow_node.deploy.form.baotapanel_site_name.label": "宝塔面板网站名称",
|
"workflow_node.deploy.form.baotapanel_site_name.label": "宝塔面板网站名称",
|
||||||
"workflow_node.deploy.form.baotapanel_site_name.placeholder": "请输入宝塔面板网站名称",
|
"workflow_node.deploy.form.baotapanel_site_name.placeholder": "请输入宝塔面板网站名称",
|
||||||
"workflow_node.deploy.form.baotapanel_site_name.tooltip": "通常为网站域名。",
|
"workflow_node.deploy.form.baotapanel_site_name.tooltip": "通常为网站域名。",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.label": "宝塔面板网站名称",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.placeholder": "请输入宝塔面板网站名称(多个值请用半角分号隔开)",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.errmsg.invalid": "请输入正确的宝塔面板网站名称",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.tooltip": "通常为网站域名。",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.multiple_input_modal.title": "修改宝塔面板网站名称",
|
||||||
|
"workflow_node.deploy.form.baotapanel_site_names.multiple_input_modal.placeholder": "请输入宝塔面板网站名称",
|
||||||
"workflow_node.deploy.form.byteplus_cdn_domain.label": "BytePlus CDN 域名(支持泛域名)",
|
"workflow_node.deploy.form.byteplus_cdn_domain.label": "BytePlus CDN 域名(支持泛域名)",
|
||||||
"workflow_node.deploy.form.byteplus_cdn_domain.placeholder": "请输入 BytePlus CDN 域名",
|
"workflow_node.deploy.form.byteplus_cdn_domain.placeholder": "请输入 BytePlus CDN 域名",
|
||||||
"workflow_node.deploy.form.byteplus_cdn_domain.tooltip": "这是什么?请参阅 <a href=\"https://console.byteplus.com/cdn\" target=\"_blank\">https://console.byteplus.com/cdn</a>",
|
"workflow_node.deploy.form.byteplus_cdn_domain.tooltip": "这是什么?请参阅 <a href=\"https://console.byteplus.com/cdn\" target=\"_blank\">https://console.byteplus.com/cdn</a>",
|
||||||
|
|
Loading…
Reference in New Issue