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

src/main/java/com/realtime/protection/configuration/auth/Application.java

@@ -0,0 +1,22 @@
+package com.realtime.protection.configuration.auth;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ * @author Yixiang Zhao (@seriouszyx)
+ **/
+@SpringBootApplication
+@EnableCaching
+public class Application implements WebMvcConfigurer {
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+//        InterceptorRegistration ir = registry.addInterceptor(new LoginInterceptor());
+//        ir.addPathPatterns("/**");
+//        ir.excludePathPatterns("/js/**", "/html/**", "/image/**", "/css/**", "/api/**");
+    }
+}
+

src/main/java/com/realtime/protection/configuration/auth/LoginInterceptor.java

@@ -0,0 +1,31 @@
+package com.realtime.protection.configuration.auth;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.WebRequestInterceptor;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.handler.WebRequestHandlerInterceptorAdapter;
+
+import com.realtime.protection.configuration.entity.user.User;
+import com.realtime.protection.configuration.response.ResponseResult;
+
+/**
+ * @author Yixiang Zhao
+ **/
+@Component
+public class LoginInterceptor implements HandlerInterceptor {
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        HttpSession session = request.getSession();
+        User user = (User) session.getAttribute("user");
+        if (user != null) {
+            return true;
+        }
+        // 未登录
+        throw new Exception("not login");
+    }
+}
+

src/main/java/com/realtime/protection/configuration/entity/defense/template/Template.java

@@ -22,7 +22,6 @@ public class Template {
     private String sourceSystem;
 
     @JsonProperty("description")
-    @NotNull(message = "source_system字段不能为空。")
     @Schema(description = "对策略模板的文字描述。方便用户使用", example = "zd防护对象的全流量")
     private String description;
 

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

@@ -97,7 +97,7 @@ public class TaskCommandInfo {
     @Schema(description = "防御策略模板ID", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer templateId;
 
-    @Schema(description = "防护等级", accessMode = Schema.AccessMode.READ_ONLY)
+    @Schema(description = "防护等级,1代表low、2代表medium、3代表high", accessMode = Schema.AccessMode.READ_ONLY)
     private Integer protectLevel;
 
     @Schema(description = "指令所属任务的运行状态", accessMode = Schema.AccessMode.READ_ONLY)