From 3dc829a630f7f7344d024894d9a4c07666a7fcaa Mon Sep 17 00:00:00 2001 From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com> Date: Fri, 15 Dec 2023 18:14:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AF=81=E4=B9=A6=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=BA=9B=E6=8F=90=E7=A4=BA=20(#3349?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/api/v1/website_ca.go | 2 +- cmd/server/docs/docs.go | 55 ++++++++++++++++++- cmd/server/docs/swagger.json | 51 +++++++++++++++++ cmd/server/docs/swagger.yaml | 33 +++++++++++ frontend/src/lang/modules/en.ts | 1 + frontend/src/lang/modules/tw.ts | 1 + frontend/src/lang/modules/zh.ts | 1 + .../website/ssl/acme-account/create/index.vue | 4 +- .../src/views/website/ssl/create/index.vue | 3 + 9 files changed, 147 insertions(+), 4 deletions(-) diff --git a/backend/app/api/v1/website_ca.go b/backend/app/api/v1/website_ca.go index c457f1361252..52c8b89c8c50 100644 --- a/backend/app/api/v1/website_ca.go +++ b/backend/app/api/v1/website_ca.go @@ -124,7 +124,7 @@ func (b *BaseApi) ObtainWebsiteCA(c *gin.Context) { // @Param request body request.WebsiteCAObtain true "request" // @Success 200 // @Security ApiKeyAuth -// @Router /websites/ca/obtain [post] +// @Router /websites/ca/renew [post] // @x-panel-log {"bodyKeys":["id"],"paramKeys":[],"BeforeFunctions":[{"input_column":"id","input_value":"id","isList":false,"db":"website_cas","output_column":"name","output_value":"name"}],"formatZH":"自签 SSL 证书 [name]","formatEN":"Obtain SSL [name]"} func (b *BaseApi) RenewWebsiteCA(c *gin.Context) { var req request.WebsiteCARenew diff --git a/cmd/server/docs/docs.go b/cmd/server/docs/docs.go index 76b60951382f..b4be0567cbfc 100644 --- a/cmd/server/docs/docs.go +++ b/cmd/server/docs/docs.go @@ -1,5 +1,5 @@ -// Code generated by swaggo/swag. DO NOT EDIT. - +// Package docs GENERATED BY SWAG; DO NOT EDIT +// This file was generated by swaggo/swag package docs import "github.com/swaggo/swag" @@ -11096,6 +11096,57 @@ const docTemplate = `{ } }, "/websites/ca/obtain": { + "post": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "description": "自签 SSL 证书", + "consumes": [ + "application/json" + ], + "tags": [ + "Website CA" + ], + "summary": "Obtain SSL", + "parameters": [ + { + "description": "request", + "name": "request", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.WebsiteCAObtain" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + }, + "x-panel-log": { + "BeforeFunctions": [ + { + "db": "website_cas", + "input_column": "id", + "input_value": "id", + "isList": false, + "output_column": "name", + "output_value": "name" + } + ], + "bodyKeys": [ + "id" + ], + "formatEN": "Obtain SSL [name]", + "formatZH": "自签 SSL 证书 [name]", + "paramKeys": [] + } + } + }, + "/websites/ca/renew": { "post": { "security": [ { diff --git a/cmd/server/docs/swagger.json b/cmd/server/docs/swagger.json index 4804481d657e..18b52a8d0830 100644 --- a/cmd/server/docs/swagger.json +++ b/cmd/server/docs/swagger.json @@ -11089,6 +11089,57 @@ } }, "/websites/ca/obtain": { + "post": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "description": "自签 SSL 证书", + "consumes": [ + "application/json" + ], + "tags": [ + "Website CA" + ], + "summary": "Obtain SSL", + "parameters": [ + { + "description": "request", + "name": "request", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.WebsiteCAObtain" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + }, + "x-panel-log": { + "BeforeFunctions": [ + { + "db": "website_cas", + "input_column": "id", + "input_value": "id", + "isList": false, + "output_column": "name", + "output_value": "name" + } + ], + "bodyKeys": [ + "id" + ], + "formatEN": "Obtain SSL [name]", + "formatZH": "自签 SSL 证书 [name]", + "paramKeys": [] + } + } + }, + "/websites/ca/renew": { "post": { "security": [ { diff --git a/cmd/server/docs/swagger.yaml b/cmd/server/docs/swagger.yaml index e0e0f38bd7a6..712e5140bc71 100644 --- a/cmd/server/docs/swagger.yaml +++ b/cmd/server/docs/swagger.yaml @@ -11807,6 +11807,39 @@ paths: formatZH: 删除网站 ca [name] paramKeys: [] /websites/ca/obtain: + post: + consumes: + - application/json + description: 自签 SSL 证书 + parameters: + - description: request + in: body + name: request + required: true + schema: + $ref: '#/definitions/request.WebsiteCAObtain' + responses: + "200": + description: OK + security: + - ApiKeyAuth: [] + summary: Obtain SSL + tags: + - Website CA + x-panel-log: + BeforeFunctions: + - db: website_cas + input_column: id + input_value: id + isList: false + output_column: name + output_value: name + bodyKeys: + - id + formatEN: Obtain SSL [name] + formatZH: 自签 SSL 证书 [name] + paramKeys: [] + /websites/ca/renew: post: consumes: - application/json diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 842d975933d6..738a2730220f 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1882,6 +1882,7 @@ const message = { googleHelper: "如何取得EAB HmacKey 和EAB kid ", googleCloudHelper: 'Google Cloud API is not accessible in most parts of mainland China', + httpHelper2: 'Unable to apply for a generic domain name certificate in HTTP mode', }, firewall: { create: 'Create rule', diff --git a/frontend/src/lang/modules/tw.ts b/frontend/src/lang/modules/tw.ts index dd87f3162463..a325b50a0b0d 100644 --- a/frontend/src/lang/modules/tw.ts +++ b/frontend/src/lang/modules/tw.ts @@ -1768,6 +1768,7 @@ const message = { googleHelper: "如何取得EAB HmacKey 和EAB kid ", googleCloudHelper: 'Google Cloud API 大陸大部分地區無法存取', + httpHelper2: 'HTTP 模式無法申請泛網域憑證', }, firewall: { create: '創建規則', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 30d296f4855c..3583b134021b 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1768,6 +1768,7 @@ const message = { googleHelper: "如何获取 EAB HmacKey 和 EAB kid ", googleCloudHelper: 'Google Cloud API 大陆大部分地区无法访问', + httpHelper2: 'HTTP 模式无法申请泛域名证书', }, firewall: { create: '创建规则', diff --git a/frontend/src/views/website/ssl/acme-account/create/index.vue b/frontend/src/views/website/ssl/acme-account/create/index.vue index 0315a70da92a..313de04e3b1c 100644 --- a/frontend/src/views/website/ssl/acme-account/create/index.vue +++ b/frontend/src/views/website/ssl/acme-account/create/index.vue @@ -24,6 +24,9 @@ {{ $t('ssl.buypassHelper') }} + + {{ $t('ssl.googleCloudHelper') }} + @@ -34,7 +37,6 @@ :value="keyType.value" > - {{ $t('ssl.googleCloudHelper') }}
diff --git a/frontend/src/views/website/ssl/create/index.vue b/frontend/src/views/website/ssl/create/index.vue index 443ae16cb794..3cdb2257817b 100644 --- a/frontend/src/views/website/ssl/create/index.vue +++ b/frontend/src/views/website/ssl/create/index.vue @@ -67,6 +67,9 @@ {{ $t('ssl.httpHelper') }} + + {{ $t('ssl.httpHelper2') }} +