diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java index 5a317685..3df3bf80 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/chat/ChatManager.java @@ -113,7 +113,7 @@ public class ChatManager { }else{ roomId = room.getRoomId(); } - String wsSocketUrlFormat = systemConfigManager.getSystemConfig(SystemConfigEnum.WS_SOCKET_URL); + String wsSocketUrlFormat = systemConfigManager.getWebSocketUrl(); String token = setWsToken(roomId, fromUser.getId(), toUser.getId(),userId); String weSocketUrl = String.format(wsSocketUrlFormat,token,roomId); Long guardPrice = systemConfigManager.getSystemConfigOfLong(SystemConfigEnum.GUARD_PRICE); @@ -155,7 +155,7 @@ public class ChatManager { User fromUser = userMap.get(userCall.getFromUid()); User toUser = userMap.get(userCall.getToUid()); Anchor anchor = anchorService.getByUserId(toUser.getId()); - String wsSocketUrlFormat = systemConfigManager.getSystemConfig(SystemConfigEnum.WS_SOCKET_URL); + String wsSocketUrlFormat = systemConfigManager.getWebSocketUrl(); String token = setWsToken(userCall.getId(), fromUser.getId(), toUser.getId(), userId); String weSocketUrl = String.format(wsSocketUrlFormat,token,roomId); GetRoomResp getRoomResp = new GetRoomResp(); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java index 63883e51..4c18b3d5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java @@ -5,6 +5,8 @@ import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.common.core.service.SensitiveService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.availability.AvailabilityChangeEvent; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; @@ -30,12 +32,24 @@ public class SystemConfigManager { @Autowired private SensitiveService sensitiveService; + @Value("${spring.profiles.active:'dev'}") + private String active; + private final static String DEV_ACTIVE = "dev"; + @PostConstruct public void initSensitive(){ boolean config = getSystemConfigOfBool(SystemConfigEnum.SENSITIVE_ENABLE); sensitiveService.setSensitive(config); } + + public String getWebSocketUrl(){ + if(DEV_ACTIVE.equals(active)){ + return SystemConfigEnum.WS_SOCKET_URL.getDefaultValue(); + } + return getSystemConfig(SystemConfigEnum.WS_SOCKET_URL); + } + /** * 获取配置信息返回boolean * @param systemConfig