Merge branch 'feature/0803-im' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/UploadFileService.java

@@ -60,7 +60,8 @@ public class UploadFileService {
             return uploadReturn;
         }
 
-        String root = fileRoot;
+        String root = "d:";
+                //fileRoot;
         if (StringUtils.isBlank(root)) {
             uploadReturn.setMessage("上传临时目录没有配置");
             return uploadReturn;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImGroupServiceImpl.java

@@ -90,6 +90,7 @@ import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.io.*;
 import java.net.URL;
@@ -1102,33 +1103,33 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         //bais = new ByteArrayInputStream(bytes);
 
             //获取图片类型
-            String suffix = name.substring(name.lastIndexOf(".") + 1);
+            //String suffix = name.substring(name.lastIndexOf(".") + 1);
             //获取JDK8里的解码器Base64.Decoder,将base64字符串转为字节数组
             byte[] bytes = Base64.getDecoder().decode(content);
             //构建字节数组输入流
             bais = new ByteArrayInputStream(bytes);
-            //通过ImageIO把字节数组输入流转为BufferedImage
+           /* //通过ImageIO把字节数组输入流转为BufferedImage
             BufferedImage bufferedImage = ImageIO.read(bais);
 
             //构建文件
             File imageFile = new File(name);
             //写入生成文件
-            ImageIO.write(bufferedImage, suffix, imageFile);
+            ImageIO.write(bufferedImage, format, imageFile);*/
 
 
 
 
 
-        UploadReturnBean uploadReturnBean = uploadFileService.uploadFile(bais, suffix);
+        UploadReturnBean uploadReturnBean = uploadFileService.uploadFile(bais, format);
         String url = uploadReturnBean.getUrl();
-        /*BufferedImage read = ImageIO.read(bais);
+        URL url2 =  new URL(url);
+        BufferedImage read = ImageIO.read(url2);
         int width = read.getWidth();
-        int height = read.getHeight();*/
-
+        int height = read.getHeight();
 
         ImageUtil.ImageInfo imageReq = ImageUtil.ImageInfo.builder()
                 .imgUrl(url)
-                .suffix(suffix)
+                .suffix(format)
                 .build();
 
 
@@ -1141,9 +1142,9 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
         timVideoFileElem.setVideoDownloadFlag(2);
         timVideoFileElem.setThumbUrl(url);
         timVideoFileElem.setThumbUUID(imageReq.getMd5());
-        timVideoFileElem.setThumbWidth( bufferedImage.getWidth());
-        timVideoFileElem.setThumbHeight( bufferedImage.getHeight());
-        timVideoFileElem.setThumbSize((imageReq.getSize().intValue()));
+        timVideoFileElem.setThumbWidth( width);
+        timVideoFileElem.setThumbHeight( height);
+        //timVideoFileElem.setThumbSize((imageReq.getSize().intValue()));
         timVideoFileElem.setThumbDownloadFlag(2);
         timVideoFileElem.setThumbFormat(format);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomMemberServiceImpl.java

@@ -54,7 +54,7 @@ public class ImNetworkRoomMemberServiceImpl extends ServiceImpl<ImNetworkRoomMem
             roomMember.setHandFlag(false);
             roomMember.setMicFlag(microphone);
             roomMember.setMusicModeFlag(false);
-            roomMember.setRole(userRole.ordinal());
+            roomMember.setRole(userRole.getValue());
             roomMember.setUserId(sysUser.getUserId());
             roomMember.setUsername(sysUser.getUsername());
             roomMember.setAvatar(sysUser.getAvatar());

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/ImHistoryMessageWrapper.java

@@ -61,42 +61,55 @@ public class ImHistoryMessageWrapper {
     @ApiModel("ImHistoryMessage-iM视频")
     public static class TimVideoFileElem {
 
+        @JSONField(name = "VideoUrl")
         @ApiModelProperty("视频下载地址。可通过该 URL 地址直接下载相应视频。")
         private String VideoUrl;
 
+        @JSONField(name = "VideoUUID")
         @ApiModelProperty("文视频的唯一标识，客户端用于索引视频的键值。")
         private String VideoUUID;
 
+        @JSONField(name = "VideoSize")
         @ApiModelProperty("视频数据大小，单位：字节。")
         private Integer VideoSize;
 
+        @JSONField(name = "VideoSecond")
         @ApiModelProperty("视频时长，单位：秒。Web 端不支持获取视频时长，值为0")
         private Integer VideoSecond;
 
+        @JSONField(name = "VideoFormat")
         @ApiModelProperty("视频格式，例如 mp4")
         private String VideoFormat;
 
+        @JSONField(name = "VideoDownloadFlag")
         @ApiModelProperty("视频下载方式标记。目前 VideoDownloadFlag 取值只能为2，表示可通过 VideoUrl 字段值的 URL 地址直接下载视频。")
         private Integer VideoDownloadFlag;
 
+        @JSONField(name = "ThumbUrl")
         @ApiModelProperty("视频缩略图下载地址。可通过该 URL 地址直接下载相应视频缩略图。")
         private String ThumbUrl;
 
+        @JSONField(name = "ThumbUUID")
         @ApiModelProperty("视频缩略图的唯一标识，客户端用于索引视频缩略图的键值")
         private String ThumbUUID;
 
+        @JSONField(name = "ThumbSize")
         @ApiModelProperty("缩略图大小，单位：字节。")
         private Integer ThumbSize;
 
+        @JSONField(name = "ThumbWidth")
         @ApiModelProperty("缩略图宽度，单位为像素。")
         private Integer ThumbWidth;
 
+        @JSONField(name = "ThumbHeight")
         @ApiModelProperty("缩略图高度，单位为像素。")
         private Integer ThumbHeight;
 
+        @JSONField(name = "ThumbFormat")
         @ApiModelProperty("缩略图格式，例如 JPG、BMP 等。")
         private String ThumbFormat;
 
+        @JSONField(name = "ThumbDownloadFlag")
         @ApiModelProperty("视频缩略图下载方式标记。目前 ThumbDownloadFlag 取值只能为2，表示可通过 ThumbUrl 字段值的 URL 地址直接下载视频缩略图。")
         private Integer ThumbDownloadFlag;
     }