From ae5b9da486f9cb3213012d0cfbe31c9ce674b31c Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Sun, 9 Jun 2024 04:16:06 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81protocolnum=E8=A7=A3=E6=B1=BA=202?=
 =?UTF-8?q?=E3=80=81docker=20run=20=E6=99=82=E9=96=93=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 load_springboot.sh                                |  3 ++-
 .../protection/server/task/TaskService.java       |  4 +++-
 src/main/resources/mappers/CommandMapper.xml      | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/load_springboot.sh b/load_springboot.sh
index 81c697d..50fd369 100644
--- a/load_springboot.sh
+++ b/load_springboot.sh
@@ -18,5 +18,6 @@ docker build -t protection_springboot -f realtime_protection/docker-springboot/D
 echo "============built backend servers============"
 
 # 使用privileged模式，在中心部署时不会遭遇Java内存异常错误
-docker run --privileged -itd --name springboot_backend -p 8081:8081 protection_springboot
+#增加-v /etc/localtime:/etc/localtime -v /etc/timezone:/etc/timezone，使容器时间与宿主机时间一致
+docker run  -v /etc/localtime:/etc/localtime -v /etc/timezone:/etc/timezone --privileged -itd --name springboot_backend -p 8081:8081 protection_springboot
 echo "============started backend servers============"
\ No newline at end of file
diff --git a/src/main/java/com/realtime/protection/server/task/TaskService.java b/src/main/java/com/realtime/protection/server/task/TaskService.java
index e951953..fd02677 100644
--- a/src/main/java/com/realtime/protection/server/task/TaskService.java
+++ b/src/main/java/com/realtime/protection/server/task/TaskService.java
@@ -281,6 +281,7 @@ public class TaskService {
 
     @Transactional
     public Boolean updateTask(Task task) {
+        //未审核不能修改
         if (!Objects.equals(taskMapper.queryTaskAuditStatus(task.getTaskId()), AuditStatusEnum.AUDITED.getNum())) {
             return false;
         }
@@ -368,7 +369,8 @@ public class TaskService {
         List<TaskCommandInfo> staticCommandInfos = taskMapper.getStaticCommandInfos(taskId);
 
         staticCommandInfos.forEach(taskCommandInfo -> {
-            taskCommandInfo.setProtocolNum();
+//            taskCommandInfo.setProtocolNum();
+            taskCommandInfo.getFiveTupleWithMask().setProtocolNum(Integer.valueOf(taskCommandInfo.getFiveTupleWithMask().getProtocol()));
 //            taskCommandInfo.setMask();
         });
 
diff --git a/src/main/resources/mappers/CommandMapper.xml b/src/main/resources/mappers/CommandMapper.xml
index 1b0a074..613a123 100644
--- a/src/main/resources/mappers/CommandMapper.xml
+++ b/src/main/resources/mappers/CommandMapper.xml
@@ -15,7 +15,7 @@
                 DEFAULT,
                 #{info.fiveTupleWithMask.sourceIP}, #{info.fiveTupleWithMask.sourcePort},
                 #{info.fiveTupleWithMask.destinationIP}, #{info.fiveTupleWithMask.destinationPort},
-                #{info.fiveTupleWithMask.protocolNum},
+                #{info.fiveTupleWithMask.protocol},
                 #{info.fiveTupleWithMask.maskSourceIP}, #{info.fiveTupleWithMask.maskSourcePort},
                 #{info.fiveTupleWithMask.maskDestinationIP}, #{info.fiveTupleWithMask.maskDestinationPort},
                 #{info.fiveTupleWithMask.maskProtocol},
@@ -41,7 +41,7 @@
             DEFAULT,
             #{info.fiveTupleWithMask.sourceIP}, #{info.fiveTupleWithMask.sourcePort},
             #{info.fiveTupleWithMask.destinationIP}, #{info.fiveTupleWithMask.destinationPort},
-            #{info.fiveTupleWithMask.protocolNum},
+            #{info.fiveTupleWithMask.protocol},
             #{info.fiveTupleWithMask.maskSourceIP}, #{info.fiveTupleWithMask.maskSourcePort},
             #{info.fiveTupleWithMask.maskDestinationIP}, #{info.fiveTupleWithMask.maskDestinationPort},
             #{info.fiveTupleWithMask.maskProtocol},
@@ -64,7 +64,7 @@
                 DEFAULT,
                 #{info.fiveTupleWithMask.sourceIP}, #{info.fiveTupleWithMask.sourcePort},
                 #{info.fiveTupleWithMask.destinationIP}, #{info.fiveTupleWithMask.destinationPort},
-                #{info.fiveTupleWithMask.protocolNum},
+                #{info.fiveTupleWithMask.protocol},
                 #{info.fiveTupleWithMask.maskSourceIP}, #{info.fiveTupleWithMask.maskSourcePort},
                 #{info.fiveTupleWithMask.maskDestinationIP}, #{info.fiveTupleWithMask.maskDestinationPort},
                 #{info.fiveTupleWithMask.maskProtocol},
@@ -511,6 +511,9 @@
                 <if test="command.sourcePort != null">
                     and white_list_port = CAST(#{command.sourcePort} AS UNSIGNED)
                 </if>
+                <if test="command.protocol != null">
+                    and white_list_protocol = #{command.protocol}
+                </if>
 
                 )
             </if>
@@ -529,6 +532,9 @@
                 or (white_list_ip = INET_ATON(#{command.destinationIP})
                 <if test="command.destinationPort != null">
                     and white_list_port = CAST(#{command.destinationPort} AS UNSIGNED)
+                </if>
+                <if test="command.protocol != null">
+                    and white_list_protocol = #{command.protocol}
                 </if>)
             </if>
             <if test="command.destinationIP != null and command.maskDestinationIP != null">
@@ -536,6 +542,9 @@
                 (INET_ATON(#{command.destinationIP}) &amp; INET_ATON(#{command.maskDestinationIP}))
                 <if test="command.destinationPort != null">
                     and white_list_port = CAST(#{command.destinationPort} AS UNSIGNED)
+                </if>
+                <if test="command.protocol != null">
+                    and white_list_protocol = #{command.protocol}
                 </if>)
             </if>