Browse Source

更新控制台工具函数和依赖

将控制台相关的代码页常量从 `win32.go` 移至 `global.go`,并调整了部分函数的参数类型。同时更新了项目依赖,移除了间接标志。
SongZihuan 1 week ago
parent
commit
7866ef959a

+ 5 - 4
go.mod

@@ -5,8 +5,9 @@ go 1.23.0
 toolchain go1.23.4
 
 require (
-	github.com/kardianos/service v1.2.2 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	github.com/kardianos/service v1.2.2
+	github.com/mattn/go-isatty v0.0.20
+	gopkg.in/yaml.v3 v3.0.1
 )
+
+require golang.org/x/sys v0.31.0 // indirect

+ 1 - 0
go.sum

@@ -6,6 +6,7 @@ golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
 golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

+ 2 - 0
src/consolewatcher/posix.go

@@ -6,6 +6,8 @@
 
 package consolewatcher
 
+import "github.com/SongZihuan/BackendServerTemplate/src/utils/consoleutils"
+
 func NewWin32ConsoleExitChannel() (chan consoleutils.Event, chan any, error) {
 	var exitChannel = make(chan consoleutils.Event)
 	var waitExitChannel = make(chan any)

+ 5 - 0
src/utils/consoleutils/global.go

@@ -4,6 +4,11 @@
 
 package consoleutils
 
+const (
+	CodePageUTF8 uint = 65001
+	CodePageGBK  uint = 936
+)
+
 type Event interface {
 	String() string
 	ConsoleEvent()

+ 5 - 5
src/utils/consoleutils/posix.go

@@ -18,7 +18,7 @@ func BindStdToConsole() error {
 	return nil
 }
 
-func SetConsoleCtrlHandler(handler func(event uint) uintptr, add bool) error {
+func SetConsoleCtrlHandler(handler func(event uint) bool, add bool) error {
 	return nil
 }
 
@@ -34,18 +34,18 @@ func HasConsoleWindow() bool {
 	return GetConsoleWindow() != 0
 }
 
-func SetConsoleInputCP(codePage int) error {
+func SetConsoleInputCP(codePage uint) error {
 	return nil
 }
 
-func SetConsoleOutputCP(codePage int) error {
+func SetConsoleOutputCP(codePage uint) error {
 	return nil
 }
 
-func SetConsoleCP(codePage int) error {
+func SetConsoleCP(codePage uint) error {
 	return nil
 }
 
-func SetConsoleCPSafe(codePage int) error {
+func SetConsoleCPSafe(codePage uint) error {
 	return nil
 }

+ 0 - 5
src/utils/consoleutils/win32.go

@@ -12,11 +12,6 @@ import (
 	"syscall"
 )
 
-const (
-	CodePageUTF8 uint = 65001
-	CodePageGBK  uint = 936
-)
-
 var (
 	kernel32 = syscall.NewLazyDLL("kernel32.dll")