From c6c5a8ce0f42d46ea2fe0312c9eda67a49fd3917 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 01 二月 2021 18:58:21 +0800
Subject: [PATCH] 完善根据IP屏蔽广告,创建会员实体
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 94 insertions(+), 11 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 3006c7d..3e5e306 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;
@@ -9,15 +11,19 @@
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.recommend.FloatAD;
+import com.yeshi.buwan.dto.config.ADShieldIPConfig;
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.vo.AcceptData;
+import net.sf.json.JSONArray;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
@@ -40,6 +46,9 @@
@Resource
private FloatADService floatADService;
+ @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);
@@ -57,6 +66,61 @@
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) {
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
@@ -65,27 +129,38 @@
JSONObject adNew = new JSONObject();
String ip = IPUtil.getRemotIP(request);
+
+
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 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)) {
- String pro = IPUtil.getIPProvince(ip);
- LogHelper.print("鍩庡競灞忚斀锛�" + ip + ":" + pro);
- if (pro != null && pro.contains(province)) {//灞忚斀IP
- hidden = true;
- LogHelper.print("鍩庡競灞忚斀:" + pro);
+
+ 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 (hidden)
+
+ if (hiddenSplash)
splashConfig = null;
String splash = "";
@@ -94,6 +169,8 @@
Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ if (hiddenAll)
+ splashConfig = null;
//寮�灞�
ad.put("splash", splash);
adNew.put("splash", gson.toJson(splashConfig));
@@ -102,19 +179,25 @@
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());
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());
adNew.put("videoDetailFullVideo", gson.toJson(adConfig));
//鎼滅储椤靛箍鍛婃帶鍒�
adConfig = getAdShowType("ad_video_search", acceptData.getChannel(), acceptData.getVersion(), map);
- if (hidden)
+ if (hiddenAll)
adConfig = null;
ad.put("videoSearch", adConfig == null ? "" : adConfig.getType());
adNew.put("videoSearch", gson.toJson(adConfig));
--
Gitblit v1.8.0