From d6b016d5e8685df5e6f9ca55aca1313084b4c35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=97=E5=AD=90?= <i@haozi.net>
Date: Thu, 2 Jan 2025 21:33:53 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E8=AF=81=E4=B9=A6=E7=BB=AD=E7=AD=BE=E5=B9=B6=E5=B0=86=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E6=9C=89=E6=95=88=E6=9C=9F=E5=9B=BA=E5=AE=9A=E4=B8=BA?=
 =?UTF-8?q?10=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/job/cert_renew.go | 18 ------------------
 pkg/cert/cert.go           |  4 ++--
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/internal/job/cert_renew.go b/internal/job/cert_renew.go
index 320dcb739f..d32a1fa2ff 100644
--- a/internal/job/cert_renew.go
+++ b/internal/job/cert_renew.go
@@ -2,7 +2,6 @@ package job
 
 import (
 	"log/slog"
-	"path/filepath"
 	"time"
 
 	"gorm.io/gorm"
@@ -10,8 +9,6 @@ import (
 	"github.com/tnb-labs/panel/internal/app"
 	"github.com/tnb-labs/panel/internal/biz"
 	pkgcert "github.com/tnb-labs/panel/pkg/cert"
-	"github.com/tnb-labs/panel/pkg/io"
-	"github.com/tnb-labs/panel/pkg/shell"
 )
 
 // CertRenew 证书续签
@@ -60,19 +57,4 @@ func (r *CertRenew) Run() {
 			r.log.Warn("[Cert Renew] failed to renew cert", slog.Any("err", err))
 		}
 	}
-
-	// 续签面板证书
-	panelCert, err := io.Read(filepath.Join(app.Root, "panel/storage/cert.pem"))
-	if err != nil {
-		r.log.Warn("[Cert Renew] failed to read panel cert", slog.Any("err", err))
-		return
-	}
-	decode, err := pkgcert.ParseCert(panelCert)
-	if err != nil {
-		r.log.Warn("[Cert Renew] failed to parse panel cert", slog.Any("err", err))
-		return
-	}
-	if time.Until(decode.NotAfter) < 24*7*time.Hour {
-		_, _ = shell.Exec("panel-cli https generate")
-	}
 }
diff --git a/pkg/cert/cert.go b/pkg/cert/cert.go
index f414b447ac..32e7d9cbf0 100644
--- a/pkg/cert/cert.go
+++ b/pkg/cert/cert.go
@@ -141,7 +141,7 @@ func GenerateSelfSigned(names []string) (cert []byte, key []byte, err error) {
 		SerialNumber:          big.NewInt(2),
 		Subject:               pkix.Name{CommonName: "Rat Panel CA"},
 		NotBefore:             time.Now(),
-		NotAfter:              time.Now().AddDate(3, 0, 0),
+		NotAfter:              time.Now().AddDate(10, 0, 0),
 		BasicConstraintsValid: true,
 		IsCA:                  true,
 		KeyUsage:              x509.KeyUsageCertSign | x509.KeyUsageDigitalSignature,
@@ -167,7 +167,7 @@ func GenerateSelfSigned(names []string) (cert []byte, key []byte, err error) {
 		SerialNumber: big.NewInt(3),
 		Subject:      pkix.Name{CommonName: "Rat Panel"},
 		NotBefore:    time.Now(),
-		NotAfter:     time.Now().AddDate(1, 0, 0),
+		NotAfter:     time.Now().AddDate(10, 0, 0),
 		KeyUsage:     x509.KeyUsageDigitalSignature | x509.KeyUsageKeyEncipherment,
 		ExtKeyUsage:  []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
 	}