diff --git a/cluster/cluster.go b/cluster/cluster.go index 797ddea..ea5f3ee 100644 --- a/cluster/cluster.go +++ b/cluster/cluster.go @@ -2,9 +2,9 @@ package cluster import ( "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/service" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/service" "strings" "sync" ) diff --git a/cluster/dynamicdiscovery.go b/cluster/dynamicdiscovery.go index 84c6cca..ab96673 100644 --- a/cluster/dynamicdiscovery.go +++ b/cluster/dynamicdiscovery.go @@ -2,11 +2,11 @@ package cluster import ( "errors" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/service" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/service" "time" - "github.com/duanhf2012/origin/util/timer" + "github.com/duanhf2012/origin/v2/util/timer" "google.golang.org/protobuf/proto" ) diff --git a/cluster/parsecfg.go b/cluster/parsecfg.go index aa0c9cd..8dbccd8 100644 --- a/cluster/parsecfg.go +++ b/cluster/parsecfg.go @@ -2,8 +2,8 @@ package cluster import ( "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" jsoniter "github.com/json-iterator/go" "os" "path/filepath" diff --git a/concurrent/concurrent.go b/concurrent/concurrent.go index 702c020..d206a73 100644 --- a/concurrent/concurrent.go +++ b/concurrent/concurrent.go @@ -4,7 +4,7 @@ import ( "errors" "runtime" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "sync/atomic" ) diff --git a/concurrent/dispatch.go b/concurrent/dispatch.go index 0f3d13b..becc634 100644 --- a/concurrent/dispatch.go +++ b/concurrent/dispatch.go @@ -8,8 +8,8 @@ import ( "fmt" "runtime" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/util/queue" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/util/queue" ) var idleTimeout = int64(2 * time.Second) diff --git a/concurrent/worker.go b/concurrent/worker.go index 76f020c..6b8d25d 100644 --- a/concurrent/worker.go +++ b/concurrent/worker.go @@ -7,7 +7,7 @@ import ( "fmt" "runtime" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" ) type task struct { diff --git a/event/event.go b/event/event.go index bd1c095..f25768c 100644 --- a/event/event.go +++ b/event/event.go @@ -2,7 +2,7 @@ package event import ( "fmt" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "runtime" "sync" ) diff --git a/event/eventpool.go b/event/eventpool.go index 7edd7a7..a888d00 100644 --- a/event/eventpool.go +++ b/event/eventpool.go @@ -1,6 +1,6 @@ package event -import "github.com/duanhf2012/origin/util/sync" +import "github.com/duanhf2012/origin/v2/util/sync" // eventPool的内存池,缓存Event const defaultMaxEventChannelNum = 2000000 diff --git a/go.mod b/go.mod index dd1769d..d232bb8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/duanhf2012/origin/v2 +module github.com/duanhf2012/origin/v2/v2 go 1.21 diff --git a/log/log.go b/log/log.go index 7158fd2..67c503a 100644 --- a/log/log.go +++ b/log/log.go @@ -3,7 +3,7 @@ package log import ( "context" "fmt" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/util/bytespool" jsoniter "github.com/json-iterator/go" "io" "log/slog" diff --git a/network/http_server.go b/network/http_server.go index e19652d..407542c 100644 --- a/network/http_server.go +++ b/network/http_server.go @@ -3,7 +3,7 @@ package network import ( "crypto/tls" "errors" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "net/http" "time" ) diff --git a/network/processor/jsonprocessor.go b/network/processor/jsonprocessor.go index 9ddc669..df571ff 100644 --- a/network/processor/jsonprocessor.go +++ b/network/processor/jsonprocessor.go @@ -3,8 +3,8 @@ package processor import ( "encoding/json" "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/util/bytespool" "reflect" ) diff --git a/network/processor/pbprocessor.go b/network/processor/pbprocessor.go index 601157d..07afc79 100644 --- a/network/processor/pbprocessor.go +++ b/network/processor/pbprocessor.go @@ -3,7 +3,7 @@ package processor import ( "encoding/binary" "fmt" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/util/bytespool" "google.golang.org/protobuf/proto" "reflect" ) diff --git a/network/tcp_client.go b/network/tcp_client.go index 228135e..fb8df9d 100644 --- a/network/tcp_client.go +++ b/network/tcp_client.go @@ -1,7 +1,7 @@ package network import ( - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "net" "sync" "time" diff --git a/network/tcp_conn.go b/network/tcp_conn.go index 31acc23..6e1e02f 100644 --- a/network/tcp_conn.go +++ b/network/tcp_conn.go @@ -2,7 +2,7 @@ package network import ( "errors" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "net" "sync" "sync/atomic" diff --git a/network/tcp_msg.go b/network/tcp_msg.go index 4c24cee..4af4265 100644 --- a/network/tcp_msg.go +++ b/network/tcp_msg.go @@ -3,7 +3,7 @@ package network import ( "encoding/binary" "errors" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/util/bytespool" "io" "math" ) diff --git a/network/tcp_server.go b/network/tcp_server.go index 887989f..2b9b745 100644 --- a/network/tcp_server.go +++ b/network/tcp_server.go @@ -1,8 +1,8 @@ package network import ( - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/util/bytespool" "net" "sync" "time" diff --git a/network/ws_client.go b/network/ws_client.go index 3c310d5..8b76717 100644 --- a/network/ws_client.go +++ b/network/ws_client.go @@ -1,7 +1,7 @@ package network import ( - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "github.com/gorilla/websocket" "sync" "time" diff --git a/network/ws_conn.go b/network/ws_conn.go index 339531d..a01ccc1 100644 --- a/network/ws_conn.go +++ b/network/ws_conn.go @@ -2,7 +2,7 @@ package network import ( "errors" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "github.com/gorilla/websocket" "net" "sync" diff --git a/network/ws_server.go b/network/ws_server.go index e5b3c88..394eb2a 100644 --- a/network/ws_server.go +++ b/network/ws_server.go @@ -2,7 +2,7 @@ package network import ( "crypto/tls" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "github.com/gorilla/websocket" "net" "net/http" diff --git a/node/node.go b/node/node.go index d8e577a..79d3f26 100644 --- a/node/node.go +++ b/node/node.go @@ -3,13 +3,13 @@ package node import ( "errors" "fmt" - "github.com/duanhf2012/origin/cluster" - "github.com/duanhf2012/origin/console" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/profiler" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/util/buildtime" - "github.com/duanhf2012/origin/util/timer" + "github.com/duanhf2012/origin/v2/cluster" + "github.com/duanhf2012/origin/v2/console" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/profiler" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/util/buildtime" + "github.com/duanhf2012/origin/v2/util/timer" "io" "net/http" _ "net/http/pprof" @@ -19,7 +19,7 @@ import ( "strings" "syscall" "time" - "github.com/duanhf2012/origin/util/sysprocess" + "github.com/duanhf2012/origin/v2/util/sysprocess" ) var sig chan os.Signal diff --git a/profiler/profiler.go b/profiler/profiler.go index 8c8beed..1676cb8 100644 --- a/profiler/profiler.go +++ b/profiler/profiler.go @@ -3,7 +3,7 @@ package profiler import ( "container/list" "fmt" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "sync" "time" ) diff --git a/rpc/client.go b/rpc/client.go index 25931e9..20185c4 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -2,13 +2,13 @@ package rpc import ( "errors" - "github.com/duanhf2012/origin/network" + "github.com/duanhf2012/origin/v2/network" "reflect" "strconv" "sync" "sync/atomic" "time" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" ) const( diff --git a/rpc/compressor.go b/rpc/compressor.go index a5940a7..51f449e 100644 --- a/rpc/compressor.go +++ b/rpc/compressor.go @@ -3,7 +3,7 @@ package rpc import ( "errors" "fmt" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/util/bytespool" "github.com/pierrec/lz4/v4" "runtime" ) diff --git a/rpc/jsonprocessor.go b/rpc/jsonprocessor.go index 1ff7355..041542c 100644 --- a/rpc/jsonprocessor.go +++ b/rpc/jsonprocessor.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/duanhf2012/origin/util/sync" + "github.com/duanhf2012/origin/v2/util/sync" jsoniter "github.com/json-iterator/go" "reflect" ) diff --git a/rpc/lclient.go b/rpc/lclient.go index c88474d..cf0947a 100644 --- a/rpc/lclient.go +++ b/rpc/lclient.go @@ -2,8 +2,8 @@ package rpc import ( "errors" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/network" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/network" "reflect" "strings" "sync/atomic" diff --git a/rpc/pbprocessor.go b/rpc/pbprocessor.go index 3070f3f..d618d3b 100644 --- a/rpc/pbprocessor.go +++ b/rpc/pbprocessor.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/duanhf2012/origin/util/sync" + "github.com/duanhf2012/origin/v2/util/sync" "google.golang.org/protobuf/proto" "fmt" ) diff --git a/rpc/rclient.go b/rpc/rclient.go index 33d6b13..f3cef0d 100644 --- a/rpc/rclient.go +++ b/rpc/rclient.go @@ -3,8 +3,8 @@ package rpc import ( "errors" "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/network" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/network" "math" "reflect" "runtime" diff --git a/rpc/rpc.go b/rpc/rpc.go index 04f91d2..edfc1eb 100644 --- a/rpc/rpc.go +++ b/rpc/rpc.go @@ -1,7 +1,7 @@ package rpc import ( - "github.com/duanhf2012/origin/util/sync" + "github.com/duanhf2012/origin/v2/util/sync" "reflect" "time" ) diff --git a/rpc/rpchandler.go b/rpc/rpchandler.go index 8158137..fef321f 100644 --- a/rpc/rpchandler.go +++ b/rpc/rpchandler.go @@ -3,7 +3,7 @@ package rpc import ( "errors" "fmt" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "reflect" "runtime" "strings" diff --git a/rpc/server.go b/rpc/server.go index 935aff6..dc70cca 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -3,8 +3,8 @@ package rpc import ( "errors" "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/network" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/network" "math" "net" "reflect" diff --git a/service/module.go b/service/module.go index d208484..50554b8 100644 --- a/service/module.go +++ b/service/module.go @@ -6,11 +6,11 @@ import ( "sync/atomic" "time" - "github.com/duanhf2012/origin/event" - "github.com/duanhf2012/origin/log" - rpcHandle "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/util/timer" - "github.com/duanhf2012/origin/concurrent" + "github.com/duanhf2012/origin/v2/event" + "github.com/duanhf2012/origin/v2/log" + rpcHandle "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/util/timer" + "github.com/duanhf2012/origin/v2/concurrent" ) const InitModuleId = 1e9 diff --git a/service/service.go b/service/service.go index c353729..3979c4b 100644 --- a/service/service.go +++ b/service/service.go @@ -3,17 +3,17 @@ package service import ( "errors" "fmt" - "github.com/duanhf2012/origin/event" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/profiler" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/util/timer" + "github.com/duanhf2012/origin/v2/event" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/profiler" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/util/timer" "reflect" "runtime" "strconv" "sync" "sync/atomic" - "github.com/duanhf2012/origin/concurrent" + "github.com/duanhf2012/origin/v2/concurrent" ) var timerDispatcherLen = 100000 diff --git a/sysmodule/httpclientmodule/httpclientpoolmodule.go b/sysmodule/httpclientmodule/httpclientpoolmodule.go index d3d1e1d..644e7f2 100644 --- a/sysmodule/httpclientmodule/httpclientpoolmodule.go +++ b/sysmodule/httpclientmodule/httpclientpoolmodule.go @@ -10,7 +10,7 @@ import ( "net/url" "time" - "github.com/duanhf2012/origin/service" + "github.com/duanhf2012/origin/v2/service" ) type HttpClientModule struct { diff --git a/sysmodule/mongomodule/mongomodule.go b/sysmodule/mongomodule/mongomodule.go index 673702b..5c9fe49 100644 --- a/sysmodule/mongomodule/mongomodule.go +++ b/sysmodule/mongomodule/mongomodule.go @@ -1,7 +1,7 @@ package mongomodule import ( - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "gopkg.in/mgo.v2" "gopkg.in/mgo.v2/bson" "sync" diff --git a/sysmodule/mysqlmodule/mysqlmodule.go b/sysmodule/mysqlmodule/mysqlmodule.go index 916f7c5..189ee89 100644 --- a/sysmodule/mysqlmodule/mysqlmodule.go +++ b/sysmodule/mysqlmodule/mysqlmodule.go @@ -4,7 +4,7 @@ import ( "database/sql" "errors" "fmt" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "net/url" "reflect" "strconv" @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/duanhf2012/origin/service" + "github.com/duanhf2012/origin/v2/service" _ "github.com/go-sql-driver/mysql" ) diff --git a/sysmodule/redismodule/redismodule.go b/sysmodule/redismodule/redismodule.go index 99dd1a0..f4b795b 100644 --- a/sysmodule/redismodule/redismodule.go +++ b/sysmodule/redismodule/redismodule.go @@ -5,11 +5,11 @@ import ( "encoding/json" "errors" "fmt" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "strconv" "time" - "github.com/duanhf2012/origin/service" + "github.com/duanhf2012/origin/v2/service" "github.com/gomodule/redigo/redis" ) diff --git a/sysservice/httpservice/httpservice.go b/sysservice/httpservice/httpservice.go index eb1ef69..ceba1b8 100644 --- a/sysservice/httpservice/httpservice.go +++ b/sysservice/httpservice/httpservice.go @@ -2,10 +2,10 @@ package httpservice import ( "fmt" - "github.com/duanhf2012/origin/event" - "github.com/duanhf2012/origin/network" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/util/uuid" + "github.com/duanhf2012/origin/v2/event" + "github.com/duanhf2012/origin/v2/network" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/util/uuid" jsoniter "github.com/json-iterator/go" "io" "net/http" diff --git a/sysservice/messagequeueservice/CustomerSubscriber.go b/sysservice/messagequeueservice/CustomerSubscriber.go index 87a7b6c..94578b4 100644 --- a/sysservice/messagequeueservice/CustomerSubscriber.go +++ b/sysservice/messagequeueservice/CustomerSubscriber.go @@ -3,10 +3,10 @@ package messagequeueservice import ( "errors" "fmt" - "github.com/duanhf2012/origin/cluster" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/util/coroutine" + "github.com/duanhf2012/origin/v2/cluster" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/util/coroutine" "strings" "sync/atomic" "time" diff --git a/sysservice/messagequeueservice/MemoryQueue.go b/sysservice/messagequeueservice/MemoryQueue.go index 986fe46..b41f3cc 100644 --- a/sysservice/messagequeueservice/MemoryQueue.go +++ b/sysservice/messagequeueservice/MemoryQueue.go @@ -1,7 +1,7 @@ package messagequeueservice import ( - "github.com/duanhf2012/origin/util/algorithms" + "github.com/duanhf2012/origin/v2/util/algorithms" "sync" ) diff --git a/sysservice/messagequeueservice/MessageQueueService.go b/sysservice/messagequeueservice/MessageQueueService.go index 75ab955..90a4d38 100644 --- a/sysservice/messagequeueservice/MessageQueueService.go +++ b/sysservice/messagequeueservice/MessageQueueService.go @@ -3,9 +3,9 @@ package messagequeueservice import ( "errors" "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/rpc" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/rpc" "sync" ) diff --git a/sysservice/messagequeueservice/MongoPersist.go b/sysservice/messagequeueservice/MongoPersist.go index acbdcda..4feead4 100644 --- a/sysservice/messagequeueservice/MongoPersist.go +++ b/sysservice/messagequeueservice/MongoPersist.go @@ -3,9 +3,9 @@ package messagequeueservice import ( "errors" "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/sysmodule/mongodbmodule" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/sysmodule/mongodbmodule" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo/options" "time" diff --git a/sysservice/messagequeueservice/Subscriber.go b/sysservice/messagequeueservice/Subscriber.go index edae532..42ad824 100644 --- a/sysservice/messagequeueservice/Subscriber.go +++ b/sysservice/messagequeueservice/Subscriber.go @@ -1,8 +1,8 @@ package messagequeueservice import ( - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" "sync" ) diff --git a/sysservice/messagequeueservice/TopicRoom.go b/sysservice/messagequeueservice/TopicRoom.go index 778acdf..26a8fc5 100644 --- a/sysservice/messagequeueservice/TopicRoom.go +++ b/sysservice/messagequeueservice/TopicRoom.go @@ -2,8 +2,8 @@ package messagequeueservice import ( "errors" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/util/coroutine" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/util/coroutine" "sync" "sync/atomic" "time" diff --git a/sysservice/rankservice/MongodbPersist.go b/sysservice/rankservice/MongodbPersist.go index 2fc7499..c843ea4 100644 --- a/sysservice/rankservice/MongodbPersist.go +++ b/sysservice/rankservice/MongodbPersist.go @@ -2,10 +2,10 @@ package rankservice import ( "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/sysmodule/mongodbmodule" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/sysmodule/mongodbmodule" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/mongo/options" "runtime" diff --git a/sysservice/rankservice/RankData.go b/sysservice/rankservice/RankData.go index 00a9e88..52f7262 100644 --- a/sysservice/rankservice/RankData.go +++ b/sysservice/rankservice/RankData.go @@ -1,9 +1,9 @@ package rankservice import ( - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/util/algorithms/skip" - "github.com/duanhf2012/origin/util/sync" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/util/algorithms/skip" + "github.com/duanhf2012/origin/v2/util/sync" ) var emptyRankData RankData diff --git a/sysservice/rankservice/RankDataExpire.go b/sysservice/rankservice/RankDataExpire.go index 4249fe2..13e0410 100644 --- a/sysservice/rankservice/RankDataExpire.go +++ b/sysservice/rankservice/RankDataExpire.go @@ -2,7 +2,7 @@ package rankservice import ( "container/heap" - "github.com/duanhf2012/origin/util/sync" + "github.com/duanhf2012/origin/v2/util/sync" "time" ) diff --git a/sysservice/rankservice/RankInterface.go b/sysservice/rankservice/RankInterface.go index 15af6be..ba356e9 100644 --- a/sysservice/rankservice/RankInterface.go +++ b/sysservice/rankservice/RankInterface.go @@ -1,8 +1,8 @@ package rankservice import ( - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/rpc" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/rpc" ) type RankDataChangeType int8 diff --git a/sysservice/rankservice/RankService.go b/sysservice/rankservice/RankService.go index 4e73631..80f7083 100644 --- a/sysservice/rankservice/RankService.go +++ b/sysservice/rankservice/RankService.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/service" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/service" ) const PreMapRankSkipLen = 10 diff --git a/sysservice/rankservice/RankSkip.go b/sysservice/rankservice/RankSkip.go index e2a7dc1..be1ef21 100644 --- a/sysservice/rankservice/RankSkip.go +++ b/sysservice/rankservice/RankSkip.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/duanhf2012/origin/rpc" - "github.com/duanhf2012/origin/util/algorithms/skip" + "github.com/duanhf2012/origin/v2/rpc" + "github.com/duanhf2012/origin/v2/util/algorithms/skip" ) type RankSkip struct { diff --git a/sysservice/tcpservice/tcpservice.go b/sysservice/tcpservice/tcpservice.go index c5cd425..1793b41 100644 --- a/sysservice/tcpservice/tcpservice.go +++ b/sysservice/tcpservice/tcpservice.go @@ -2,13 +2,13 @@ package tcpservice import ( "fmt" - "github.com/duanhf2012/origin/event" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/network" - "github.com/duanhf2012/origin/network/processor" - "github.com/duanhf2012/origin/node" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/util/bytespool" + "github.com/duanhf2012/origin/v2/event" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/network" + "github.com/duanhf2012/origin/v2/network/processor" + "github.com/duanhf2012/origin/v2/node" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/util/bytespool" "runtime" "sync" "sync/atomic" diff --git a/sysservice/wsservice/wsservice.go b/sysservice/wsservice/wsservice.go index 6cb42dc..b1643d2 100644 --- a/sysservice/wsservice/wsservice.go +++ b/sysservice/wsservice/wsservice.go @@ -2,12 +2,12 @@ package wsservice import ( "fmt" - "github.com/duanhf2012/origin/event" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/network" - "github.com/duanhf2012/origin/network/processor" - "github.com/duanhf2012/origin/service" - "github.com/duanhf2012/origin/node" + "github.com/duanhf2012/origin/v2/event" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/network" + "github.com/duanhf2012/origin/v2/network/processor" + "github.com/duanhf2012/origin/v2/service" + "github.com/duanhf2012/origin/v2/node" "sync" "sync/atomic" "time" diff --git a/util/buildtime/build.go b/util/buildtime/build.go index 03979a7..fa5dadc 100644 --- a/util/buildtime/build.go +++ b/util/buildtime/build.go @@ -1,12 +1,12 @@ package buildtime /* -//查询buildtime包中的位置，在github.com/duanhf2012/origin/util/buildtime.BuildTime中 +//查询buildtime包中的位置，在github.com/duanhf2012/origin/v2/util/buildtime.BuildTime中 go tool nm ./originserver.exe |grep buildtime //编译传入编译时间信息 -go build -ldflags "-X 'github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101'" -go build -ldflags "-X github.com/duanhf2012/origin/util/buildtime.BuildTime=20200101 -X github.com/duanhf2012/origin/util/buildtime.BuildTag=debug" +go build -ldflags "-X 'github.com/duanhf2012/origin/v2/util/buildtime.BuildTime=20200101'" +go build -ldflags "-X github.com/duanhf2012/origin/v2/util/buildtime.BuildTime=20200101 -X github.com/duanhf2012/origin/v2/util/buildtime.BuildTag=debug" */ var BuildTime string var BuildTag string diff --git a/util/coroutine/coroutine.go b/util/coroutine/coroutine.go index 88b6811..a38a18f 100644 --- a/util/coroutine/coroutine.go +++ b/util/coroutine/coroutine.go @@ -2,7 +2,7 @@ package coroutine import ( "fmt" - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" "reflect" "runtime/debug" ) diff --git a/util/math/math.go b/util/math/math.go index 9d50e11..56399cc 100644 --- a/util/math/math.go +++ b/util/math/math.go @@ -1,7 +1,7 @@ package math import ( - "github.com/duanhf2012/origin/log" + "github.com/duanhf2012/origin/v2/log" ) type NumberType interface { diff --git a/util/timer/timer.go b/util/timer/timer.go index f531cb1..c111316 100644 --- a/util/timer/timer.go +++ b/util/timer/timer.go @@ -2,8 +2,8 @@ package timer import ( "fmt" - "github.com/duanhf2012/origin/log" - "github.com/duanhf2012/origin/util/sync" + "github.com/duanhf2012/origin/v2/log" + "github.com/duanhf2012/origin/v2/util/sync" "reflect" "runtime" "time" diff --git a/util/umap/mapEx.go b/util/umap/mapEx.go index abfe0f5..6f027d2 100644 --- a/util/umap/mapEx.go +++ b/util/umap/mapEx.go @@ -2,7 +2,7 @@ package umap import ( "fmt" - "github.com/duanhf2012/origin/util/hash" + "github.com/duanhf2012/origin/v2/util/hash" "sync" "sync/atomic" )