Merge branch 'release' into develop

dbproxy/svc/m_monitor.go

@@ -13,6 +13,7 @@ import (
 	"mongo.games.com/game/dbproxy/mongo"
 	"mongo.games.com/game/mgrsrv/api"
 	"mongo.games.com/game/model"
+	"mongo.games.com/game/webapi"
 	"mongo.games.com/goserver/core/basic"
 	"mongo.games.com/goserver/core/logger"
 	"mongo.games.com/goserver/core/netlib"
@@ -119,6 +120,8 @@ func init() {
 	gob.Register(map[string]*model.APITransactStats{})
 	gob.Register(api.ApiStats{}) // 这里依赖了mgrsrv的结构体，会导致mgrsrv初始化，最好是把结构体放到一个公共包里，不要两个不相关的程序有直接依赖
 	gob.Register(map[string]api.ApiStats{})
+	gob.Register(webapi.ApiStats{})
+	gob.Register(map[string]webapi.ApiStats{})
 	gob.Register(mgo.Stats{})
 	gob.Register(profile.TimeElement{})
 	gob.Register(map[string]profile.TimeElement{})

protocol/server/pbdata.proto

@@ -839,6 +839,8 @@ message DB_GameFree {
 
 	int32 IsCustom = 73;
 
+	string GameName = 74;
+
 }
 
 message DB_GameFreeArray {