From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
index 3e5e306..36d846f 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -12,8 +12,7 @@
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.buwan.domain.Config;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.recommend.FloatAD;
import com.yeshi.buwan.dto.config.ADShieldIPConfig;
import com.yeshi.buwan.log.LogHelper;
@@ -23,13 +22,12 @@
import com.yeshi.buwan.util.IPUtil;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.vo.AcceptData;
-import net.sf.json.JSONArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import com.google.gson.Gson;
-import com.yeshi.buwan.service.imp.ConfigService;
+import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.util.JsonUtil;
import net.sf.json.JSONObject;
@@ -39,7 +37,7 @@
Logger logger = LoggerFactory.getLogger(ConfigParser.class);
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private SystemService systemService;
@@ -129,7 +127,9 @@
JSONObject adNew = new JSONObject();
String ip = IPUtil.getRemotIP(request);
-
+ //浼氬憳閾炬帴
+ String vipLink = map.get("vip_link");
+ data.put("vipLink", vipLink);
ADConfig splashConfig = getAdShowType("ad_splash_config", acceptData.getChannel(), acceptData.getVersion(), map);
@@ -202,8 +202,22 @@
ad.put("videoSearch", adConfig == null ? "" : adConfig.getType());
adNew.put("videoSearch", gson.toJson(adConfig));
+ //pptv鍏嶅箍鍛婃縺鍔辫棰�
+ adConfig = getAdShowType("pptv_no_ad_reward", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("pptvNoAdReward", gson.toJson(adConfig));
+
data.put("ad", ad);
data.put("adNew", adNew);
+ //PPTV鍏嶅箍鍛婃潈鐩婃椂闀�,鏆傛椂璁剧疆涓�3灏忔椂
+ data.put("pptvNoAdRewardHour", 3);
+ //璁剧疆缃戦〉鍔犻�熷煙鍚�
+ data.put("webSpeedUpHost",map.get("web_speed_up_host"));
+
+
+
+
out.print(JsonUtil.loadTrueJson(data.toString()));
}
--
Gitblit v1.8.0