From f06a592dd1a7e995bf313ccb5efe7dff73ccfc4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 12 四月 2023 18:25:52 +0800
Subject: [PATCH] 增加本地获取IP归属地/广告优化
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 229 +++++++++++++++-----------------------------------------
1 files changed, 63 insertions(+), 166 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 74342db..6e79f62 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -22,6 +22,8 @@
import com.yeshi.buwan.util.log.LoggerUtil;
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.vo.AcceptData;
+import com.yeshi.buwan.vo.ad.AdConfigTypeVO;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -107,188 +109,53 @@
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()) {
- //璇锋眰
+
+ // 鑾峰彇骞垮憡閰嶇疆淇℃伅
+ private void loadAdConfig(AcceptData acceptData, Map<String, String> map, String ip, boolean isDPUser,JSONObject data) {
+ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ Map<String, Boolean> shieldMap = new HashMap<>();
+ // 鑾峰彇鍖哄煙灞忚斀淇℃伅
+ String shieldInfo = map.get("ad_shield_province_rules");
+ if (!StringUtil.isNullOrEmpty(shieldInfo)) {
+ JSONObject json = JSONObject.fromObject(shieldInfo);
+ //鑾峰彇娓犻亾闇�瑕佸睆钄界殑鍩庡競
+ JSONObject shieldProvinceRules = json.optJSONObject(acceptData.getChannel().toLowerCase());
+ if (shieldProvinceRules != null) {
IPUtil.IPInfo ipInfo = null;
try {
ipInfo = ipManager.getIPInfo(ip);
} catch (Exception e) {
e.printStackTrace();
+ logger.error("IP鍦板潃浣嶇疆淇℃伅鑾峰彇澶辫触锛�" + ip);
}
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;
+ //鑾峰彇鏄惁闇�瑕佸睆钄藉紑灞�
+ for (AdConfigTypeVO adType : AdConfigTypeVO.values()) {
+ JSONArray splashProvinces = shieldProvinceRules.optJSONArray(adType.getSettingKey());
+ if (splashProvinces != null) {
+ for (int i = 0; i < splashProvinces.size(); i++) {
+ String p = splashProvinces.optString(i);
+ if (p.equalsIgnoreCase(ipInfo.getProvince())) {
+ shieldMap.put(adType.getSettingKey(), true);
+ break;
}
- } 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(acceptData.getChildDetailSystem(), acceptData.getVersion());
- JSONObject data = new JSONObject();
- JSONObject ad = new JSONObject();
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);
-
-
- //寮�灞忕殑鍦板尯灞忚斀瑙勫垯
- 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 (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);
- }
+ JSONObject ad = new JSONObject();
+ for (AdConfigTypeVO adType: AdConfigTypeVO.values()){
+ ADConfig adConfig = getAdShowType(adType.getDbKey(), acceptData.getChannel(), acceptData.getVersion(), map);
+ if (shieldMap.get(adType.getSettingKey())!=null&&shieldMap.get(adType.getSettingKey())) {
+ //灞忚斀骞垮憡
+ adConfig = null;
}
+ ad.put(adType.getVoKey(), adConfig == null ? "" : adConfig.getType());
+ adNew.put(adType.getVoKey(), gson.toJson(adConfig));
}
- //鏄惁涓哄唴瀹归槄璇荤敤鎴�
- boolean isDPUser = false;
- try {
- isDPUser = userDPContentWatchStatisticService.isDPUser(acceptData);
- } catch (Exception e) {
-
- }
-
- //骞垮憡鍏ㄩ儴灞忚斀鍖哄煙
- 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);
- if (!isDPUser)
- adNew.put("splash", gson.toJson(splashConfig));
-
-
- ADConfig adConfig = null;
- //瑙嗛鍓嶈创
- 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閫�鍑�
- adConfig = getAdShowType("ad_exit_app", acceptData.getChannel(), acceptData.getVersion(), map);
- if (hiddenAll)
- adConfig = null;
- ad.put("exitApp", adConfig == null ? "" : adConfig.getType());
- if (!isDPUser)
- adNew.put("exitApp", gson.toJson(adConfig));
- //鍏ㄥ睆骞垮憡鎺у埗
- adConfig = getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
- if (hiddenAll)
- adConfig = null;
- ad.put("videoDetailFullVideo", adConfig == null ? "" : adConfig.getType());
- if (!isDPUser)
- 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));
-
- //棣栭〉鎻掑睆
- adConfig = getAdShowType("home_ad_interstitial", acceptData.getChannel(), acceptData.getVersion(), map);
- if (hiddenAll)
- adConfig = null;
- if (!isDPUser)
- adNew.put("homeInterstitial", gson.toJson(adConfig));
-
- //搴旂敤閫�鍑哄叏灞�
- adConfig = getAdShowType("ad_exit_app_fullvideo", acceptData.getChannel(), acceptData.getVersion(), map);
- if (hiddenAll)
- adConfig = null;
- if (!isDPUser)
- adNew.put("exitAppFullvideo", gson.toJson(adConfig));
-
-
- //鍏朵粬骞垮憡
- adConfig = getAdShowType("ad_other", acceptData.getChannel(), acceptData.getVersion(), map);
- if (hiddenAll)
- adConfig = null;
- adNew.put("other", gson.toJson(adConfig));
//骞垮憡ID
if (!StringUtil.isNullOrEmpty(map.get("gdt_app_id"))) {
@@ -301,6 +168,31 @@
data.put("ad", ad);
data.put("adNew", adNew);
+ }
+
+
+ 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(acceptData.getChildDetailSystem(), acceptData.getVersion());
+ JSONObject data = new JSONObject();
+
+
+ String ip = IPUtil.getRemotIP(request);
+ //浼氬憳閾炬帴
+ String vipLink = map.get("vip_link");
+ data.put("vipLink", vipLink);
+
+ //鏄惁涓哄唴瀹归槄璇荤敤鎴�
+ boolean isDPUser = false;
+ try {
+ isDPUser = userDPContentWatchStatisticService.isDPUser(acceptData);
+ } catch (Exception e) {
+
+ }
+ // 鍔犺浇骞垮憡閰嶇疆
+ loadAdConfig(acceptData,map,ip,isDPUser,data);
+
//PPTV鍏嶅箍鍛婃潈鐩婃椂闀�,鏆傛椂璁剧疆涓�3灏忔椂
data.put("pptvNoAdRewardHour", 3);
//璁剧疆缃戦〉鍔犻�熷煙鍚�
@@ -334,7 +226,12 @@
} catch (Exception e) {
}
data.put("onLining", onLine);
-
+ String aidao = map.get("ai_dao_mode");
+ if ("1".equalsIgnoreCase((aidao + "").trim())) {
+ data.put("aiDaoMode", true);
+ } else {
+ data.put("aiDaoMode", false);
+ }
out.print(JsonUtil.loadTrueJson(data.toString()));
}
--
Gitblit v1.8.0