Merge remote-tracking branch 'origin/master'

# Conflicts:
#	router/lesson.js

common/LjConst.js

@@ -2,6 +2,7 @@ const constBase = {
     BASE_DIR:'c:\\efunbox\\',
     VIDEO_TYPE_M3U8 : 'm3u8',
     VIDEO_TYPE_MP4 : 'mp4',
+    VIDEO_TYPE_MP3 : 'mp3',
     RES_TYPE_AUDIO : 4,
     RES_TYPE_IMAGE : 3,
     RES_TYPE_VIDEO : 0,

helper/LjFileHelper.js

@@ -66,6 +66,39 @@ class LjFileHelper
                     })
                 })
                 .save(localFileDir);
+        }//有声读物处理
+        else if (filePropObj.fileType == ljConst.VIDEO_TYPE_MP3)
+        {
+            //未加密有声读物本地存储地址
+            var localFileDir = filePropObj.folderDir + filePropObj.fileName + "." + filePropObj.fileType;
+
+            //读取有声读物
+            request(fileUrl).pipe(fs.createWriteStream(localFileDir)).on('close', function ()
+            {
+                //加密有声读物存储地址
+                var localFileDirNew = filePropObj.folderDir + filePropObj.fileName + "_new." + filePropObj.fileType;
+                logHelper.info("Succeeded to down audio：" + localFileDirNew);
+
+                //加密有声读物
+                LjFileHelper.writeEncryptedStream(localFileDir, localFileDirNew);
+
+                logHelper.info("Succeeded to image audio：" + localFileDirNew);
+
+                //删除文件（加密存储完成后删除未加密文件）
+                fs.unlink(localFileDir, function (err)
+                {
+                    if (err)
+                    {
+                        //删除失败
+                        logHelper.erro("Failed to delete audio[" + err.message + "]：" + localFileDir);
+                        throw err;
+                    }
+                    else
+                    {
+                        logHelper.info('Succeeded to delete audio：' + localFileDir)
+                    }
+                })
+            });
         }//图片处理
         else
         {
@@ -90,7 +123,7 @@ class LjFileHelper
                     if (err)
                     {
                         //删除失败
-                        logHelper.erro("Failed to delete image[" + err.message + "]：" + localFileDir);
+                        logHelper.error("Failed to delete image[" + err.message + "]：" + localFileDir);
                         throw err;
                     }
                     else