From 17cfeee374bf4d697db42d5a92aaa05f81d50491 Mon Sep 17 00:00:00 2001
From: yoan <536464346@qq.com>
Date: Sat, 19 Oct 2024 21:15:01 +0800
Subject: [PATCH 1/2] update package name
---
go.mod | 2 +-
internal/applicant/aliyun.go | 2 +-
internal/applicant/applicant.go | 5 +++--
internal/applicant/aws.go | 2 +-
internal/applicant/cloudflare.go | 2 +-
internal/applicant/godaddy.go | 2 +-
internal/applicant/huaweicloud.go | 2 +-
internal/applicant/namesilo.go | 2 +-
internal/applicant/tencent.go | 2 +-
internal/deployer/aliyun_cdn.go | 4 ++--
internal/deployer/aliyun_esa.go | 6 +++---
internal/deployer/aliyun_oss.go | 2 +-
internal/deployer/deployer.go | 6 +++---
internal/deployer/qiniu_cdn.go | 4 ++--
internal/deployer/qiniu_cdn_test.go | 2 +-
internal/deployer/tencent_cdn.go | 4 ++--
internal/deployer/webhook.go | 2 +-
internal/domains/deploy.go | 6 +++---
internal/domains/domains.go | 2 +-
internal/domains/event.go | 2 +-
internal/domains/history.go | 6 +++---
internal/domains/init.go | 4 ++--
internal/notify/expire.go | 4 ++--
internal/notify/notify.go | 4 ++--
internal/notify/service.go | 2 +-
internal/repository/setting.go | 4 ++--
internal/rest/notify.go | 4 ++--
internal/routes/routes.go | 6 +++---
internal/utils/resp/resp.go | 2 +-
main.go | 11 ++++++-----
30 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/go.mod b/go.mod
index f862f99a..33826858 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module certimate
+module github.com/usual2970/certimate
go 1.22.0
diff --git a/internal/applicant/aliyun.go b/internal/applicant/aliyun.go
index 0b0dc61d..40adf960 100644
--- a/internal/applicant/aliyun.go
+++ b/internal/applicant/aliyun.go
@@ -7,7 +7,7 @@ import (
"github.com/go-acme/lego/v4/providers/dns/alidns"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type aliyun struct {
diff --git a/internal/applicant/applicant.go b/internal/applicant/applicant.go
index c941a13c..51ea03cc 100644
--- a/internal/applicant/applicant.go
+++ b/internal/applicant/applicant.go
@@ -1,8 +1,6 @@
package applicant
import (
- "certimate/internal/domain"
- "certimate/internal/utils/app"
"crypto"
"crypto/ecdsa"
"crypto/elliptic"
@@ -11,6 +9,9 @@ import (
"fmt"
"strings"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/app"
+
"github.com/go-acme/lego/v4/certcrypto"
"github.com/go-acme/lego/v4/certificate"
"github.com/go-acme/lego/v4/challenge"
diff --git a/internal/applicant/aws.go b/internal/applicant/aws.go
index 9a491d06..be18d747 100644
--- a/internal/applicant/aws.go
+++ b/internal/applicant/aws.go
@@ -7,7 +7,7 @@ import (
"github.com/go-acme/lego/v4/providers/dns/route53"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type aws struct {
diff --git a/internal/applicant/cloudflare.go b/internal/applicant/cloudflare.go
index 75d083fd..f1c40ebe 100644
--- a/internal/applicant/cloudflare.go
+++ b/internal/applicant/cloudflare.go
@@ -7,7 +7,7 @@ import (
cf "github.com/go-acme/lego/v4/providers/dns/cloudflare"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type cloudflare struct {
diff --git a/internal/applicant/godaddy.go b/internal/applicant/godaddy.go
index adcfe13b..7ae40a72 100644
--- a/internal/applicant/godaddy.go
+++ b/internal/applicant/godaddy.go
@@ -7,7 +7,7 @@ import (
godaddyProvider "github.com/go-acme/lego/v4/providers/dns/godaddy"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type godaddy struct {
diff --git a/internal/applicant/huaweicloud.go b/internal/applicant/huaweicloud.go
index 294e95a6..94f72c7f 100644
--- a/internal/applicant/huaweicloud.go
+++ b/internal/applicant/huaweicloud.go
@@ -7,7 +7,7 @@ import (
huaweicloudProvider "github.com/go-acme/lego/v4/providers/dns/huaweicloud"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type huaweicloud struct {
diff --git a/internal/applicant/namesilo.go b/internal/applicant/namesilo.go
index 0f2aa155..55fd3b3c 100644
--- a/internal/applicant/namesilo.go
+++ b/internal/applicant/namesilo.go
@@ -7,7 +7,7 @@ import (
namesiloProvider "github.com/go-acme/lego/v4/providers/dns/namesilo"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type namesilo struct {
diff --git a/internal/applicant/tencent.go b/internal/applicant/tencent.go
index 705f63ad..4733e22e 100644
--- a/internal/applicant/tencent.go
+++ b/internal/applicant/tencent.go
@@ -7,7 +7,7 @@ import (
"github.com/go-acme/lego/v4/providers/dns/tencentcloud"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type tencent struct {
diff --git a/internal/deployer/aliyun_cdn.go b/internal/deployer/aliyun_cdn.go
index e1a59ba3..bb9e8b98 100644
--- a/internal/deployer/aliyun_cdn.go
+++ b/internal/deployer/aliyun_cdn.go
@@ -10,8 +10,8 @@ import (
util "github.com/alibabacloud-go/tea-utils/v2/service"
"github.com/alibabacloud-go/tea/tea"
- "certimate/internal/domain"
- "certimate/internal/utils/rand"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/rand"
)
type AliyunCDNDeployer struct {
diff --git a/internal/deployer/aliyun_esa.go b/internal/deployer/aliyun_esa.go
index 6d83c2c5..e277f3ae 100644
--- a/internal/deployer/aliyun_esa.go
+++ b/internal/deployer/aliyun_esa.go
@@ -1,7 +1,7 @@
/*
* @Author: Bin
* @Date: 2024-09-17
- * @FilePath: /certimate/internal/deployer/aliyun_esa.go
+ * @FilePath: /github.com/usual2970/certimate/internal/deployer/aliyun_esa.go
*/
package deployer
@@ -15,8 +15,8 @@ import (
util "github.com/alibabacloud-go/tea-utils/v2/service"
"github.com/alibabacloud-go/tea/tea"
- "certimate/internal/domain"
- "certimate/internal/utils/rand"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/rand"
)
type AliyunESADeployer struct {
diff --git a/internal/deployer/aliyun_oss.go b/internal/deployer/aliyun_oss.go
index 56e3a401..d3903218 100644
--- a/internal/deployer/aliyun_oss.go
+++ b/internal/deployer/aliyun_oss.go
@@ -7,7 +7,7 @@ import (
"github.com/aliyun/aliyun-oss-go-sdk/oss"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
type AliyunOSSDeployer struct {
diff --git a/internal/deployer/deployer.go b/internal/deployer/deployer.go
index 85452c52..d9c62774 100644
--- a/internal/deployer/deployer.go
+++ b/internal/deployer/deployer.go
@@ -9,9 +9,9 @@ import (
"github.com/pocketbase/pocketbase/models"
- "certimate/internal/applicant"
- "certimate/internal/domain"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/applicant"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/app"
)
const (
diff --git a/internal/deployer/qiniu_cdn.go b/internal/deployer/qiniu_cdn.go
index 8b345fe3..b2ead1ae 100644
--- a/internal/deployer/qiniu_cdn.go
+++ b/internal/deployer/qiniu_cdn.go
@@ -10,8 +10,8 @@ import (
"github.com/qiniu/go-sdk/v7/auth"
- "certimate/internal/domain"
- xhttp "certimate/internal/utils/http"
+ "github.com/usual2970/certimate/internal/domain"
+ xhttp "github.com/usual2970/certimate/internal/utils/http"
)
const qiniuGateway = "http://api.qiniu.com"
diff --git a/internal/deployer/qiniu_cdn_test.go b/internal/deployer/qiniu_cdn_test.go
index 7e625dfb..396f6546 100644
--- a/internal/deployer/qiniu_cdn_test.go
+++ b/internal/deployer/qiniu_cdn_test.go
@@ -5,7 +5,7 @@ import (
"github.com/qiniu/go-sdk/v7/auth"
- "certimate/internal/applicant"
+ "github.com/usual2970/certimate/internal/applicant"
)
func Test_qiuniu_uploadCert(t *testing.T) {
diff --git a/internal/deployer/tencent_cdn.go b/internal/deployer/tencent_cdn.go
index 69b3ecd3..d82950b8 100644
--- a/internal/deployer/tencent_cdn.go
+++ b/internal/deployer/tencent_cdn.go
@@ -12,8 +12,8 @@ import (
"github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/profile"
ssl "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/ssl/v20191205"
- "certimate/internal/domain"
- "certimate/internal/utils/rand"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/rand"
)
type TencentCDNDeployer struct {
diff --git a/internal/deployer/webhook.go b/internal/deployer/webhook.go
index be2a5b34..4dadb8bf 100644
--- a/internal/deployer/webhook.go
+++ b/internal/deployer/webhook.go
@@ -7,7 +7,7 @@ import (
"fmt"
"net/http"
- xhttp "certimate/internal/utils/http"
+ xhttp "github.com/usual2970/certimate/internal/utils/http"
)
type WebhookAccess struct {
diff --git a/internal/domains/deploy.go b/internal/domains/deploy.go
index 0f6776c6..23b3a1dd 100644
--- a/internal/domains/deploy.go
+++ b/internal/domains/deploy.go
@@ -7,9 +7,9 @@ import (
"github.com/pocketbase/pocketbase/models"
- "certimate/internal/applicant"
- "certimate/internal/deployer"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/applicant"
+ "github.com/usual2970/certimate/internal/deployer"
+ "github.com/usual2970/certimate/internal/utils/app"
)
type Phase string
diff --git a/internal/domains/domains.go b/internal/domains/domains.go
index 03fc24f1..dd65dff8 100644
--- a/internal/domains/domains.go
+++ b/internal/domains/domains.go
@@ -6,7 +6,7 @@ import (
"github.com/pocketbase/pocketbase/models"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/utils/app"
)
func create(ctx context.Context, record *models.Record) error {
diff --git a/internal/domains/event.go b/internal/domains/event.go
index 5ad38ad1..7acb31e9 100644
--- a/internal/domains/event.go
+++ b/internal/domains/event.go
@@ -3,7 +3,7 @@ package domains
import (
"github.com/pocketbase/pocketbase/core"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/utils/app"
)
const tableName = "domains"
diff --git a/internal/domains/history.go b/internal/domains/history.go
index 616c7c8c..47ed5afa 100644
--- a/internal/domains/history.go
+++ b/internal/domains/history.go
@@ -5,9 +5,9 @@ import (
"github.com/pocketbase/pocketbase/models"
- "certimate/internal/applicant"
- "certimate/internal/utils/app"
- "certimate/internal/utils/xtime"
+ "github.com/usual2970/certimate/internal/applicant"
+ "github.com/usual2970/certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/utils/xtime"
)
type historyItem struct {
diff --git a/internal/domains/init.go b/internal/domains/init.go
index 69de4018..6ca683a0 100644
--- a/internal/domains/init.go
+++ b/internal/domains/init.go
@@ -3,8 +3,8 @@ package domains
import (
"context"
- "certimate/internal/notify"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/notify"
+ "github.com/usual2970/certimate/internal/utils/app"
)
func InitSchedule() {
diff --git a/internal/notify/expire.go b/internal/notify/expire.go
index 985d7491..d4942272 100644
--- a/internal/notify/expire.go
+++ b/internal/notify/expire.go
@@ -8,8 +8,8 @@ import (
"github.com/pocketbase/dbx"
"github.com/pocketbase/pocketbase/models"
- "certimate/internal/utils/app"
- "certimate/internal/utils/xtime"
+ "github.com/usual2970/certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/utils/xtime"
)
type msg struct {
diff --git a/internal/notify/notify.go b/internal/notify/notify.go
index 90e661f1..e5265b51 100644
--- a/internal/notify/notify.go
+++ b/internal/notify/notify.go
@@ -5,8 +5,8 @@ import (
"fmt"
"strconv"
- "certimate/internal/domain"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/app"
notifyPackage "github.com/nikoksr/notify"
"github.com/nikoksr/notify/service/dingding"
diff --git a/internal/notify/service.go b/internal/notify/service.go
index 3e733514..22b77160 100644
--- a/internal/notify/service.go
+++ b/internal/notify/service.go
@@ -4,7 +4,7 @@ import (
"context"
"fmt"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
)
const (
diff --git a/internal/repository/setting.go b/internal/repository/setting.go
index 2bf29d0c..c173151f 100644
--- a/internal/repository/setting.go
+++ b/internal/repository/setting.go
@@ -3,8 +3,8 @@ package repository
import (
"context"
- "certimate/internal/domain"
- "certimate/internal/utils/app"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/app"
)
type SettingRepository struct{}
diff --git a/internal/rest/notify.go b/internal/rest/notify.go
index 3430119b..eb8aae48 100644
--- a/internal/rest/notify.go
+++ b/internal/rest/notify.go
@@ -3,8 +3,8 @@ package rest
import (
"context"
- "certimate/internal/domain"
- "certimate/internal/utils/resp"
+ "github.com/usual2970/certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/utils/resp"
"github.com/labstack/echo/v5"
)
diff --git a/internal/routes/routes.go b/internal/routes/routes.go
index 2c670446..d469bb3c 100644
--- a/internal/routes/routes.go
+++ b/internal/routes/routes.go
@@ -1,9 +1,9 @@
package routes
import (
- "certimate/internal/notify"
- "certimate/internal/repository"
- "certimate/internal/rest"
+ "github.com/usual2970/certimate/internal/notify"
+ "github.com/usual2970/certimate/internal/repository"
+ "github.com/usual2970/certimate/internal/rest"
"github.com/labstack/echo/v5"
"github.com/pocketbase/pocketbase/apis"
diff --git a/internal/utils/resp/resp.go b/internal/utils/resp/resp.go
index 0153a14c..b4d8240f 100644
--- a/internal/utils/resp/resp.go
+++ b/internal/utils/resp/resp.go
@@ -3,7 +3,7 @@ package resp
import (
"net/http"
- "certimate/internal/domain"
+ "github.com/usual2970/certimate/internal/domain"
"github.com/labstack/echo/v5"
)
diff --git a/main.go b/main.go
index 37482041..7a0bf641 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,7 @@
package main
import (
+ "github.com/usual2970/certimate/ui"
"log"
"os"
"strings"
@@ -10,11 +11,11 @@ import (
"github.com/pocketbase/pocketbase/core"
"github.com/pocketbase/pocketbase/plugins/migratecmd"
- "certimate/internal/domains"
- "certimate/internal/routes"
- "certimate/internal/utils/app"
- _ "certimate/migrations"
- "certimate/ui"
+ _ "github.com/usual2970/certimate/migrations"
+
+ "github.com/usual2970/certimate/internal/domains"
+ "github.com/usual2970/certimate/internal/routes"
+ "github.com/usual2970/certimate/internal/utils/app"
_ "time/tzdata"
)
From 499bbe4fa7760ced6d67f2dd35efb966f103135a Mon Sep 17 00:00:00 2001
From: yoan <536464346@qq.com>
Date: Sat, 19 Oct 2024 22:23:56 +0800
Subject: [PATCH 2/2] fix deployment dialog title
---
ui/src/components/certimate/DeployList.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/src/components/certimate/DeployList.tsx b/ui/src/components/certimate/DeployList.tsx
index b3a1b62e..6c3caf71 100644
--- a/ui/src/components/certimate/DeployList.tsx
+++ b/ui/src/components/certimate/DeployList.tsx
@@ -326,7 +326,7 @@ const DeployEditDialog = ({ trigger, deployConfig, onSave }: DeployEditDialogPro
{trigger}
- {t("history.page.title")}
+ {t("domain.deployment.tab")}
@@ -889,3 +889,4 @@ const DeployToKubernetes = () => {
);
};
+