other: 修正

kercylan98 · Apr 28, 2024 · e90b164 · e90b164
1 parent edfd562
commit e90b164
Show file tree

Hide file tree

Showing 112 changed files with 337 additions and 399 deletions.
diff --git a/.codacy.yml b/.codacy.yml
diff --git a/.github/workflows/codacy.yml b/.github/workflows/codacy.yml
diff --git a/internal/game/activity/controller_internal.go b/internal/game/activity/controller_internal.go
@@ -2,11 +2,11 @@ package activity
 
 import (
 	"fmt"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/generic"
-	"github.com/kercylan98/minotaur/utils/times"
-	"reflect"
-	"time"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/generic"
+"github.com/kercylan98/minotaur/utils/times"
+"reflect"
+"time"
 )
 
 var (

diff --git a/internal/game/activity/events.go b/internal/game/activity/events.go
@@ -2,16 +2,15 @@ package activity
 
 import (
 	"fmt"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/collection/listings"
-	"github.com/kercylan98/minotaur/utils/generic"
-	"github.com/kercylan98/minotaur/utils/log"
-	"github.com/kercylan98/minotaur/utils/timer"
-	"github.com/kercylan98/minotaur/utils/times"
-	"reflect"
-	"time"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/collection/listings"
+"github.com/kercylan98/minotaur/utils/generic"
+"github.com/kercylan98/minotaur/utils/log"
+"github.com/kercylan98/minotaur/utils/timer"
+"github.com/kercylan98/minotaur/utils/times"
+"reflect"
+"time"
 )
-
 type (
 	UpcomingEventHandler[ID generic.Basic]            func(activityId ID) // 即将开始的活动事件处理器
 	StartedEventHandler[ID generic.Basic]             func(activityId ID) // 活动开始事件处理器

diff --git a/internal/game/space/room_controller.go b/internal/game/space/room_controller.go
@@ -1,9 +1,9 @@
 package space
 
 import (
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/generic"
-	"sync"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/generic"
+"sync"
 )
 
 const UnknownSeat = -1 // 未知座位号

diff --git a/internal/game/space/room_manager.go b/internal/game/space/room_manager.go
@@ -1,9 +1,9 @@
 package space
 
 import (
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/generic"
-	"sync"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/generic"
+"sync"
 )
 
 // NewRoomManager 创建房间管理器 RoomManager 的实例

diff --git a/internal/planner/pce/exporter/cmd/exportgo.go b/internal/planner/pce/exporter/cmd/exportgo.go
@@ -5,15 +5,15 @@ import (
 	"github.com/kercylan98/minotaur/planner/pce"
 	"github.com/kercylan98/minotaur/planner/pce/cs"
 	"github.com/kercylan98/minotaur/planner/pce/tmpls"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/file"
-	"github.com/kercylan98/minotaur/utils/str"
-	"github.com/spf13/cobra"
-	"github.com/tealeg/xlsx"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/file"
+"github.com/kercylan98/minotaur/utils/str"
+"github.com/spf13/cobra"
+"github.com/tealeg/xlsx"
+"os"
+"os/exec"
+"path/filepath"
+"strings"
 )
 
 func init() {

diff --git a/internal/planner/pce/exporter/cmd/exportjson.go b/internal/planner/pce/exporter/cmd/exportjson.go
@@ -6,14 +6,14 @@ import (
 	"github.com/kercylan98/minotaur/planner/pce"
 	"github.com/kercylan98/minotaur/planner/pce/cs"
 	"github.com/kercylan98/minotaur/planner/pce/tmpls"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/file"
-	"github.com/kercylan98/minotaur/utils/str"
-	"github.com/spf13/cobra"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strings"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/file"
+"github.com/kercylan98/minotaur/utils/str"
+"github.com/spf13/cobra"
+"github.com/tealeg/xlsx"
+"os"
+"path/filepath"
+"strings"
 )
 
 func init() {

diff --git a/internal/planner/pce/exporter/cmd/exportjson_test.go b/internal/planner/pce/exporter/cmd/exportjson_test.go
@@ -6,14 +6,14 @@ import (
 	"github.com/kercylan98/minotaur/planner/pce"
 	"github.com/kercylan98/minotaur/planner/pce/cs"
 	"github.com/kercylan98/minotaur/planner/pce/tmpls"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/file"
-	"github.com/kercylan98/minotaur/utils/str"
-	"github.com/tealeg/xlsx"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/file"
+"github.com/kercylan98/minotaur/utils/str"
+"github.com/tealeg/xlsx"
+"os"
+"path/filepath"
+"strings"
+"testing"
 )
 
 func TestExecute(t *testing.T) {

diff --git a/internal/planner/pce/tmpl_field.go b/internal/planner/pce/tmpl_field.go
@@ -2,9 +2,9 @@ package pce
 
 import (
 	"fmt"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/str"
-	"strings"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/str"
+"strings"
 )
 
 // TmplField 模板字段

diff --git a/internal/planner/pce/tmpl_struct.go b/internal/planner/pce/tmpl_struct.go
@@ -1,7 +1,7 @@
 package pce
 
 import (
-	"github.com/kercylan98/minotaur/utils/collection"
+"github.com/kercylan98/minotaur/toolkit/collection"
 )
 
 // TmplStruct 模板结构

diff --git a/internal/planner/pce/tmpls/golang.go b/internal/planner/pce/tmpls/golang.go
@@ -27,7 +27,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) {
 		import (
 			jsonIter "github.com/json-iterator/go"
 			"github.com/kercylan98/minotaur/utils/log"
-			"github.com/kercylan98/minotaur/utils/collection"
+			"github.com/kercylan98/minotaur/toolkit/collection"
 			"sync"
 			"sync/atomic"
 		)

diff --git a/internal/server/conn.go b/internal/server/conn.go
@@ -6,22 +6,22 @@ import (
 	"fmt"
 	"github.com/gorilla/websocket"
 	"github.com/kercylan98/minotaur/server/writeloop"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/hub"
-	"github.com/kercylan98/minotaur/utils/log"
-	"github.com/kercylan98/minotaur/utils/random"
-	"github.com/kercylan98/minotaur/utils/timer"
-	"github.com/panjf2000/gnet"
-	"github.com/xtaci/kcp-go/v5"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"runtime/debug"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"time"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/hub"
+"github.com/kercylan98/minotaur/utils/log"
+"github.com/kercylan98/minotaur/utils/random"
+"github.com/kercylan98/minotaur/utils/timer"
+"github.com/panjf2000/gnet"
+"github.com/xtaci/kcp-go/v5"
+"io"
+"net"
+"net/http"
+"os"
+"runtime/debug"
+"strings"
+"sync"
+"sync/atomic"
+"time"
 )
 
 var wsRequestKey = fmt.Sprintf("WS:REQ:%s", strings.ToUpper(random.HostName()))

diff --git a/internal/server/conn_mgr.go b/internal/server/conn_mgr.go
@@ -2,10 +2,9 @@ package server
 
 import (
 	"context"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"sync"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"sync"
 )
-
 type connMgr struct {
 	connections map[string]*Conn // 所有连接
 

diff --git a/internal/server/event.go b/internal/server/event.go
@@ -2,20 +2,19 @@ package server
 
 import (
 	"fmt"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/collection/listings"
-	"github.com/kercylan98/minotaur/utils/log"
-	"github.com/kercylan98/minotaur/utils/runtimes"
-	"golang.org/x/crypto/ssh/terminal"
-	"net/url"
-	"os"
-	"reflect"
-	"runtime/debug"
-	"strings"
-	"sync"
-	"time"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/collection/listings"
+"github.com/kercylan98/minotaur/utils/log"
+"github.com/kercylan98/minotaur/utils/runtimes"
+"golang.org/x/crypto/ssh/terminal"
+"net/url"
+"os"
+"reflect"
+"runtime/debug"
+"strings"
+"sync"
+"time"
 )
-
 type (
 	MessageReadyEventHandler func(srv *Server)
 	StartBeforeEventHandler  func(srv *Server)

diff --git a/internal/server/gateway/events.go b/internal/server/gateway/events.go
@@ -2,10 +2,9 @@ package gateway
 
 import (
 	"github.com/kercylan98/minotaur/server"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/collection/listings"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/collection/listings"
 )
-
 type (
 	ConnectionOpenedEventHandle             func(gateway *Gateway, conn *server.Conn)
 	ConnectionClosedEventHandle             func(gateway *Gateway, conn *server.Conn)

diff --git a/internal/server/message.go b/internal/server/message.go
@@ -2,10 +2,10 @@ package server
 
 import (
 	"github.com/kercylan98/minotaur/server/internal/dispatcher"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/log"
-	"github.com/kercylan98/minotaur/utils/super"
-	"sync"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/log"
+"github.com/kercylan98/minotaur/utils/super"
+"sync"
 )
 
 const (

diff --git a/internal/server/network.go b/internal/server/network.go
@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/kercylan98/minotaur/server/internal/logger"
-	"github.com/kercylan98/minotaur/utils/collection"
-	"github.com/kercylan98/minotaur/utils/log"
-	"github.com/kercylan98/minotaur/utils/super"
-	"github.com/panjf2000/gnet"
-	"github.com/xtaci/kcp-go/v5"
-	"google.golang.org/grpc"
-	"net"
-	"net/http"
-	"strings"
-	"time"
+"github.com/kercylan98/minotaur/toolkit/collection"
+"github.com/kercylan98/minotaur/utils/log"
+"github.com/kercylan98/minotaur/utils/super"
+"github.com/panjf2000/gnet"
+"github.com/xtaci/kcp-go/v5"
+"google.golang.org/grpc"
+"net"
+"net/http"
+"strings"
+"time"
 )
 
 // Network 服务器运行的网络模式