From 182b9e2bc1f0a6f25269f63f9000e63b3c956361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 22 Aug 2021 19:11:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=98=B2=E5=BE=A1=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=81=B6=E6=84=8F=E6=94=BB?=
 =?UTF-8?q?=E5=87=BB(=E4=BC=98=E5=8C=96)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java   | 1 +
 .../src/main/java/com/jsh/erp/service/log/LogService.java       | 2 +-
 jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
index 94af9487..e3d96ab6 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/LogMapperEx.java
@@ -30,6 +30,7 @@ public interface LogMapperEx {
             @Param("content") String content);
 
     Long getCountByIpAndDate(
+            @Param("moduleName") String moduleName,
             @Param("clientIp") String clientIp,
             @Param("createTime") String createTime);
 }
\ No newline at end of file
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
index b710cbf1..8f5e5054 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
@@ -150,7 +150,7 @@ public class LogService {
             if(userId!=null) {
                 String clientIp = getLocalIp(request);
                 String createTime = Tools.getNow3();
-                Long count = logMapperEx.getCountByIpAndDate(clientIp, createTime);
+                Long count = logMapperEx.getCountByIpAndDate(moduleName, clientIp, createTime);
                 if(count > 0) {
                     //如果某1个IP在同1秒内连续操作两遍，此时需要删除该redis记录，使其退出，防止恶意攻击
                     redisService.deleteObjectByKeyAndIp("clientIp", clientIp, "userId");
diff --git a/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
index 9cbbaac7..cb208ae0 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/LogMapperEx.xml
@@ -72,6 +72,6 @@
     </select>
 
     <select id="getCountByIpAndDate" resultType="java.lang.Long">
-        select count(1) from jsh_log where client_ip=#{clientIp} and create_time=#{createTime}
+        select count(1) from jsh_log where operation=#{moduleName} and client_ip=#{clientIp} and create_time=#{createTime}
     </select>
 </mapper>
\ No newline at end of file