Merge branch 'feature/1020-tencent-im' into test

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroup.java

@@ -37,19 +37,32 @@ public class ImGroup extends BaseEntity {
 	private String importFlag;
 
 	public enum GroupTypeEnum implements BaseEnum<String,GroupTypeEnum> {
-		NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "基础技能班"),
-		VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"),
-		SNAP("SNAP","临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "线上基础技能课"),
-		MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课"),PARENT_MEETING("PARENT_MEETING","家长会"),
-		TRAINING("TRAINING","训练营"),REPERTOIRE_PLAY("REPERTOIRE_PLAY","曲目演奏课"), SCHOOL("SCHOOL","学校衔接群"),LIVE("LIVE","直播课");
+		NORMAL("NORMAL", "普通班级", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		MIX("MIX", "合奏班级", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		HIGH("HIGH", "基础技能班", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		VIP("VIP", "vip课", "https://oss.dayaedu.com/default-images/mec/VIP.png"),
+		DEMO("DEMO", "试听课", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		PRACTICE("PRACTICE", "网管课", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		SNAP("SNAP","临时班级", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		COMM("COMM", "对外课程", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		HIGH_ONLINE("HIGH_ONLINE", "线上基础技能课", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		PARENT_MEETING("PARENT_MEETING","家长会", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		TRAINING("TRAINING","训练营", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		REPERTOIRE_PLAY("REPERTOIRE_PLAY","曲目演奏课", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		SCHOOL("SCHOOL","学校衔接群", "https://oss.dayaedu.com/default-images/mec/TRAINING.png"),
+		LIVE("LIVE","直播课", "https://oss.dayaedu.com/default-images/mec/LIVE.png");
 
 		private String code;
 
 		private String msg;
 
-		GroupTypeEnum(String code, String msg) {
+		private String avatar;
+
+		GroupTypeEnum(String code, String msg, String avatar) {
 			this.code = code;
 			this.msg = msg;
+			this.avatar = avatar;
 		}
 
 		public void setCode(String code) {
@@ -68,6 +81,14 @@ public class ImGroup extends BaseEntity {
 		public String getCode() {
 			return this.code;
 		}
+
+		public String getAvatar() {
+			return avatar;
+		}
+
+		public void setAvatar(String avatar) {
+			this.avatar = avatar;
+		}
 	}
 
 	//群类型

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupPlus.java

@@ -3,7 +3,6 @@ package com.ym.mec.biz.dal.entity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.ym.mec.common.enums.BaseEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -74,50 +73,15 @@ public class ImGroupPlus implements Serializable {
     @TableField(value = "import_flag_")
     private String importFlag;
 
-    public enum GroupTypeEnum implements BaseEnum<String, GroupTypeEnum> {
-        NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "基础技能班"),
-        VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"),
-        SNAP("SNAP", "临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "线上基础技能课"),
-        MUSIC_NETWORK("MUSIC_NETWORK", "乐团网管课"), PARENT_MEETING("PARENT_MEETING", "家长会"),
-        TRAINING("TRAINING", "训练营"), REPERTOIRE_PLAY("REPERTOIRE_PLAY", "曲目演奏课"), SCHOOL("SCHOOL", "学校衔接群"), LIVE(
-                "LIVE", "直播课");
-
-        private String code;
-
-        private String msg;
-
-        GroupTypeEnum(String code, String msg) {
-            this.code = code;
-            this.msg = msg;
-        }
-
-        public void setCode(String code) {
-            this.code = code;
-        }
-
-        public String getMsg() {
-            return msg;
-        }
-
-        public void setMsg(String msg) {
-            this.msg = msg;
-        }
-
-        @Override
-        public String getCode() {
-            return this.code;
-        }
-    }
-
     //群类型
     @TableField(value = "group_type_")
-    private GroupTypeEnum groupType;
+    private ImGroup.GroupTypeEnum groupType;
 
-    public GroupTypeEnum getGroupType() {
+    public ImGroup.GroupTypeEnum getGroupType() {
         return groupType;
     }
 
-    public void setGroupType(GroupTypeEnum groupType) {
+    public void setGroupType(ImGroup.GroupTypeEnum groupType) {
         this.groupType = groupType;
     }
 

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/ImGroupWrapper.java

@@ -1,14 +1,12 @@
 package com.ym.mec.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.slf4j.helpers.MessageFormatter;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -117,8 +115,10 @@ public class ImGroupWrapper {
         /** 群标签 */
         private String tags;
 
-        //群类型
+        // 群类型
         private com.ym.mec.biz.dal.entity.ImGroup.GroupTypeEnum groupType;
+
+
         public static ImGroup from(String json) {
             return JSON.parseObject(json, ImGroup.class);
         }

mec-biz/src/main/java/com/ym/mec/biz/service/im/impl/ImGroupCoreServiceImpl.java

@@ -7,9 +7,6 @@ import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.tools.ThreadPool;
 import com.microsvc.toolkit.middleware.im.ImPluginContext;
 import com.microsvc.toolkit.middleware.im.message.GroupMemberWrapper;
-import com.ym.mec.biz.dal.entity.ImGroup;
-import com.microsvc.toolkit.middleware.im.properties.ImConfigProperties;
-import com.ym.mec.biz.dal.entity.ImGroupMember;
 import com.ym.mec.biz.dal.entity.ImGroupMemberPlus;
 import com.ym.mec.biz.dal.entity.ImGroupPlus;
 import com.ym.mec.biz.dal.enums.EFriendRoleType;
@@ -163,8 +160,13 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
             registerUser(groupMembers);
         }
 
+        // 群默认头象
+        String groupAvatar = "";
+        if (Objects.nonNull(imGroup.getGroupType())) {
+            groupAvatar = imGroup.getGroupType().getAvatar();
+        }
         // 创建IM群组
-        imPluginContext.getPluginService().groupCreate(imGroup.getGroupId(), imGroup.getName(),imUserId);
+        imPluginContext.getPluginService().groupCreate(imGroup.getGroupId(), imGroup.getName(), groupAvatar, imUserId);
 
         if (userInfo != null) {
             // 添加群成员到当前群组