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/UserParser.java |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index 9181699..fb83b0e 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -795,6 +795,32 @@
                         break;
                 }
             }
+            if (map.get(0) == null) {
+                //濡傛灉娌℃湁鐑悳姒滃氨濉厖鎵�鏈夋鍗曠殑鍓嶅嚑涓暟鎹�
+                List<String> list = new ArrayList<>();
+                Type type = new TypeToken<List<String>>() {
+                }.getType();
+
+                for (int i = 1; i < 5; i++) {
+                    if (map.get(i) != null) {
+                        JSONObject json = map.get(i);
+                        String key = json.keySet().iterator().next() + "";
+                        JSONArray array = json.optJSONArray(key);
+                        List<String> keys = new Gson().fromJson(array.toString(), type);
+                        if (keys.size() > 3) {
+                            list.addAll(keys.subList(0, 3));
+                        } else {
+                            list.addAll(keys);
+                        }
+                    }
+                }
+                if (list.size() > 10) {
+                    list = list.subList(0, 10);
+                }
+                JSONObject data = new JSONObject();
+                data.put("鐑悳姒�", list);
+                map.put(0, data);
+            }
         }
 
         JSONObject data = new JSONObject();
@@ -1475,7 +1501,7 @@
         String path = session.getServletContext().getRealPath("upload") + "/" + fileName;
         if (!new File(session.getServletContext().getRealPath("upload") + "/").exists())
             new File(session.getServletContext().getRealPath("upload") + "/").mkdirs();
-        boolean isS = StringUtil.generateImageFromBase64(base64.replace("\n",""), path);
+        boolean isS = StringUtil.generateImageFromBase64(base64.replace("\n", ""), path);
         if (!isS)
             return "";
 
@@ -1506,7 +1532,11 @@
         if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
             ip = request.getRemoteAddr();
         }
-        out.print(ip + "-----" + IPUtil.getIPContry(request.getRemoteAddr()));
+        try {
+            out.print(ip + "-----" + new Gson().toJson(IPUtil.getLocalIPInfo(request.getRemoteAddr())));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
     }
 

--
Gitblit v1.8.0