From f7b2baec57a19039ca85880bbba4e17fe27f0511 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 三月 2021 18:21:13 +0800
Subject: [PATCH] 删除冗余代码，初步优化首页的推荐专题，3.8.7之后在我的里面添加VIP分类
---
src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 204 insertions(+), 17 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 2bfb4e6..87af938 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ConfigParser.java
@@ -1,59 +1,239 @@
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;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.google.gson.GsonBuilder;
+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.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 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;
@Controller
public class ConfigParser {
+
+ Logger logger = LoggerFactory.getLogger(ConfigParser.class);
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private SystemService systemService;
- public void getConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
- String channel = request.getParameter("Channel");
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- String version = request.getParameter("Version");
- Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
- String splash = map.get("ad_splash_config");
+ @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);
- ADConfig splashAD = null;
+ ADConfig adConfig = null;
+ channel = channel.toLowerCase();
if (jsonObject.optJSONObject(channel) == null) {
// 榛樿涓哄簲鐢ㄥ疂
channel = "qq";
}
- String splashAdType = "";
- splashAD = new Gson().fromJson(jsonObject.optJSONObject(channel).toString(), ADConfig.class);
- if (Integer.parseInt(version) >= splashAD.getVersion()) {
- splashAdType = "";
- } else {
- splashAdType = splashAD.getType();
+ adConfig = new Gson().fromJson(jsonObject.optJSONObject(channel).toString(), ADConfig.class);
+ if (version >= adConfig.getVersion()) {
+ adConfig = null;
}
+ 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());
JSONObject data = new JSONObject();
JSONObject ad = new JSONObject();
- ad.put("splash", splashAdType);
+ 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);
+ }
+ }
+ }
+ //骞垮憡鍏ㄩ儴灞忚斀鍖哄煙
+ 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;
+ //瑙嗛鍓嶈创
+ 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 (hiddenAll)
+ 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()));
+ }
+
+
+ /**
+ * 鑾峰彇棣栭〉閰嶇疆淇℃伅
+ *
+ * @param acceptData
+ * @param request
+ * @param out
+ */
+ public void getHomeConfig(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+ DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ List<FloatAD> adList = floatADService.listShowAD(1, 1);
+ Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation().create();
+ JSONObject data = new JSONObject();
+ if (adList != null && adList.size() > 0) {
+ FloatAD ad = adList.get(0);
+ data.put("floatAD", gson.toJson(ad));
+ }
+
out.print(JsonUtil.loadTrueJson(data.toString()));
}
class ADConfig {
int version;
+ @Expose
String type;
+ @Expose
+ String pid;
public int getVersion() {
return version;
@@ -71,6 +251,13 @@
this.type = type;
}
+ public String getPid() {
+ return pid;
+ }
+
+ public void setPid(String pid) {
+ this.pid = pid;
+ }
}
}
--
Gitblit v1.8.0