diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java index e293138fe..56b262049 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/constant/Constant.java @@ -1392,6 +1392,8 @@ public class Constant { public static final String GUILD_WEEK_LEVEL_R_FILTER = "guild_week_level_R_filter"; public static final String GUILD_MEMBER_NEW_UP_ACCEPT_REGION = "guild_member_new_up_accept_region"; + + public static final String CP_MIC_SVGA_URL = "cp_mic_svga_url"; } public static class WithDrawStatus { diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/AppResourceVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/AppResourceVo.java index 92f185404..7bc7796a4 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/AppResourceVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/AppResourceVo.java @@ -3,13 +3,11 @@ package com.accompany.business.vo; import com.accompany.business.model.room.RoomMicDress; import lombok.Data; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; @Data public class AppResourceVo { List roomMicDressList = new ArrayList<>(); Map roomGiftPanelNums = new HashMap<>(); + List cpMicSvgaList = Collections.emptyList(); } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/client/impl/ClientServiceImpl.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/client/impl/ClientServiceImpl.java index b83c82bc4..b4532ae9b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/client/impl/ClientServiceImpl.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/client/impl/ClientServiceImpl.java @@ -17,9 +17,11 @@ import com.accompany.common.config.MiniGameConfig; import com.accompany.common.config.NetEaseConfig; import com.accompany.common.config.SystemConfig; import com.accompany.common.config.TencentTRCTConfig; +import com.accompany.common.constant.AppEnum; import com.accompany.common.constant.Constant; import com.accompany.common.device.DeviceInfo; import com.accompany.common.result.BusiResult; +import com.accompany.common.utils.ReplaceAppDomainUtils; import com.accompany.core.base.DeviceInfoContextHolder; import com.accompany.core.base.SpringContextHolder; import com.accompany.core.service.SysConfService; @@ -29,8 +31,11 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.math.NumberUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.Map; /** @@ -135,6 +140,7 @@ public class ClientServiceImpl implements ClientService { try { appResourceVo.setRoomMicDressList(roomMicDressService.getRoomMicDressCacheOrDbAllList()); appResourceVo.setRoomGiftPanelNums(getGiftPanelNums()); + appResourceVo.setCpMicSvgaList(listCpMicSvga()); } catch (Exception e) { log.error("ClientServiceImpl.resourceVo,e:{}", e.getMessage(), e); } @@ -145,4 +151,16 @@ public class ClientServiceImpl implements ClientService { String giftPanelNums = sysConfService.getDefaultSysConfValueById(Constant.SysConfId.ROOM_GIFT_PANEL_NUMS, "{\"1\":\"1,7,17\",\"2\":\"1,7,17\",\"4\":\"1,7,17\",\"8\":\"1,7,17\"}"); return JSONObject.parseObject(giftPanelNums, Map.class); } + + private List listCpMicSvga() { + String str = sysConfService.getSysConfValueById(Constant.SysConfId.CP_MIC_SVGA_URL); + if (!StringUtils.hasText(str)){ + return Collections.emptyList(); + } + AppEnum appEnum = AppEnum.getCurApp(); + return JSONObject.parseArray(str, String.class).stream() + .filter(StringUtils::hasText) + .map(url-> ReplaceAppDomainUtils.replaceUrl(url, appEnum)) + .toList(); + } } diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java deleted file mode 100644 index d15800b85..000000000 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientConfigController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.accompany.business.controller.home; - -import com.accompany.business.common.BaseController; -import com.accompany.business.service.client.ClientService; -import com.accompany.business.vo.AppConfigVo; -import com.accompany.common.result.BusiResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@Api(tags = "APP初始化") -@Slf4j -@RestController -@RequestMapping("/client/config") -public class ClientConfigController extends BaseController { - - @Autowired - private ClientService clientService; - - /** - * APP启动拉取的初始化数据 - * - * @return - */ - @ApiOperation("APP启动拉取的初始化数据") - @GetMapping("") - public BusiResult init() { - return BusiResult.success(clientService.config()); - } - -} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientController.java index 8ae2ae407..5602da0c4 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/home/ClientController.java @@ -2,6 +2,7 @@ package com.accompany.business.controller.home; import com.accompany.business.common.BaseController; import com.accompany.business.service.client.ClientService; +import com.accompany.business.vo.AppConfigVo; import com.accompany.business.vo.AppInitVo; import com.accompany.business.vo.AppResourceVo; import com.accompany.business.vo.PropVo; @@ -35,6 +36,17 @@ public class ClientController extends BaseController { return BusiResult.success(clientService.init()); } + /** + * APP启动拉取的初始化数据 + * + * @return + */ + @ApiOperation("APP启动拉取的初始化数据") + @GetMapping("/config") + public BusiResult config() { + return BusiResult.success(clientService.config()); + } + /** * APP启动拉取系统云信账号 *