From 86cfec0eef7e5c8fee134337b4f84372dc207954 Mon Sep 17 00:00:00 2001
From: PushM <584406942@qq.com>
Date: Fri, 19 Jul 2024 01:31:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/response/AuditAdvice.java   | 48 ++++++++++++++++---
 .../object/ProtectObjectController.java       |  9 ++++
 2 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java b/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java
index 2ae3dfc..cd359f0 100644
--- a/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java
+++ b/src/main/java/com/realtime/protection/configuration/response/AuditAdvice.java
@@ -1,5 +1,6 @@
 package com.realtime.protection.configuration.response;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.realtime.protection.ProtectionApplication;
 import com.realtime.protection.configuration.entity.user.User;
 import com.realtime.protection.configuration.entity.user.UserFull;
@@ -247,28 +248,51 @@ public class AuditAdvice implements ResponseBodyAdvice<ResponseResult> {
 
     private final WebClient webClient = WebClient
             .builder()
-            .baseUrl("http://39.105.210.156:8090/chanct-log/audit-xgs")
-//            .baseUrl("http://10.58.44.241:1888/api/chanct-log/audit-xgs")
+//            .baseUrl("http://39.105.210.156:8090/chanct-log/audit-xgs")
+            .baseUrl("http://10.58.44.241:1888/api/chanct-log/audit-xgs")
+//            .baseUrl("http://10.58.44.241:1888/magic-api/audit/save")
             .build();
 
     @Data
     @AllArgsConstructor
     private static class AuditRes{
+        @JsonProperty("auditBase")
         private AuditData auditBase;
     }
     @Data
     @AllArgsConstructor
     private static class AuditData {
+        @JsonProperty("userId")
         private String userId;
+        @JsonProperty("deptId")
         private String deptId;
+        @JsonProperty("userName")
         private String userName;
+        @JsonProperty("deptName")
+        private String deptName;
+        @JsonProperty("menu")
+        private String menu;
+        @JsonProperty("action")
+        private String action;
+        @JsonProperty("res")
+        private String res;
+        @JsonProperty("content")
+        private String content;
+        @JsonProperty("userIp")
+        private String userIp;
+    }
+    @Data
+    @AllArgsConstructor
+    private static class AuditDataNew {
+        private String userName;
+        private String userIp;
+        private String sourceType;
         private String deptName;
         private String menu;
-        private String action;
-        private String res;
         private String content;
+        private String originData;
+
 
-        private String userIp;
     }
 
     @Override
@@ -280,9 +304,12 @@ public class AuditAdvice implements ResponseBodyAdvice<ResponseResult> {
     @Override
     public ResponseResult beforeBodyWrite(ResponseResult body, MethodParameter returnType, MediaType selectedContentType, Class<? extends HttpMessageConverter<?>> selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) {
 // 可以不发送query的请求，数据量太大
-        if (request.getURI().getPath().contains("query")){
+        if (request.getURI().getPath().contains("query")
+        || request.getURI().getPath().contains("swagger")
+        || request.getURI().getPath().contains("dict")){
             return body;
         }
+
         AuditData auditData ;
         try {
             auditData = getAuditData(body, request);
@@ -292,7 +319,7 @@ public class AuditAdvice implements ResponseBodyAdvice<ResponseResult> {
         }
 
         AuditRes auditRes = new AuditRes(auditData);
-        log.info("auditData-----------:"+auditData);
+        log.info("auditData-----------:"+auditRes.toString());
 
         Mono<String> mono = webClient
                 .post()
@@ -364,6 +391,13 @@ public class AuditAdvice implements ResponseBodyAdvice<ResponseResult> {
                     request.getURI().getPath(),
                     extractFirstIpAddress(request.getHeaders().getFirst("X-Forwarded-For"))
             );
+//            auditData = new AuditData(
+//                    "NSADD管理员",extractFirstIpAddress(request.getHeaders().getFirst("X-Forwarded-For"))
+//                    "xgs","组织树",
+//                    getTag(request.getURI().getPath()),
+//                    getSummary(request.getURI().getPath()),
+//                    body.toString()+" "+request.getURI().getPath()
+//            );
         }else {
             UserFull user = (UserFull) session.getAttribute("user");
             auditData = new AuditData(
diff --git a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java
index e45415f..6445c94 100644
--- a/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java
+++ b/src/main/java/com/realtime/protection/server/defense/object/ProtectObjectController.java
@@ -279,4 +279,13 @@ public class ProtectObjectController implements ProtectObjectControllerApi {
                 .setData("history", protectObjectService.queryHistory(id, page, pageSize));
     }
 
+    @Override
+    @GetMapping("/synchronize")
+    public ResponseResult synchronizeProtectObject() {
+
+        return ResponseResult.ok()
+                .setData("success", true)
+                .setData("synchronize", 145);
+    }
+
 }