From 2a593ddac16e06f1ff55edca22ea568f07b068ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 四月 2021 19:15:18 +0800
Subject: [PATCH] 3.9.0bug修改
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 200 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 172 insertions(+), 28 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..6b5a106 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -1,6 +1,8 @@
package com.yeshi.buwan.controller.parser;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -8,21 +10,27 @@
import javax.servlet.http.HttpServletRequest;
import com.google.gson.GsonBuilder;
-import com.yeshi.buwan.domain.Config;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.google.gson.annotations.Expose;
+import com.google.gson.reflect.TypeToken;
+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.dto.log.BaseLog;
import com.yeshi.buwan.log.LogHelper;
import com.yeshi.buwan.service.imp.SystemService;
import com.yeshi.buwan.service.inter.ad.FloatADService;
+import com.yeshi.buwan.service.manager.IPManager;
import com.yeshi.buwan.util.IPUtil;
import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.log.LoggerUtil;
+import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.vo.AcceptData;
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;
@@ -30,73 +38,199 @@
@Controller
public class ConfigParser {
+
Logger logger = LoggerFactory.getLogger(ConfigParser.class);
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private SystemService systemService;
@Resource
private FloatADService floatADService;
- public String getAdShowType(String key, String channel, int version, Map<String, String> map) {
+ @Resource
+ private IPManager ipManager;
+
+
+ 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;
+ if (jsonObject == null || jsonObject.isEmpty())
+ return null;
+ ADConfig adConfig = null;
channel = channel.toLowerCase();
- if (jsonObject.optJSONObject(channel) == null) {
+ if (jsonObject == null || 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;
+ }
+
+ /**
+ * 灞忚斀鎵�鏈夌殑骞垮憡
+ *
+ * @param channel
+ * @param version
+ * @param shieldInfo
+ * @param ip
+ * @return
+ */
+ private boolean shieldAllAd(String channel, Integer version, String shieldInfo, String ip) {
+ if (StringUtil.isNullOrEmpty(shieldInfo)) {
+ return false;
+ }
+ Type type = new TypeToken<List<ADShieldIPConfig>>() {
+ }.getType();
+ List<ADShieldIPConfig> list = new Gson().fromJson(shieldInfo, type);
+ Map<String, ADShieldIPConfig.IPShieldRule> map = new HashMap<>();
+ for (ADShieldIPConfig config : list) {
+ map.put(config.getChannel().toLowerCase(), config.getRule());
+ }
+ if (map.get(channel.toLowerCase()) != null) {
+ ADShieldIPConfig.IPShieldRule rule = map.get(channel.toLowerCase());
+ if (version >= rule.getVersion()) {
+ //璇锋眰
+ IPUtil.IPInfo ipInfo = null;
+ try {
+ ipInfo = ipManager.getIPInfo(ip);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if (ipInfo != null) {
+ //鍏堝垽鏂渷
+ if (!StringUtil.isNullOrEmpty(rule.getProvince())) {
+ if (ipInfo.getProvince() != null && ipInfo.getProvince().contains(rule.getProvince())) {
+ if (!StringUtil.isNullOrEmpty(rule.getCity())) {//鍚屾椂鍒ゆ柇鐪佸拰甯�
+ if (ipInfo.getCity() != null && ipInfo.getCity().contains(rule.getCity())) {
+ return true;
+ }
+ } else {
+ //鍙垽鏂渷
+ return true;
+ }
+ }
+ } else if (!StringUtil.isNullOrEmpty(rule.getCity())) {
+ //鍙垽鏂競
+ if (ipInfo.getCity() != null && ipInfo.getCity().contains(rule.getCity())) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
}
public void getConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createAppSplash(new BaseLog(acceptData, "")));
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
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);
+ //浼氬憳閾炬帴
+ String vipLink = map.get("vip_link");
+ data.put("vipLink", vipLink);
+
+ ADConfig splashConfig = getAdShowType("ad_splash_config", acceptData.getChannel(), acceptData.getVersion(), map);
//寮�灞忕殑鍦板尯灞忚斀瑙勫垯
- String shieldProvince = map.get("shield_province");
- if (!StringUtil.isNullOrEmpty(shieldProvince)) {
- JSONObject json = JSONObject.fromObject(shieldProvince);
+ String shieldInfo = map.get("shield_province");
+ boolean hiddenSplash = false;
+ if (!StringUtil.isNullOrEmpty(shieldInfo)) {
+ JSONObject json = JSONObject.fromObject(shieldInfo);
//鑾峰彇娓犻亾闇�瑕佸睆钄界殑鍩庡競
String province = json.optString(acceptData.getChannel().toLowerCase());
- if (!StringUtil.isNullOrEmpty(splash) && !StringUtil.isNullOrEmpty(province)) {
- String pro = IPUtil.getIPProvince(ip);
- LogHelper.print("鍩庡競灞忚斀锛�" + ip + ":" + pro);
- if (pro != null && pro.contains(province)) {//灞忚斀IP
- splash = "";
- LogHelper.print("鍩庡競灞忚斀:" + pro);
+ if (splashConfig != null && !StringUtil.isNullOrEmpty(province)) {
+
+ IPUtil.IPInfo ipInfo = null;
+ try {
+ ipInfo = ipManager.getIPInfo(ip);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ if (ipInfo != null && ipInfo.getProvince().contains(province)) {//灞忚斀IP
+ hiddenSplash = true;
+ LogHelper.print("鍩庡競灞忚斀:" + province);
}
}
}
+ //骞垮憡鍏ㄩ儴灞忚斀鍖哄煙
+ String shieldAdLocationInfo = map.get("shield_ad_ip_location");
+ boolean hiddenAll = shieldAllAd(acceptData.getChannel(), acceptData.getVersion(), shieldAdLocationInfo, ip);
+
+ if (hiddenSplash)
+ splashConfig = null;
+
+ String splash = "";
+ if (splashConfig != null)
+ splash = splashConfig.getType();
+
+ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+
+ if (hiddenAll)
+ splashConfig = null;
//寮�灞�
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);
+ if (hiddenAll)
+ adConfig = null;
+ 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);
+ if (hiddenAll)
+ adConfig = null;
+ 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);
+ if (hiddenAll)
+ adConfig = null;
+ ad.put("videoDetailFullVideo", adConfig == null ? "" : adConfig.getType());
+ adNew.put("videoDetailFullVideo", gson.toJson(adConfig));
+ //鎼滅储椤靛箍鍛婃帶鍒�
+ adConfig = getAdShowType("ad_video_search", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ 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));
+
+ //鐑惎鍔ㄥ紑灞�
+ adConfig = getAdShowType("ad_splash_hot_start", acceptData.getChannel(), acceptData.getVersion(), map);
+ if (hiddenAll)
+ adConfig = null;
+ adNew.put("splashHotStart", 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"));
+ data.put("minePageBanner", map.get("mine_page_banner"));
+
out.print(JsonUtil.loadTrueJson(data.toString()));
}
@@ -109,7 +243,7 @@
* @param out
*/
public void getHomeConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createAppMainPage(new BaseLog(acceptData, "")));
List<FloatAD> adList = floatADService.listShowAD(1, 1);
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
JSONObject data = new JSONObject();
@@ -123,7 +257,10 @@
class ADConfig {
int version;
+ @Expose
String type;
+ @Expose
+ String pid;
public int getVersion() {
return version;
@@ -141,6 +278,13 @@
this.type = type;
}
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
}
}
--
Gitblit v1.8.0