debug fix

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/tools v0.27.0 // indirect
 	gorm.io/datatypes v1.2.4 // indirect
 	gorm.io/driver/mysql v1.5.6 // indirect
@@ -87,7 +87,7 @@ require (
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/crypto v0.29.0 // indirect
 	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.20.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -225,8 +225,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -250,8 +250,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
-golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=

internal/app/repository/config.go

@@ -1,6 +1,8 @@
 package repository
 
 import (
+	"errors"
+
 	"github.com/lzh-1625/go_process_manager/internal/app/model"
 	"github.com/lzh-1625/go_process_manager/internal/app/repository/query"
 )
@@ -11,6 +13,9 @@ var ConfigRepository = new(configRepository)
 
 func (c *configRepository) GetConfigValue(key string) (string, error) {
 	data, err := query.Config.Select(query.Config.Value).Where(query.Config.Key.Eq(key)).First()
+	if data == nil || err != nil {
+		return "", errors.ErrUnsupported
+	}
 	return *data.Value, err
 }
 

internal/app/repository/db.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/lzh-1625/go_process_manager/internal/app/model"
+	"github.com/lzh-1625/go_process_manager/internal/app/repository/query"
 
 	"github.com/glebarez/sqlite"
 	"gorm.io/gorm"
@@ -40,7 +41,7 @@ func InitDb() {
 	}
 	sqlDB.SetConnMaxLifetime(time.Hour)
 	db = gdb.Session(&defaultConfig)
-	// db = gdb.Session(&defaultConfig).Debug()
+	db = gdb.Session(&defaultConfig).Debug()
 	db.AutoMigrate(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}, &model.WsShare{})
 
 	// g := gen.NewGenerator(gen.Config{
@@ -50,4 +51,5 @@ func InitDb() {
 	// g.UseDB(db)
 	// g.ApplyBasic(&model.Process{}, &model.User{}, &model.Permission{}, &model.Push{}, &model.Config{}, &model.ProcessLog{}, &model.Task{}, &model.WsShare{})
 	// g.Execute()
+	query.SetDefault(db)
 }

internal/app/repository/log.go

@@ -1,6 +1,8 @@
 package repository
 
 import (
+	"context"
+
 	"github.com/lzh-1625/go_process_manager/internal/app/model"
 	"github.com/lzh-1625/go_process_manager/internal/app/repository/query"
 	"github.com/lzh-1625/go_process_manager/log"
@@ -17,21 +19,27 @@ func (l *logRepository) InsertLog(data model.ProcessLog) {
 }
 
 func (l *logRepository) SearchLog(req model.GetLogReq) (result []*model.ProcessLog, total int64) {
-	q := query.ProcessLog.Where(query.ProcessLog.Name.Eq(req.Match.Name)).Where(query.ProcessLog.Using.Eq(req.Match.Using))
+	q := query.ProcessLog.WithContext(context.TODO())
+	if req.Match.Name != "" {
+		q = q.Where(query.ProcessLog.Name.Eq(req.Match.Name))
+	}
+	if req.Match.Using != "" {
+		q = q.Where(query.ProcessLog.Using.Eq(req.Match.Using))
+	}
 	if req.Match.Log != "" {
-		q.Where(query.ProcessLog.Log.Like("%" + req.Match.Log + "%"))
+		q = q.Where(query.ProcessLog.Log.Like("%" + req.Match.Log + "%"))
 	}
 	if req.Sort == "desc" {
-		q.Order(query.ProcessLog.Time.Desc())
+		q = q.Order(query.ProcessLog.Time.Desc())
 	}
 	if req.TimeRange.StartTime != 0 {
-		q.Where(query.ProcessLog.Time.Gte(req.TimeRange.StartTime))
+		q = q.Where(query.ProcessLog.Time.Gte(req.TimeRange.StartTime))
 	}
 	if req.TimeRange.EndTime != 0 {
-		q.Where(query.ProcessLog.Time.Lte(req.TimeRange.EndTime))
+		q = q.Where(query.ProcessLog.Time.Lte(req.TimeRange.EndTime))
 	}
 	if len(req.FilterName) != 0 {
-		q.Where(query.ProcessLog.Name.In(req.FilterName...))
+		q = q.Where(query.ProcessLog.Name.In(req.FilterName...))
 	}
 	result, total, _ = q.FindByPage(req.Page.From, req.Page.Size)
 	return

internal/app/repository/process.go

@@ -23,7 +23,10 @@ func (p *processRepository) GetAllProcessConfig() []model.Process {
 
 func (p *processRepository) GetProcessConfigByUser(username string) []model.Process {
 	result := []model.Process{}
-	err := query.Permission.LeftJoin(query.Process, query.Process.Uuid.EqCol(query.Permission.Pid)).Where(query.Permission.Owned.Is(true)).Where(query.Permission.Account.Eq(username)).Scan(&result)
+	err := query.Permission.LeftJoin(query.Process, query.Process.Uuid.EqCol(query.Permission.Pid)).
+		Where(query.Permission.Owned.Is(true)).
+		Where(query.Permission.Account.Eq(username)).
+		Scan(&result)
 	if err != nil {
 		log.Logger.Error(err)
 		return []model.Process{}