From b57bbc82880ec2b1351631d9596f679cf4668e90 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Wed, 15 Jul 2020 15:36:53 +0800
Subject: [PATCH] 'commit'

---
 .../PreviewController/PreviewController.go    |  5 ---
 dsSupport/Config/logo.txt                     | 11 ++++++
 dsSupport/Utils/FileUtil/FileUtil.go          | 38 +++++++++++++++++++
 dsSupport/main.go                             |  7 ++++
 4 files changed, 56 insertions(+), 5 deletions(-)
 create mode 100644 dsSupport/Config/logo.txt

diff --git a/dsSupport/Business/Preview/PreviewController/PreviewController.go b/dsSupport/Business/Preview/PreviewController/PreviewController.go
index 3fd508b8..82a0eb30 100644
--- a/dsSupport/Business/Preview/PreviewController/PreviewController.go
+++ b/dsSupport/Business/Preview/PreviewController/PreviewController.go
@@ -70,11 +70,6 @@ func previewOffice(c *gin.Context) {
 	//(2) 是不是本地文件
 	_, p := filepath.Split(fullPath)
 
-	//TODO
-	//(1)只允许上传office系列的文件
-	//(2)在上传前判断文件是否已存在,存在了直接返回,不做重复工作，也可以支持强制刷新，需要添加参数
-	//(3)需要判断文件名是不是是标准的GUID形式，不是的不让上传
-
 	//判断是不是本地存在
 	isExist, err := CommonUtil.PathExists(fullPath)
 	if err != nil {
diff --git a/dsSupport/Config/logo.txt b/dsSupport/Config/logo.txt
new file mode 100644
index 00000000..e94470c9
--- /dev/null
+++ b/dsSupport/Config/logo.txt
@@ -0,0 +1,11 @@
+       _      _____                              _
+      | |    / ____|                            | |
+    __| |___| (___  _   _ _ __  _ __   ___  _ __| |_
+   / _` / __|\___ \| | | | '_ \| '_ \ / _ \| '__| __|
+  | (_| \__ \____) | |_| | |_) | |_) | (_) | |  | |_
+   \__,_|___/_____/ \__,_| .__/| .__/ \___/|_|   \__|
+                         | |   | |
+                         |_|   |_|
+
+Created By HuangHai 2020-01-20
+http://patorjk.com/software/taag/#p=display&f=Big&t=dsSupport
diff --git a/dsSupport/Utils/FileUtil/FileUtil.go b/dsSupport/Utils/FileUtil/FileUtil.go
index 49d9c658..2f6f2e7b 100644
--- a/dsSupport/Utils/FileUtil/FileUtil.go
+++ b/dsSupport/Utils/FileUtil/FileUtil.go
@@ -3,6 +3,8 @@ package FileUtil
 import (
 	"bufio"
 	"fmt"
+	"io"
+	"log"
 	"os"
 )
 
@@ -56,3 +58,39 @@ func WriteLines(lines []string, path string) error {
 	return w.Flush()
 }
 
+
+/**
+功能：读取文件内容
+作者：黄海
+时间：2019-12-31
+*/
+func ReadFileContent(filepath string) string {
+	file, err := os.Open(filepath)
+	if err != nil {
+		log.Print("文件打开失败：", err)
+	}
+	defer file.Close()
+
+	buf := make([]byte, 12) // 存放文件内容的缓存，相当于中转站
+	data := make([]byte, 0) // 用来存放文件内容，buf读取的内容都会写到data里面去
+
+	for {
+		//无限循环，不断读取
+		n, err := file.Read(buf)
+		// 什么时候文件读完呢？如果文件读完的话，那么err不为nil，而是io.EOF
+		// 所以我们可以进行判断
+		if err != nil {
+			//如果err != nil说明出错了，但如果还等于io.EOF的话，说明读完了，因为文件读完，err也不为nil。直接break
+			if err == io.EOF {
+				break
+			} else {
+				//如果错误不是io.EOF的话，说明就真的在读取中出现了错误，直接panic出来
+				//panic(err)
+				fmt.Println(err.Error())
+			}
+		}
+		//此时文件内容写到buf里面去了，写了多少个呢？写了n个，那么我们再写到data里面去
+		data = append(data, buf[:n]...)
+	}
+	return string(data)
+}
\ No newline at end of file
diff --git a/dsSupport/main.go b/dsSupport/main.go
index 6bb358ea..db1b7f97 100644
--- a/dsSupport/main.go
+++ b/dsSupport/main.go
@@ -3,11 +3,18 @@ package main
 import (
 	"dsSupport/CronTask"
 	"dsSupport/Router"
+	"dsSupport/Utils/FileUtil"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/robfig/cron/v3"
 )
 
 func main(){
+	// 一、显示Logo
+	configIniFile := "./Config/logo.txt"
+	var logo = FileUtil.ReadFileContent(configIniFile)
+	fmt.Print(logo)
+
 	r := gin.Default()
 	//主路由
 	Router.GinRouter(r)