|
@@ -1,5 +1,6 @@
|
|
|
var express = require('express');
|
|
|
var mac = require('getmac');//获取mac地址
|
|
|
+var os = require('os');
|
|
|
var fs = require('fs');
|
|
|
var url = require('url');
|
|
|
var router = express.Router();
|
|
@@ -131,7 +132,7 @@ router.get("/downloadFile", function (req, res, next)
|
|
|
var resourceSize = resourceList.length;
|
|
|
res_total += resourceSize
|
|
|
}
|
|
|
- logHelper.info("res_total:"+res_total);
|
|
|
+ logHelper.info("res_total:" + res_total);
|
|
|
/*课件-End*/
|
|
|
|
|
|
//添加下载记录
|
|
@@ -155,7 +156,7 @@ router.get("/downloadFile", function (req, res, next)
|
|
|
logHelper.debug(resourceList[j].url);
|
|
|
var url = resourceList[j].url;
|
|
|
|
|
|
- fileHelper.downloadFile(url,opt);
|
|
|
+ fileHelper.downloadFile(url, opt);
|
|
|
}
|
|
|
}
|
|
|
/*课件-End*/
|
|
@@ -185,7 +186,18 @@ router.get("/readFile", function (req, res)
|
|
|
{
|
|
|
var arg = url.parse(req.url, true).query;
|
|
|
var fileDirStr = arg.n;
|
|
|
- var fileDirNew = fileDirStr.replace(/\*/g, '\\');
|
|
|
+ var platform = os.platform();
|
|
|
+
|
|
|
+ var fileDirNew = "";
|
|
|
+ if (platform == "win32")
|
|
|
+ {
|
|
|
+ fileDirNew = fileDirStr.replace(/\*/g, '\\');
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ fileDirNew = fileDirStr.replace(/\*/g, '/');
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
var fileDir = fileHelper.getFileDir(fileDirNew)
|
|
|
var fileProp = fileHelper.getFileProperty(fileDir);
|
|
@@ -351,11 +363,12 @@ router.get("/delFile", function (req, res)
|
|
|
var addDownload = function (opt)
|
|
|
{
|
|
|
var macAddressStr = "";
|
|
|
- mac.getMac(function(err,macAddress){
|
|
|
- if (err) throw err;
|
|
|
- macAddressStr = macAddress; //获取mac地址
|
|
|
+ mac.getMac(function (err, macAddress)
|
|
|
+ {
|
|
|
+ if (err) throw err;
|
|
|
+ macAddressStr = macAddress; //获取mac地址
|
|
|
});
|
|
|
- console.info("macAddressStr:"+macAddressStr);
|
|
|
+ console.info("macAddressStr:" + macAddressStr);
|
|
|
|
|
|
opt.url = apiHelper.getApiForAddDownload(opt.lessonId, opt.courseId, opt.resTotal, opt.resSize);
|
|
|
opt.method = "post";
|