From a5fc7922fc31304c4ce95d95e305639944592b2e Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Fri, 31 May 2024 14:37:46 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81staticrule=E5=A2=9E=E5=8A=A0=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/rule/staticrule/StaticRuleObject.java   |  3 +++
 .../defense/templatenew/TemplateController.java    | 11 ++++++++++-
 .../protection/server/user/login/LoginService.java | 11 ++++++-----
 src/main/resources/mappers/StaticRuleMapper.xml    | 14 ++++++++++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java b/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java
index 8269e66..dbb8a3e 100644
--- a/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java
+++ b/src/main/java/com/realtime/protection/configuration/entity/rule/staticrule/StaticRuleObject.java
@@ -163,6 +163,9 @@ public class StaticRuleObject {
     @Schema(description = "审核用户部门", example = "部门1")
     private String auditUserDepart;
 
+    @Schema(description = "事件类型", example = "DDos")
+    private String eventType;
+
 
     public void checkAuditStatusValidate(AuditStatusEnum newAuditStatus) {
         if (!List.of(AuditStatusEnum.AUDITED.getNum(), AuditStatusEnum.USING.getNum()).contains(this.getAuditStatus())) {
diff --git a/src/main/java/com/realtime/protection/server/defense/templatenew/TemplateController.java b/src/main/java/com/realtime/protection/server/defense/templatenew/TemplateController.java
index 93096c6..882f85a 100644
--- a/src/main/java/com/realtime/protection/server/defense/templatenew/TemplateController.java
+++ b/src/main/java/com/realtime/protection/server/defense/templatenew/TemplateController.java
@@ -1,8 +1,10 @@
 package com.realtime.protection.server.defense.templatenew;
 
 import com.realtime.protection.configuration.entity.defense.template.TemplateNew;
+import com.realtime.protection.configuration.entity.user.UserFull;
 import com.realtime.protection.configuration.response.ResponseResult;
 import com.realtime.protection.configuration.utils.enums.audit.AuditStatusEnum;
+import jakarta.servlet.http.HttpSession;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Min;
 import org.springframework.web.bind.annotation.*;
@@ -24,7 +26,14 @@ public class TemplateController implements TemplateNewCpntrollerApi{
     @Override
     @PostMapping("/new")
     public ResponseResult newTemplate(@RequestBody @Valid TemplateNew template) {
-
+        //从http首部session字段获取用户信息
+//        HttpSession session = request.getSession();
+//        UserFull user = (UserFull) session.getAttribute("user");
+//        if (user != null) {
+//            object.setStaticRuleCreateUsername(user.name);
+//            object.setStaticRuleCreateUserId(Integer.valueOf(user.uid));
+//            object.setStaticRuleCreateDepart(user.getOrgName());
+//        }
         Integer templateId = templateService.newTemplate(template);
 
         if (templateId > 0) {
diff --git a/src/main/java/com/realtime/protection/server/user/login/LoginService.java b/src/main/java/com/realtime/protection/server/user/login/LoginService.java
index 7373234..8bb63fb 100644
--- a/src/main/java/com/realtime/protection/server/user/login/LoginService.java
+++ b/src/main/java/com/realtime/protection/server/user/login/LoginService.java
@@ -60,11 +60,12 @@ public class LoginService {
                 .build();
 
         Request request = new Request.Builder()
-            .url("https://114.243.134.122:10217/passport/accessToken?grant_type=client_credentials")
-//            .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials")
-            .header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2")
-            .post(okhttp3.internal.Util.EMPTY_REQUEST)
-            .build();
+//            .url("https://114.243.134.122:10217/passport/accessToken?grant_type=client_credentials")
+                .url("https://passport.iam.pub/passport/accessToken?grant_type=client_credentials")
+//            .header("Authorization", "Basic TlNBRERAWlguT1JHOk14a1hHZ1ltOUNROUE3TCRSOCNLRW02R1pSeEhwd1c2")
+                .header("Authorization", "Basic TlNBREQ6bkhRbE5zN3lLeVd5bzJOc2JmNk5oRmFhYmlWWUlBU1NsdWJRZ3pUaDhOU2xOUkE1V2xQUTF3PT0=")
+                .post(okhttp3.internal.Util.EMPTY_REQUEST)
+                .build();
         try  {
             Response response = client.newCall(request).execute();
             String rsp = response.body().string();
diff --git a/src/main/resources/mappers/StaticRuleMapper.xml b/src/main/resources/mappers/StaticRuleMapper.xml
index 064a0d5..c3dad04 100644
--- a/src/main/resources/mappers/StaticRuleMapper.xml
+++ b/src/main/resources/mappers/StaticRuleMapper.xml
@@ -14,7 +14,7 @@
                                   static_rule_protocol, static_rule_mprotocol, static_rule_dns,
                                   static_rule_url, static_rule_priority,
                                   static_rule_frequency, static_rule_audit_status,
-                                  static_rule_display_id)
+                                  static_rule_display_id,event_type)
         values (#{object.staticRuleName}, #{object.staticRuleCreateTime}, #{object.staticRuleCreateUsername},
                 #{object.staticRuleCreateDepart}, #{object.staticRuleCreateUserId}, INET_ATON(#{object.staticRuleSip}),
                 INET_ATON(#{object.staticRuleMsip}), #{object.staticRuleSport}, #{object.staticRuleMsport},
@@ -23,7 +23,7 @@
                 #{object.staticRuleDns}, #{object.staticRuleURL}, #{object.staticRulePriority},
                 #{object.staticRuleFrequency},
                 #{object.auditStatus},
-                #{object.staticRuleDisplayId})
+                #{object.staticRuleDisplayId},#{object.eventType})
     </insert>
     <insert id="newStaticRules">
         insert into t_static_rule(static_rule_name, static_rule_create_time,
@@ -34,7 +34,7 @@
                                   static_rule_protocol, static_rule_mprotocol, static_rule_dns,
                                   static_rule_url, static_rule_priority,
                                   static_rule_frequency,  static_rule_audit_status,
-                                  static_rule_display_id
+                                  static_rule_display_id,event_type
                                   )
         values
         <foreach collection="staticRuleBatch" item="object" separator=",">
@@ -45,7 +45,7 @@
             #{object.staticRuleMdport}, #{object.staticRuleProtocol}, #{object.staticRuleMprotocol},
             #{object.staticRuleDns}, #{object.staticRuleURL}, #{object.staticRulePriority},
             #{object.staticRuleFrequency}, 0,
-            #{object.staticRuleDisplayId}
+            #{object.staticRuleDisplayId},#{object.eventType}
             )
         </foreach>
     </insert>
@@ -76,6 +76,11 @@
             <if test="object.staticRuleFrequency != null and object.staticRuleFrequency != ''">
                 static_rule_frequency = #{object.staticRuleFrequency},
             </if>
+
+            <if test="object.eventType != null and object.eventType != ''">
+                event_type = #{eventType},
+            </if>
+
             static_rule_modify_time = NOW()
 
         </set>
@@ -173,6 +178,7 @@
         <result column="static_rule_frequency" property="staticRuleFrequency"/>
 
         <result column="static_rule_display_id" property="staticRuleDisplayId"/>
+        <result column="event_type" property="eventType"/>
     </resultMap>
 
     <select id="queryStaticRule"  resultMap="staticRuleMap">