diff --git a/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/file/MimeTypeUtils.java b/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/file/MimeTypeUtils.java index 1c1ad0d..40153bc 100644 --- a/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/file/MimeTypeUtils.java +++ b/m2pool-common/common-core/src/main/java/com/m2pool/common/core/utils/file/MimeTypeUtils.java @@ -35,6 +35,8 @@ public class MimeTypeUtils "rar", "zip", "gz", "bz2", // 视频格式 "mp4", "avi", "rmvb", + //音频格式 + "mp3","aif","aiff","wav","wma", // pdf "pdf" }; diff --git a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java index 9b2f08c..d107d9d 100644 --- a/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java +++ b/m2pool-modules/m2pool-chat/src/main/java/com/m2pool/chat/config/WebSocketBrokerConfig.java @@ -70,8 +70,9 @@ public class WebSocketBrokerConfig implements WebSocketMessageBrokerConfigurer { .setHeartbeatValue(new long[] {20000, 20000}) .setTaskScheduler(new DefaultManagedTaskScheduler()); + //发送消息前缀 config.setApplicationDestinationPrefixes(Destination.SEND_PREFIX); - //服务端通知客户端的前缀,可以不设置,默认为user + //客户端订阅前缀,可以不设置,默认为user config.setUserDestinationPrefix(Destination.USER_PREFIX); } diff --git a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java index 128c00c..09786ca 100644 --- a/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java +++ b/m2pool-modules/m2pool-pool/src/main/java/com/m2pool/pool/service/impl/TicketServiceImpl.java @@ -80,8 +80,7 @@ public class TicketServiceImpl implements TicketService { R upload = fileService.uploadFile(f); if (StringUtils.isNull(upload) || StringUtils.isNull(upload.getData())) { - System.out.println("gg"); - System.out.println(upload.getMsg()); + System.out.println("文件上传失败,错误消息"+upload.getMsg()); return AjaxResult.error("文件服务异常,文件上传失败"); }