提交

 exports.domain = require('../config/common.js').domain;
-// exports.domain="http://172.16.6.240:8088/platform";
 // exports.domain = "http://172.16.6.227:8088/platform";
 exports.res = [{ //基础商品列表
 		route: '/supplier/baseproduct/index',

@@ -49,7 +49,7 @@ exports.uploadFile = function(req, res) {
                 url: domain + '/batch/import?'+url.join("&"),
                 formData: req.body,
                 headers: headers,
-                timeout: 5*60*1000
+                timeout: 300000
             }, function optionalCallback(error, httpResponse, body) {
                 if (!error && httpResponse.statusCode == 200) {
                     var json = JSON.parse(body);