diff --git a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 6bebd98..402dcda 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -94,9 +94,9 @@ public class VideoController extends BaseController { title = multiReq.getOriginalFilename().substring(0,dot); } } - if(!fileFormat.endsWith("mp4") || !fileFormat.endsWith("mp3")){ - return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); - } +// if(!fileFormat.endsWith("mp4") || !fileFormat.endsWith("mp3")){ +// return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); +// } VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat); result.setSize(size); return new ResultData(result); diff --git a/suimangVideo/src/main/java/com/iformall/language/LanguageDetect.java b/suimangVideo/src/main/java/com/iformall/language/LanguageDetect.java index 34e10d2..86c0fac 100644 --- a/suimangVideo/src/main/java/com/iformall/language/LanguageDetect.java +++ b/suimangVideo/src/main/java/com/iformall/language/LanguageDetect.java @@ -32,11 +32,15 @@ public class LanguageDetect { PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); Resource[] resources = resolver.getResources("classpath:profiles/*"); for (Resource resource:resources) { +// InputStream inputStream = resource.getInputStream(); +// String str = StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8); +//// String str = new String(ByteStreams.toByteArray(inputStream)); +// profile.add(str); +// inputStream.close(); InputStream inputStream = resource.getInputStream(); - String str = StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8); -// String str = new String(ByteStreams.toByteArray(inputStream)); - profile.add(str); - inputStream.close(); + byte[] bytes = new byte[0]; + inputStream.read(bytes); + profile.add(new String(bytes)); } } catch (IOException e) { e.printStackTrace();