From d248fcaf389ae5c763926955d7ba0cfa80fc002f Mon Sep 17 00:00:00 2001
From: Administrator <1101184511@qq.com>
Date: 星期四, 13 二月 2025 00:52:11 +0800
Subject: [PATCH] 区域封禁

---
 src/main/java/com/taoke/autopay/controller/WebApiController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/taoke/autopay/controller/WebApiController.java b/src/main/java/com/taoke/autopay/controller/WebApiController.java
index 76d23cd..7b930dd 100644
--- a/src/main/java/com/taoke/autopay/controller/WebApiController.java
+++ b/src/main/java/com/taoke/autopay/controller/WebApiController.java
@@ -49,7 +49,7 @@
     private SystemConfigService systemConfigService;
 
 
-    private void addKey(SubmitKeyInfo keyInfo, Long wxUid, String ip, IPUtil.IPInfo ipInfo) throws KeyVerifyException, KeyOrderException, WxOrderCountException {
+    private void addKey(SubmitKeyInfo keyInfo, Long wxUid) throws KeyVerifyException, KeyOrderException, WxOrderCountException {
 
         // 鏌ヨ娌℃湁澶勭悊鐨勬暟閲�
         long notProcessCount = keyOrderService.countUserNotDoOrder(wxUid, new Date(System.currentTimeMillis() - 1000*60*30));
@@ -65,7 +65,7 @@
         if (verifyAlipayKey != null && verifyAlipayKey.trim().equalsIgnoreCase("1")) {
             try {
                 // 闇�瑕侀獙璇佹敮浠樺疂鍙d护
-                if (urllist.size() < 1) {
+                if (urllist.isEmpty()) {
                     throw new Exception("鍙d护涓笉鍖呭惈閾炬帴");
                 }
                 AlipayOrderUtil.AlipayOrderTradeInfo tradeInfo = AlipayOrderUtil.getTradeInfo(urllist.get(0));
@@ -140,6 +140,7 @@
                 throw new RuntimeException(e);
             }
         }
+        keyInfo.setIpInfo(ipInfoMap.get(ip));
 
         String citys =  systemConfigService.getValueCache(SystemConfigKeyEnum.FORBIDDEN_SUBMIT_CITYS);
         if(citys!=null&&ipInfoMap.get(ip)!=null){
@@ -185,7 +186,7 @@
         wxLogger.info("寰俊鏈夋巿鏉�:" + session.getId());
         LogUtil.loggerDebug.warn("GEO淇℃伅锛歿}-{}-{}", user.getId(),ip, new Gson().toJson(ipInfoMap.get(ip)));
         try {
-            addKey(keyInfo, user.getId(),ip, ipInfoMap.get(ip));
+            addKey(keyInfo, user.getId());
             return JsonUtil.loadTrueResult("");
         } catch (KeyOrderException e) {
             e.printStackTrace();
@@ -253,7 +254,7 @@
                             throw new RuntimeException(e);
                         }
                     }
-                    addKey(alipayKeyInfo, user.getId(),alipayKeyInfo.getIp(),ipInfoMap.get(alipayKeyInfo.getIp()));
+                    addKey(alipayKeyInfo, user.getId());
                 }
                 response.sendRedirect(successLink);
                 return;

--
Gitblit v1.8.0