Showing
1 changed file
with
12 additions
and
22 deletions
@@ -17,25 +17,30 @@ var errBackMsg = { | @@ -17,25 +17,30 @@ var errBackMsg = { | ||
17 | //var domain = 'http://172.16.6.227:8088/platform'; //马力 | 17 | //var domain = 'http://172.16.6.227:8088/platform'; //马力 |
18 | // var domain = 'http://172.16.6.162:8088/platform'; | 18 | // var domain = 'http://172.16.6.162:8088/platform'; |
19 | //var domain = 'http://172.16.6.240:8088/platform'; | 19 | //var domain = 'http://172.16.6.240:8088/platform'; |
20 | - | ||
21 | -exports.uploadFile = function (req, res) { | 20 | +function getHeader(req,res){ |
22 | var headers = {}; | 21 | var headers = {}; |
23 | if (req.session && req.session.user) { | 22 | if (req.session && req.session.user) { |
24 | - var ipObject = ipaddr.process(req.ip).octets; | 23 | + var ipObject = ipaddr.process(req.ip).octets |
25 | var ip = ipObject ? ipObject.join('.') : req.ip; | 24 | var ip = ipObject ? ipObject.join('.') : req.ip; |
25 | + | ||
26 | headers = { | 26 | headers = { |
27 | 'x-user-id': req.session.user.auth.pid, | 27 | 'x-user-id': req.session.user.auth.pid, |
28 | 'x-user-name': req.session.user.auth.account, | 28 | 'x-user-name': req.session.user.auth.account, |
29 | 'x-site-type': 1, | 29 | 'x-site-type': 1, |
30 | 'x-client-ip': ip | 30 | 'x-client-ip': ip |
31 | }; | 31 | }; |
32 | - } | ||
33 | - else { | 32 | + |
33 | + } else { | ||
34 | res.json({ | 34 | res.json({ |
35 | code: "501", | 35 | code: "501", |
36 | message: "用户失效,请重新登录" | 36 | message: "用户失效,请重新登录" |
37 | }); | 37 | }); |
38 | } | 38 | } |
39 | + return headers; | ||
40 | +} | ||
41 | + | ||
42 | +exports.uploadFile = function (req, res) { | ||
43 | + var headers = getHeader(req, res); | ||
39 | if (req.is("multipart/form-data")) { | 44 | if (req.is("multipart/form-data")) { |
40 | var url = []; | 45 | var url = []; |
41 | for (var key in req.body) { | 46 | for (var key in req.body) { |
@@ -172,24 +177,9 @@ function joinimg(url) { | @@ -172,24 +177,9 @@ function joinimg(url) { | ||
172 | // } | 177 | // } |
173 | 178 | ||
174 | exports.ueditor = function(req, res) { | 179 | exports.ueditor = function(req, res) { |
175 | - var headers = {}; | ||
176 | - if (req.session && req.session.user) { | ||
177 | - var ipObject = ipaddr.process(req.ip).octets; | ||
178 | - var ip = ipObject ? ipObject.join('.') : req.ip; | 180 | + |
181 | + var headers = getHeader(req, res); | ||
179 | 182 | ||
180 | - headers = { | ||
181 | - 'x-user-id': req.session.user.auth.pid, | ||
182 | - 'x-user-name': req.session.user.auth.account, | ||
183 | - 'x-site-type': 1, | ||
184 | - 'x-client-ip': ip | ||
185 | - }; | ||
186 | - | ||
187 | - }else{ | ||
188 | - res.json({ | ||
189 | - code: "501", | ||
190 | - message: "用户失效,请重新登录" | ||
191 | - }); | ||
192 | - } | ||
193 | if (req.is("multipart/form-data")) { | 183 | if (req.is("multipart/form-data")) { |
194 | req.body.file = fs.createReadStream(req.files.upfile.path); | 184 | req.body.file = fs.createReadStream(req.files.upfile.path); |
195 | req.body.bucket="goodsimg"; | 185 | req.body.bucket="goodsimg"; |
-
Please register or login to post a comment