Merge branch 'feature/0902_courseware' into online

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/open/ImController.java

@@ -24,6 +24,7 @@ import com.yonge.cooleshow.biz.dal.wrapper.im.ImGroupWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.base.exception.BizException;
+import feign.Client;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -315,6 +316,10 @@ public class ImController extends BaseController {
         log.info("注册im用户");
 
         try {
+            if (ClientEnum.QR_TEACHER == clientType) {
+                // 机构老师扫码
+                clientType = ClientEnum.TEACHER;
+            }
             ImGroupWrapper.ImUserInfo register = imGroupService.register(userId, clientType, username, avatar);
             return JSON.parseObject(JSON.toJSONString(register), ImUserInfo.class);
         } catch (Exception e) {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ClientEnum.java

@@ -18,7 +18,7 @@ public enum ClientEnum implements BaseEnum<String, ClientEnum> {
     SYSTEM("平台端"),
     WEBSITE("官网"),
     TENANT("机构端"),
-
+    QR_TEACHER("机构老师扫码"),
     ;
     @EnumValue
     private String code;