From aab4e229a8c38d91d1263a55dc0e42a45195ab12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 13 Dec 2022 09:35:42 +0800
Subject: [PATCH 1/2] 'commit'

---
 .../com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
index 7b197c4..cc84b8d 100644
--- a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
+++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
@@ -54,7 +54,7 @@ public class TouPiaoModel {
             record.set("houxuanren_type_id", 1);
 
             record.set("toupiaoren_tel", toupiaoren_tel);
-            record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name"));
+            record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
             saveList.add(record);
         }
@@ -65,7 +65,7 @@ public class TouPiaoModel {
             record.set("houxuanren_type_id", 2);
 
             record.set("toupiaoren_tel", toupiaoren_tel);
-            record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name"));
+            record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
             saveList.add(record);
         }

From 8af5919d477093a243cb6fb0657b11bbf16d919c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 13 Dec 2022 09:37:44 +0800
Subject: [PATCH 2/2] 'commit'

---
 .../FengHuang/TouPiao/Controller/TouPiaoController.java       | 4 +++-
 .../com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java     | 4 +++-
 src/main/java/com/dsideal/FengHuang/Util/CommonUtil.java      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java
index f70b509..1406a8f 100644
--- a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java
+++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java
@@ -7,6 +7,7 @@ import com.dsideal.FengHuang.TouPiao.Model.TouPiaoModel;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.dsideal.FengHuang.Util.ExcelExportUtil;
 import com.dsideal.FengHuang.Util.FileUtil;
+import com.dsideal.FengHuang.Util.IpUtil;
 import com.jfinal.aop.Before;
 import com.jfinal.core.Controller;
 import com.jfinal.ext.interceptor.GET;
@@ -59,6 +60,7 @@ public class TouPiaoController extends Controller {
     @Before({POST.class})
     @IsLoginInterface({})
     public void save(String gaoji, String zhongji) {
+        String ip = IpUtil.getIpAddr(getRequest());
         String toupiaoren_tel = getCookie("toupiaoren_tel");
         if (tm.haveFinishTouPiao(toupiaoren_tel)) {
             Kv kv = Kv.create();
@@ -85,7 +87,7 @@ public class TouPiaoController extends Controller {
             renderJson(kv);
             return;
         }
-        tm.save(toupiaoren_tel, gaojiArray, zhongjiArray);
+        tm.save(toupiaoren_tel, gaojiArray, zhongjiArray,ip);
         Kv kv = Kv.create();
         kv.set("success", true);
         kv.set("message", "投票成功 !");
diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
index cc84b8d..991596b 100644
--- a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
+++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java
@@ -38,7 +38,7 @@ public class TouPiaoModel {
         return cnt > 0;
     }
 
-    public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray) {
+    public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray,String ip) {
         Record r = getTouPiaoRenInfo(toupiaoren_tel);
         int toupiaoren_type_id = r.getInt("toupiaoren_type_id");
         String sql = "delete from t_toupiao_result where toupiaoren_tel=?";
@@ -56,6 +56,7 @@ public class TouPiaoModel {
             record.set("toupiaoren_tel", toupiaoren_tel);
             record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
+            record.set("ip",ip);
             saveList.add(record);
         }
         for (String s : zhongjiArray) {
@@ -67,6 +68,7 @@ public class TouPiaoModel {
             record.set("toupiaoren_tel", toupiaoren_tel);
             record.set("toupiaoren_name", _map.get(toupiaoren_tel).getStr("toupiaoren_name"));
             record.set("toupiaoren_type_id", toupiaoren_type_id);
+            record.set("ip",ip);
             saveList.add(record);
         }
         Db.batchSave("t_toupiao_result", saveList, 100);
diff --git a/src/main/java/com/dsideal/FengHuang/Util/CommonUtil.java b/src/main/java/com/dsideal/FengHuang/Util/CommonUtil.java
index 15ce749..63d458d 100644
--- a/src/main/java/com/dsideal/FengHuang/Util/CommonUtil.java
+++ b/src/main/java/com/dsideal/FengHuang/Util/CommonUtil.java
@@ -559,7 +559,7 @@ public class CommonUtil {
 
     //检查是不是放行的特殊IP地址
     public static boolean checkAllowIpAddress(HttpServletRequest request) {
-        String ip = IpUtil.getIpAddr(request);;
+        String ip = IpUtil.getIpAddr(request);
         String[] ips = PropKit.get("IP").split(",");
         boolean flag = false;
         for (int i = 0; i < ips.length; i++)