From 2c8c78b10c5950e838da189bde4df544ba09b5a7 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 3 Aug 2024 14:37:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90mt=20mtb=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/adminserver/api/v1/system/sys_user.go | 2 +- server/adminserver/app/app.go | 2 +- server/adminserver/go.mod | 8 ------- server/adminserver/middleware/permission.go | 2 +- server/adminserver/mt/AccountDb.go | 2 +- server/adminserver/mt/AdminCluster.go | 2 +- server/adminserver/mt/AdminDb.go | 2 +- server/adminserver/mt/ConfDb.go | 2 +- server/adminserver/mt/Config.go | 2 +- server/adminserver/mt/FriendDb.go | 2 +- server/adminserver/mt/GameDb.go | 2 +- server/adminserver/mt/MailDb.go | 2 +- server/adminserver/mt/NFTDb.go | 2 +- server/adminserver/mt/Web3ServiceCluster.go | 2 +- server/adminserver/mt/go.mod | 14 ----------- server/adminserver/mtb/go.mod | 16 ------------- server/adminserver/mtb/go.sum | 23 ------------------- server/backtask/app/app.go | 2 +- server/backtask/go.mod | 8 ------- server/backtask/mt/BackTaskCluster.go | 2 +- server/backtask/mt/BcCurrency.go | 2 +- server/backtask/mt/BcEventDb.go | 2 +- server/backtask/mt/BcNftDb.go | 2 +- server/backtask/mt/Config.go | 2 +- server/backtask/mt/GameDb.go | 2 +- server/backtask/mt/HashRateCommon.go | 2 +- server/backtask/mt/Item.go | 2 +- server/backtask/mt/Language.go | 2 +- server/backtask/mt/MailDb.go | 2 +- server/backtask/mt/RankSeason.go | 2 +- server/backtask/mt/go.mod | 14 ----------- server/backtask/mtb/go.mod | 16 ------------- server/backtask/mtb/go.sum | 23 ------------------- server/backtask/service/bc_currency.go | 2 +- server/backtask/task/gold_bullion_return.go | 2 +- server/backtask/task/nftlock.go | 2 +- server/backtask/task/recharge.go | 2 +- server/gamelog/app/app.go | 2 +- server/gamelog/go.mod | 8 ------- server/gamelog/mt/Config.go | 2 +- server/gamelog/mt/MailCluster.go | 2 +- server/gamelog/mt/MailDb.go | 2 +- server/gamelog/mt/go.mod | 14 ----------- server/gamelog/mtb/go.mod | 16 ------------- server/gamelog/mtb/go.sum | 23 ------------------- server/gamesapi/app/app.go | 2 +- server/gamesapi/go.mod | 8 ------- server/gamesapi/middleware/caforward.go | 2 +- server/gamesapi/mt/Config.go | 2 +- server/gamesapi/mt/GamesapiCluster.go | 2 +- server/gamesapi/mt/go.mod | 14 ----------- server/gamesapi/mtb/go.mod | 16 ------------- server/gamesapi/mtb/go.sum | 23 ------------------- server/gamesapi/service/sapi_forward.go | 2 +- server/gateserver/app/app.go | 2 +- server/gateserver/go.mod | 8 ------- server/gateserver/mt/Config.go | 2 +- server/gateserver/mt/MailCluster.go | 2 +- server/gateserver/mt/MailDb.go | 2 +- server/gateserver/mt/go.mod | 14 ----------- server/gateserver/mtb/go.mod | 16 ------------- server/gateserver/mtb/go.sum | 23 ------------------- server/hallserver/app/app.go | 2 +- server/hallserver/go.mod | 8 ------- server/hallserver/listener/wsplistener.go | 2 +- server/hallserver/mt/Config.go | 2 +- server/hallserver/mt/HallCluster.go | 2 +- server/hallserver/mt/MasterCluster.go | 2 +- server/hallserver/mt/go.mod | 14 ----------- server/hallserver/mtb/go.mod | 16 ------------- server/hallserver/mtb/go.sum | 23 ------------------- server/hallserver/player/playermgr.go | 2 +- server/hallserver/room/room.go | 2 +- server/imserver/app/app.go | 2 +- server/imserver/go.mod | 8 ------- server/imserver/guild/guildmgr.go | 2 +- server/imserver/listener/wsplistener.go | 2 +- server/imserver/mt/Config.go | 2 +- server/imserver/mt/FriendDb.go | 2 +- server/imserver/mt/GameDb.go | 2 +- server/imserver/mt/IMCluster.go | 2 +- server/imserver/mt/MasterCluster.go | 2 +- server/imserver/mt/go.mod | 14 ----------- server/imserver/mtb/go.mod | 16 ------------- server/imserver/mtb/go.sum | 23 ------------------- server/imserver/player/playermgr.go | 2 +- server/light_backtask/app/app.go | 2 +- server/light_backtask/go.mod | 8 ------- server/light_backtask/mt/BackTaskCluster.go | 2 +- server/light_backtask/mt/BcCurrency.go | 2 +- server/light_backtask/mt/BcEventDb.go | 2 +- server/light_backtask/mt/BcNftDb.go | 2 +- server/light_backtask/mt/Config.go | 2 +- server/light_backtask/mt/GameDb.go | 2 +- server/light_backtask/mt/HashRateCommon.go | 2 +- server/light_backtask/mt/Item.go | 2 +- server/light_backtask/mt/Language.go | 2 +- server/light_backtask/mt/MailDb.go | 2 +- server/light_backtask/mt/RankSeason.go | 2 +- server/light_backtask/mt/go.mod | 14 ----------- server/light_backtask/mtb/go.mod | 16 ------------- server/light_backtask/mtb/go.sum | 23 ------------------- server/light_backtask/service/bc_currency.go | 2 +- server/light_backtask/task/chain_activity.go | 2 +- server/light_backtask/task/contribution.go | 2 +- server/light_backtask/task/recharge.go | 2 +- server/light_backtask/task/refresh_meta.go | 2 +- server/light_backtask/task/webhook.go | 2 +- server/loginserver/app/app.go | 2 +- server/loginserver/go.mod | 7 ------ server/loginserver/mt/Config.go | 2 +- server/loginserver/mt/LoginCluster.go | 2 +- server/loginserver/mt/LoginDb.go | 2 +- server/loginserver/mt/go.mod | 14 ----------- server/loginserver/mtb/go.mod | 16 ------------- server/loginserver/mtb/go.sum | 23 ------------------- server/mailserver/app/app.go | 2 +- server/mailserver/go.mod | 8 ------- server/mailserver/mail/mailmgr.go | 2 +- server/mailserver/mt/Config.go | 2 +- server/mailserver/mt/MailCluster.go | 2 +- server/mailserver/mt/MailDb.go | 2 +- server/mailserver/mt/go.mod | 14 ----------- server/mailserver/mtb/go.mod | 16 ------------- server/mailserver/mtb/go.sum | 23 ------------------- server/mailserver/player/player.go | 2 +- server/makefile | 3 +++ .../marketserver/api/v1/activity/stacking.go | 2 +- server/marketserver/api/v1/asset/asset.go | 2 +- server/marketserver/api/v1/event/event.go | 2 +- server/marketserver/api/v1/ingame/ingame.go | 2 +- server/marketserver/api/v1/market/market.go | 2 +- .../api/v1/market/marketsecondary.go | 2 +- server/marketserver/api/v1/nft/nft.go | 2 +- .../marketserver/api/v1/recharge/recharge.go | 2 +- server/marketserver/app/app.go | 2 +- server/marketserver/cache/cachemgr.go | 2 +- server/marketserver/go.mod | 7 ------ server/marketserver/middleware/jwtauth.go | 2 +- server/marketserver/mt/Config.go | 2 +- server/marketserver/mt/GameDb.go | 2 +- server/marketserver/mt/Item.go | 2 +- server/marketserver/mt/Language.go | 2 +- server/marketserver/mt/MarketServerCluster.go | 2 +- server/marketserver/mt/NftDb.go | 2 +- server/marketserver/mt/NftEventDb.go | 2 +- server/marketserver/mt/Recharge.go | 2 +- server/marketserver/mt/Web3ServiceCluster.go | 2 +- server/marketserver/mt/Web3SignCluster.go | 2 +- server/marketserver/mt/go.mod | 16 ------------- server/marketserver/mtb/go.mod | 16 ------------- server/marketserver/mtb/go.sum | 23 ------------------- server/matchserver/app/app.go | 2 +- server/matchserver/go.mod | 8 ------- server/matchserver/listener/wsplistener.go | 2 +- server/matchserver/mt/Config.go | 2 +- server/matchserver/mt/MasterCluster.go | 2 +- server/matchserver/mt/MatchCluster.go | 2 +- server/matchserver/mt/Robot.go | 2 +- server/matchserver/mt/go.mod | 14 ----------- server/matchserver/mtb/go.mod | 16 ------------- server/matchserver/mtb/go.sum | 23 ------------------- server/matchserver/player/player.go | 2 +- server/matchserver/player/playermgr.go | 2 +- server/matchserver/team/team.go | 2 +- server/matchserver/team/teammgr.go | 2 +- server/nftserver/api/v1/nft/nftdetail.go | 2 +- server/nftserver/api/v1/nft/nftmeta.go | 2 +- server/nftserver/app/app.go | 2 +- server/nftserver/go.mod | 7 ------ server/nftserver/mt/Config.go | 2 +- server/nftserver/mt/NftDb.go | 2 +- server/nftserver/mt/NftHomeMeta.go | 2 +- server/nftserver/mt/NftServerCluster.go | 2 +- server/nftserver/mt/go.mod | 14 ----------- server/nftserver/mtb/go.mod | 16 ------------- server/nftserver/mtb/go.sum | 23 ------------------- server/statserver/app/app.go | 2 +- server/statserver/go.mod | 8 ------- server/statserver/mt/Config.go | 2 +- server/statserver/mt/MailCluster.go | 2 +- server/statserver/mt/MailDb.go | 2 +- server/statserver/mt/go.mod | 14 ----------- server/statserver/mtb/go.mod | 16 ------------- server/statserver/mtb/go.sum | 23 ------------------- 185 files changed, 131 insertions(+), 981 deletions(-) delete mode 100644 server/adminserver/mt/go.mod delete mode 100644 server/adminserver/mtb/go.mod delete mode 100644 server/adminserver/mtb/go.sum delete mode 100644 server/backtask/mt/go.mod delete mode 100644 server/backtask/mtb/go.mod delete mode 100644 server/backtask/mtb/go.sum delete mode 100644 server/gamelog/mt/go.mod delete mode 100644 server/gamelog/mtb/go.mod delete mode 100644 server/gamelog/mtb/go.sum delete mode 100644 server/gamesapi/mt/go.mod delete mode 100644 server/gamesapi/mtb/go.mod delete mode 100644 server/gamesapi/mtb/go.sum delete mode 100644 server/gateserver/mt/go.mod delete mode 100644 server/gateserver/mtb/go.mod delete mode 100644 server/gateserver/mtb/go.sum delete mode 100644 server/hallserver/mt/go.mod delete mode 100644 server/hallserver/mtb/go.mod delete mode 100644 server/hallserver/mtb/go.sum delete mode 100644 server/imserver/mt/go.mod delete mode 100644 server/imserver/mtb/go.mod delete mode 100644 server/imserver/mtb/go.sum delete mode 100644 server/light_backtask/mt/go.mod delete mode 100644 server/light_backtask/mtb/go.mod delete mode 100644 server/light_backtask/mtb/go.sum delete mode 100644 server/loginserver/mt/go.mod delete mode 100644 server/loginserver/mtb/go.mod delete mode 100644 server/loginserver/mtb/go.sum delete mode 100644 server/mailserver/mt/go.mod delete mode 100644 server/mailserver/mtb/go.mod delete mode 100644 server/mailserver/mtb/go.sum delete mode 100644 server/marketserver/mt/go.mod delete mode 100644 server/marketserver/mtb/go.mod delete mode 100644 server/marketserver/mtb/go.sum delete mode 100644 server/matchserver/mt/go.mod delete mode 100644 server/matchserver/mtb/go.mod delete mode 100644 server/matchserver/mtb/go.sum delete mode 100644 server/nftserver/mt/go.mod delete mode 100644 server/nftserver/mtb/go.mod delete mode 100644 server/nftserver/mtb/go.sum delete mode 100644 server/statserver/mt/go.mod delete mode 100644 server/statserver/mtb/go.mod delete mode 100644 server/statserver/mtb/go.sum diff --git a/server/adminserver/api/v1/system/sys_user.go b/server/adminserver/api/v1/system/sys_user.go index 3e935405..5a3e1ac2 100644 --- a/server/adminserver/api/v1/system/sys_user.go +++ b/server/adminserver/api/v1/system/sys_user.go @@ -4,7 +4,7 @@ import ( "f5" . "main/global" "main/model/system" - "mt" + "main/mt" "net/http" "q5" "strings" diff --git a/server/adminserver/app/app.go b/server/adminserver/app/app.go index 8fce04cd..aadc7989 100644 --- a/server/adminserver/app/app.go +++ b/server/adminserver/app/app.go @@ -7,7 +7,7 @@ import ( //"fmt" "main/constant" "main/task" - "mt" + "main/mt" //"sync" //"time" ) diff --git a/server/adminserver/go.mod b/server/adminserver/go.mod index 2599cd4f..4f3f8541 100644 --- a/server/adminserver/go.mod +++ b/server/adminserver/go.mod @@ -8,10 +8,6 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -65,8 +61,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/adminserver/middleware/permission.go b/server/adminserver/middleware/permission.go index 7ed98c12..69884ef6 100644 --- a/server/adminserver/middleware/permission.go +++ b/server/adminserver/middleware/permission.go @@ -4,7 +4,7 @@ import ( "adminserver/common" "net/http" - "mt" + "main/mt" "github.com/gin-gonic/gin" ) diff --git a/server/adminserver/mt/AccountDb.go b/server/adminserver/mt/AccountDb.go index 65cca2e1..2e1f5610 100644 --- a/server/adminserver/mt/AccountDb.go +++ b/server/adminserver/mt/AccountDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type AccountDb struct { diff --git a/server/adminserver/mt/AdminCluster.go b/server/adminserver/mt/AdminCluster.go index a33ed038..b647803c 100644 --- a/server/adminserver/mt/AdminCluster.go +++ b/server/adminserver/mt/AdminCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type AdminCluster struct { diff --git a/server/adminserver/mt/AdminDb.go b/server/adminserver/mt/AdminDb.go index f36d03cd..6a8a38e2 100644 --- a/server/adminserver/mt/AdminDb.go +++ b/server/adminserver/mt/AdminDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type AdminDb struct { diff --git a/server/adminserver/mt/ConfDb.go b/server/adminserver/mt/ConfDb.go index 09e015ef..e48e4a08 100644 --- a/server/adminserver/mt/ConfDb.go +++ b/server/adminserver/mt/ConfDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type ConfDb struct { diff --git a/server/adminserver/mt/Config.go b/server/adminserver/mt/Config.go index a7fdaed8..0be56031 100644 --- a/server/adminserver/mt/Config.go +++ b/server/adminserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/adminserver/mt/FriendDb.go b/server/adminserver/mt/FriendDb.go index ad5f270c..0f29b598 100644 --- a/server/adminserver/mt/FriendDb.go +++ b/server/adminserver/mt/FriendDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type FriendDb struct { diff --git a/server/adminserver/mt/GameDb.go b/server/adminserver/mt/GameDb.go index ff9aa3f4..94fd37c4 100644 --- a/server/adminserver/mt/GameDb.go +++ b/server/adminserver/mt/GameDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type GameDb struct { diff --git a/server/adminserver/mt/MailDb.go b/server/adminserver/mt/MailDb.go index ff7f954a..45a087a7 100644 --- a/server/adminserver/mt/MailDb.go +++ b/server/adminserver/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/adminserver/mt/NFTDb.go b/server/adminserver/mt/NFTDb.go index 42564e4f..9f9a81b1 100644 --- a/server/adminserver/mt/NFTDb.go +++ b/server/adminserver/mt/NFTDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type NFTDb struct { diff --git a/server/adminserver/mt/Web3ServiceCluster.go b/server/adminserver/mt/Web3ServiceCluster.go index 2050623c..a8569350 100644 --- a/server/adminserver/mt/Web3ServiceCluster.go +++ b/server/adminserver/mt/Web3ServiceCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Web3ServiceCluster struct { diff --git a/server/adminserver/mt/go.mod b/server/adminserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/adminserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/adminserver/mtb/go.mod b/server/adminserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/adminserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/adminserver/mtb/go.sum b/server/adminserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/adminserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/backtask/app/app.go b/server/backtask/app/app.go index ff4a3441..87eb131c 100644 --- a/server/backtask/app/app.go +++ b/server/backtask/app/app.go @@ -3,7 +3,7 @@ package app import ( "f5" "main/constant" - "mt" + "main/mt" ) type app struct { diff --git a/server/backtask/go.mod b/server/backtask/go.mod index 53d35228..00bd07df 100644 --- a/server/backtask/go.mod +++ b/server/backtask/go.mod @@ -8,10 +8,6 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -58,8 +54,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/backtask/mt/BackTaskCluster.go b/server/backtask/mt/BackTaskCluster.go index 36ca5b14..428fa368 100644 --- a/server/backtask/mt/BackTaskCluster.go +++ b/server/backtask/mt/BackTaskCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type BackTaskCluster struct { diff --git a/server/backtask/mt/BcCurrency.go b/server/backtask/mt/BcCurrency.go index 22155a31..08ff7193 100644 --- a/server/backtask/mt/BcCurrency.go +++ b/server/backtask/mt/BcCurrency.go @@ -3,7 +3,7 @@ package mt import ( "q5" "f5" - "mtb" + "main/mtb" ) type BcCurrency struct { diff --git a/server/backtask/mt/BcEventDb.go b/server/backtask/mt/BcEventDb.go index 1c6c24ee..b9cbdaa3 100644 --- a/server/backtask/mt/BcEventDb.go +++ b/server/backtask/mt/BcEventDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type BcEventDb struct { diff --git a/server/backtask/mt/BcNftDb.go b/server/backtask/mt/BcNftDb.go index b22a719b..8b9340e0 100644 --- a/server/backtask/mt/BcNftDb.go +++ b/server/backtask/mt/BcNftDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type BcNftDb struct { diff --git a/server/backtask/mt/Config.go b/server/backtask/mt/Config.go index 70158920..03f872a8 100644 --- a/server/backtask/mt/Config.go +++ b/server/backtask/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/backtask/mt/GameDb.go b/server/backtask/mt/GameDb.go index e852667e..2ab61741 100644 --- a/server/backtask/mt/GameDb.go +++ b/server/backtask/mt/GameDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type GameDb struct { diff --git a/server/backtask/mt/HashRateCommon.go b/server/backtask/mt/HashRateCommon.go index ec405aa9..3c5c5c1e 100644 --- a/server/backtask/mt/HashRateCommon.go +++ b/server/backtask/mt/HashRateCommon.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" "time" ) diff --git a/server/backtask/mt/Item.go b/server/backtask/mt/Item.go index f3489251..5eb74a87 100644 --- a/server/backtask/mt/Item.go +++ b/server/backtask/mt/Item.go @@ -3,7 +3,7 @@ package mt import ( "q5" "f5" - "mtb" + "main/mtb" ) type Item struct { diff --git a/server/backtask/mt/Language.go b/server/backtask/mt/Language.go index 3b18b49e..cc033fbc 100644 --- a/server/backtask/mt/Language.go +++ b/server/backtask/mt/Language.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Language struct { diff --git a/server/backtask/mt/MailDb.go b/server/backtask/mt/MailDb.go index d6015824..735ee1ab 100644 --- a/server/backtask/mt/MailDb.go +++ b/server/backtask/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/backtask/mt/RankSeason.go b/server/backtask/mt/RankSeason.go index 60a57fc3..f81dfacf 100644 --- a/server/backtask/mt/RankSeason.go +++ b/server/backtask/mt/RankSeason.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" "time" ) diff --git a/server/backtask/mt/go.mod b/server/backtask/mt/go.mod deleted file mode 100644 index 30a71ab1..00000000 --- a/server/backtask/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/backtask/mtb/go.mod b/server/backtask/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/backtask/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/backtask/mtb/go.sum b/server/backtask/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/backtask/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/backtask/service/bc_currency.go b/server/backtask/service/bc_currency.go index 1c6cd34c..e1e3279d 100644 --- a/server/backtask/service/bc_currency.go +++ b/server/backtask/service/bc_currency.go @@ -6,7 +6,7 @@ import ( "time" "jccommon" "math/big" - "mt" + "main/mt" "strings" ) diff --git a/server/backtask/task/gold_bullion_return.go b/server/backtask/task/gold_bullion_return.go index d9624eef..c5b1a6a3 100644 --- a/server/backtask/task/gold_bullion_return.go +++ b/server/backtask/task/gold_bullion_return.go @@ -3,7 +3,7 @@ package task import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "fmt" "main/constant" diff --git a/server/backtask/task/nftlock.go b/server/backtask/task/nftlock.go index 54dfc868..685e1b1d 100644 --- a/server/backtask/task/nftlock.go +++ b/server/backtask/task/nftlock.go @@ -5,7 +5,7 @@ import ( "f5" "fmt" "strings" - "mt" + "main/mt" "jccommon" "main/constant" "main/service" diff --git a/server/backtask/task/recharge.go b/server/backtask/task/recharge.go index 206faa9e..24c4a5ab 100644 --- a/server/backtask/task/recharge.go +++ b/server/backtask/task/recharge.go @@ -5,7 +5,7 @@ import ( "f5" "main/constant" "fmt" - //"mt" + //"main/mt" //"strings" "jccommon" ) diff --git a/server/gamelog/app/app.go b/server/gamelog/app/app.go index 3811ac80..c4ec1dc4 100644 --- a/server/gamelog/app/app.go +++ b/server/gamelog/app/app.go @@ -2,7 +2,7 @@ package app import ( "f5" - "mt" + "main/mt" ) type app struct { diff --git a/server/gamelog/go.mod b/server/gamelog/go.mod index b151e861..e0991366 100644 --- a/server/gamelog/go.mod +++ b/server/gamelog/go.mod @@ -6,10 +6,6 @@ require q5 v1.0.0 require f5 v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -55,8 +51,4 @@ replace q5 => ../../third_party/q5 replace f5 => ../../third_party/f5 -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/gamelog/mt/Config.go b/server/gamelog/mt/Config.go index 7438532d..ccc23b05 100644 --- a/server/gamelog/mt/Config.go +++ b/server/gamelog/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/gamelog/mt/MailCluster.go b/server/gamelog/mt/MailCluster.go index 9d821836..b5e5e809 100644 --- a/server/gamelog/mt/MailCluster.go +++ b/server/gamelog/mt/MailCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailCluster struct { diff --git a/server/gamelog/mt/MailDb.go b/server/gamelog/mt/MailDb.go index 32067b75..61339a2b 100644 --- a/server/gamelog/mt/MailDb.go +++ b/server/gamelog/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/gamelog/mt/go.mod b/server/gamelog/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/gamelog/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/gamelog/mtb/go.mod b/server/gamelog/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/gamelog/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/gamelog/mtb/go.sum b/server/gamelog/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/gamelog/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/gamesapi/app/app.go b/server/gamesapi/app/app.go index 179d432c..10ff2f13 100644 --- a/server/gamesapi/app/app.go +++ b/server/gamesapi/app/app.go @@ -3,7 +3,7 @@ package app import ( "f5" //. "main/global" - "mt" + "main/mt" ) type app struct { diff --git a/server/gamesapi/go.mod b/server/gamesapi/go.mod index ed898e90..3ee497d3 100644 --- a/server/gamesapi/go.mod +++ b/server/gamesapi/go.mod @@ -8,10 +8,6 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -60,8 +56,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/gamesapi/middleware/caforward.go b/server/gamesapi/middleware/caforward.go index 65a7b5d6..2a0b2bfb 100644 --- a/server/gamesapi/middleware/caforward.go +++ b/server/gamesapi/middleware/caforward.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "jccommon" "main/service" - "mt" + "main/mt" "net/http" net_url "net/url" "q5" diff --git a/server/gamesapi/mt/Config.go b/server/gamesapi/mt/Config.go index e30ac592..323fb68f 100644 --- a/server/gamesapi/mt/Config.go +++ b/server/gamesapi/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/gamesapi/mt/GamesapiCluster.go b/server/gamesapi/mt/GamesapiCluster.go index 98c03df4..d815dad0 100644 --- a/server/gamesapi/mt/GamesapiCluster.go +++ b/server/gamesapi/mt/GamesapiCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type GamesapiCluster struct { diff --git a/server/gamesapi/mt/go.mod b/server/gamesapi/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/gamesapi/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/gamesapi/mtb/go.mod b/server/gamesapi/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/gamesapi/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/gamesapi/mtb/go.sum b/server/gamesapi/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/gamesapi/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/gamesapi/service/sapi_forward.go b/server/gamesapi/service/sapi_forward.go index 4d3f8021..1f4e8064 100644 --- a/server/gamesapi/service/sapi_forward.go +++ b/server/gamesapi/service/sapi_forward.go @@ -2,7 +2,7 @@ package service import ( "f5" - "mt" + "main/mt" "q5" "sync" "sync/atomic" diff --git a/server/gateserver/app/app.go b/server/gateserver/app/app.go index 77d7f7b1..2591361d 100644 --- a/server/gateserver/app/app.go +++ b/server/gateserver/app/app.go @@ -3,7 +3,7 @@ package app import ( "f5" //"main/constant" - "mt" + "main/mt" "main/middleware" . "main/global" ) diff --git a/server/gateserver/go.mod b/server/gateserver/go.mod index 92ace9ee..a9837501 100644 --- a/server/gateserver/go.mod +++ b/server/gateserver/go.mod @@ -6,10 +6,6 @@ require q5 v1.0.0 require f5 v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -55,8 +51,4 @@ replace q5 => ../../third_party/q5 replace f5 => ../../third_party/f5 -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/gateserver/mt/Config.go b/server/gateserver/mt/Config.go index 7438532d..ccc23b05 100644 --- a/server/gateserver/mt/Config.go +++ b/server/gateserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/gateserver/mt/MailCluster.go b/server/gateserver/mt/MailCluster.go index 9d821836..b5e5e809 100644 --- a/server/gateserver/mt/MailCluster.go +++ b/server/gateserver/mt/MailCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailCluster struct { diff --git a/server/gateserver/mt/MailDb.go b/server/gateserver/mt/MailDb.go index 32067b75..61339a2b 100644 --- a/server/gateserver/mt/MailDb.go +++ b/server/gateserver/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/gateserver/mt/go.mod b/server/gateserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/gateserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/gateserver/mtb/go.mod b/server/gateserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/gateserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/gateserver/mtb/go.sum b/server/gateserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/gateserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/hallserver/app/app.go b/server/hallserver/app/app.go index 1fcf0f20..ae70bc31 100644 --- a/server/hallserver/app/app.go +++ b/server/hallserver/app/app.go @@ -5,7 +5,7 @@ import ( "f5" "main/constant" . "main/global" - "mt" + "main/mt" "q5" "ss" ) diff --git a/server/hallserver/go.mod b/server/hallserver/go.mod index 949edbdd..84ad22d6 100644 --- a/server/hallserver/go.mod +++ b/server/hallserver/go.mod @@ -6,10 +6,6 @@ require q5 v1.0.0 require f5 v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require cs v1.0.0 @@ -57,10 +53,6 @@ replace q5 => ../../third_party/q5 replace f5 => ../../third_party/f5 -replace mt => ./mt - -replace mtb => ./mtb - replace cs => ./cs replace ss => ./ss diff --git a/server/hallserver/listener/wsplistener.go b/server/hallserver/listener/wsplistener.go index f595b535..e112574c 100644 --- a/server/hallserver/listener/wsplistener.go +++ b/server/hallserver/listener/wsplistener.go @@ -6,7 +6,7 @@ import ( "cs" "f5" - "mt" + "main/mt" "q5" "ss" diff --git a/server/hallserver/mt/Config.go b/server/hallserver/mt/Config.go index 096739b7..892bc101 100644 --- a/server/hallserver/mt/Config.go +++ b/server/hallserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/hallserver/mt/HallCluster.go b/server/hallserver/mt/HallCluster.go index bbc57539..a0d6f7d7 100644 --- a/server/hallserver/mt/HallCluster.go +++ b/server/hallserver/mt/HallCluster.go @@ -3,7 +3,7 @@ package mt import ( "q5" "f5" - "mtb" + "main/mtb" ) type HallCluster struct { diff --git a/server/hallserver/mt/MasterCluster.go b/server/hallserver/mt/MasterCluster.go index 8b609276..88f793ed 100644 --- a/server/hallserver/mt/MasterCluster.go +++ b/server/hallserver/mt/MasterCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MasterCluster struct { diff --git a/server/hallserver/mt/go.mod b/server/hallserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/hallserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/hallserver/mtb/go.mod b/server/hallserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/hallserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/hallserver/mtb/go.sum b/server/hallserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/hallserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/hallserver/player/playermgr.go b/server/hallserver/player/playermgr.go index 126257a1..0515d59e 100644 --- a/server/hallserver/player/playermgr.go +++ b/server/hallserver/player/playermgr.go @@ -9,7 +9,7 @@ import ( "main/common" "main/constant" . "main/global" - "mt" + "main/mt" "net" "q5" ) diff --git a/server/hallserver/room/room.go b/server/hallserver/room/room.go index 0b5b9141..878f85d0 100644 --- a/server/hallserver/room/room.go +++ b/server/hallserver/room/room.go @@ -6,7 +6,7 @@ import ( "github.com/golang/protobuf/proto" "main/common" "main/constant" - "mt" + "main/mt" "q5" "sort" ) diff --git a/server/imserver/app/app.go b/server/imserver/app/app.go index fe428050..74ff43b6 100644 --- a/server/imserver/app/app.go +++ b/server/imserver/app/app.go @@ -5,7 +5,7 @@ import ( "f5" "main/constant" . "main/global" - "mt" + "main/mt" "q5" "ss" ) diff --git a/server/imserver/go.mod b/server/imserver/go.mod index 87090da6..58ed5092 100644 --- a/server/imserver/go.mod +++ b/server/imserver/go.mod @@ -6,10 +6,6 @@ require q5 v1.0.0 require f5 v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require cs v1.0.0 require ss v1.0.0 @@ -57,10 +53,6 @@ replace q5 => ../../third_party/q5 replace f5 => ../../third_party/f5 -replace mt => ./mt - -replace mtb => ./mtb - replace cs => ./cs replace ss => ./ss diff --git a/server/imserver/guild/guildmgr.go b/server/imserver/guild/guildmgr.go index 4eb38971..e51b14d9 100644 --- a/server/imserver/guild/guildmgr.go +++ b/server/imserver/guild/guildmgr.go @@ -7,7 +7,7 @@ import ( "main/constant" "main/model" "fmt" - "mt" + "main/mt" "strings" . "main/global" "github.com/golang/protobuf/proto" diff --git a/server/imserver/listener/wsplistener.go b/server/imserver/listener/wsplistener.go index 101e3aef..01ef20d1 100644 --- a/server/imserver/listener/wsplistener.go +++ b/server/imserver/listener/wsplistener.go @@ -6,7 +6,7 @@ import ( "cs" "f5" - "mt" + "main/mt" "q5" "ss" diff --git a/server/imserver/mt/Config.go b/server/imserver/mt/Config.go index a7fdaed8..0be56031 100644 --- a/server/imserver/mt/Config.go +++ b/server/imserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/imserver/mt/FriendDb.go b/server/imserver/mt/FriendDb.go index ad5f270c..0f29b598 100644 --- a/server/imserver/mt/FriendDb.go +++ b/server/imserver/mt/FriendDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type FriendDb struct { diff --git a/server/imserver/mt/GameDb.go b/server/imserver/mt/GameDb.go index ff9aa3f4..94fd37c4 100644 --- a/server/imserver/mt/GameDb.go +++ b/server/imserver/mt/GameDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type GameDb struct { diff --git a/server/imserver/mt/IMCluster.go b/server/imserver/mt/IMCluster.go index 7f6ec428..dda66349 100644 --- a/server/imserver/mt/IMCluster.go +++ b/server/imserver/mt/IMCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" "q5" ) diff --git a/server/imserver/mt/MasterCluster.go b/server/imserver/mt/MasterCluster.go index 8b609276..88f793ed 100644 --- a/server/imserver/mt/MasterCluster.go +++ b/server/imserver/mt/MasterCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MasterCluster struct { diff --git a/server/imserver/mt/go.mod b/server/imserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/imserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/imserver/mtb/go.mod b/server/imserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/imserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/imserver/mtb/go.sum b/server/imserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/imserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/imserver/player/playermgr.go b/server/imserver/player/playermgr.go index 65fcf692..6f93cf78 100644 --- a/server/imserver/player/playermgr.go +++ b/server/imserver/player/playermgr.go @@ -5,7 +5,7 @@ import ( "f5" "fmt" "github.com/golang/protobuf/proto" - "mt" + "main/mt" "q5" "net" "main/constant" diff --git a/server/light_backtask/app/app.go b/server/light_backtask/app/app.go index 8e602f3e..ad8cf44d 100644 --- a/server/light_backtask/app/app.go +++ b/server/light_backtask/app/app.go @@ -3,7 +3,7 @@ package app import ( "f5" "main/constant" - "mt" + "main/mt" ) type app struct { diff --git a/server/light_backtask/go.mod b/server/light_backtask/go.mod index a8c47988..d1e52f6b 100644 --- a/server/light_backtask/go.mod +++ b/server/light_backtask/go.mod @@ -8,10 +8,6 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -58,8 +54,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/light_backtask/mt/BackTaskCluster.go b/server/light_backtask/mt/BackTaskCluster.go index 36ca5b14..428fa368 100644 --- a/server/light_backtask/mt/BackTaskCluster.go +++ b/server/light_backtask/mt/BackTaskCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type BackTaskCluster struct { diff --git a/server/light_backtask/mt/BcCurrency.go b/server/light_backtask/mt/BcCurrency.go index 22155a31..08ff7193 100644 --- a/server/light_backtask/mt/BcCurrency.go +++ b/server/light_backtask/mt/BcCurrency.go @@ -3,7 +3,7 @@ package mt import ( "q5" "f5" - "mtb" + "main/mtb" ) type BcCurrency struct { diff --git a/server/light_backtask/mt/BcEventDb.go b/server/light_backtask/mt/BcEventDb.go index 1c6c24ee..b9cbdaa3 100644 --- a/server/light_backtask/mt/BcEventDb.go +++ b/server/light_backtask/mt/BcEventDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type BcEventDb struct { diff --git a/server/light_backtask/mt/BcNftDb.go b/server/light_backtask/mt/BcNftDb.go index b22a719b..8b9340e0 100644 --- a/server/light_backtask/mt/BcNftDb.go +++ b/server/light_backtask/mt/BcNftDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type BcNftDb struct { diff --git a/server/light_backtask/mt/Config.go b/server/light_backtask/mt/Config.go index 70158920..03f872a8 100644 --- a/server/light_backtask/mt/Config.go +++ b/server/light_backtask/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/light_backtask/mt/GameDb.go b/server/light_backtask/mt/GameDb.go index e852667e..2ab61741 100644 --- a/server/light_backtask/mt/GameDb.go +++ b/server/light_backtask/mt/GameDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type GameDb struct { diff --git a/server/light_backtask/mt/HashRateCommon.go b/server/light_backtask/mt/HashRateCommon.go index ec405aa9..3c5c5c1e 100644 --- a/server/light_backtask/mt/HashRateCommon.go +++ b/server/light_backtask/mt/HashRateCommon.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" "time" ) diff --git a/server/light_backtask/mt/Item.go b/server/light_backtask/mt/Item.go index f3489251..5eb74a87 100644 --- a/server/light_backtask/mt/Item.go +++ b/server/light_backtask/mt/Item.go @@ -3,7 +3,7 @@ package mt import ( "q5" "f5" - "mtb" + "main/mtb" ) type Item struct { diff --git a/server/light_backtask/mt/Language.go b/server/light_backtask/mt/Language.go index 3b18b49e..cc033fbc 100644 --- a/server/light_backtask/mt/Language.go +++ b/server/light_backtask/mt/Language.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Language struct { diff --git a/server/light_backtask/mt/MailDb.go b/server/light_backtask/mt/MailDb.go index d6015824..735ee1ab 100644 --- a/server/light_backtask/mt/MailDb.go +++ b/server/light_backtask/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/light_backtask/mt/RankSeason.go b/server/light_backtask/mt/RankSeason.go index 60a57fc3..f81dfacf 100644 --- a/server/light_backtask/mt/RankSeason.go +++ b/server/light_backtask/mt/RankSeason.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" "time" ) diff --git a/server/light_backtask/mt/go.mod b/server/light_backtask/mt/go.mod deleted file mode 100644 index 30a71ab1..00000000 --- a/server/light_backtask/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/light_backtask/mtb/go.mod b/server/light_backtask/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/light_backtask/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/light_backtask/mtb/go.sum b/server/light_backtask/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/light_backtask/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/light_backtask/service/bc_currency.go b/server/light_backtask/service/bc_currency.go index 1c6cd34c..e1e3279d 100644 --- a/server/light_backtask/service/bc_currency.go +++ b/server/light_backtask/service/bc_currency.go @@ -6,7 +6,7 @@ import ( "time" "jccommon" "math/big" - "mt" + "main/mt" "strings" ) diff --git a/server/light_backtask/task/chain_activity.go b/server/light_backtask/task/chain_activity.go index 111a2d66..0af79765 100644 --- a/server/light_backtask/task/chain_activity.go +++ b/server/light_backtask/task/chain_activity.go @@ -3,7 +3,7 @@ package task import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "main/constant" "main/service" diff --git a/server/light_backtask/task/contribution.go b/server/light_backtask/task/contribution.go index a2d5b985..0c7a9aa3 100644 --- a/server/light_backtask/task/contribution.go +++ b/server/light_backtask/task/contribution.go @@ -3,7 +3,7 @@ package task import ( "q5" "f5" - "mt" + "main/mt" "main/service" "jccommon" "main/constant" diff --git a/server/light_backtask/task/recharge.go b/server/light_backtask/task/recharge.go index bde83e7f..60093544 100644 --- a/server/light_backtask/task/recharge.go +++ b/server/light_backtask/task/recharge.go @@ -5,7 +5,7 @@ import ( "f5" "main/constant" "fmt" - "mt" + "main/mt" "strings" "jccommon" ) diff --git a/server/light_backtask/task/refresh_meta.go b/server/light_backtask/task/refresh_meta.go index 74b55479..802d02a4 100644 --- a/server/light_backtask/task/refresh_meta.go +++ b/server/light_backtask/task/refresh_meta.go @@ -3,7 +3,7 @@ package task import ( "q5" "f5" - "mt" + "main/mt" "fmt" "main/constant" "strings" diff --git a/server/light_backtask/task/webhook.go b/server/light_backtask/task/webhook.go index 3e424c8f..f9cba44d 100644 --- a/server/light_backtask/task/webhook.go +++ b/server/light_backtask/task/webhook.go @@ -3,7 +3,7 @@ package task import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "main/constant" "main/service" diff --git a/server/loginserver/app/app.go b/server/loginserver/app/app.go index 88572d70..c86a5f4c 100644 --- a/server/loginserver/app/app.go +++ b/server/loginserver/app/app.go @@ -2,7 +2,7 @@ package app import ( "f5" - "mt" + "main/mt" ) type app struct { diff --git a/server/loginserver/go.mod b/server/loginserver/go.mod index e39bd589..8f2ae1ca 100644 --- a/server/loginserver/go.mod +++ b/server/loginserver/go.mod @@ -6,12 +6,9 @@ require q5 v1.0.0 require f5 v1.0.0 -require mt v1.0.0 - require ( golang.org/x/sync v0.6.0 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.2 // indirect - mtb v1.0.0 // indirect ) require main v1.0.0 @@ -59,8 +56,4 @@ replace q5 => ../../third_party/q5 replace f5 => ../../third_party/f5 -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/loginserver/mt/Config.go b/server/loginserver/mt/Config.go index 7438532d..ccc23b05 100644 --- a/server/loginserver/mt/Config.go +++ b/server/loginserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/loginserver/mt/LoginCluster.go b/server/loginserver/mt/LoginCluster.go index a0e657fe..2993fcbf 100644 --- a/server/loginserver/mt/LoginCluster.go +++ b/server/loginserver/mt/LoginCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type LoginCluster struct { diff --git a/server/loginserver/mt/LoginDb.go b/server/loginserver/mt/LoginDb.go index 845f21ea..203dcea0 100644 --- a/server/loginserver/mt/LoginDb.go +++ b/server/loginserver/mt/LoginDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type LoginDb struct { diff --git a/server/loginserver/mt/go.mod b/server/loginserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/loginserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/loginserver/mtb/go.mod b/server/loginserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/loginserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/loginserver/mtb/go.sum b/server/loginserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/loginserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/mailserver/app/app.go b/server/mailserver/app/app.go index f98769e7..6d2ef934 100644 --- a/server/mailserver/app/app.go +++ b/server/mailserver/app/app.go @@ -3,7 +3,7 @@ package app import ( "f5" "main/constant" - "mt" + "main/mt" "main/middleware" . "main/global" ) diff --git a/server/mailserver/go.mod b/server/mailserver/go.mod index fb116854..b59787dd 100644 --- a/server/mailserver/go.mod +++ b/server/mailserver/go.mod @@ -8,10 +8,6 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -59,8 +55,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/mailserver/mail/mailmgr.go b/server/mailserver/mail/mailmgr.go index e06dcbae..861ae8af 100644 --- a/server/mailserver/mail/mailmgr.go +++ b/server/mailserver/mail/mailmgr.go @@ -5,7 +5,7 @@ import ( "f5" "jccommon" "main/common" - "mt" + "main/mt" "main/constant" "sync" "fmt" diff --git a/server/mailserver/mt/Config.go b/server/mailserver/mt/Config.go index 31c9df6c..d52ca4fd 100644 --- a/server/mailserver/mt/Config.go +++ b/server/mailserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/mailserver/mt/MailCluster.go b/server/mailserver/mt/MailCluster.go index 9d821836..b5e5e809 100644 --- a/server/mailserver/mt/MailCluster.go +++ b/server/mailserver/mt/MailCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailCluster struct { diff --git a/server/mailserver/mt/MailDb.go b/server/mailserver/mt/MailDb.go index 32067b75..61339a2b 100644 --- a/server/mailserver/mt/MailDb.go +++ b/server/mailserver/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/mailserver/mt/go.mod b/server/mailserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/mailserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/mailserver/mtb/go.mod b/server/mailserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/mailserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/mailserver/mtb/go.sum b/server/mailserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/mailserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/mailserver/player/player.go b/server/mailserver/player/player.go index 295f5e26..2b774464 100644 --- a/server/mailserver/player/player.go +++ b/server/mailserver/player/player.go @@ -3,7 +3,7 @@ package player import ( "q5" "f5" - "mt" + "main/mt" "sync" "main/common" "main/constant" diff --git a/server/makefile b/server/makefile index f7787862..43ef35ff 100644 --- a/server/makefile +++ b/server/makefile @@ -2,6 +2,7 @@ compile: cd adminserver && make cd gamelog && make cd backtask && make + cd light_backtask && make cd gateserver && make cd hallserver && make cd imserver && make @@ -10,3 +11,5 @@ compile: cd marketserver && make cd nftserver && make cd statserver && make + cd gamesapi && make + cd matchserver && make diff --git a/server/marketserver/api/v1/activity/stacking.go b/server/marketserver/api/v1/activity/stacking.go index 584cfbe2..1177039c 100644 --- a/server/marketserver/api/v1/activity/stacking.go +++ b/server/marketserver/api/v1/activity/stacking.go @@ -5,7 +5,7 @@ import ( "fmt" "jccommon" "main/constant" - "mt" + "main/mt" "q5" "strings" diff --git a/server/marketserver/api/v1/asset/asset.go b/server/marketserver/api/v1/asset/asset.go index af2faa0b..944f9c57 100644 --- a/server/marketserver/api/v1/asset/asset.go +++ b/server/marketserver/api/v1/asset/asset.go @@ -7,7 +7,7 @@ import ( "main/common" "jccommon" "fmt" - "mt" + "main/mt" "strings" . "main/global" "github.com/gin-gonic/gin" diff --git a/server/marketserver/api/v1/event/event.go b/server/marketserver/api/v1/event/event.go index 41b0aaa6..157ea05c 100644 --- a/server/marketserver/api/v1/event/event.go +++ b/server/marketserver/api/v1/event/event.go @@ -7,7 +7,7 @@ import ( "main/constant" . "main/global" - "mt" + "main/mt" "net/http" "q5" "strings" diff --git a/server/marketserver/api/v1/ingame/ingame.go b/server/marketserver/api/v1/ingame/ingame.go index 434958af..90ffd446 100644 --- a/server/marketserver/api/v1/ingame/ingame.go +++ b/server/marketserver/api/v1/ingame/ingame.go @@ -3,7 +3,7 @@ package ingame import ( "q5" "f5" - "mt" + "main/mt" "main/common" "main/constant" . "main/global" diff --git a/server/marketserver/api/v1/market/market.go b/server/marketserver/api/v1/market/market.go index 2c562c8a..7f36337b 100644 --- a/server/marketserver/api/v1/market/market.go +++ b/server/marketserver/api/v1/market/market.go @@ -8,7 +8,7 @@ import ( "main/constant" . "main/global" "main/service" - "mt" + "main/mt" "net/http" "q5" "strings" diff --git a/server/marketserver/api/v1/market/marketsecondary.go b/server/marketserver/api/v1/market/marketsecondary.go index d7ea27cd..4a8a5349 100644 --- a/server/marketserver/api/v1/market/marketsecondary.go +++ b/server/marketserver/api/v1/market/marketsecondary.go @@ -7,7 +7,7 @@ import ( "main/common" "main/constant" . "main/global" - "mt" + "main/mt" "net/http" "q5" "strings" diff --git a/server/marketserver/api/v1/nft/nft.go b/server/marketserver/api/v1/nft/nft.go index 7720fd2b..dfc3aea6 100644 --- a/server/marketserver/api/v1/nft/nft.go +++ b/server/marketserver/api/v1/nft/nft.go @@ -3,7 +3,7 @@ package nft import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "main/constant" "strings" diff --git a/server/marketserver/api/v1/recharge/recharge.go b/server/marketserver/api/v1/recharge/recharge.go index c33fa93b..b2177c9c 100644 --- a/server/marketserver/api/v1/recharge/recharge.go +++ b/server/marketserver/api/v1/recharge/recharge.go @@ -8,7 +8,7 @@ import ( "main/constant" "main/service" - "mt" + "main/mt" "net/http" "q5" "strings" diff --git a/server/marketserver/app/app.go b/server/marketserver/app/app.go index 144736ed..3afb8551 100644 --- a/server/marketserver/app/app.go +++ b/server/marketserver/app/app.go @@ -3,7 +3,7 @@ package app import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "main/constant" ) diff --git a/server/marketserver/cache/cachemgr.go b/server/marketserver/cache/cachemgr.go index 53b955e7..a709952d 100644 --- a/server/marketserver/cache/cachemgr.go +++ b/server/marketserver/cache/cachemgr.go @@ -3,7 +3,7 @@ package cache import ( "q5" "f5" - "mt" + "main/mt" "main/common" ) diff --git a/server/marketserver/go.mod b/server/marketserver/go.mod index bd1f35f5..e3bacbe9 100644 --- a/server/marketserver/go.mod +++ b/server/marketserver/go.mod @@ -8,12 +8,9 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - require ( golang.org/x/sync v0.6.0 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.2 // indirect - mtb v1.0.0 // indirect ) require main v1.0.0 @@ -63,8 +60,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/marketserver/middleware/jwtauth.go b/server/marketserver/middleware/jwtauth.go index b3829bf2..6917dcbe 100644 --- a/server/marketserver/middleware/jwtauth.go +++ b/server/marketserver/middleware/jwtauth.go @@ -3,7 +3,7 @@ package middleware import ( "q5" "f5" - "mt" + "main/mt" "fmt" "jccommon" "strings" diff --git a/server/marketserver/mt/Config.go b/server/marketserver/mt/Config.go index 9cce9437..86e16b15 100644 --- a/server/marketserver/mt/Config.go +++ b/server/marketserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/marketserver/mt/GameDb.go b/server/marketserver/mt/GameDb.go index ff9aa3f4..94fd37c4 100644 --- a/server/marketserver/mt/GameDb.go +++ b/server/marketserver/mt/GameDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type GameDb struct { diff --git a/server/marketserver/mt/Item.go b/server/marketserver/mt/Item.go index d855e9f9..436ad32f 100644 --- a/server/marketserver/mt/Item.go +++ b/server/marketserver/mt/Item.go @@ -4,7 +4,7 @@ import ( "q5" "f5" "os" - "mtb" + "main/mtb" "jccommon" "strings" ) diff --git a/server/marketserver/mt/Language.go b/server/marketserver/mt/Language.go index 3b18b49e..cc033fbc 100644 --- a/server/marketserver/mt/Language.go +++ b/server/marketserver/mt/Language.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Language struct { diff --git a/server/marketserver/mt/MarketServerCluster.go b/server/marketserver/mt/MarketServerCluster.go index 898c5a90..1dc42827 100644 --- a/server/marketserver/mt/MarketServerCluster.go +++ b/server/marketserver/mt/MarketServerCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MarketServerCluster struct { diff --git a/server/marketserver/mt/NftDb.go b/server/marketserver/mt/NftDb.go index b03c3842..cfb49c91 100644 --- a/server/marketserver/mt/NftDb.go +++ b/server/marketserver/mt/NftDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type NftDb struct { diff --git a/server/marketserver/mt/NftEventDb.go b/server/marketserver/mt/NftEventDb.go index 98db4282..1bcc2222 100644 --- a/server/marketserver/mt/NftEventDb.go +++ b/server/marketserver/mt/NftEventDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type NftEventDb struct { diff --git a/server/marketserver/mt/Recharge.go b/server/marketserver/mt/Recharge.go index d078a853..cc658238 100644 --- a/server/marketserver/mt/Recharge.go +++ b/server/marketserver/mt/Recharge.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Recharge struct { diff --git a/server/marketserver/mt/Web3ServiceCluster.go b/server/marketserver/mt/Web3ServiceCluster.go index a5381fe9..fd4a1acf 100644 --- a/server/marketserver/mt/Web3ServiceCluster.go +++ b/server/marketserver/mt/Web3ServiceCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Web3ServiceCluster struct { diff --git a/server/marketserver/mt/Web3SignCluster.go b/server/marketserver/mt/Web3SignCluster.go index 3133c30e..2b62e302 100644 --- a/server/marketserver/mt/Web3SignCluster.go +++ b/server/marketserver/mt/Web3SignCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Web3SignCluster struct { diff --git a/server/marketserver/mt/go.mod b/server/marketserver/mt/go.mod deleted file mode 100644 index 62f32606..00000000 --- a/server/marketserver/mt/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 -require jccommon v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace jccommon => ../../jccommon -replace mtb => ../mtb \ No newline at end of file diff --git a/server/marketserver/mtb/go.mod b/server/marketserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/marketserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/marketserver/mtb/go.sum b/server/marketserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/marketserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/matchserver/app/app.go b/server/matchserver/app/app.go index 6e54d254..48f5c8e4 100644 --- a/server/matchserver/app/app.go +++ b/server/matchserver/app/app.go @@ -5,7 +5,7 @@ import ( "f5" "main/constant" . "main/global" - "mt" + "main/mt" "q5" "ss" ) diff --git a/server/matchserver/go.mod b/server/matchserver/go.mod index 1c1a17ff..71fb38f4 100644 --- a/server/matchserver/go.mod +++ b/server/matchserver/go.mod @@ -8,10 +8,6 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require cs v1.0.0 @@ -61,10 +57,6 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace cs => ./cs replace ss => ./ss diff --git a/server/matchserver/listener/wsplistener.go b/server/matchserver/listener/wsplistener.go index 6da8787c..78bbfcdb 100644 --- a/server/matchserver/listener/wsplistener.go +++ b/server/matchserver/listener/wsplistener.go @@ -6,7 +6,7 @@ import ( "cs" "f5" - "mt" + "main/mt" "q5" "ss" diff --git a/server/matchserver/mt/Config.go b/server/matchserver/mt/Config.go index 096739b7..892bc101 100644 --- a/server/matchserver/mt/Config.go +++ b/server/matchserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/matchserver/mt/MasterCluster.go b/server/matchserver/mt/MasterCluster.go index 8b609276..88f793ed 100644 --- a/server/matchserver/mt/MasterCluster.go +++ b/server/matchserver/mt/MasterCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MasterCluster struct { diff --git a/server/matchserver/mt/MatchCluster.go b/server/matchserver/mt/MatchCluster.go index 73beece6..cd33e2f1 100644 --- a/server/matchserver/mt/MatchCluster.go +++ b/server/matchserver/mt/MatchCluster.go @@ -3,7 +3,7 @@ package mt import ( "q5" "f5" - "mtb" + "main/mtb" ) type MatchCluster struct { diff --git a/server/matchserver/mt/Robot.go b/server/matchserver/mt/Robot.go index 5a1501d4..c8c91f09 100644 --- a/server/matchserver/mt/Robot.go +++ b/server/matchserver/mt/Robot.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Robot struct { diff --git a/server/matchserver/mt/go.mod b/server/matchserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/matchserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/matchserver/mtb/go.mod b/server/matchserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/matchserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/matchserver/mtb/go.sum b/server/matchserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/matchserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/matchserver/player/player.go b/server/matchserver/player/player.go index 3a10cd72..7281b85f 100644 --- a/server/matchserver/player/player.go +++ b/server/matchserver/player/player.go @@ -9,7 +9,7 @@ import ( . "main/global" "fmt" "encoding/json" - "mt" + "main/mt" ) type hero struct { diff --git a/server/matchserver/player/playermgr.go b/server/matchserver/player/playermgr.go index c73cd89b..df66651f 100644 --- a/server/matchserver/player/playermgr.go +++ b/server/matchserver/player/playermgr.go @@ -9,7 +9,7 @@ import ( "main/common" "main/constant" . "main/global" - "mt" + "main/mt" "net" "q5" ) diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go index 573d8aec..f5775a09 100644 --- a/server/matchserver/team/team.go +++ b/server/matchserver/team/team.go @@ -4,7 +4,7 @@ import ( "q5" "f5" "cs" - "mt" + "main/mt" "main/common" "main/constant" diff --git a/server/matchserver/team/teammgr.go b/server/matchserver/team/teammgr.go index 0860dec5..a36d89a6 100644 --- a/server/matchserver/team/teammgr.go +++ b/server/matchserver/team/teammgr.go @@ -5,7 +5,7 @@ import ( "f5" "cs" "main/common" - "mt" + "main/mt" ) type teamMgr struct { diff --git a/server/nftserver/api/v1/nft/nftdetail.go b/server/nftserver/api/v1/nft/nftdetail.go index e4fdc79c..d5d8ab89 100644 --- a/server/nftserver/api/v1/nft/nftdetail.go +++ b/server/nftserver/api/v1/nft/nftdetail.go @@ -3,7 +3,7 @@ package nft import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "github.com/gin-gonic/gin" ) diff --git a/server/nftserver/api/v1/nft/nftmeta.go b/server/nftserver/api/v1/nft/nftmeta.go index a63576b6..deac83d1 100644 --- a/server/nftserver/api/v1/nft/nftmeta.go +++ b/server/nftserver/api/v1/nft/nftmeta.go @@ -3,7 +3,7 @@ package nft import ( "q5" "f5" - "mt" + "main/mt" "jccommon" "main/common" "github.com/gin-gonic/gin" diff --git a/server/nftserver/app/app.go b/server/nftserver/app/app.go index 588e4042..12c2c5f5 100644 --- a/server/nftserver/app/app.go +++ b/server/nftserver/app/app.go @@ -2,7 +2,7 @@ package app import ( "f5" - "mt" + "main/mt" ) type app struct { diff --git a/server/nftserver/go.mod b/server/nftserver/go.mod index 6f1a2b57..5a2bbf1c 100644 --- a/server/nftserver/go.mod +++ b/server/nftserver/go.mod @@ -8,12 +8,9 @@ require f5 v1.0.0 require jccommon v1.0.0 -require mt v1.0.0 - require ( golang.org/x/sync v0.6.0 // indirect gopkg.in/go-jose/go-jose.v2 v2.6.2 // indirect - mtb v1.0.0 // indirect ) require main v1.0.0 @@ -63,8 +60,4 @@ replace f5 => ../../third_party/f5 replace jccommon => ../jccommon -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/nftserver/mt/Config.go b/server/nftserver/mt/Config.go index bdcb7f55..b6732ebb 100644 --- a/server/nftserver/mt/Config.go +++ b/server/nftserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/nftserver/mt/NftDb.go b/server/nftserver/mt/NftDb.go index b03c3842..cfb49c91 100644 --- a/server/nftserver/mt/NftDb.go +++ b/server/nftserver/mt/NftDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type NftDb struct { diff --git a/server/nftserver/mt/NftHomeMeta.go b/server/nftserver/mt/NftHomeMeta.go index 5e101d49..d74d2c47 100644 --- a/server/nftserver/mt/NftHomeMeta.go +++ b/server/nftserver/mt/NftHomeMeta.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type NftHomeMeta struct { diff --git a/server/nftserver/mt/NftServerCluster.go b/server/nftserver/mt/NftServerCluster.go index 4980a16e..57ba096e 100644 --- a/server/nftserver/mt/NftServerCluster.go +++ b/server/nftserver/mt/NftServerCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type NftServerCluster struct { diff --git a/server/nftserver/mt/go.mod b/server/nftserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/nftserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/nftserver/mtb/go.mod b/server/nftserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/nftserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/nftserver/mtb/go.sum b/server/nftserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/nftserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= diff --git a/server/statserver/app/app.go b/server/statserver/app/app.go index 3811ac80..c4ec1dc4 100644 --- a/server/statserver/app/app.go +++ b/server/statserver/app/app.go @@ -2,7 +2,7 @@ package app import ( "f5" - "mt" + "main/mt" ) type app struct { diff --git a/server/statserver/go.mod b/server/statserver/go.mod index 5a79a75f..f7d452de 100644 --- a/server/statserver/go.mod +++ b/server/statserver/go.mod @@ -6,10 +6,6 @@ require q5 v1.0.0 require f5 v1.0.0 -require mt v1.0.0 - -require mtb v1.0.0 // indirect - require main v1.0.0 require ( @@ -55,8 +51,4 @@ replace q5 => ../../third_party/q5 replace f5 => ../../third_party/f5 -replace mt => ./mt - -replace mtb => ./mtb - replace main => ./ diff --git a/server/statserver/mt/Config.go b/server/statserver/mt/Config.go index 39f961a2..dcfe6c84 100644 --- a/server/statserver/mt/Config.go +++ b/server/statserver/mt/Config.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type Config struct { diff --git a/server/statserver/mt/MailCluster.go b/server/statserver/mt/MailCluster.go index 9d821836..b5e5e809 100644 --- a/server/statserver/mt/MailCluster.go +++ b/server/statserver/mt/MailCluster.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailCluster struct { diff --git a/server/statserver/mt/MailDb.go b/server/statserver/mt/MailDb.go index 32067b75..61339a2b 100644 --- a/server/statserver/mt/MailDb.go +++ b/server/statserver/mt/MailDb.go @@ -2,7 +2,7 @@ package mt import ( "f5" - "mtb" + "main/mtb" ) type MailDb struct { diff --git a/server/statserver/mt/go.mod b/server/statserver/mt/go.mod deleted file mode 100644 index 53d319d6..00000000 --- a/server/statserver/mt/go.mod +++ /dev/null @@ -1,14 +0,0 @@ -module mt - -go 1.20 - -require q5 v1.0.0 -require f5 v1.0.0 -require mtb v1.0.0 - -require ( -) - -replace q5 => ../../../third_party/q5 -replace f5 => ../../../third_party/f5 -replace mtb => ../mtb \ No newline at end of file diff --git a/server/statserver/mtb/go.mod b/server/statserver/mtb/go.mod deleted file mode 100644 index 5e8b3f91..00000000 --- a/server/statserver/mtb/go.mod +++ /dev/null @@ -1,16 +0,0 @@ -module mtb - -go 1.20 - -require q5 v1.0.0 - -require f5 v1.0.0 - -require ( - github.com/golang/protobuf v1.5.0 - google.golang.org/protobuf v1.31.0 -) - -replace q5 => ../../../third_party/q5 - -replace f5 => ../../../third_party/f5 diff --git a/server/statserver/mtb/go.sum b/server/statserver/mtb/go.sum deleted file mode 100644 index 88e5c542..00000000 --- a/server/statserver/mtb/go.sum +++ /dev/null @@ -1,23 +0,0 @@ -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=