Merge branch 'sxy' into dev

# Conflicts:
#	pkg/service/register_record.go

pkg/logic/excel.go

@@ -2,14 +2,15 @@ package logic
 
 import (
 	"fmt"
-	"github.com/360EntSecGroup-Skylar/excelize"
-	"github.com/exhibition-main/internal/model"
-	"github.com/exhibition-main/pkg/utils"
 	"image"
 	"math"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/360EntSecGroup-Skylar/excelize"
+	"github.com/exhibition-main/internal/model"
+	"github.com/exhibition-main/pkg/utils"
 )
 
 func DealExcelImg(filePath string) (err error) {

pkg/service/register_record.go

@@ -15,6 +15,7 @@ import (
 	"github.com/exhibition-main/internal/model"
 	"github.com/exhibition-main/internal/msg"
 	"github.com/exhibition-main/internal/response"
+	"github.com/exhibition-main/pkg/logic"
 	"github.com/exhibition-main/pkg/service/common"
 	"github.com/exhibition-main/pkg/utils"
 	"github.com/gin-gonic/gin"
@@ -205,11 +206,11 @@ func ExportRegister(c *gin.Context) {
 		return
 	}
 	//处理图片
-	// err = logic.DealExcelImg(filePath)
-	// if err != nil {
-	// 	response.ResponseQuickMsg(c, msg.Fail, err.Error(), nil)
-	// 	return
-	// }
+	err = logic.DealExcelImg(filePath)
+	if err != nil {
+		response.ResponseQuickMsg(c, msg.Fail, err.Error(), nil)
+		return
+	}
 	var httpType string
 	if config.Data.System.Mode == "prod" {
 		httpType = model.HttpsType

pkg/utils/untils.go

@@ -59,16 +59,19 @@ func Get(url string) string {
 // ToExcelByType 转成Excel类型
 func ToExcelByType(titleList []string, dataList []interface{}, dataType string, filePath string) (content io.ReadSeeker, err error) {
 	// 生成一个新的文件
+
 	file := xlsx.NewFile()
 	// 添加sheet页
 	sheet, _ := file.AddSheet("Sheet1")
 	// 插入表头
+	fmt.Println("=======================插入表头============================")
 	titleRow := sheet.AddRow()
 	for _, v := range titleList {
 		cell := titleRow.AddCell()
 		cell.Value = v
 	}
 	// 插入内容
+	fmt.Println("=======================插入内容============================")
 	for _, v := range dataList {
 		row := sheet.AddRow()
 		if dataType == "struct" {
@@ -79,6 +82,7 @@ func ToExcelByType(titleList []string, dataList []interface{}, dataType string,
 	}
 	var buffer bytes.Buffer
 	_ = file.Write(&buffer)
+	fmt.Println("=======================Save============================")
 	if filePath != "" {
 		dir := filepath.Dir(filePath)
 		if err = CreateDirPath(dir); err != nil {