nouffer/FBSAdminTool
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update upload

Browse Source
This commit is contained in:
Mohamed Nouffer
2021-09-14 19:33:23 +05:30
parent 8f18b9facc
commit 36d8e448fd
1 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server.js
View File

@ -17,8 +17,15 @@ app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: true })); app.use(bodyParser.urlencoded({ extended: true }));
app.use(cors(corsOptions)); app.use(cors(corsOptions));
function callLoadInitializeData(projectid, construction_id, username, sheetname, filename){ function callLoadInitializeData(req, res, resdata){
https.get('https://natnats.mobilous.com/loadInitializeData?projectid=23&construction_id=1&username=1&sheetname=dataSheet&filename=ini_データ入力シート.xlsx', (resp) => {
_email = req.query.email;
let url = `https://natnats.mobilous.com/loadInitializeData?projectid=23&construction_id=${resdata.construction_id}&username=${_email}&sheetname=${resdata.file_type}&filename=${resdata.file_name}`
console.log(url);
https.get(url, (resp) => {
let data = ''; let data = '';
// A chunk of data has been received. // A chunk of data has been received.
@ -41,7 +48,7 @@ function callLoadInitializeData(projectid, construction_id, username, sheetname,
}); });
} }
function callInitFileMover(re) { function callInitFileMover(req, res) {
https.get('https://natnats.mobilous.com/iniFileMover', (resp) => { https.get('https://natnats.mobilous.com/iniFileMover', (resp) => {
let data = ''; let data = '';
@ -61,6 +68,7 @@ function callInitFileMover(re) {
if(data !== 'no match'){ if(data !== 'no match'){
resdata = JSON.parse(data); resdata = JSON.parse(data);
console.log(resdata); console.log(resdata);
callLoadInitializeData(req, res, resdata);
} }
}); });
@ -87,20 +95,20 @@ app.post('/upload', function(req, res, next) {
console.log('email is ' + req.query.email); console.log('email is ' + req.query.email);
// upload(req, res, function(err) { upload(req, res, function(err) {
// if (err instanceof multer.MulterError) { if (err instanceof multer.MulterError) {
// return res.status(500).json(err) return res.status(500).json(err)
// } else if (err) { } else if (err) {
// return res.status(500).json(err) return res.status(500).json(err)
// } }
// else { else {
// var FileName = req.file.filename; var FileName = req.file.filename;
// callInitFileMover(res); callInitFileMover(req, res);
// res.status(200).send(FileName); res.status(200).send(FileName);
// } }
// //return res.status(200).send(req.file) //return res.status(200).send(req.file)
// }) })
}); });