diff --git a/dsSzxy/.idea/workspace.xml b/dsSzxy/.idea/workspace.xml index ad667e85..f82a8f81 100644 --- a/dsSzxy/.idea/workspace.xml +++ b/dsSzxy/.idea/workspace.xml @@ -3,9 +3,10 @@ - - - + + + + @@ -74,9 +76,15 @@ + true + + + + + diff --git a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go index 641f51eb..5ae42097 100644 --- a/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go +++ b/dsSzxy/Business/ImRelate/ImRelateController/ImRelateController.go @@ -75,6 +75,7 @@ func fileUpload(c *gin.Context) { //返回 s := getFileDownLoadUrl(trueName[0:2]+"/"+trueName, file.Filename) + originUrl := ConfigUtil.MinioDownloadPrefix + ConfigUtil.MinioBucket + "/" + trueName[0:2] + "/" + trueName //判断扩展名是不是图片 if ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" { @@ -108,6 +109,7 @@ func fileUpload(c *gin.Context) { os.Remove(thumbTrueName) c.JSON(200, gin.H{ "success": true, + "originUrl": originUrl, "url": s, "thumbContent": sourceString, "size": size, diff --git a/dsSzxy/build/dsSzxy b/dsSzxy/build/dsSzxy index 8f68f6b6..efb5ff55 100644 Binary files a/dsSzxy/build/dsSzxy and b/dsSzxy/build/dsSzxy differ diff --git a/dsSzxy/go.mod b/dsSzxy/go.mod index 969d01e4..424d1d88 100644 --- a/dsSzxy/go.mod +++ b/dsSzxy/go.mod @@ -6,6 +6,7 @@ require ( github.com/Chronokeeper/anyxml v0.0.0-20160530174208-54457d8e98c6 // indirect github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 // indirect github.com/CloudyKit/jet v2.1.2+incompatible // indirect + github.com/FishGoddess/props v0.2.0 // indirect github.com/agrison/go-tablib v0.0.0-20160310143025-4930582c22ee // indirect github.com/agrison/mxj v0.0.0-20160310142625-1269f8afb3b4 // indirect github.com/bndr/gotabulate v1.1.2 // indirect diff --git a/dsSzxy/go.sum b/dsSzxy/go.sum index caee5d2f..2d2e95e9 100644 --- a/dsSzxy/go.sum +++ b/dsSzxy/go.sum @@ -5,6 +5,8 @@ github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4s github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet v2.1.2+incompatible h1:ybZoYzMBdoijK6I+Ke3vg9GZsmlKo/ZhKdNMWz0P26c= github.com/CloudyKit/jet v2.1.2+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= +github.com/FishGoddess/props v0.2.0 h1:IeYa0KyZ2pZdg6IWgd5m+tD7axWJYSe9bL79v1WicVM= +github.com/FishGoddess/props v0.2.0/go.mod h1:94yhmiqHPC3rU3sagSObsMzVAo0STfvEobn39D5unK8= github.com/agrison/go-tablib v0.0.0-20160310143025-4930582c22ee h1:0RklYSvekYaIFI9JUx7TFPQvo++TdILmZiV17QI4nXk= github.com/agrison/go-tablib v0.0.0-20160310143025-4930582c22ee/go.mod h1:M9nmO4lBRWR/bBv7UCOmDJ1MB2DVoqz19B4JchDA+K0= github.com/agrison/mxj v0.0.0-20160310142625-1269f8afb3b4 h1:XBNSe5eibe5Fh131ah+xnO6s4A97U1T3tKZKLQQvqu0=