From cae277a234b6e660f2aedf0f26ff0e028282a485 Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Tue, 19 May 2020 15:01:06 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/conf/world.xml | 6 ------
 src/HttpServer/main/main.go   | 8 ++------
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 src/HttpServer/conf/world.xml

diff --git a/src/HttpServer/conf/world.xml b/src/HttpServer/conf/world.xml
deleted file mode 100644
index a1d55c2..0000000
--- a/src/HttpServer/conf/world.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Config>
-    <GameDB Ip="172.21.0.34" Port="3306" User="mini_game_db" Pwd="TXsql@VFhzcWxAV1Z" Database="cat_cafe" LoadInterval="5" />
-    <ServerHttpAddr Host=":50058" />
-    <Redis Host="172.21.0.25:6379" Db="6" Password="crs-lzslccdc:redis@YXp8Jk#MV" />
-</Config>
\ No newline at end of file
diff --git a/src/HttpServer/main/main.go b/src/HttpServer/main/main.go
index 4db76cc..3f58dae 100644
--- a/src/HttpServer/main/main.go
+++ b/src/HttpServer/main/main.go
@@ -3,8 +3,6 @@ package main
 import (
 	"HttpServer/conf"
 	"HttpServer/jsonconf"
-	"mysql"
-
 	"HttpServer/logic"
 	"HttpServer/redishandler"
 	"common/logger"
@@ -47,19 +45,17 @@ func main() {
 		return
 	}
 
-
-
 	err = redishandler.Init()
 	if err != nil {
 		logger.Error("err init redis err=%v", err)
 		return
 	}
 
-	err = mysql.InitMysql()
+	/*err = mysql.InitMysql()
 	if err != nil {
 		logger.Error("err init mysql err=%v", err)
 		return
-	}
+	}*/
 
 	err = jsonconf.LoadJsonConf()
 	if err != nil {
--
libgit2 0.21.0