Merge remote-tracking branch 'origin/master'

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -315,11 +315,14 @@ public class ExhibitionBoardController extends BaseController {
                 }
             }
             if (exhibitionBoard.getVideoContentId() != null) {
-                final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
+                String videoContentId = exhibitionBoard.getVideoContentId();
+                final VideoContent videoContent = this.videoContentService.getById(videoContentId);
                 if (videoContent == null) {
                     exhibitionBoard.setVideoContentName("对应的视频内容已被删除");
                 } else {
                     exhibitionBoard.setVideoContentName(videoContent.getName());
+                    final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name()));
+                    exhibitionBoard.setVideoList(videoList);
                 }
             }
         }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/FileUploadController.java

@@ -49,7 +49,7 @@ public class FileUploadController extends BaseController {
 
     private static final String[] IMAGE_TYPE = new String[]{"JPG", "JPEG", "PNG", "BMP", "WBMP"};
     private static final String[] AUDIO_TYPE = new String[]{"MP3", "AAC", "WMA", "FLAC", "RM", "OGG"};
-    private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV"};
+    private static final String[] VIDEO_TYPE = new String[]{"MP4", "FLV", "MPEG"};
     private static final String[] DOC_TYPE = new String[]{"PDF", "DOC", "DOCX", "PPT", "PPTX", "XLS", "XLSX"};
     private static final String[] DATUM_TYPE = ArrayUtil.addAll(DOC_TYPE, IMAGE_TYPE, VIDEO_TYPE);