Merge remote-tracking branch 'origin/V4.0' into V5

Author: sanluan

publiccms-parent/publiccms/src/main/resources/templates/admin/cmsTemplate/demo/content/content.html

@@ -67,7 +67,7 @@ <h1 data-diy="content" data-diy-id="${(content.id)!}"><a href="${content.url!}">
                 <#if content.hasFiles>
                     <@cms.contentFileList contentId=content.id fileTypes='video,audio,document,other'>
                         <#list page.list as file>
-                            <p><a href="${site.dynamicPath}content/fileRedirect?id=${file.id}" download="${(file.description)!}">${file?counter}. ${(file.description)!}</a></p>
+                            <p><a href="${site.dynamicPath}content/fileRedirect?id=${file.id}&contentId=${content.id}" download="${(file.description)!}">${file?counter}. ${(file.description)!}</a></p>
                         </#list>
                     </@cms.contentFileList>
                 </#if>

publiccms-parent/publiccms/src/main/resources/templates/admin/cmsTemplate/demo/content/staticContent.html

@@ -60,7 +60,7 @@ <h1 data-diy="content" data-diy-id="${(content.id)!}"><a href="${content.url!}">
                 <#if content.hasFiles>
                     <@cms.contentFileList contentId=content.id fileTypes='video,audio,document,other'>
                         <#list page.list as file>
-                            <p><a href="${site.dynamicPath}content/fileRedirect?id=${file.id}" download="${(file.description)!}">${file?counter}. ${(file.description)!}</a></p>
+                            <p><a href="${site.dynamicPath}content/fileRedirect?id=${file.id}&contentId=${content.id}" download="${(file.description)!}">${file?counter}. ${(file.description)!}</a></p>
                         </#list>
                     </@cms.contentFileList>
                 </#if>

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/attachment/attachment.js

@@ -161,6 +161,7 @@
                     label: lang.uploadSelectFile
                 },
                 server: actionUrl,
+                headers: editor.getOpt('headers') || {},
                 fileVal: editor.getOpt('fileFieldName'),
                 duplicate: true,
                 fileSingleSizeLimit: fileMaxSize,
@@ -488,7 +489,7 @@
 
             uploader.on('uploadBeforeSend', function (file, data, header) {
                 //这里可以通过data对象添加POST参数
-                header['X_Requested_With'] = 'XMLHttpRequest';
+                header['X-Requested-With'] = 'XMLHttpRequest';
             });
 
             uploader.on('uploadProgress', function (file, percentage) {
@@ -635,14 +636,15 @@
                 this.isLoadingData = true;
                 ajax.request(editor.getActionUrl(editor.getOpt('fileManagerActionName')), {
                     timeout: 100000,
+                    'headers': editor.options.headers || {},
                     data: utils.extend({
                             start: this.listIndex,
                             size: this.listSize
                         }, editor.queryCommandValue('serverparam')),
                     method: 'get',
                     onsuccess: function (r) {
                         try {
-                            var json = eval('(' + r.responseText + ')');
+                            var json = utils.str2json(r.responseText);
                             if (json.state == 'SUCCESS') {
                                 _this.pushData(json.list);
                                 _this.listIndex = parseInt(json.start) + parseInt(json.list.length);