From 5f0f0fbd14cbc9f648d3192d2fdb9dc53d06adc5 Mon Sep 17 00:00:00 2001
From: Chuck1sn <chuck1inzl@gmail.com>
Date: Thu, 17 Jul 2025 09:41:15 +0800
Subject: [PATCH] update lib

---
 backend/build.gradle.kts                           |  6 +++---
 .../java/com/zl/mjga/aspect/LoggingAspect.java     | 10 +++++-----
 .../com/zl/mjga/dto/aoplog/AopLogQueryDto.java     |  2 --
 .../com/zl/mjga/repository/AopLogRepository.java   | 14 ++++++++------
 .../com/zl/mjga/integration/e2e/SignE2ETest.java   |  4 ++--
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
index 42e4f4b..86a0224 100644
--- a/backend/build.gradle.kts
+++ b/backend/build.gradle.kts
@@ -102,14 +102,14 @@ tasks.jacocoTestReport {
 }
 
 jacoco {
-    toolVersion = "0.8.12"
+    toolVersion = "0.8.13"
     reportsDirectory.set(layout.buildDirectory.dir("reports/jacoco"))
 }
 
 pmd {
     sourceSets = listOf(java.sourceSets.findByName("main"))
     isConsoleOutput = true
-    toolVersion = "7.9.0"
+    toolVersion = "7.15.0"
     rulesMinimumPriority.set(5)
     ruleSetFiles = files("pmd-rules.xml")
 }
@@ -125,7 +125,7 @@ spotless {
     }
 
     java {
-        googleJavaFormat("1.25.2").reflowLongStrings()
+        googleJavaFormat("1.28.0").reflowLongStrings()
         formatAnnotations()
     }
 
diff --git a/backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java b/backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java
index 2367284..4d1f6cf 100644
--- a/backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java
+++ b/backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java
@@ -48,11 +48,11 @@ public class LoggingAspect {
     return processWithLogging(joinPoint, aopLog);
   }
 
-//  @Around("execution(* com.zl.mjga.service..*(..))")
-//  public Object logService(ProceedingJoinPoint joinPoint) throws Throwable {
-//    AopLog aopLog = new AopLog();
-//    return processWithLogging(joinPoint, aopLog);
-//  }
+  //  @Around("execution(* com.zl.mjga.service..*(..))")
+  //  public Object logService(ProceedingJoinPoint joinPoint) throws Throwable {
+  //    AopLog aopLog = new AopLog();
+  //    return processWithLogging(joinPoint, aopLog);
+  //  }
 
   private Object processWithLogging(ProceedingJoinPoint joinPoint, AopLog aopLog) throws Throwable {
     if (shouldSkipLogging(joinPoint) || !isUserAuthenticated()) {
diff --git a/backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java b/backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java
index 3c0b16f..23a427f 100644
--- a/backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java
+++ b/backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java
@@ -1,8 +1,6 @@
 package com.zl.mjga.dto.aoplog;
 
-import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java b/backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java
index 667de1a..4df74d9 100644
--- a/backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java
+++ b/backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java
@@ -47,14 +47,16 @@ public class AopLogRepository extends AopLogDao {
         .where(buildConditions(queryDto));
   }
 
-
   public SelectConditionStep<Record> selectByWithoutReturnValue(AopLogQueryDto queryDto) {
     return ctx()
-            .select(AOP_LOG.asterisk().except(AOP_LOG.RETURN_VALUE, AOP_LOG.METHOD_ARGS), USER.USERNAME, DSL.count().over().as("total_count"))
-            .from(AOP_LOG)
-            .leftJoin(USER)
-            .on(AOP_LOG.USER_ID.eq(USER.ID))
-            .where(buildConditions(queryDto));
+        .select(
+            AOP_LOG.asterisk().except(AOP_LOG.RETURN_VALUE, AOP_LOG.METHOD_ARGS),
+            USER.USERNAME,
+            DSL.count().over().as("total_count"))
+        .from(AOP_LOG)
+        .leftJoin(USER)
+        .on(AOP_LOG.USER_ID.eq(USER.ID))
+        .where(buildConditions(queryDto));
   }
 
   private Condition buildConditions(AopLogQueryDto queryDto) {
diff --git a/backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java b/backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java
index aec02e6..206db7d 100644
--- a/backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java
+++ b/backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java
@@ -53,7 +53,7 @@ public class SignE2ETest {
         .uri("/auth/sign-up")
         .contentType(MediaType.APPLICATION_JSON)
         .bodyValue(
-            """
+"""
 {
   "username": "test_5fab32c22a3e",
   "password": "test_eab28b939ba1"
@@ -75,7 +75,7 @@ public class SignE2ETest {
         .uri("/auth/sign-in")
         .contentType(MediaType.APPLICATION_JSON)
         .bodyValue(
-            """
+"""
 {
   "username": "test_5fab32c22a3e",
   "password": "test_eab28b939ba1"