修改csv exporter 支持 upload oss or export file

config/init.go

@@ -120,7 +120,7 @@ func nacosConf() {
 	Cfg.ConfCenter.Nacos.ContextPath = contextPath
 	Cfg.ConfCenter.Nacos.Username = username
 	Cfg.ConfCenter.Nacos.Password = password
-	logger.Debug("[conf]nacos ", logger.Any("conf", Cfg.ConfCenter.Nacos))
+	// logger.Debug("[conf]nacos ", logger.Any("conf", Cfg.ConfCenter.Nacos))
 }
 
 func consulConf() {

config/nacos.go

@@ -7,7 +7,6 @@ import (
 	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
 	"github.com/nacos-group/nacos-sdk-go/common/constant"
 	"github.com/nacos-group/nacos-sdk-go/vo"
-	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/logger"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/xerrors/xerror"
 	"go.uber.org/zap"
 )
@@ -63,7 +62,7 @@ func (x *NacosClient) Connect() *NacosClient {
 		constant.WithUsername(x.cfg.Username),     // 用户名
 		constant.WithPassword(x.cfg.Password),     // 密码
 	)
-	logger.Debug("[conf][nacos]", logger.Any("x.cfg", x.cfg))
+	// logger.Debug("[conf][nacos]", logger.Any("x.cfg", x.cfg))
 	serverConfigs := make([]constant.ServerConfig, 0, len(x.cfg.IPs))
 	for _, ip := range x.cfg.IPs {
 		serverConfig := constant.NewServerConfig(

utils/csv_exporter/csv_exporter.go

@@ -2,11 +2,17 @@ package csvexporter
 
 import (
 	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"path/filepath"
 
+	"github.com/gin-gonic/gin"
 	"github.com/gocarina/gocsv"
 	"github.com/jinzhu/copier"
 	"gitlab.wanzhuangkj.com/tush/xpkg/config"
 	"gitlab.wanzhuangkj.com/tush/xpkg/pkg/oss"
+	"gitlab.wanzhuangkj.com/tush/xpkg/utils/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/xcommon/odao"
 )
 
@@ -14,7 +20,10 @@ type CSVExporter[T any] struct {
 	pageSize int
 	page     PageFn[T]
 	total    TotalFn
-	fileURL  FileURLFn
+	filename FileURLFn
+	err      error
+	content  []byte
+	fileURL  string
 }
 
 type PageFn[T any] func(offset int) ([]*T, error)
@@ -27,32 +36,39 @@ type IPageReq interface {
 	odao.Query
 }
 
-func New[T any](pageSize int, total TotalFn, page PageFn[T], fileURL FileURLFn) *CSVExporter[T] {
+func New[T any](pageSize int, total TotalFn, page PageFn[T], filename FileURLFn) *CSVExporter[T] {
 	return &CSVExporter[T]{
 		pageSize: pageSize,
 		total:    total,
 		page:     page,
-		fileURL:  fileURL,
+		filename: filename,
 	}
 }
 
-func (x *CSVExporter[T]) Export() (string, error) {
+func (x *CSVExporter[T]) Export() *CSVExporter[T] {
+	if x.err != nil {
+		return x
+	}
 	total, err := x.total()
 	if err != nil {
-		return "", err
+		x.err = err
+		return x
 	}
 	var rs []*T
 	if total > 0 {
 		rs, err = x.nestedLoop(total)
 		if err != nil {
-			return "", err
+			x.err = err
+			return x
 		}
 	}
-	csvBytes, err := gocsv.MarshalBytes(&rs)
+	content, err := gocsv.MarshalBytes(&rs)
 	if err != nil {
-		return "", err
+		x.err = err
+		return x
 	}
-	return x.upload(x.fileURL(), bytes.NewBuffer(csvBytes))
+	x.content = content
+	return x
 }
 
 func (x *CSVExporter[T]) nestedLoop(total int64) ([]*T, error) {
@@ -65,7 +81,6 @@ func (x *CSVExporter[T]) nestedLoop(total int64) ([]*T, error) {
 		if err != nil {
 			return nil, err
 		}
-
 		if len(rs) == 0 {
 			break
 		}
@@ -75,13 +90,54 @@ func (x *CSVExporter[T]) nestedLoop(total int64) ([]*T, error) {
 	return ret, nil
 }
 
-func (x *CSVExporter[T]) upload(fileURL string, buffer *bytes.Buffer) (fileUrl string, err error) {
+func (x *CSVExporter[T]) Upload() *CSVExporter[T] {
+	if x.err != nil {
+		return x
+	}
 	ossCfg := oss.AliOssConfig{}
 	config.Read(func(c *config.Config) {
 		copier.Copy(&ossCfg, c.Oss)
 	})
-	if fileUrl, _, err = oss.OSS.UploadFile(buffer, fileURL, &ossCfg); err != nil {
-		return "", err
+	if fileUrl, _, err := oss.OSS.UploadFile(bytes.NewBuffer(x.content), x.filename(), &ossCfg); err != nil {
+		x.err = err
+		return x
+	} else {
+		x.fileURL = fileUrl
+	}
+	return x
+}
+
+func (x *CSVExporter[T]) WriteToGin(c *gin.Context) *CSVExporter[T] {
+	if x.err != nil {
+		return x
+	}
+	filename := filepath.Base(x.filename())
+	c.Header("Content-Type", "application/octet-stream")
+	c.Header("Content-Disposition", fmt.Sprintf("attachment; filename=%s", filename))
+	if _, err := io.Copy(c.Writer, bytes.NewBuffer(x.content)); err != nil {
+		x.err = err
+		return x
+	}
+	c.Writer.Flush()
+	return x
+}
+
+func (x *CSVExporter[T]) WriteToCtx(ctx context.Context) *CSVExporter[T] {
+	if x.err != nil {
+		return x
+	}
+	c, err := ctxUtils.GetGinCtx(ctx)
+	if err != nil {
+		x.err = err
+		return x
 	}
-	return fileUrl, nil
+	return x.WriteToGin(c)
+}
+
+func (x *CSVExporter[T]) Err() error {
+	return x.err
+}
+
+func (x *CSVExporter[T]) URI() (string, error) {
+	return x.fileURL, x.err
 }