From a774253ec35cd8c2227e264f4392aa6e0e573f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sat, 26 Oct 2024 02:53:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B4=A6=E5=8F=B7=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/data/cert_account.go | 22 +++++++++++----------- web/src/views/cert/CertView.vue | 30 +++++++++++++++--------------- web/src/views/cert/IndexView.vue | 8 +++++++- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/internal/data/cert_account.go b/internal/data/cert_account.go index 539ee44d..2cce566c 100644 --- a/internal/data/cert_account.go +++ b/internal/data/cert_account.go @@ -85,16 +85,16 @@ func (r certAccountRepo) Create(req *request.CertAccountCreate) (*biz.CertAccoun case "sslcom": client, err = acme.NewRegisterAccount(context.Background(), account.Email, acme.CASSLcom, &acme.EAB{KeyID: account.Kid, MACKey: account.HmacEncoded}, acme.KeyType(account.KeyType)) default: - return nil, errors.New("CA 提供商不支持") + return nil, errors.New("unsupported CA") } if err != nil { - return nil, fmt.Errorf("注册账号失败：%v", err) + return nil, fmt.Errorf("failed to register account: %v", err) } privateKey, err := cert.EncodeKey(client.Account.PrivateKey) if err != nil { - return nil, errors.New("获取私钥失败") + return nil, errors.New("failed to get private key") } account.PrivateKey = string(privateKey) @@ -144,16 +144,16 @@ func (r certAccountRepo) Update(req *request.CertAccountUpdate) error { case "sslcom": client, err = acme.NewRegisterAccount(context.Background(), account.Email, acme.CASSLcom, &acme.EAB{KeyID: account.Kid, MACKey: account.HmacEncoded}, acme.KeyType(account.KeyType)) default: - return errors.New("CA 提供商不支持") + return errors.New("unsupported CA") } if err != nil { - return errors.New("向 CA 注册账号失败，请检查参数是否正确") + return errors.New("failed to register account") } privateKey, err := cert.EncodeKey(client.Account.PrivateKey) if err != nil { - return errors.New("获取私钥失败") + return errors.New("failed to get private key") } account.PrivateKey = string(privateKey) @@ -177,13 +177,13 @@ func (r certAccountRepo) getGoogleEAB() (*acme.EAB, error) { client.SetTimeout(5 * time.Second) client.SetRetryCount(2) - resp, err := client.R().SetResult(&data{}).Get("https://panel.haozi.net/api/acme/googleEAB") + resp, err := client.R().SetResult(&data{}).Get("https://gts.rat.dev/eab") if err != nil || !resp.IsSuccess() { - return &acme.EAB{}, errors.New("获取Google EAB失败") + return &acme.EAB{}, fmt.Errorf("failed to get Google EAB: %v", err) } eab := resp.Result().(*data) if eab.Message != "success" { - return &acme.EAB{}, errors.New("获取Google EAB失败") + return &acme.EAB{}, fmt.Errorf("failed to get Google EAB: %s", eab.Message) } return &acme.EAB{KeyID: eab.Data.KeyId, MACKey: eab.Data.MacKey}, nil @@ -204,11 +204,11 @@ func (r certAccountRepo) getZeroSSLEAB(email string) (*acme.EAB, error) { "email": email, }).SetResult(&data{}).Post("https://api.zerossl.com/acme/eab-credentials-email") if err != nil || !resp.IsSuccess() { - return &acme.EAB{}, errors.New("获取ZeroSSL EAB失败") + return &acme.EAB{}, fmt.Errorf("failed to get ZeroSSL EAB: %v", err) } eab := resp.Result().(*data) if !eab.Success { - return &acme.EAB{}, errors.New("获取ZeroSSL EAB失败") + return &acme.EAB{}, fmt.Errorf("failed to get ZeroSSL EAB") } return &acme.EAB{KeyID: eab.EabKid, MACKey: eab.EabHmacKey}, nil diff --git a/web/src/views/cert/CertView.vue b/web/src/views/cert/CertView.vue index 2d60ba3b..16ee170a 100644 --- a/web/src/views/cert/CertView.vue +++ b/web/src/views/cert/CertView.vue @@ -1,6 +1,6 @@