Merge remote-tracking branch 'origin/master' into haskafka

# Conflicts:
#	src/main/resources/nginx/defense/css/app.ee6094cd.css
#	src/main/resources/nginx/defense/css/chunk-015a3ee5.6a3c9ed3.css
#	src/main/resources/nginx/defense/css/chunk-17b3460d.c80b66ce.css
#	src/main/resources/nginx/defense/js/chunk-855887e8.c53330cd.js
#	src/main/resources/nginx/defense/js/fail.e190e5d9.js
#	src/main/resources/nginx/defense/js/user.17caa144.js

src/main/java/com/realtime/protection/configuration/entity/task/FiveTupleWithMask.java

@@ -1,6 +1,7 @@
 package com.realtime.protection.configuration.entity.task;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.realtime.protection.configuration.utils.enums.ProtocolEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
@@ -83,4 +84,10 @@ public class FiveTupleWithMask {
         this.maskDestinationPort = original.maskDestinationPort;
         this.maskProtocol = original.maskProtocol;
     }
+
+    public void setProtocolNum() {
+        ProtocolEnum protocol = ProtocolEnum.getProtocolEnumByProtocol(this.protocol);
+        assert protocol != null;
+        this.protocolNum = protocol.getNumber();
+    }
 }

src/main/java/com/realtime/protection/configuration/entity/task/TaskCommandInfo.java

@@ -127,7 +127,9 @@ public class TaskCommandInfo {
         this.templateId = original.templateId;
         this.protectLevel = original.protectLevel;
         this.taskStatus = original.taskStatus;
-
     }
 
+    public void setProtocolNum() {
+        this.fiveTupleWithMask.setProtocolNum();
+    }
 }

src/main/java/com/realtime/protection/configuration/utils/enums/ProtocolEnum.java

@@ -1,30 +1,35 @@
 package com.realtime.protection.configuration.utils.enums;
 
+import lombok.Getter;
+
 import java.util.HashMap;
 import java.util.Map;
 
+@Getter
 public enum ProtocolEnum {
-    TCP(6),
-    UDP(17);
+    TCP(6, "TCP"),
+    UDP(17, "UDP");
 
     private final Integer number;
-    private static final Map<Integer, ProtocolEnum> map = new HashMap<>();
+    private final String protocol;
+
+    private static final Map<Integer, ProtocolEnum> protocolNumMap = new HashMap<>();
+    private static final Map<String, ProtocolEnum> protocolMap = new HashMap<>();
 
     static {
         for (ProtocolEnum protocol : ProtocolEnum.values()) {
-            map.put(protocol.getProtocolNumber(), protocol);
+            protocolNumMap.put(protocol.getNumber(), protocol);
+            protocolMap.put(protocol.getProtocol(), protocol);
         }
     }
 
-    ProtocolEnum(int protocolNumber) {
+    ProtocolEnum(int protocolNumber, String protocol) {
         this.number = protocolNumber;
-    }
-
-    public Integer getProtocolNumber() {
-        return this.number;
+        this.protocol = protocol;
     }
 
     public static ProtocolEnum getProtocolEnumByNumber(Integer protocolNum) {
-        return map.get(protocolNum);
+        return protocolNumMap.get(protocolNum);
     }
+    public static ProtocolEnum getProtocolEnumByProtocol(String protocol) { return protocolMap.get(protocol); }
 }

src/main/java/com/realtime/protection/server/task/TaskService.java

@@ -108,7 +108,9 @@ public class TaskService {
     }
 
     public List<TaskCommandInfo> getStaticCommandInfos(Long taskId) {
-        return taskMapper.getStaticCommandInfos(taskId);
+        List<TaskCommandInfo> staticCommandInfos = taskMapper.getStaticCommandInfos(taskId);
+        staticCommandInfos.forEach(TaskCommandInfo::setProtocolNum);
+        return staticCommandInfos;
     }
 
     public List<DynamicTaskInfo> getDynamicTaskInfos(Long taskId) {