fix打包配置

config/config.toml

@@ -49,65 +49,9 @@ mongo-port = "20001"
     pass = "admin"
 
 
-#------X1韩国-正式服------
-# [database]  #数据库配置
-#     link = "mysql:gmadmin:n4sbKk6trTBNPhCb@tcp(127.0.0.1:3306)/gm"
-# [mongo]
-#     default = "mongodb://ilodadmin:dlffhem!0929#$@bahl6.vpc.mg.naverncp.com:17017"
-# [redis]    #Redis数据库配置
-#     default = "192.168.1.10:6080,0,kjm20220829@WH_redis"
-#     cache   = "192.168.1.10:6080,1,kjm20220829@WH_redis?idleTimeout=600"
-# [db]    # X1韩国正式
-#      itemlog = "x1_ilod_login"
-#      login = "x1_ilod_login"
-#      core = "x1_ilod_login"
-#      prefix = "x1_ilod_game_"
-
-#------韩国测试服 新------
-# [database]  #数据库配置
-#     link = "mysql:gmadmin:6NTkMYDeawWWXji5@tcp(127.0.0.1:3306)/gm"
-# [mongo]
-#     default = "mongodb://root:kjm2022&WH5b1Ae9@127.0.0.1:27020"
-# [redis]    #Redis数据库配置
-#     default = "127.0.0.1:6080,0,kjm2022@WH_redis"
-#     cache   = "127.0.0.1:6080,1,kjm2022@WH_redis?idleTimeout=600"
-# [db]    # X1韩国测试
-#      itemlog = "x1_korea_test_login"
-#      login = "x1_korea_test_login"
-#      core = "x1_korea_test_login"
-#      prefix = "x1_korea_game_"
-
-#------QA测试服------
-# [database]  #数据库配置
-#     link = "mysql:root:Aa_123456@tcp(127.0.0.1:3306)/gm"
-# [mongo]
-#     default = "mongodb://admin:123456@120.92.119.145:27020"
-# [redis]    #Redis数据库配置
-#     default = "120.92.119.145:6080,0,@emiplay_m5fangzhi_redis"
-#     cache   = "120.92.119.145:6080,1,@emiplay_m5fangzhi_redis?idleTimeout=600"
-# [db]    # X1韩国测试
-#      itemlog = "m5_x1_login"
-#      login = "m5_x1_login"
-#      core = "m5_x1_login"
-#      prefix = "m5_x1_game_"
-
-#------国内quick正式服------
-# [database]  #数据库配置
-#     link = "mysql:root:Aa_123$%^@tcp(127.0.0.1:3306)/gm"
-# [mongo]
-#     default = "mongodb://ilodadmin:VV20221116#WH_db@10.206.0.3:27017"
-# [redis]    #Redis数据库配置
-#     default = "1.13.164.95:6379,0,kjm20220829@WH_redis"
-#     cache   = "1.13.164.95:6379,1,kjm20220829@WH_redis?idleTimeout=600"
-# [db]    # X1韩国测试
-#      itemlog = "x1_test_login"
-#      login = "x1_test_login"
-#      core = "x1_test_login"
-#      prefix = "x1_test_game_"
-
-#------国内九九正式服------
 [database]  #数据库配置
-    link = "mysql:root:f7bd979b98fb334d@tcp(127.0.0.1:3306)/gm"
+    default = true
+    link = "mysql:root:f7bd979b98fb334d@tcp(127.0.0.1:3306)/gm?charset=utf8mb4&parseTime=True&loc=Local"
 [mongo]
     default = "mongodb://172.0.0.1:27017"
 [redis]    #Redis数据库配置
@@ -119,93 +63,6 @@ mongo-port = "20001"
      core = "x5_tk_login"
      prefix = "x5_tk_game_"
 
-#------韩国测试服 老------
-# [database]  #数据库配置
-#     link = "mysql:gmadmin:6NTkMYDeawWWXji5@tcp(127.0.0.1:3306)/gm"
-# [mongo]
-#     default = "mongodb://root:kjm2022&WH5b1Ae9@127.0.0.1:27020"
-# [redis]    #Redis数据库配置
-#     default = "127.0.0.1:6080,0,kjm2022@WH_redis"
-#     cache   = "127.0.0.1:6080,1,kjm2022@WH_redis?idleTimeout=600"
-# [db]    # X1赤兔正式
-#      itemlog = "x1_korea_test_login"
-#      login = "x1_korea_test_login"
-#      core = "x1_korea_test_login"
-#      prefix = "x1_korea_game_"
-
-
-# #------赤兔测试服------
-# [database]  #数据库配置
-#     link = "mysql:gm:k6GKdx24zpAC3GJp@tcp(10.0.0.92:3306)/gm"           #赤兔测试服
-# [mongo]
-#     default = "mongodb://root:kjm2022&WH@10.0.0.92:27020"               #赤兔测试服
-# [redis]    #Redis数据库配置
-#     default = "127.0.0.1:6080,0,kjm2022@WH_redis"
-#     cache   = "127.0.0.1:6080,1,kjm2022@WH_redis?idleTimeout=600"
-# [db]    #赤兔测试服
-#    itemlog = "x1_cn_test_login"
-#    login = "x1_cn_test_login"
-#    core = "x1_cn_test_login"
-#    prefix = "x1_cn_test_game_"
-
-# #------赤兔正式服------
-# [database]  #数据库配置
-#     link = "mysql:gmadmin:7h64j5pJdMn86YpP@tcp(127.0.0.1:3306)/gm"       #赤兔正式服
-# [mongo]
-#     default = "mongodb://mongouser:vuvEUUp8x2SFq@192.168.7.12:27017"         #赤兔正式服
-# [redis]    #Redis数据库配置
-#     default = "192.168.7.5:6080,0,kjm20220804@WH_redis"
-#     cache   = "192.168.7.5:6080,1,kjm20220804@WH_redis?idleTimeout=600"
-# [db]    # X1赤兔正式
-#      itemlog = "x1_cn_chitu_login"
-#      login = "x1_cn_chitu_login"
-#      core = "x1_cn_chitu_login"
-#      prefix = "x1_cn_chitu_game_"
-
-# 数据库配置
-#[database]
-    #link = "mysql:root:6ce975d0f2af0ce0@tcp(10.0.0.118:3306)/gm"
-    #link = "mysql:admin:Lwmfwje88DCWZFme@tcp(127.0.0.1:3306)/gm"
-    #link = "mysql:gm:k6GKdx24zpAC3GJp@tcp(10.0.0.92:3306)/gm"       #测试服
-    #link = "mysql:gmadmin:7h64j5pJdMn86YpP@tcp(127.0.0.1:3306)/gm"       #赤兔正式服
-#[mongo]
-    #default = "mongodb://admin:123456@120.92.119.145:27020"
-    #default = "mongodb://127.0.0.1:27017"
-    #default = "mongodb://root:kejm&2580WH@10.0.1.131:27017"
-    #default = "mongodb://root:kjm2022&WH@10.0.0.92:27020"           #测试服
-    #default = "mongodb://mongouser:vuvEUUp8x2SFq@192.168.7.12:27017"         #赤兔正式服
-
-# Redis数据库配置
-#[redis]
-    #default = "127.0.0.1:6379,0"
-    #cache   = "127.0.0.1:6379,1,123456?idleTimeout=600"
-    ##default = "192.168.7.5:6080,0,kjm20220804@WH_redis"
-    #cache   = "192.168.7.5:6080,1,kjm20220804@WH_redis?idleTimeout=600"
-
-#[db]
-# X1赤兔正式
-     #itemlog = "x1_cn_chitu_login"
-     #login = "x1_cn_chitu_login"
-     #core = "x1_cn_chitu_login"
-     #prefix = "x1_cn_chitu_game_"
-# # X1国内正式服
-#      itemlog = "x1_cn_login"
-#      login = "x1_cn_login"
-#      core = "x1_cn_login"
-#      prefix = "x1_cn_game_"
-
-# X1国内测试服
-#    itemlog = "x1_cn_test_login"
-#    login = "x1_cn_test_login"
-#    core = "x1_cn_test_login"
-#    prefix = "x1_cn_test_game_"
-
-# 本地服
-#     itemlog = "m5_x1_login"
-#     login = "m5_x1_login"
-#     core = "m5_x1_login"
-#     prefix = "m5_x1_game_"
-
 # 游戏名字（百度-计收独代数据用）
 [game]
     name = "errorcity"

config/default.toml

@@ -0,0 +1,70 @@
+# log-path = "./logs"
+# http-port = 80
+url-path = ""
+startday= "2022-02-22"
+# 发送全服邮件中使用的uid
+userId = "10000006"
+# mongo 默认服务器端口
+mongo-port = "20001"
+
+# gtoken配置文件
+[gtoken]
+    # 缓存模式 1 gcache 2 gredis
+    cache-mode = 1
+    # 是否支持多端登录
+    multi-login = true
+
+[server]
+    Address          = ":8083"
+    ServerRoot       = "public"
+    LogPath          = "./logs"
+#    IndexFiles       = ["index.php", "main.php"]
+    AccessLogEnabled = false
+    ErrorLogEnabled  = true
+    PProfEnabled     = true
+#    SessionIdName    = "MySessionId"
+#    SessionPath      = "/tmp/MySessionStoragePath"
+#    SessionMaxAge    = "24h"
+#    DumpRouterMap    = false
+
+# 全局日志配置
+[logger]
+    Path   = "./logs"
+    Level  = "all"
+    Stdout = true
+
+# 模板引擎配置
+[viewer]
+#    Path        = "./template"
+    DefaultFile = "index.html"
+    Delimiters  =  ["${", "}"]
+
+# title设置
+[setting]
+    title = "配置管理中心"
+
+# WebServer管理
+[admin]
+    user = "admin"
+    pass = "admin"
+
+
+[database]  #数据库配置
+    default = true
+    link = "mysql:root:f7bd979b98fb334d@tcp(127.0.0.1:3306)/gm?charset=utf8mb4&parseTime=True&loc=Local"
+[mongo]
+    default = "mongodb://172.0.0.1:27017"
+[redis]    #Redis数据库配置
+    default = "127.0.0.1:6379,0"
+    cache   = "127.0.0.1:6379,1?idleTimeout=600"
+[db]    # X1韩国测试
+     itemlog = "x5_tk_login"
+     login = "x5_tk_login"
+     core = "x5_tk_login"
+     prefix = "x5_tk_game_"
+
+# 游戏名字（百度-计收独代数据用）
+[game]
+    name = "errorcity"
+    # 是否需要导出    0：不导出； 1：导出
+    export = "1"

go.mod

@@ -6,7 +6,9 @@ require (
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/goflyfox/gtoken v1.4.1
 	github.com/gogf/gf v1.14.5
+	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/jsyzchen/pan v0.0.9
 	github.com/jszwec/csvutil v1.6.0
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	go.mongodb.org/mongo-driver v1.3.1
 )

go.sum

@@ -58,6 +58,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
 github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jsyzchen/pan v0.0.9 h1:6R4XdueMQ/kC7P7Ja+szkR8PZh2R6i0PuZ7UUFEMrng=
 github.com/jsyzchen/pan v0.0.9/go.mod h1:R/n6SD89FCwMNQLOp29zR7hhCw2Ec30uilSbYiupmgw=
 github.com/jszwec/csvutil v1.6.0 h1:QORXquCT0t8nUKD7utAD4HDmQMgG0Ir9WieZXzpa7ms=
@@ -80,8 +82,12 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
 github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
 github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=

library/mongo/gameinfo/ServerInfo.go

@@ -6,31 +6,31 @@ import (
 )
 
 type ServerInfo struct {
-	Id            int     `bson:"_id"  	 			json:"id"`
-	Name          string  `bson:"name"     			json:"name"`
-	Ip            string  `bson:"ip"      			json:"ip"`
-	Port          string  `bson:"port"      		json:"port"`
-	ServerId      string  `bson:"server_id"      	json:"serverid"`
-	Channel       string  `bson:"channel"      		json:"channel"`
-	SubChannel    string  `bson:"sub_channel"   	json:"subchannel"`
-	State         string  `bson:"state"      		json:"state"`
-	Plat          string  `bson:"plat"      		json:"plat"`
-	OpenTime      string  `bson:"open_time"      	json:"opentime"`
-	OpenType      string  `bson:"open_type"      	json:"opentype"`
-	IsNew         string  `bson:"is_new"      		json:"isnew"`
-	IsBanreg      string  `bson:"is_banreg"      	json:"isbanreg"`
-	IsWhite       string  `bson:"isWhite"      		json:"iswhite"`
+	Id            int    `bson:"_id"  	 			json:"id"`
+	Name          string `bson:"name"     			json:"name"`
+	Ip            string `bson:"ip"      			json:"ip"`
+	Port          string `bson:"port"      		json:"port"`
+	ServerId      string `bson:"server_id"      	json:"serverid"`
+	Channel       string `bson:"channel"      		json:"channel"`
+	SubChannel    string `bson:"sub_channel"   	json:"subchannel"`
+	State         string `bson:"state"      		json:"state"`
+	Plat          string `bson:"plat"      		json:"plat"`
+	OpenTime      string `bson:"open_time"      	json:"opentime"`
+	OpenType      string `bson:"open_type"      	json:"opentype"`
+	IsNew         string `bson:"is_new"      		json:"isnew"`
+	IsBanreg      string `bson:"is_banreg"      	json:"isbanreg"`
+	IsWhite       string `bson:"isWhite"      		json:"iswhite"`
 	ServerVersion string `bson:"server_version"	json:"serverversion"`
-	GMIp          string  `bson:"gm_ip"				json:"gmip"`
-	GMPort        string  `bson:"gm_port"			json:"gmport"`
-	Timezone      string  `bson:"time_zone"			json:"timezone"`	// 时区
-	Currency      string  `bson:"currency"			json:"currency"`	// 币种
-	Exportdata    string  `bson:"exportdata"	 	json:"exportdata"`	// 是否导出数据
+	GMIp          string `bson:"gm_ip"				json:"gmip"`
+	GMPort        string `bson:"gm_port"			json:"gmport"`
+	Timezone      string `bson:"time_zone"			json:"timezone"` // 时区
+	Currency      string `bson:"currency"			json:"currency"`  // 币种
+	Exportdata    string `bson:"exportdata"	 	json:"exportdata"` // 是否导出数据
 }
 
 var (
 	// Table is the table name of account.
-	TableServer = "server_info"
+	TableServer      = "server_info"
 	ServerTablbeName = g.Config().GetString("db.core")
 	// Model is the model object of account.
 	ModelServer = dao.NewMgo(ServerTablbeName, TableServer)

main.go

@@ -8,6 +8,7 @@ import (
 	_ "gmanager/router"
 )
 
+// 默认使用default.toml
 func main() {
 	fmt.Println("main run ...")
 	//task.Liucun()