From cb551a45b5f37202d0a6df61b3d6fbdd4d8bdaea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= Date: Tue, 7 Nov 2023 11:08:55 +0800 Subject: [PATCH] =?UTF-8?q?Add=20admin=E6=88=98=E6=96=97=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=99=A8=E5=88=97=E8=A1=A8,=20=E9=82=AE=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2remote=20request=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/v1/system/battle_server.go | 89 +++++++++++++++++++ server/adminserver/api/v1/system/email.go | 16 ++-- server/adminserver/api/v1/system/enter.go | 1 + server/adminserver/constant/constant.go | 7 +- .../adminserver/model/system/battle_server.go | 12 +++ server/adminserver/router/routermgr.go | 1 + server/adminserver/router/system/enter.go | 1 + .../router/system/sys_battle_server.go | 18 ++++ server/adminserver/router/system/sys_email.go | 2 +- 9 files changed, 136 insertions(+), 11 deletions(-) create mode 100644 server/adminserver/api/v1/system/battle_server.go create mode 100644 server/adminserver/model/system/battle_server.go create mode 100644 server/adminserver/router/system/sys_battle_server.go diff --git a/server/adminserver/api/v1/system/battle_server.go b/server/adminserver/api/v1/system/battle_server.go new file mode 100644 index 00000000..eeba2459 --- /dev/null +++ b/server/adminserver/api/v1/system/battle_server.go @@ -0,0 +1,89 @@ +package system + +import ( + "adminsever/constant" + "adminsever/model/system" + "f5" + "github.com/gin-gonic/gin" + "net/http" +) + +type BattleServerApi struct{} + +func (s *BattleServerApi) Add(c *gin.Context) { + server := system.BattleServer{} + if err := c.ShouldBindJSON(&server); err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } + + err := f5.GetApp().GetOrmDb(constant.ADMIN_DB).Create(&server).Error + if err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } + + // response + c.JSON(http.StatusOK, gin.H{ + "code": 0, + "message": "success", + "data": "", + }) +} + +func (s *BattleServerApi) List(c *gin.Context) { + var battleServers []system.BattleServer + err := f5.GetApp().GetOrmDb(constant.ADMIN_DB).Find(&battleServers).Error + if err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } + c.JSON(http.StatusOK, gin.H{ + "code": 0, + "message": "success", + "data": battleServers, + }) +} + +func (s *BattleServerApi) Update(c *gin.Context) { + entity := system.BattleServer{} + if err := c.ShouldBindJSON(&entity); err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } + var count int64 + f5.GetApp().GetOrmDb(constant.ADMIN_DB).Table(entity.TableName()).Where("idx = ?", entity.Idx).Count(&count) + if count < 1 { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": "不存在的数据", + }) + return + } + + err := f5.GetApp().GetOrmDb(constant.ADMIN_DB).Select("*").Omit("idx").Where("idx = ?", entity.Idx).Updates(&entity).Error + if err != nil { + c.JSON(http.StatusOK, gin.H{ + "code": 1, + "message": err.Error(), + }) + return + } + + c.JSON(http.StatusOK, gin.H{ + "code": 0, + "message": "success", + }) +} diff --git a/server/adminserver/api/v1/system/email.go b/server/adminserver/api/v1/system/email.go index 333c805e..9e6896d8 100644 --- a/server/adminserver/api/v1/system/email.go +++ b/server/adminserver/api/v1/system/email.go @@ -13,7 +13,11 @@ type EmailApi struct { } var ( - url = "https://" + constant.EMAIL_URL_DEV + "/webapp/index.php" + url = "https://" + constant.EMAIL_URL_DEV + "/webapp/index.php" + SendEmailAPI = "http://localhost:9992/mail_mgr/sendMail" + EmailListAPI = "http://localhost:9992/mail_mgr/getMailList" + DeleteEmailAPI = "http://localhost:9992/mail_mgr/deleteMail" + UpdateEmailAPI = "http://localhost:9992/mail_mgr/updateMail" ) type emailReq struct { @@ -57,7 +61,7 @@ func (this *EmailApi) SendEmail(c *gin.Context) { "key": constant.EMAIL_KEY, } - f5.GetHttpCliMgr().SyncSendGoStyleRequest(url, params, func(response f5.HttpCliResponse) { + f5.GetHttpCliMgr().SyncSendGoStyleRequest(SendEmailAPI, params, func(response f5.HttpCliResponse) { err := response.GetErr() data := response.GetRawData() if err != nil { @@ -89,12 +93,10 @@ func (this *EmailApi) SendEmail(c *gin.Context) { func (this *EmailApi) EmailList(c *gin.Context) { params := map[string]string{ - "c": "MailMgr", - "a": "getMailList", "key": constant.EMAIL_KEY, "gameid": constant.GAMEID, } - f5.GetHttpCliMgr().SyncSendGoStyleRequest(url, params, func(response f5.HttpCliResponse) { + f5.GetHttpCliMgr().SyncSendGoStyleRequest(EmailListAPI, params, func(response f5.HttpCliResponse) { err := response.GetErr() data := response.GetRawData() if err != nil { @@ -175,7 +177,7 @@ func (this *EmailApi) UpdateEmail(c *gin.Context) { "key": constant.EMAIL_KEY, } - f5.GetHttpCliMgr().SyncSendGoStyleRequest(url, params, func(response f5.HttpCliResponse) { + f5.GetHttpCliMgr().SyncSendGoStyleRequest(UpdateEmailAPI, params, func(response f5.HttpCliResponse) { err := response.GetErr() data := response.GetRawData() if err != nil { @@ -215,7 +217,7 @@ func (this *EmailApi) DelEmail(c *gin.Context) { "key": constant.EMAIL_KEY, } - f5.GetHttpCliMgr().SyncSendGoStyleRequest(url, params, func(response f5.HttpCliResponse) { + f5.GetHttpCliMgr().SyncSendGoStyleRequest(DeleteEmailAPI, params, func(response f5.HttpCliResponse) { err := response.GetErr() data := response.GetRawData() if err != nil { diff --git a/server/adminserver/api/v1/system/enter.go b/server/adminserver/api/v1/system/enter.go index 710c0828..1f0686da 100644 --- a/server/adminserver/api/v1/system/enter.go +++ b/server/adminserver/api/v1/system/enter.go @@ -5,4 +5,5 @@ type ApiGroup struct { AnncApi AuditApi EmailApi + BattleServerApi } diff --git a/server/adminserver/constant/constant.go b/server/adminserver/constant/constant.go index 72411eae..5664a080 100644 --- a/server/adminserver/constant/constant.go +++ b/server/adminserver/constant/constant.go @@ -17,7 +17,8 @@ const ( ) const ( - GAMEID = "2006" - EMAIL_URL_DEV = "gamemail-test.kingsome.cn" - EMAIL_KEY = "520d8eeb8cf1d833a42c820432c020b2fd60f4b7|" + EMAIL_URL_DEV + GAMEID = "2006" + EMAIL_URL_DEV = "gamemail-test.kingsome.cn" + API_MAIL_HOST_DEV = "localhost:9992" + EMAIL_KEY = "520d8eeb8cf1d833a42c820432c020b2fd60f4b7|" + EMAIL_URL_DEV ) diff --git a/server/adminserver/model/system/battle_server.go b/server/adminserver/model/system/battle_server.go new file mode 100644 index 00000000..36e806c8 --- /dev/null +++ b/server/adminserver/model/system/battle_server.go @@ -0,0 +1,12 @@ +package system + +type BattleServer struct { + Idx int `json:"idx"` + Name string `json:"name"` + Host string `json:"host"` + IsEnable int `json:"is_enable"` +} + +func (s BattleServer) TableName() string { + return "t_battle_servers" +} diff --git a/server/adminserver/router/routermgr.go b/server/adminserver/router/routermgr.go index 44c93591..9e3524c2 100644 --- a/server/adminserver/router/routermgr.go +++ b/server/adminserver/router/routermgr.go @@ -20,6 +20,7 @@ func (this *routerMgr) Init() { this.system.InitAnncRouter(priGroup) this.system.InitAuditRouter(priGroup) this.system.InitEmailRouter(priGroup) + this.system.InitBattleServerRouter(priGroup) f5.GetSysLog().Info("routerMgr.init") } diff --git a/server/adminserver/router/system/enter.go b/server/adminserver/router/system/enter.go index 7b340d91..279f3e30 100644 --- a/server/adminserver/router/system/enter.go +++ b/server/adminserver/router/system/enter.go @@ -5,4 +5,5 @@ type RouterGroup struct { AnncRouter AuditRouter EmailRoute + BattleServerRoute } diff --git a/server/adminserver/router/system/sys_battle_server.go b/server/adminserver/router/system/sys_battle_server.go new file mode 100644 index 00000000..e15977a9 --- /dev/null +++ b/server/adminserver/router/system/sys_battle_server.go @@ -0,0 +1,18 @@ +package system + +import ( + "github.com/gin-gonic/gin" + "main/api/v1" +) + +type BattleServerRoute struct{} + +func (r *BattleServerRoute) InitBattleServerRouter(priRouter *gin.RouterGroup) { + priUserRouter := priRouter.Group("battle_server") + api := v1.ApiGroupApp.SystemApiGroup.BattleServerApi + { + priUserRouter.POST("add", api.Add) + priUserRouter.GET("list", api.List) + priUserRouter.PUT("update", api.Update) + } +} diff --git a/server/adminserver/router/system/sys_email.go b/server/adminserver/router/system/sys_email.go index d72d797e..3ec9452b 100644 --- a/server/adminserver/router/system/sys_email.go +++ b/server/adminserver/router/system/sys_email.go @@ -7,7 +7,7 @@ import ( type EmailRoute struct{} -func (this *AnncRouter) InitEmailRouter(priRouter *gin.RouterGroup) { +func (this *EmailRoute) InitEmailRouter(priRouter *gin.RouterGroup) { priUserRouter := priRouter.Group("email") emailApi := v1.ApiGroupApp.SystemApiGroup.EmailApi {