refactor: clean code

internal/app/schedule.go

@@ -14,7 +14,7 @@ var scheduler *cron.Cron
 func GetScheduler() *cron.Cron {
 	schedulerOnce.Do(func() {
 		scheduler = cron.New()
-		location, err := time.LoadLocation("Asia/Shanghai")
+		location, err := time.LoadLocation("Local")
 		if err == nil {
 			scheduler.SetTimezone(location)
 		}

internal/applicant/applicant.go

@@ -12,11 +12,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/pkg/utils/x509"
-	"github.com/usual2970/certimate/internal/repository"
-	"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"
@@ -24,6 +19,11 @@ import (
 	"github.com/go-acme/lego/v4/lego"
 	"github.com/go-acme/lego/v4/registration"
 	"github.com/pocketbase/pocketbase/models"
+
+	"github.com/usual2970/certimate/internal/app"
+	"github.com/usual2970/certimate/internal/domain"
+	"github.com/usual2970/certimate/internal/pkg/utils/x509"
+	"github.com/usual2970/certimate/internal/repository"
 )
 
 /*

internal/certificate/service.go

@@ -6,10 +6,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
 	"github.com/usual2970/certimate/internal/notify"
 	"github.com/usual2970/certimate/internal/repository"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 const (

internal/notify/notify.go

@@ -6,9 +6,9 @@ import (
 
 	"golang.org/x/sync/errgroup"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/pkg/core/notifier"
 	"github.com/usual2970/certimate/internal/pkg/utils/maps"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 func SendToAllChannels(subject, message string) error {

internal/repository/access.go

@@ -5,8 +5,8 @@ import (
 	"database/sql"
 	"errors"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 type AccessRepository struct{}

internal/repository/acme_account.go

@@ -6,9 +6,10 @@ import (
 	"github.com/go-acme/lego/v4/registration"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/models"
-	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 	"golang.org/x/sync/singleflight"
+
+	"github.com/usual2970/certimate/internal/app"
+	"github.com/usual2970/certimate/internal/domain"
 )
 
 type AcmeAccountRepository struct{}

internal/repository/certificate.go

@@ -3,8 +3,8 @@ package repository
 import (
 	"context"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 type CertificateRepository struct{}

internal/repository/setting.go

@@ -3,8 +3,8 @@ package repository
 import (
 	"context"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 type SettingRepository struct{}

internal/repository/statistics.go

@@ -3,8 +3,8 @@ package repository
 import (
 	"context"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 type StatisticsRepository struct{}

internal/repository/workflow.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/models"
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 type WorkflowRepository struct{}

internal/repository/workflow_output.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/models"
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 type WorkflowOutputRepository struct{}

internal/rest/notify.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/resp"
+	"github.com/usual2970/certimate/internal/rest/resp"
 
 	"github.com/labstack/echo/v5"
 )

internal/rest/resp/resp.go

@@ -3,9 +3,9 @@ package resp
 import (
 	"net/http"
 
-	"github.com/usual2970/certimate/internal/domain"
-
 	"github.com/labstack/echo/v5"
+
+	"github.com/usual2970/certimate/internal/domain"
 )
 
 type Response struct {

internal/rest/statistics.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/labstack/echo/v5"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/resp"
+	"github.com/usual2970/certimate/internal/rest/resp"
 )
 
 type StatisticsService interface {

internal/rest/workflow.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/labstack/echo/v5"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/resp"
+	"github.com/usual2970/certimate/internal/rest/resp"
 )
 
 type WorkflowService interface {

internal/utils/xtime/time.go

@@ -1,15 +0,0 @@
-package xtime
-
-import (
-	"time"
-)
-
-func BeijingTimeStr() string {
-	location, _ := time.LoadLocation("Asia/Shanghai")
-
-	// 获取当前时间
-	now := time.Now().In(location)
-
-	// 格式化为字符串
-	return now.Format("2006-01-02 15:04:05")
-}

internal/workflow/event.go

@@ -7,9 +7,9 @@ import (
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/models"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
 	"github.com/usual2970/certimate/internal/repository"
-	"github.com/usual2970/certimate/internal/utils/app"
 )
 
 const tableName = "workflow"

internal/workflow/node-processor/processor.go

@@ -3,9 +3,9 @@ package nodeprocessor
 import (
 	"context"
 	"errors"
+	"time"
 
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/xtime"
 )
 
 type NodeProcessor interface {
@@ -33,7 +33,7 @@ func (l *Logger) Log(ctx context.Context) *domain.RunLog {
 
 func (l *Logger) AddOutput(ctx context.Context, title, content string, err ...string) {
 	output := domain.RunLogOutput{
-		Time:    xtime.BeijingTimeStr(),
+		Time:    time.Now().UTC().Format(time.RFC3339),
 		Title:   title,
 		Content: content,
 	}

internal/workflow/service.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/usual2970/certimate/internal/app"
 	"github.com/usual2970/certimate/internal/domain"
-	"github.com/usual2970/certimate/internal/utils/app"
 	nodeprocessor "github.com/usual2970/certimate/internal/workflow/node-processor"
 )
 

main.go

@@ -6,20 +6,20 @@ import (
 	"os"
 	"strings"
 
+	_ "time/tzdata"
+
 	"github.com/labstack/echo/v5"
 	"github.com/labstack/echo/v5/middleware"
 	"github.com/pocketbase/pocketbase/core"
 	"github.com/pocketbase/pocketbase/plugins/migratecmd"
 
-	_ "github.com/usual2970/certimate/migrations"
+	"github.com/usual2970/certimate/internal/app"
-
 	"github.com/usual2970/certimate/internal/routes"
 	"github.com/usual2970/certimate/internal/scheduler"
-	"github.com/usual2970/certimate/internal/utils/app"
 	"github.com/usual2970/certimate/internal/workflow"
 	"github.com/usual2970/certimate/ui"
 
-	_ "time/tzdata"
+	_ "github.com/usual2970/certimate/migrations"
 )
 
 func main() {