Merge branch 'sxy' into dev

This commit is contained in:
孙肖扬 2025-03-05 16:49:53 +08:00
commit 4389ccc622

View File

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