Merge remote-tracking branch 'origin/master'

src/main/java/com/realtime/protection/configuration/entity/rule/dynamicrule/AlertMessage.java

@@ -18,8 +18,8 @@ public class AlertMessage {
     @JsonProperty("five_tuple_with_mask")
     private FiveTupleWithMask fiveTupleWithMask;
 
-    @JsonProperty("is_distribute")
-    private Boolean isDistribute;//待删除
+//    @JsonProperty("is_distribute")
+//    private Boolean isDistribute;//待删除
 
     @JsonProperty("command_uuid")
     private String commandUUID;

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

@@ -49,4 +49,8 @@ public enum StateEnum {
     public static StateEnum getStateEnumByState(State state) {
         return stateToStateEnumMap.get(state);
     }
+
+    public static StateEnum getStateEnumByNum(Integer stateNum) {
+        return getStateEnumByState(getStateByNum(stateNum));
+    }
 }