Merge branch 'dev_v1.3.5_20220927'

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/TeacherFeignService.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.feign.config.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 
 @FeignClient(name = AppConstant.APPLICATION_TEACHER + AppConstant.SERVER, configuration = FeignConfiguration.class, fallback = TeacherFeignServiceFallback.class)
 public interface TeacherFeignService {
@@ -63,4 +64,12 @@ public interface TeacherFeignService {
      */
     @GetMapping("/task/teacherSalary")
     HttpResponseResult<Object> teacherSalary();
+
+    /**
+     * 用户老师身份
+     * @param userId 用户ID
+     * @return HttpResponseResult<Boolean>
+     */
+    @GetMapping("/open/teacher/identity/{ID}")
+    HttpResponseResult<Boolean> userTeacherIdentityInfo(@PathVariable("ID") Long userId);
 }

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/TeacherFeignServiceFallback.java

@@ -41,4 +41,15 @@ public class TeacherFeignServiceFallback implements TeacherFeignService {
     public HttpResponseResult<Object> teacherSalary() {
         return null;
     }
+
+    /**
+     * 用户老师身份
+     *
+     * @param userId 用户ID
+     * @return HttpResponseResult<Boolean>
+     */
+    @Override
+    public HttpResponseResult<Boolean> userTeacherIdentityInfo(Long userId) {
+        return null;
+    }
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/enums/EClientType.java

@@ -0,0 +1,51 @@
+package com.yonge.cooleshow.auth.enums;
+
+import com.yonge.toolset.base.enums.BaseEnum;
+
+/**
+ * Description
+ *
+ * @author liujunchi
+ * @date 2022-04-28
+ */
+public enum EClientType implements BaseEnum<String, EClientType> {
+    TEACHER("老师端"),
+    STUDENT("学生端"),
+    SYSTEM("平台端"),
+    WEBSITE("官网"),
+    ;
+    private String code;
+    private String msg;
+
+    EClientType(String msg) {
+        this.code = this.name();
+        this.msg = msg;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    /**
+     * 校验客户端类型合法性
+     * @param clientType 客户端类型
+     * @return boolean
+     */
+    public static boolean invalid(String clientType) {
+
+        EClientType[] values = EClientType.values();
+
+        for (EClientType item : values) {
+
+            if (item.getCode().equals(clientType)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+}

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/SysUserService.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.auth.api.dto.SysUserQueryInfo;
 import com.yonge.cooleshow.auth.api.dto.UserSetReq;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.vo.UserSetVo;
+import com.yonge.cooleshow.auth.enums.EClientType;
 import com.yonge.cooleshow.common.entity.ImUserModel;
 import com.yonge.cooleshow.common.enums.SysUserType;
 import com.yonge.cooleshow.common.enums.UserLockFlag;
@@ -201,4 +202,12 @@ public interface SysUserService extends BaseService<Long, SysUser> {
     void logoffById(Long id);
 
     void updateLockStatus(Long userId, Integer lockFlag, String sysUserType);
+
+    /**
+     * 用户信息
+     * @param userId 用户ID
+     * @param clientType 客户端类型
+     * @return SysUser
+     */
+    SysUser queryUserInfoWithIMToken(Long userId, EClientType clientType);
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.auth.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.google.common.collect.Lists;
 import com.yonge.cooleshow.api.feign.AdminFeignService;
+import com.yonge.cooleshow.api.feign.TeacherFeignService;
 import com.yonge.cooleshow.api.feign.dto.UserFriendInfoVO;
 import com.yonge.cooleshow.auth.api.dto.QRLoginDto;
 import com.yonge.cooleshow.auth.api.dto.RealnameAuthReq;
@@ -14,6 +15,7 @@ import com.yonge.cooleshow.auth.api.vo.UserSetVo;
 import com.yonge.cooleshow.auth.config.CustomerServiceConfig;
 import com.yonge.cooleshow.auth.config.RongCloudConfig;
 import com.yonge.cooleshow.auth.dal.dao.SysUserDao;
+import com.yonge.cooleshow.auth.enums.EClientType;
 import com.yonge.cooleshow.auth.service.SysConfigService;
 import com.yonge.cooleshow.auth.service.SysRoleMenuService;
 import com.yonge.cooleshow.auth.service.SysUserRoleService;
@@ -28,6 +30,7 @@ import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.util.ThreadPool;
 import com.yonge.toolset.mybatis.dal.BaseDAO;
 import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
+import io.rong.models.response.TokenResult;
 import io.rong.models.user.UserModel;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -36,10 +39,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.text.MessageFormat;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -65,6 +68,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     private AdminFeignService adminFeignService;
     @Autowired
     private CustomerServiceConfig customerServiceConfig;
+    @Autowired
+    private TeacherFeignService teacherFeignService;
 
     @Override
     public BaseDAO<Long, SysUser> getDAO() {
@@ -347,4 +352,51 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     public void updateLockStatus(Long userId, Integer lockFlag, String sysUserType) {
         sysUserDao.updateLockStatus(userId, lockFlag, sysUserType);
     }
+
+    /**
+     * 用户信息
+     *
+     * @param userId     用户ID
+     * @param clientType 客户端类型
+     * @return SysUser
+     */
+    @Override
+    public SysUser queryUserInfoWithIMToken(Long userId, EClientType clientType) {
+
+        // 查询用户基本信息
+        SysUser sysUser = sysUserDao.get(userId);
+
+        if (EClientType.STUDENT == clientType && Objects.nonNull(sysUser)) {
+
+            // 重新请求生成IM会话TOKEN
+            try {
+
+                HttpResponseResult<Boolean> recv = teacherFeignService.userTeacherIdentityInfo(userId);
+
+                if (Objects.nonNull(recv) && recv.getData()) {
+
+                    String name = sysUser.getRealName();
+                    if(StringUtils.isEmpty(name)){
+                        name = sysUser.getUsername();
+                    }
+
+                    // IM用户ID
+                    String imIdentity = MessageFormat.format("{0}:{1}", String.valueOf(sysUser.getId()), clientType.name());
+
+                    TokenResult result = RongCloudConfig.rongCloud.user.register(new UserModel(imIdentity, name, sysUser.getAvatar()));
+                    if(result.code.equals(200)){
+
+                        sysUser.setImToken(result.getToken());
+                    } else {
+                        log.warn("queryUserInfoWithIMToken 获取用户token失败:{}", result.errorMessage);
+                    }
+                }
+
+            } catch (Exception e) {
+                log.error("queryUserInfoWithIMToken 获取用户token失败, userId={}", userId, e);
+            }
+        }
+
+        return sysUser;
+    }
 }

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/TokenController.java

@@ -1,22 +1,23 @@
 package com.yonge.cooleshow.auth.web.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yonge.cooleshow.auth.api.dto.QRLoginDto;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.auth.core.service.CustomTokenServices;
+import com.yonge.cooleshow.auth.enums.EClientType;
+import com.yonge.cooleshow.auth.service.SysUserService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.enums.CacheNameEnum;
-import com.yonge.cooleshow.common.util.TokenUtil;
+import com.yonge.cooleshow.common.security.AuthUser;
+import com.yonge.cooleshow.common.security.SecurityUtils;
 import com.yonge.toolset.base.util.StringUtil;
-import io.swagger.annotations.*;
-
-import java.io.IOException;
-import java.util.Base64;
-import java.util.Calendar;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-
-import javax.servlet.http.HttpServletRequest;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,17 +32,20 @@ import org.springframework.security.oauth2.provider.token.ResourceServerTokenSer
 import org.springframework.security.oauth2.provider.token.TokenStore;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.client.RestTemplate;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.core.service.CustomTokenServices;
-import com.yonge.cooleshow.auth.service.SysUserService;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.security.AuthUser;
-import com.yonge.cooleshow.common.security.SecurityUtils;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.util.Base64;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 @RestController
 @Api(tags = "认证服务")
@@ -93,10 +97,18 @@ public class TokenController extends BaseController {
 
     @ApiOperation(value = "获取用户信息")
     @GetMapping("/api/queryUserInfo")
-    public Object apiQueryUserInfo() {
+    public Object apiQueryUserInfo(@RequestParam(value = "clientType", required = false, defaultValue = "TEACHER") String clientType) {
+
+        // 校验客户端类型
+        if (EClientType.invalid(clientType)) {
+            return failed("无效的客户端类型");
+        }
+
         AuthUser authUser = SecurityUtils.getUser();
         if (authUser != null) {
-            return succeed(userService.queryUserInfo(authUser.getUserId()));
+            SysUser sysUser = userService.queryUserInfoWithIMToken(authUser.getUserId(), EClientType.valueOf(clientType));
+
+            return succeed(sysUser);
         }
         return failed("获取用户信息失败");
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/open/OpenShareController.java

@@ -1,9 +1,11 @@
 package com.yonge.cooleshow.teacher.controller.open;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.ShareProfitParam;
 import com.yonge.cooleshow.biz.dal.entity.SysConfig;
+import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.CheckVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicActivityVo;
@@ -23,6 +25,8 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 
 @RestController
 @RequestMapping("/open")
@@ -46,6 +50,8 @@ public class OpenShareController extends BaseController {
     private ActivityPlanService activityPlanService;
     @Autowired
     private SysConfigService sysConfigService;
+    @Autowired
+    private TeacherService teacherService;
 
     /**
      * 服务对象
@@ -130,4 +136,20 @@ public class OpenShareController extends BaseController {
         List<SysConfig> configs = sysConfigService.findAll(params);
         return succeed(configs);
     }
+
+    @ApiOperation(value = "用户老师身份查询")
+    @GetMapping("/teacher/identity/{ID}")
+    public HttpResponseResult<Boolean> userTeacherIdentityInfo(@PathVariable("ID") Long userId) {
+
+        // 校验请求参数
+        if (Optional.ofNullable(userId).orElse(0L) <= 0) {
+            return succeed(false);
+        }
+
+        // 根据用户ID，查询老师身份信息
+        Teacher teacher = teacherService.getOne(Wrappers.<Teacher>lambdaQuery().eq(Teacher::getUserId, userId));
+
+        // 响应数据
+        return succeed(Objects.nonNull(teacher));
+    }
 }