From 351798662aa7a067b6e1131e3b92ffb4bef061de Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Mon, 4 Sep 2023 19:05:23 +0800 Subject: [PATCH] 1 --- .../config/adminserver.cluster.json | 7 ++++ bin/adminserver/config/config.json | 3 ++ bin/adminserver/config/frienddb.mysql.json | 7 ++++ bin/adminserver/config/gamedb.mysql.json | 7 ++++ server/adminserver/app.go | 2 + server/adminserver/export.go | 1 + server/adminserver/ginmgr.go | 39 +++++++++++++++++++ server/adminserver/go.mod | 1 + server/adminserver/go.sum | 2 + server/adminserver/mt/export.go | 2 +- 10 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 bin/adminserver/config/adminserver.cluster.json create mode 100644 bin/adminserver/config/config.json create mode 100644 bin/adminserver/config/frienddb.mysql.json create mode 100644 bin/adminserver/config/gamedb.mysql.json create mode 100644 server/adminserver/ginmgr.go diff --git a/bin/adminserver/config/adminserver.cluster.json b/bin/adminserver/config/adminserver.cluster.json new file mode 100644 index 00000000..32b0e5bc --- /dev/null +++ b/bin/adminserver/config/adminserver.cluster.json @@ -0,0 +1,7 @@ +[ + { + "instance_id": 1, + "listen_port": 8890, + "http_listen_port": 9991 + } +] diff --git a/bin/adminserver/config/config.json b/bin/adminserver/config/config.json new file mode 100644 index 00000000..de800383 --- /dev/null +++ b/bin/adminserver/config/config.json @@ -0,0 +1,3 @@ +{ + "gameapi_url": "https://game2006api-test.kingsome.cn" +} diff --git a/bin/adminserver/config/frienddb.mysql.json b/bin/adminserver/config/frienddb.mysql.json new file mode 100644 index 00000000..08826af9 --- /dev/null +++ b/bin/adminserver/config/frienddb.mysql.json @@ -0,0 +1,7 @@ +{ + "host": "login-test.kingsome.cn", + "port": 3306, + "user": "root", + "passwd": "keji178", + "database": "frienddb_dev_1" +} diff --git a/bin/adminserver/config/gamedb.mysql.json b/bin/adminserver/config/gamedb.mysql.json new file mode 100644 index 00000000..0e7a7e40 --- /dev/null +++ b/bin/adminserver/config/gamedb.mysql.json @@ -0,0 +1,7 @@ +{ + "host": "login-test.kingsome.cn", + "port": 3306, + "user": "root", + "passwd": "keji178", + "database": "gamedb2006_dev_1" +} diff --git a/server/adminserver/app.go b/server/adminserver/app.go index fb3baa66..9602567c 100644 --- a/server/adminserver/app.go +++ b/server/adminserver/app.go @@ -15,9 +15,11 @@ func (this *App) GetPkgName() string { func (this *App) Init() { f5.LoadMetaTable(mt.Table) this.registerDataSources() + ginMgr.init() } func (this *App) UnInit() { + ginMgr.unInit() } func (this *App) Update() { diff --git a/server/adminserver/export.go b/server/adminserver/export.go index eb8ee4dc..ac30e302 100644 --- a/server/adminserver/export.go +++ b/server/adminserver/export.go @@ -1,3 +1,4 @@ package main var app = new(App) +var ginMgr = new(GinMgr) diff --git a/server/adminserver/ginmgr.go b/server/adminserver/ginmgr.go new file mode 100644 index 00000000..5c031ca3 --- /dev/null +++ b/server/adminserver/ginmgr.go @@ -0,0 +1,39 @@ +package main + +import ( + "time" + "net/http" + "github.com/gin-gonic/gin" + "golang.org/x/sync/errgroup" +) + +type GinMgr struct { + group errgroup.Group +} + +func (this *GinMgr) init() { + server01 := &http.Server{ + Addr: ":8080", + Handler: this.router(), + ReadTimeout: 5 * time.Second, + WriteTimeout: 10 * time.Second, + } + this.group.Go(func() error { + return server01.ListenAndServe() + }) +} + +func (this *GinMgr) unInit() { +} + +func (this *GinMgr) router() http.Handler { + r := gin.New() + r.Use(gin.Recovery()) + r.GET("/webapp/index.php", func(c *gin.Context) { + c.JSON(200, gin.H{ + "errcode": 0, + "errmsg": "", + }) + }) + return r +} diff --git a/server/adminserver/go.mod b/server/adminserver/go.mod index dba48acf..ceab9a13 100644 --- a/server/adminserver/go.mod +++ b/server/adminserver/go.mod @@ -37,6 +37,7 @@ require ( golang.org/x/arch v0.5.0 // indirect golang.org/x/crypto v0.12.0 // indirect golang.org/x/net v0.14.0 // indirect + golang.org/x/sync v0.3.0 // indirect golang.org/x/sys v0.12.0 // indirect golang.org/x/text v0.13.0 // indirect google.golang.org/protobuf v1.31.0 // indirect diff --git a/server/adminserver/go.sum b/server/adminserver/go.sum index 2c89f139..9faf4bda 100644 --- a/server/adminserver/go.sum +++ b/server/adminserver/go.sum @@ -88,6 +88,8 @@ golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk= golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw= golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o= diff --git a/server/adminserver/mt/export.go b/server/adminserver/mt/export.go index 99a1c4ee..778e2b83 100644 --- a/server/adminserver/mt/export.go +++ b/server/adminserver/mt/export.go @@ -13,7 +13,7 @@ type table struct { var Table = f5.New(func (this* table) { this.AdminCluster = f5.New(func (this *AdminClusterTable) { - this.FileName = "../config/imserver.cluster.json" + this.FileName = "../config/adminserver.cluster.json" this.PrimKey = "instance_id" });