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

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

@@ -29,6 +29,7 @@ import com.ym.mec.biz.dal.enums.im.ClientEnum;
 import com.ym.mec.biz.dal.enums.school.ESchoolStaffType;
 import com.ym.mec.biz.dal.mapper.SchoolStaffMapper;
 import com.ym.mec.biz.dal.page.GroupMemberQueryInfo;
+import com.ym.mec.biz.dal.wrapper.ImGroupMemberWrapper;
 import com.ym.mec.biz.dal.wrapper.ImGroupWrapper;
 import com.ym.mec.biz.dal.wrapper.ImHistoryMessageWrapper;
 import com.ym.mec.biz.dal.wrapper.SchoolStaffWrapper;
@@ -538,8 +539,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         // 注册主播用户信息到三方平台
         imGroupCoreService.register(userId.toString(),"", name, avatar);
 
+        boolean createFlag = false;
         // 群组不存在，先创建群组
         if (Objects.isNull(imGroup)) {
+            createFlag = true;
             CooperationOrgan cooperationOrgan = cooperationOrganService.get(schoolId.intValue());
             imGroup = new ImGroup();
             imGroup.setSchoolId(schoolId);
@@ -559,22 +562,28 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
 
             initSchoolGroup(imGroup.getSchoolId());
         } else {
+            ImGroupMemberWrapper.ImGroupMember groupMember = ImGroupMemberWrapper.ImGroupMember.builder()
+                    .userId(userId.longValue())
+                    .nickname(name)
+                    .build();
+            imGroupCoreService.groupMemberJoin(imGroup.getId(), Lists.newArrayList(groupMember));
             // 更新群主流程
             if (schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER)) {
                 groupChangeOwner(userId, imGroup.getId());
             }
-        }
 
-        ImGroupMember imGroupMember = new ImGroupMember();
-        imGroupMember.setImGroupId(imGroup.getId());
-        imGroupMember.setUserId(userId);
-        imGroupMember.setIsAdmin(schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER));
-        imGroupMember.setRoleType(schoolStaffType.getDescribe());
-        imGroupMember.setType(EFriendRoleType.getByName(schoolStaffType.getDescribe()).name());
-        imGroupMember.setTenantId(imGroup.getTenantId());
-        imGroupMemberDao.insert(imGroupMember);
+            ImGroupMember imGroupMember = new ImGroupMember();
+            imGroupMember.setImGroupId(imGroup.getId());
+            imGroupMember.setUserId(userId);
+            imGroupMember.setIsAdmin(schoolStaffType.equals(ESchoolStaffType.ORCHESTRA_LEADER));
+            imGroupMember.setRoleType(schoolStaffType.getDescribe());
+            imGroupMember.setType(EFriendRoleType.getByName(schoolStaffType.getDescribe()).name());
+            imGroupMember.setTenantId(imGroup.getTenantId());
+            imGroupMemberDao.insert(imGroupMember);
 
+        }
         updateImGroupUserNumber(imGroup.getId());
+
     }
 
     private void initSchoolGroup(Long schoolId) {
@@ -1410,7 +1419,17 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<TencentRequest.MessageBody> bodyList = new ArrayList<>();
         if (i.getClassname().equals("RC:TxtMsg")) {
             //文本
-            TencentRequest.MessageBody body1 = getTimTextElem(jsonObject.getString("content"));
+            //文本
+            String content = jsonObject.getString("content");
+
+            // http开头的链接 扩展字段没有值 放在扩展字段里
+            if (content.startsWith("http")) {
+                String extra = jsonObject.getString("extra");
+                if (StringUtils.isEmpty(extra)) {
+                    jsonObject.put("extra", content);
+                }
+            }
+            TencentRequest.MessageBody body1 = getTimTextElem(content);
             bodyList.add(body1);
         } else if (i.getClassname().equals("RC:ImgMsg")) {
             //图片
@@ -1479,7 +1498,17 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
         List<TencentRequest.MessageBody> list = new ArrayList<>();
         if (i.getClassname().equals("RC:TxtMsg")) {
             //文本
-            TencentRequest.MessageBody body1 = getTimTextElem(jsonObject.getString("content"));
+            String content = jsonObject.getString("content");
+
+            // http开头的链接 扩展字段没有值 放在扩展字段里
+            if (content.startsWith("http")) {
+                String extra = jsonObject.getString("extra");
+                if (StringUtils.isEmpty(extra)) {
+                    jsonObject.put("extra", content);
+                }
+            }
+
+            TencentRequest.MessageBody body1 = getTimTextElem(content);
             list.add(body1);
         } else if (i.getClassname().equals("RC:ImgMsg")) {
             //图片