From 12cbdfb9b7f39153a0d44e53bd65f90e7dcfe8f7 Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Thu, 16 Jul 2020 08:40:00 +0800
Subject: [PATCH] 'commit'

---
 dsBaseRpc/Test/excel_test.go             | 8 ++++----
 dsBaseRpc/Test/readXlsx_test.go          | 2 +-
 dsBaseRpc/Utils/CommonUtil/CommonUtil.go | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dsBaseRpc/Test/excel_test.go b/dsBaseRpc/Test/excel_test.go
index 57aa68b6..62d5ae06 100644
--- a/dsBaseRpc/Test/excel_test.go
+++ b/dsBaseRpc/Test/excel_test.go
@@ -25,7 +25,7 @@ func TestImportTeacher(t *testing.T) {
 	////哪个单位
 	//bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	////文件在哪里
-	//fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Static\\ExcelTemp\\" + bureauId + ".xlsx"
+	//fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx"
 	//success, message, err := BaseTeacherDao.ImportTeacherInfoExcel(fileName, bureauId)
 	//if err != nil {
 	//	fmt.Println(err.Error())
@@ -43,7 +43,7 @@ func TestTeacherExportExcel(t *testing.T) {
 	//哪个单位
 	bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	//文件在哪里
-	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Static\\ExcelTemp\\" + bureauId + ".xlsx"
+	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx"
 	BaseTeacherDao.ExportTeacherInfoExcel(fileName, bureauId, 1)
 }
 
@@ -56,7 +56,7 @@ func TestStudentExportExcel(t *testing.T) {
 	//哪个单位
 	bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	//文件在哪里
-	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Static\\ExcelTemp\\" + bureauId + ".xlsx"
+	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx"
 	BaseStudentDao.ExportStudentInfoExcel(fileName, bureauId, 1, []string{})
 }
 
@@ -64,7 +64,7 @@ func TestImportStudent(t *testing.T) {
 	////哪个单位
 	//bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	////文件在哪里
-	//fileName := `E:\Work\dsMin\dsBaseWeb\Static\ExcelTemp\` + bureauId + ".xlsx"
+	//fileName := `E:\Work\dsMin\dsBaseWeb\html\ExcelTemp\` + bureauId + ".xlsx"
 	//success, message, err := BaseStudentDao.ImportStudentInfoExcel(fileName, bureauId)
 	//if err != nil {
 	//	fmt.Println(err.Error())
diff --git a/dsBaseRpc/Test/readXlsx_test.go b/dsBaseRpc/Test/readXlsx_test.go
index 18b68627..951adbda 100644
--- a/dsBaseRpc/Test/readXlsx_test.go
+++ b/dsBaseRpc/Test/readXlsx_test.go
@@ -6,7 +6,7 @@ import (
 )
 
 func TestReadXlsx(t *testing.T){
-	outFileName:=`E:\Work\dsMin\dsBaseWeb\Static\ExcelTemp\test2.xlsx`
+	outFileName:=`E:\Work\dsMin\dsBaseWeb\Html\ExcelTemp\test2.xlsx`
 	file := xlsx.NewFile()
 	sheet,err := file.AddSheet("sheet1")
 	if err != nil  {
diff --git a/dsBaseRpc/Utils/CommonUtil/CommonUtil.go b/dsBaseRpc/Utils/CommonUtil/CommonUtil.go
index 03718141..251d7fa0 100644
--- a/dsBaseRpc/Utils/CommonUtil/CommonUtil.go
+++ b/dsBaseRpc/Utils/CommonUtil/CommonUtil.go
@@ -581,7 +581,7 @@ func IsContainInt32(items []int32, item int32) bool {
 func GetExportExcelFilePath() string {
 	TargetPath, _ := os.Getwd()
 	//生成随机的文件名
-	TargetPath = filepath.Dir(TargetPath) + "/dsBaseWeb/Static/ExcelTemp/" + GetUUID() + ".xlsx"
+	TargetPath = filepath.Dir(TargetPath) + "/dsBaseWeb/Html/ExcelTemp/" + GetUUID() + ".xlsx"
 	return TargetPath
 }