|
|
@@ -4,6 +4,7 @@ import (
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
"github.com/tealeg/xlsx"
|
|
|
+ "os"
|
|
|
"reflect"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
@@ -18,6 +19,7 @@ import (
|
|
|
. "dashoo.cn/backend/api/controllers"
|
|
|
"dashoo.cn/business2/userRole"
|
|
|
"dashoo.cn/utils"
|
|
|
+ . "github.com/linxGnu/goseaweedfs"
|
|
|
)
|
|
|
|
|
|
type OilGoodsAptitudeController struct {
|
|
|
@@ -961,7 +963,18 @@ func (this *OilGoodsAptitudeController) ExportExcelAll() {
|
|
|
SaveDirectory(dir)
|
|
|
path := dir + "/" + utils.TimeFormat(time.Now(), "200612") + filetitle + ".xlsx"
|
|
|
f.Save(path)
|
|
|
- this.Data["json"] = this.Ctx.Request.Host + "/" + path
|
|
|
+ var sw *Seaweed
|
|
|
+ var filer []string
|
|
|
+ if _filer := os.Getenv("GOSWFS_FILER_URL"); _filer != "" {
|
|
|
+ filer = []string{_filer}
|
|
|
+ }
|
|
|
+ sw = NewSeaweed("http", utils.Cfg.MustValue("file", "upFileHost"), filer, 2*1024*1024, 5*time.Minute)
|
|
|
+ _, _, fID, _ := sw.UploadFile(path, "", "")
|
|
|
+
|
|
|
+ retDocUrl := utils.Cfg.MustValue("file", "downFileHost") + "/" + fID
|
|
|
+ os.Remove(path)
|
|
|
+ fmt.Println("==retDocWatermarkUrl==", retDocUrl)
|
|
|
+ this.Data["json"] = retDocUrl
|
|
|
this.ServeJSON()
|
|
|
elapsed := time.Since(t)
|
|
|
fmt.Println(elapsed)
|
|
|
@@ -1041,7 +1054,18 @@ func (this *OilGoodsAptitudeController) ExportExcelAll2019() {
|
|
|
SaveDirectory(dir)
|
|
|
path := dir + "/" + utils.TimeFormat(time.Now(), "200612") + filetitle + ".xlsx"
|
|
|
f.Save(path)
|
|
|
- this.Data["json"] = this.Ctx.Request.Host + "/" + path
|
|
|
+ var sw *Seaweed
|
|
|
+ var filer []string
|
|
|
+ if _filer := os.Getenv("GOSWFS_FILER_URL"); _filer != "" {
|
|
|
+ filer = []string{_filer}
|
|
|
+ }
|
|
|
+ sw = NewSeaweed("http", utils.Cfg.MustValue("file", "upFileHost"), filer, 2*1024*1024, 5*time.Minute)
|
|
|
+ _, _, fID, _ := sw.UploadFile(path, "", "")
|
|
|
+
|
|
|
+ retDocUrl := utils.Cfg.MustValue("file", "downFileHost") + "/" + fID
|
|
|
+ os.Remove(path)
|
|
|
+ fmt.Println("==retDocWatermarkUrl==", retDocUrl)
|
|
|
+ this.Data["json"] = retDocUrl
|
|
|
this.ServeJSON()
|
|
|
elapsed := time.Since(t)
|
|
|
fmt.Println(elapsed)
|