新增配置管理

conf/ali-test/cfg_test.conf

@@ -1,3 +1,8 @@
+[app]
+gameKey=b8JKMN1UhanX
+
+[gameservers]
+web=127.0.0.1:8112
 
 [events]
 path=./log

conf/neo/cfg_test.conf

@@ -1,3 +1,8 @@
+[app]
+gameKey=b8JKMN1UhanX
+
+[gameservers]
+web=127.0.0.1:8303
 
 [events]
 path=./log

controllers/default.go

@@ -149,6 +149,11 @@ func getIndex(permission int64) []*NavInfo {
 			Name: "兑换码",
 			Url:  "exchangecode.html",
 		})
+		navInfo.IndexList = append(navInfo.IndexList, &IndexInfo{
+			Id:   models.ModelSystem,
+			Name: "配置管理",
+			Url:  "gameconfig.html",
+		})
 
 		navList = append(navList, navInfo)
 	}

controllers/gameconfig.go

@@ -0,0 +1,54 @@
+// 实时数据
+package controllers
+
+import (
+	"box-gm/models"
+	"fmt"
+	"log"
+
+	"github.com/astaxie/beego"
+)
+
+type GameConfigController struct {
+	beego.Controller
+}
+
+func (c *GameConfigController) Get() {
+	userinfo := c.GetSession("user")
+	if userinfo == nil {
+		c.Ctx.Redirect(302, "/accountlogin")
+		return
+	}
+	c.Data["username"] = userinfo.(*LoginInfo).Username
+	c.Data["token"] = models.GetToken()
+	userPermission := models.GetPermission(userinfo.(*LoginInfo).Username)
+	if (userPermission & (1 << uint(models.ModelSystem))) == 0 {
+		c.Ctx.Redirect(302, "/accountlogin")
+		return
+	}
+
+	c.TplName = "gameconfig.tpl"
+}
+
+func (c *GameConfigController) Post() {
+	userinfo := c.GetSession("user")
+	log.Printf("GameConfigController Post userinfo[%v]", userinfo)
+	if userinfo == nil {
+		c.Ctx.Redirect(302, "/accountlogin")
+		return
+	}
+	ty := c.GetString("ty")
+	switch ty {
+	case "items":
+		models.UpdateItemConfig()
+	case "goods":
+		models.UpdateGoodsConfig()
+	default:
+		c.Data["json"] = &map[string]interface{}{"status": false, "info": fmt.Sprintf("更新失败:不支持类型%s", ty)}
+		c.ServeJSON()
+		return
+	}
+
+	c.Data["json"] = &map[string]interface{}{"status": true, "info": fmt.Sprintf("更新[%s]成功", ty)}
+	c.ServeJSON()
+}

main.go

@@ -143,6 +143,8 @@ func main() {
 	models.InitHotfixInfo()
 	models.InitBanIPInfo()
 	models.InitExchangeCodeInfo()
+	models.UpdateItemConfig()
+	models.UpdateGoodsConfig()
 
 	//模板初始化
 	initBeegoFunMap()

models/goods.go

@@ -0,0 +1,91 @@
+/*
+ * @Descripttion:
+ * @version:
+ * @Author: Neo,Huang
+ * @Date: 2023-11-18 22:52:59
+ * @LastEditors: Neo,Huang
+ * @LastEditTime: 2023-11-19 16:04:30
+ */
+package models
+
+import (
+	"encoding/json"
+
+	"github.com/astaxie/beego"
+
+	"box-gm/utils"
+)
+
+type GoodsConfig struct {
+	Id    int    `json:"id"`   // 商品ID
+	Name  string `json:"name"` // 商品名称
+	Price int    `json:"rmb"`  // 商品价格
+}
+type GoodsConfigs []*GoodsConfig
+
+type RES_CONF_GOODS struct {
+	Code      int          `json:"code"`      // 错误码
+	GoodsList GoodsConfigs `json:"goodsList"` // 商品配置列表
+}
+
+var goodsConfigMap map[int]*GoodsConfig
+var goodsConfigs GoodsConfigs
+
+func init() {
+	goodsConfigMap = make(map[int]*GoodsConfig)
+}
+
+func UpdateGoodsConfig() (int, int) {
+	params := make(map[string]interface{})
+	params["name"] = "gm_get_conf_goods"
+
+	body, _ := json.Marshal(params)
+	host := utils.GetKeyConf("gameservers", "web")
+	sign := utils.Strtomd5(string(body) + utils.GetKeyConf("app", "gameKey"))
+	url := "http://" + host + "/json?sign=" + sign
+	buff, err := utils.SendAndRecvHTTP("POST", url, string(body))
+	if err != nil {
+		return 0, 0
+	}
+
+	var res RES_CONF_GOODS
+	err = json.Unmarshal(buff, &res)
+	if err != nil {
+		return 0, 0
+	}
+	if res.Code != 200 {
+		return 0, 0
+	}
+
+	oldCount := len(goodsConfigs)
+	goodsConfigMap = make(map[int]*GoodsConfig)
+	goodsConfigs = GoodsConfigs{}
+	for _, v := range res.GoodsList {
+		goodsConfigMap[v.Id] = v
+		goodsConfigs = append(goodsConfigs, v)
+	}
+
+	beego.Info("load goods config, oldCount: ", oldCount, "newCount", len(goodsConfigs))
+	return oldCount, len(goodsConfigs)
+}
+
+func GetGoodsName(id int) string {
+	item, ok := goodsConfigMap[id]
+	if !ok {
+		return ""
+	}
+	return item.Name
+}
+func GetGoodsPrice(id int) int {
+	item, ok := goodsConfigMap[id]
+	if !ok {
+		return 0
+	}
+	return item.Price
+}
+
+// 获取物品列表
+func GetGoodsInfoList() GoodsConfigs {
+	// InitItemConfig()
+	return goodsConfigs
+}

models/item.go

@@ -9,20 +9,27 @@
 package models
 
 import (
+	"encoding/json"
+	"log"
+
 	"github.com/astaxie/beego"
-	"github.com/bitly/go-simplejson"
 
 	"box-gm/utils"
 )
 
 type ItemConfig struct {
-	Id   int
-	Name string
-	Type int
+	Id    int    `json:"id"`    // 道具ID
+	Name  string `json:"name"`  // 道具名称
+	Type  int    `json:"ty"`    // 道具类型
+	Price int    `json:"price"` // 道具价格
 }
-
 type ItemConfigs []*ItemConfig
 
+type RES_CONF_ITEMS struct {
+	Code  int         `json:"code"`  // 道具ID
+	Items ItemConfigs `json:"items"` // 道具配置列表
+}
+
 var itemConfigMap map[int]*ItemConfig
 var itemConfigs ItemConfigs
 
@@ -49,47 +56,35 @@ func init() {
 	itemConfigs = append(itemConfigs, itemConfigMap[103])
 }
 
-func InitItemConfig() (int, int) {
-	body := "{\"name\":\"user_query_item_config\"}"
-	host := utils.GetKeyConf("gameservers", "login")
-	sign := utils.Strtomd5(body + utils.GetKeyConf("app", "gameKey"))
+func UpdateItemConfig() (int, int) {
+	params := make(map[string]interface{})
+	params["name"] = "gm_get_conf_items"
+
+	body, _ := json.Marshal(params)
+	host := utils.GetKeyConf("gameservers", "web")
+	sign := utils.Strtomd5(string(body) + utils.GetKeyConf("app", "gameKey"))
 	url := "http://" + host + "/json?sign=" + sign
-	buff, err := utils.SendAndRecvHTTP("POST", url, body)
+	buff, err := utils.SendAndRecvHTTP("POST", url, string(body))
+	log.Printf("UpdateItemConfig url[%s] body[%s] buff[%s] err[%v]", url, string(body), string(buff), err)
 	if err != nil {
 		return 0, 0
 	}
 
-	j, err := simplejson.NewJson(buff)
+	var res RES_CONF_ITEMS
+	err = json.Unmarshal(buff, &res)
 	if err != nil {
 		return 0, 0
 	}
-	code, _ := j.Get("code").Int()
-	if code != 200 {
-		return 0, 0
-	}
-	arr, err1 := j.Get("config").Array()
-	if err1 != nil {
+	if res.Code != 200 {
 		return 0, 0
 	}
 
 	oldCount := len(itemConfigs)
-
-	for i := 0; i < len(arr); i++ {
-		itype, _ := j.Get("config").GetIndex(i).Get("type").Int()
-		id, _ := j.Get("config").GetIndex(i).Get("id").Int()
-		//话费卡和红包不允许后台发放
-		// if realItem == "0" && (itype == 100 || itype == 73) {
-		// 	continue
-		// }
-
-		item := &ItemConfig{}
-		item.Id = id
-		item.Type = itype
-		item.Name, _ = j.Get("config").GetIndex(i).Get("name").String()
-		if itemConfigMap[item.Id] == nil {
-			itemConfigMap[item.Id] = item
-			itemConfigs = append(itemConfigs, item)
-		}
+	itemConfigMap = make(map[int]*ItemConfig)
+	itemConfigs = ItemConfigs{}
+	for _, v := range res.Items {
+		itemConfigMap[v.Id] = v
+		itemConfigs = append(itemConfigs, v)
 	}
 
 	beego.Info("load item config, oldCount: ", oldCount, "newCount", len(itemConfigs))

routers/router.go

@@ -59,4 +59,5 @@ func init() {
 	beego.Router("/client", &controllers.ClientController{})
 	beego.Router("/banip", &controllers.BanIPController{})
 	beego.Router("/exchangecode", &controllers.ExchangeCodeController{})
+	beego.Router("/gameconfig", &controllers.GameConfigController{})
 }

views/exchangecode.tpl

@@ -274,6 +274,7 @@
         document.getElementById("modalAdd").hidden = true;
       }
       function addExchangeCode () {
+        var token = document.getElementById("token").value;
         var pcode = document.getElementById("pcode").value;
         var awardTimes = parseInt(document.getElementById("awardTimes").value);
         var expireTime = document.getElementById("expireTime").value;
@@ -364,6 +365,7 @@
       }
 
       function modifyExchangeCode () {
+        var token = document.getElementById("token").value;
         var pcode = document.getElementById("pcode_modify").value;
         var awardTimes = document.getElementById("awardTimes_modify").value;
         var expireTime = document.getElementById("expireTime_modify").value;
@@ -393,6 +395,7 @@
       }
 
       function clickDelete (pcode) {
+        var token = document.getElementById("token").value;
         var text = "token=" + encodeURI(token);
         text += "&pcode=" + encodeURI(pcode);
 

views/gameconfig.tpl

@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset="UTF-8" />
+        <title>欢迎页面-X-admin2.0</title>
+        <link rel="stylesheet" href="./static/css/font.css">
+        <link rel="stylesheet" href="./static/css/xadmin.css">
+        <script type="text/javascript" src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
+        <script src="./static/lib/layui/layui.js" charset="utf-8"></script>
+        <script type="text/javascript" src="./static/js/xadmin.js"></script>
+    </head>
+    <body>
+    <input type="text" id="token" value={{.token}} hidden=true>
+    <br>
+    <br>
+    <input class="layui-btn" type="button" onclick="UpdateItem()" value=更新道具配置>
+    <br>
+    <br>
+    <input class="layui-btn" type="button" onclick="UpdateGoods()" value=更新商品配置>
+    <script language="JavaScript">
+      function UpdateItem() {
+        var token = document.getElementById("token").value;
+
+        var text = "token=" + encodeURI(token);
+        text += "&ty=" + encodeURI("items");
+
+        $.ajax({
+          type:"post",
+          url:"/gameconfig?" + text,
+          success:function (data) {
+            // alert(data.status);
+            if (data.status){
+              window.location.href="/gameconfig";
+            }else{
+              if (data.info){
+                alert(data.info);
+              }else{
+                window.location.href="/accountlogin";
+              }
+            }
+          }
+        });
+      }
+
+      function UpdateGoods() {
+        var token = document.getElementById("token").value;
+
+        var text = "token=" + encodeURI(token);
+        text += "&ty=" + encodeURI("goods");
+
+        $.ajax({
+          type:"post",
+          url:"/gameconfig?" + text,
+          success:function (data) {
+            // alert(data.status);
+            if (data.status){
+              window.location.href="/gameconfig";
+            }else{
+              if (data.info){
+                alert(data.info);
+              }else{
+                window.location.href="/accountlogin";
+              }
+            }
+          }
+        });
+      }
+    </script>
+    </body>
+</html>