From 8075103992e9482fddd4a579d97b9a50c5dcf550 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 24 十月 2020 18:26:43 +0800
Subject: [PATCH] 爱奇艺资源更新优化
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 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 f6e8171..3006c7d 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -8,6 +8,7 @@
import javax.servlet.http.HttpServletRequest;
import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.Expose;
import com.yeshi.buwan.domain.Config;
import com.yeshi.buwan.domain.DetailSystem;
import com.yeshi.buwan.domain.recommend.FloatAD;
@@ -39,24 +40,21 @@
@Resource
private FloatADService floatADService;
- public String getAdShowType(String key, String channel, int version, Map<String, String> map) {
+ public ADConfig getAdShowType(String key, String channel, int version, Map<String, String> map) {
String splash = map.get(key);
JSONObject jsonObject = JSONObject.fromObject(splash);
- ADConfig splashAD = null;
+ ADConfig adConfig = null;
channel = channel.toLowerCase();
if (jsonObject.optJSONObject(channel) == null) {
// 榛樿涓哄簲鐢ㄥ疂
channel = "qq";
}
- String adType = "";
- splashAD = new Gson().fromJson(jsonObject.optJSONObject(channel).toString(), ADConfig.class);
- if (version >= splashAD.getVersion()) {
- adType = "";
- } else {
- adType = splashAD.getType();
+ adConfig = new Gson().fromJson(jsonObject.optJSONObject(channel).toString(), ADConfig.class);
+ if (version >= adConfig.getVersion()) {
+ adConfig = null;
}
- return adType;
+ return adConfig;
}
public void getConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -64,39 +62,65 @@
Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
JSONObject data = new JSONObject();
JSONObject ad = new JSONObject();
+ JSONObject adNew = new JSONObject();
String ip = IPUtil.getRemotIP(request);
- String splash = getAdShowType("ad_splash_config", acceptData.getChannel(), acceptData.getVersion(), map);
+ ADConfig splashConfig = getAdShowType("ad_splash_config", acceptData.getChannel(), acceptData.getVersion(), map);
//寮�灞忕殑鍦板尯灞忚斀瑙勫垯
String shieldProvince = map.get("shield_province");
+ boolean hidden = false;
if (!StringUtil.isNullOrEmpty(shieldProvince)) {
JSONObject json = JSONObject.fromObject(shieldProvince);
//鑾峰彇娓犻亾闇�瑕佸睆钄界殑鍩庡競
String province = json.optString(acceptData.getChannel().toLowerCase());
- if (!StringUtil.isNullOrEmpty(splash) && !StringUtil.isNullOrEmpty(province)) {
+ if (splashConfig != null && !StringUtil.isNullOrEmpty(province)) {
String pro = IPUtil.getIPProvince(ip);
LogHelper.print("鍩庡競灞忚斀锛�" + ip + ":" + pro);
if (pro != null && pro.contains(province)) {//灞忚斀IP
- splash = "";
+ hidden = true;
LogHelper.print("鍩庡競灞忚斀:" + pro);
}
}
}
+ if (hidden)
+ splashConfig = null;
+
+ String splash = "";
+ if (splashConfig != null)
+ splash = splashConfig.getType();
+
+ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+
//寮�灞�
ad.put("splash", splash);
+ adNew.put("splash", gson.toJson(splashConfig));
+ ADConfig adConfig = null;
//瑙嗛鍓嶈创
- ad.put("videoPlayPre", getAdShowType("ad_play_video_pre", acceptData.getChannel(), acceptData.getVersion(), map));
+ adConfig = getAdShowType("ad_play_video_pre", acceptData.getChannel(), acceptData.getVersion(), map);
+ ad.put("videoPlayPre", adConfig == null ? "" : adConfig.getType());
+ adNew.put("videoPlayPre", gson.toJson(adConfig));
//APP閫�鍑�
- ad.put("exitApp", getAdShowType("ad_exit_app", acceptData.getChannel(), acceptData.getVersion(), map));
+ adConfig = getAdShowType("ad_exit_app", acceptData.getChannel(), acceptData.getVersion(), map);
+ ad.put("exitApp", adConfig == null ? "" : adConfig.getType());
+ adNew.put("exitApp", gson.toJson(adConfig));
//鍏ㄥ睆骞垮憡鎺у埗
- ad.put("videoDetailFullVideo", getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map));
+ adConfig = getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
+ ad.put("videoDetailFullVideo", adConfig == null ? "" : adConfig.getType());
+ adNew.put("videoDetailFullVideo", gson.toJson(adConfig));
+ //鎼滅储椤靛箍鍛婃帶鍒�
+ adConfig = getAdShowType("ad_video_search", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hidden)
+ adConfig = null;
+ ad.put("videoSearch", adConfig == null ? "" : adConfig.getType());
+ adNew.put("videoSearch", gson.toJson(adConfig));
data.put("ad", ad);
+ data.put("adNew", adNew);
out.print(JsonUtil.loadTrueJson(data.toString()));
}
@@ -123,7 +147,10 @@
class ADConfig {
int version;
+ @Expose
String type;
+ @Expose
+ String pid;
public int getVersion() {
return version;
@@ -141,6 +168,13 @@
this.type = type;
}
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
}
}
--
Gitblit v1.8.0