Merge branch 'AI-ADMIN-V3' of http://120.27.238.55:7000/r/xc-mall into AI-A...

Administrator

3 days ago c5aa21a54a9595a5ae382ede00c14e3caf6bb1b9

Merge branch 'AI-ADMIN-V3' of http://120.27.238.55:7000/r/xc-mall into AI-ADMIN-V3


 Conflicts:

	src/main/java/cc/mrbird/febs/ai/controller/fileUpload/FileUploadController.java

 src/main/resources/templates/febs/views/modules/ai/fileUpload/index.html

@@ -310,6 +310,7 @@
            var isUploading = false;
            var startTime = 0;
            var uploadedSize = 0;
            var companyId = 'default'; // 默认公司ID，实际应用中应从session或URL参数获取

            // 初始化
            init();
@@ -483,6 +484,7 @@
                formData.append('chunk', currentChunk);
                formData.append('chunks', chunks);
                formData.append('fileMd5', fileMd5);
                formData.append('companyId', companyId);

                $.ajax({
                    url: '/fileUpload/uploadChunk',
@@ -535,7 +537,8 @@
                    data: {
                        fileName: file.name,
                        fileMd5: fileMd5,
                        chunks: chunks
                        chunks: chunks,
                        companyId: companyId
                    },
                    success: function(response) {
                        if (response.code === 200 || response.success) {
@@ -589,7 +592,7 @@
            function refreshFileList() {
                layer.msg('正在获取文件列表...', {icon: 16, time: 0});
                $.ajax({
                    url: '/fileUpload/list',
                    url: '/fileUpload/list/' + companyId,
                    type: 'GET',
                    success: function(response) {
                        layer.closeAll();
@@ -632,7 +635,7 @@
                                    var videoPlayer = document.getElementById('videoPlayer');
                                    var videoSource = document.getElementById('videoSource');

                                    videoSource.src = '/fileUpload/play/' + encodeURIComponent(fileName);
                                    videoSource.src = '/fileUpload/play/' + companyId + '/' + encodeURIComponent(fileName);
                                    videoPlayer.load();
                                    videoPlayer.play();
                                });
@@ -646,7 +649,10 @@
                                        $.ajax({
                                            url: '/fileUpload/delete',
                                            type: 'POST',
                                            data: {fileName: fileName},
                                            data: {
                                                fileName: fileName,
                                                companyId: companyId
                                            },
                                            success: function(response) {
                                                if (response.code === 200 || response.success) {
                                                    layer.msg('删除成功', {icon: 1});