外网导入

src/dashoo.cn/backend/api/conf/app.conf

@@ -12,6 +12,7 @@ apiurl=http://121.42.244.228:10015/v1
 dataapiurl=http://121.42.244.228:18010/v1
 orderurl=http://uid.labsop.cn:8182/worker/2
 localIP =
+extranetIP = 60.30.245.229
 
 #临沂
 #orderurl=http:/188.188.30.89:8182/worker/2

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -2193,7 +2193,12 @@ func (this *OilSupplierController) ImportExcel() {
 	}
 
 	svc := supplier.GetOilSupplierService(utils.DBE)
-
+    log.Printf("url:==" + url) // http://60.30.245.229//upfile/dc1/2,063156edd288
+    extranetIP := utils.Cfg.MustValue("server", "extranetIP")
+	localIP := utils.Cfg.MustValue("server", "localIP")
+    if strings.Index(url, extranetIP) >= 0 {
+		url = strings.Replace(url, extranetIP, localIP, 1)
+	}
 	_dir := utils.Cfg.MustValue("file", "tmplateDir") + "xlsx"
 	filename := strconv.Itoa(int(time.Now().Unix())) + ".xlsx"
 	utils.DownloadFile(url, filename, _dir)

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplierstore/goodslist.vue

@@ -567,7 +567,7 @@
       uploadrequest (option) {
         let _this = this
         if (process.client) {
-          const myDomain = '10.76.248.23' //window.location.host
+          const myDomain = window.location.host
           axios.post(process.env.upfilehost, {})
             .then(function (res) {
               if (res.data && res.data.fid && res.data.fid !== '') {