Merge remote-tracking branch 'origin/feature/1020-tencent-im' into feature/1020-tencent-im

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

mec-application/src/main/java/com/ym/mec/student/controller/StudentManageController.java

@@ -172,7 +172,7 @@ public class StudentManageController extends BaseController {
             // 设置用户Token
             student.setImToken(register.getImToken());
             // 设置用户IM用户ID
-//            student.setImUserId(register.getImUserId());
+            student.setImUserId(register.getImUserId());
         } catch (Exception e) {
             LOGGER.error("注册IM用户Token失败", e);
         }

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

@@ -7,6 +7,7 @@ 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;
@@ -44,8 +45,6 @@ public class ImGroupCoreServiceImpl implements ImGroupCoreService {
     @Autowired
     private ImGroupPlusService imGroupService;
     @Autowired
-    private ImConfigProperties imConfig;
-    @Autowired
     private ImGroupMemberPlusService imGroupMemberPlusService;
 
     /**