diff --git a/server.js b/server.js index 752942f..93a06a4 100644 --- a/server.js +++ b/server.js @@ -68,7 +68,7 @@ function callInitFileMover(req, res) { if(data !== 'no match'){ resdata = JSON.parse(data); console.log(resdata); - //callLoadInitializeData(req, res, resdata); + callLoadInitializeData(req, res, resdata); } }); @@ -102,7 +102,7 @@ app.post('/upload', function(req, res, next) { return res.status(500).json(err) } else { - var FileName = req.file.filename; + var FileName = req.files[0].filename; callInitFileMover(req, res); res.status(200).send(FileName); } diff --git a/src/views/Uploader/index.js b/src/views/Uploader/index.js index 986a567..16a2305 100644 --- a/src/views/Uploader/index.js +++ b/src/views/Uploader/index.js @@ -32,11 +32,11 @@ function Uploader(props) { const order2 = collator.compare('ini_データ入力シート.xlsx', chk); if(order1 === 0 || order2 === 0) { - axios.post("https://fsbsso.sumasen.net/upload?email=" + props.email, { - body: data, - headers: {'Content-Type': 'multipart/form-data' } - }) - //axios.post("http://localhost:8000/upload", data, headers: {'Content-Type': 'multipart/form-data' }) + // axios.post("https://fsbsso.sumasen.net/upload?email=" + props.email, { + // body: data, + // headers: {'Content-Type': 'multipart/form-data' } + // }) + axios.post("https://fsbsso.sumasen.net/upload?email=" + props.email, data, headers: {'Content-Type': 'multipart/form-data' }) .then(res => { // then print response status //console.log(res.statusText) if (res.statusText == 'OK') {