Commit f288de27 by zhangxingmin

push

parent 3d633364
...@@ -65,7 +65,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService { ...@@ -65,7 +65,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService {
@Resource @Resource
private ApiOssFeignClient apiOssFeignClient; private ApiOssFeignClient apiOssFeignClient;
@Value("${co.room.base-url:https://default-domain.com/co/join}") @Value("${co.room.base-url:https://mdev.zuihuibi.cn/repotKYC/#/pages/launch/index?visitType=1&targetPage=showcasePage}")
private String roomBaseUrl; private String roomBaseUrl;
@Resource @Resource
...@@ -238,7 +238,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService { ...@@ -238,7 +238,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService {
} }
// 2. 构建房间链接(从配置读取) // 2. 构建房间链接(从配置读取)
String roomLink = roomBaseUrl + "?roomId=" + session.getRoomId() + "&pwd=" + session.getRoomPwd(); String roomLink = roomBaseUrl + "&roomId=" + session.getRoomId() + "&pwd=" + session.getRoomPwd();
log.info("【创建会话】生成房间链接: {}", roomLink); log.info("【创建会话】生成房间链接: {}", roomLink);
// 3. 生成二维码图片字节数组(PNG格式) // 3. 生成二维码图片字节数组(PNG格式)
...@@ -335,7 +335,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService { ...@@ -335,7 +335,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService {
joinResponse.setSessionBizId(session.getCoSessionBizId()); joinResponse.setSessionBizId(session.getCoSessionBizId());
// 获取资源所有者缓存中的登录信息 // 获取资源所有者缓存中的登录信息
RoomRedisInfoDTO roomRedisInfoDTO = redisUtil.getCacheObject(RedisEnum.ROOM.getPrefix() + session.getRoomId() + ":" + session.getRoomPwd()); RoomRedisInfoDTO roomRedisInfoDTO = redisUtil.getCacheObject(RedisEnum.ROOM.getPrefix() + session.getRoomId() + ":" + session.getRoomPwd(),RoomRedisInfoDTO.class);
if (roomRedisInfoDTO == null) { if (roomRedisInfoDTO == null) {
log.error("【加入会话】会话发起者缓存信息不存在,roomId={}", session.getRoomId()); log.error("【加入会话】会话发起者缓存信息不存在,roomId={}", session.getRoomId());
throw new BusinessException("会话发起者登录信息失效,建议联系会话发起者再次发起"); throw new BusinessException("会话发起者登录信息失效,建议联系会话发起者再次发起");
...@@ -422,7 +422,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService { ...@@ -422,7 +422,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService {
log.info("【加入会话-内部】数据库更新成功,新状态={}", session.getStatus()); log.info("【加入会话-内部】数据库更新成功,新状态={}", session.getStatus());
// 更新 Redis 缓存 // 更新 Redis 缓存
RoomRedisInfoDTO roomRedisInfoDTO = redisUtil.getCacheObject(RedisEnum.ROOM.getPrefix() + session.getRoomId() + ":" + session.getRoomPwd()); RoomRedisInfoDTO roomRedisInfoDTO = redisUtil.getCacheObject(RedisEnum.ROOM.getPrefix() + session.getRoomId() + ":" + session.getRoomPwd(),RoomRedisInfoDTO.class);
if (roomRedisInfoDTO != null) { if (roomRedisInfoDTO != null) {
roomRedisInfoDTO.setControlHolderType(session.getControlHolderType()); roomRedisInfoDTO.setControlHolderType(session.getControlHolderType());
roomRedisInfoDTO.setControlHolderId(session.getControlHolderId()); roomRedisInfoDTO.setControlHolderId(session.getControlHolderId());
...@@ -606,7 +606,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService { ...@@ -606,7 +606,7 @@ public class ApiCoSessionServiceImpl implements ApiCoSessionService {
session.getControlHolderType(), session.getControlHolderId()); session.getControlHolderType(), session.getControlHolderId());
// 更新房间缓存redis信息 // 更新房间缓存redis信息
RoomRedisInfoDTO roomRedisInfoDTO = redisUtil.getCacheObject(RedisEnum.ROOM.getPrefix() + roomId + ":" +session.getRoomPwd()); RoomRedisInfoDTO roomRedisInfoDTO = redisUtil.getCacheObject(RedisEnum.ROOM.getPrefix() + roomId + ":" +session.getRoomPwd(),RoomRedisInfoDTO.class);
if (roomRedisInfoDTO != null) { if (roomRedisInfoDTO != null) {
roomRedisInfoDTO.setControlHolderId(session.getControlHolderId()); roomRedisInfoDTO.setControlHolderId(session.getControlHolderId());
roomRedisInfoDTO.setControlHolderType(session.getControlHolderType()); roomRedisInfoDTO.setControlHolderType(session.getControlHolderType());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment