From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 03 七月 2020 17:52:07 +0800 Subject: [PATCH] 多APP优化 --- fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java index dddacd1..fc25f4a 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/ConfigController.java @@ -15,7 +15,6 @@ import com.yeshi.fanli.dto.WXMPAcceptData; import com.yeshi.fanli.entity.bus.homemodule.FloatAD; -import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture; import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.push.DeviceActive; import com.yeshi.fanli.entity.system.BusinessSystem; @@ -30,6 +29,7 @@ import com.yeshi.fanli.service.inter.push.DeviceActiveService; import com.yeshi.fanli.util.StringUtil; import com.yeshi.fanli.util.ThreadUtil; +import com.yeshi.fanli.vo.homemodule.BannerVO; import com.yeshi.fanli.vo.homemodule.FloatImgDetailVO; import net.sf.json.JSONArray; @@ -64,7 +64,6 @@ * 鑾峰彇绯荤粺閰嶇疆淇℃伅 * * @param acceptData - * @param code * @param out */ @RequestMapping("getSystemClientConfig") @@ -114,18 +113,18 @@ public void getUserConfig(WXMPAcceptData acceptData, PrintWriter out) { try { // 鐢ㄦ埛鍗忚閾炬帴 - String serviceProtocol = configService.get(ConfigKeyEnum.serviceProtocolLink.getKey()); + String serviceProtocol = configService.getValue(ConfigKeyEnum.serviceProtocolLink.getKey(),acceptData.getSystem()); // 闅愮鏉℃閾炬帴 - String privacyProtocol = configService.get(ConfigKeyEnum.privacyProtocolLink.getKey()); + String privacyProtocol = configService.getValue(ConfigKeyEnum.privacyProtocolLink.getKey(),acceptData.getSystem()); JSONObject data = new JSONObject(); data.put("serviceProtocolLink", serviceProtocol); data.put("privacyProtocolLink", privacyProtocol); // 鎴戠殑鐣岄潰banner - List<SwiperPicture> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner", - acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion())); + List<BannerVO> banner = swiperPictureService.getByBannerCardAndVersion("my_interface_banner", + acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()); if (banner == null) - banner = new ArrayList<SwiperPicture>(); + banner = new ArrayList<BannerVO>(); data.put("banner", JsonUtil.getApiCommonGson().toJson(banner)); out.print(JsonUtil.loadTrueResult(data)); -- Gitblit v1.8.0