Authored by liuyue

upload

@@ -421,8 +421,8 @@ $('#sure-change').on('click', function() { @@ -421,8 +421,8 @@ $('#sure-change').on('click', function() {
421 }); 421 });
422 422
423 data = JSON.stringify(arr); 423 data = JSON.stringify(arr);
424 -  
425 - common.util.__ajax({ 424 + console.log(data);
  425 + /*common.util.__ajax({
426 url: '/goods/batchUpdatePrice', 426 url: '/goods/batchUpdatePrice',
427 data: { 427 data: {
428 batchList: data 428 batchList: data
@@ -431,7 +431,7 @@ $('#sure-change').on('click', function() { @@ -431,7 +431,7 @@ $('#sure-change').on('click', function() {
431 $('#priceTable').hide(); 431 $('#priceTable').hide();
432 $('.success-wrap').show(); 432 $('.success-wrap').show();
433 path = res.data; 433 path = res.data;
434 - }); 434 + });*/
435 }); 435 });
436 436
437 $('#download-btn').on('click', function() { 437 $('#download-btn').on('click', function() {
1 var request = require('request'); 1 var request = require('request');
  2 +var _ = require('lodash');
2 var fs = require('fs'); 3 var fs = require('fs');
3 var ipaddr = require('ipaddr.js'); 4 var ipaddr = require('ipaddr.js');
4 var domain = require('../../config/common.js').domain; 5 var domain = require('../../config/common.js').domain;
5 //var domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力 6 //var domain = 'http://172.16.6.227:8083/yohobuy-platform-web'; //马力
6 -//var domain = 'http://192.168.102.202:8088/platform'; 7 +var domain = 'http://172.16.6.162:8088/platform';
7 8
8 var env = process.env.NODE_ENV || 'development'; 9 var env = process.env.NODE_ENV || 'development';
9 10
10 exports.uploadFile = function(req, res) { 11 exports.uploadFile = function(req, res) {
11 - if(req.session.user) {  
12 - appendAdminInfo(req,req.session.user.auth); 12 + var headers = {};
  13 + if (req.session && req.session.user) {
  14 + var ipObject = ipaddr.process(req.ip).octets
  15 + var ip = ipObject ? ipObject.join('.') : req.ip;
  16 +
  17 + headers = {
  18 + 'x-user-id': req.session.user.pid,
  19 + 'x-user-name': req.session.user.account,
  20 + 'x-site-type': 1,
  21 + 'x-client-ip': ip
  22 + };
13 } 23 }
14 if (req.is("multipart/form-data")) { 24 if (req.is("multipart/form-data")) {
15 req.body.file = fs.createReadStream(req.files[req.body.filename].path); 25 req.body.file = fs.createReadStream(req.files[req.body.filename].path);
16 if (req.body.__type == "batch-import") { 26 if (req.body.__type == "batch-import") {
17 - request.post({ 27 + var options = {
18 url: domain + '/batch/import', 28 url: domain + '/batch/import',
19 - formData: req.body  
20 - }, function optionalCallback(err, httpResponse, body) { 29 + method: 'POST',
  30 + formData: req.body,
  31 + headers: headers
  32 + };
  33 + request(options, function(error, response, body) {
21 var json = JSON.parse(body); 34 var json = JSON.parse(body);
22 json.status = true; 35 json.status = true;
23 res.json(json); 36 res.json(json);
  37 +
24 }); 38 });
  39 + // request.post({
  40 + // url: domain + '/batch/import',
  41 + // formData: req.body,
  42 + // headers: headers
  43 + // }, function optionalCallback(err, httpResponse, body) {
  44 + // var json = JSON.parse(body);
  45 + // json.status = true;
  46 + // res.json(json);
  47 + // });
25 } else { 48 } else {
26 request.post({ 49 request.post({
27 url: domain + '/fileupload/upload', 50 url: domain + '/fileupload/upload',
@@ -39,20 +62,3 @@ exports.uploadFile = function(req, res) { @@ -39,20 +62,3 @@ exports.uploadFile = function(req, res) {
39 }); 62 });
40 } 63 }
41 } 64 }
42 -/**  
43 - * 附加管理员的信息  
44 - * @param {Request} req 请求对象  
45 - * @param {Number} uid 用户ID  
46 - * @param {String} name 用户名  
47 - * @return {Object} 用户信息对象  
48 - */  
49 -function appendAdminInfo(req,auth) {  
50 - var ipObject = ipaddr.process(req.ip).octets  
51 - var ip = ipObject?ipObject.join('.'):req.ip;  
52 - req._yoheaders = {  
53 - 'x-user-id':auth.pid,  
54 - 'x-user-name':auth.account,  
55 - 'x-site-type':WEBSITE,  
56 - 'x-client-ip':ip  
57 - };  
58 -}