Commit 586c39d671766a45ae1bca35d3d704ecbeccee22
1 parent
0dd6d5dc
Exists in
master
and in
4 other branches
提交
Showing
1 changed file
with
4 additions
and
2 deletions
Show diff stats
src/HttpServer/conf/conf.go
| @@ -15,7 +15,7 @@ type RedisConf struct { | @@ -15,7 +15,7 @@ type RedisConf struct { | ||
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | type TexasConf struct { | 17 | type TexasConf struct { |
| 18 | - GameDB MysqlConf `xml:"GameDB"` | 18 | + GameDB MysqlConf `xml:"GameDB"` |
| 19 | ServerHttpAddr ServerHttpAddrConf `xml:"ServerHttpAddr"` | 19 | ServerHttpAddr ServerHttpAddrConf `xml:"ServerHttpAddr"` |
| 20 | Redis RedisConf `xml:"Redis"` | 20 | Redis RedisConf `xml:"Redis"` |
| 21 | } | 21 | } |
| @@ -27,6 +27,7 @@ var ( | @@ -27,6 +27,7 @@ var ( | ||
| 27 | func GetRedisConf() RedisConf { | 27 | func GetRedisConf() RedisConf { |
| 28 | return config.Redis | 28 | return config.Redis |
| 29 | } | 29 | } |
| 30 | + | ||
| 30 | type MysqlConf struct { | 31 | type MysqlConf struct { |
| 31 | Ip string `xml:",attr"` | 32 | Ip string `xml:",attr"` |
| 32 | Port int `xml:",attr"` | 33 | Port int `xml:",attr"` |
| @@ -66,5 +67,6 @@ func GetServerHttpAddrConf() string { | @@ -66,5 +67,6 @@ func GetServerHttpAddrConf() string { | ||
| 66 | } | 67 | } |
| 67 | 68 | ||
| 68 | type ServerHttpAddrConf struct { | 69 | type ServerHttpAddrConf struct { |
| 69 | - Host string `xml:",attr"` | 70 | + Host string `xml:",attr"` |
| 71 | + IsTest string `xml:",attr"` | ||
| 70 | } | 72 | } |