Commit cae277a234b6e660f2aedf0f26ff0e028282a485
1 parent
3736d122
Exists in
master
and in
4 other branches
提交
Showing
2 changed files
with
2 additions
and
12 deletions
Show diff stats
src/HttpServer/conf/world.xml
| @@ -1,6 +0,0 @@ | @@ -1,6 +0,0 @@ | ||
| 1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
| 2 | -<Config> | ||
| 3 | - <GameDB Ip="172.21.0.34" Port="3306" User="mini_game_db" Pwd="TXsql@VFhzcWxAV1Z" Database="cat_cafe" LoadInterval="5" /> | ||
| 4 | - <ServerHttpAddr Host=":50058" /> | ||
| 5 | - <Redis Host="172.21.0.25:6379" Db="6" Password="crs-lzslccdc:redis@YXp8Jk#MV" /> | ||
| 6 | -</Config> | ||
| 7 | \ No newline at end of file | 0 | \ No newline at end of file |
src/HttpServer/main/main.go
| @@ -3,8 +3,6 @@ package main | @@ -3,8 +3,6 @@ package main | ||
| 3 | import ( | 3 | import ( |
| 4 | "HttpServer/conf" | 4 | "HttpServer/conf" |
| 5 | "HttpServer/jsonconf" | 5 | "HttpServer/jsonconf" |
| 6 | - "mysql" | ||
| 7 | - | ||
| 8 | "HttpServer/logic" | 6 | "HttpServer/logic" |
| 9 | "HttpServer/redishandler" | 7 | "HttpServer/redishandler" |
| 10 | "common/logger" | 8 | "common/logger" |
| @@ -47,19 +45,17 @@ func main() { | @@ -47,19 +45,17 @@ func main() { | ||
| 47 | return | 45 | return |
| 48 | } | 46 | } |
| 49 | 47 | ||
| 50 | - | ||
| 51 | - | ||
| 52 | err = redishandler.Init() | 48 | err = redishandler.Init() |
| 53 | if err != nil { | 49 | if err != nil { |
| 54 | logger.Error("err init redis err=%v", err) | 50 | logger.Error("err init redis err=%v", err) |
| 55 | return | 51 | return |
| 56 | } | 52 | } |
| 57 | 53 | ||
| 58 | - err = mysql.InitMysql() | 54 | + /*err = mysql.InitMysql() |
| 59 | if err != nil { | 55 | if err != nil { |
| 60 | logger.Error("err init mysql err=%v", err) | 56 | logger.Error("err init mysql err=%v", err) |
| 61 | return | 57 | return |
| 62 | - } | 58 | + }*/ |
| 63 | 59 | ||
| 64 | err = jsonconf.LoadJsonConf() | 60 | err = jsonconf.LoadJsonConf() |
| 65 | if err != nil { | 61 | if err != nil { |