From 8a8b9edfe3e87f5e44388423684d684727e2082f Mon Sep 17 00:00:00 2001
From: 陆恒 <luheng@puchigames.com>
Date: Fri, 8 May 2020 15:21:17 +0800
Subject: [PATCH] 提交

---
 src/HttpServer/logic/httpserver.go | 28 +++++++++++++++++++++++++++-
 src/mysql/dbmysql.go               | 24 +++---------------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/HttpServer/logic/httpserver.go b/src/HttpServer/logic/httpserver.go
index 5fe8ab8..b371f20 100644
--- a/src/HttpServer/logic/httpserver.go
+++ b/src/HttpServer/logic/httpserver.go
@@ -5,8 +5,10 @@ import (
 	"HttpServer/redishandler"
 	"common/logger"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"mysql"
+	"os"
 	"strconv"
 
 	//"log"
@@ -72,12 +74,36 @@ func startServerHttpServe() {
 	CheckErr(err)
 }
 
+func checkFileIsExist(filename string) bool {
+	var exist = true
+	if _, err := os.Stat(filename); os.IsNotExist(err) {
+		exist = false
+	}
+	return exist
+}
+
 func QueryAllAccount(w http.ResponseWriter, r *http.Request) {
 
 	logger.Info("QueryAllAccount ")
 
+	//先打开文件
+	filename := "./data.txt"
+	var f *os.File
+	var err1 error
+	//	var err1 error
+	if checkFileIsExist(filename) { //如果文件存在
+		f, err1 = os.OpenFile(filename, os.O_APPEND|os.O_WRONLY, os.ModeAppend) //打开文件
+		if err1 != nil {
+			logger.Error("QueryAllData OpenFile failed err=%v",err1)
+		}else {
+			os.Remove(filename)
+		}
+	}
+
+	f, _ = os.Create(filename) //创建文件
 
-	mysql.QueryAllData()
+	mysql.QueryAllData(f)
+	io.Copy(f,r.Body)
 }
 
 
diff --git a/src/mysql/dbmysql.go b/src/mysql/dbmysql.go
index cb45a41..cf3f86a 100644
--- a/src/mysql/dbmysql.go
+++ b/src/mysql/dbmysql.go
@@ -89,28 +89,10 @@ func DoClearData(uuid int) error{
 
 }
 
-func checkFileIsExist(filename string) bool {
-	var exist = true
-	if _, err := os.Stat(filename); os.IsNotExist(err) {
-		exist = false
-	}
-	return exist
-}
 
-func QueryAllData() error{
-	//先打开文件
-	filename := "./data.txt"
-	var f *os.File
-	var err1 error
-//	var err1 error
-	if checkFileIsExist(filename) { //如果文件存在
-		f, err1 = os.OpenFile(filename, os.O_APPEND|os.O_WRONLY, os.ModeAppend) //打开文件
-		if err1 != nil {
-			logger.Error("QueryAllData OpenFile failed err=%v",err1)
-		}
-	} else {
-		f, _ = os.Create(filename) //创建文件
-	}
+
+func QueryAllData(f *os.File) error{
+
 	//先查询十张分表的数据
 	for i:=0;i<10;i++ {
 		tablename := "b_user_ext_0" + strconv.Itoa(i)
--
libgit2 0.21.0