xieyinlu/zhilu-admin
1
0
Fork 0
mirror of https://github.com/ccmjga/zhilu-admin synced 2026-03-30 07:43:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

update lib

Browse Source
This commit is contained in:
Chuck1sn
2025-07-17 09:41:15 +08:00
parent 7088712560
commit 5f0f0fbd14
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/build.gradle.kts
View File

@@ -102,14 +102,14 @@ tasks.jacocoTestReport {
} }
jacoco { jacoco {
toolVersion = "0.8.12" toolVersion = "0.8.13"
reportsDirectory.set(layout.buildDirectory.dir("reports/jacoco")) reportsDirectory.set(layout.buildDirectory.dir("reports/jacoco"))
} }
pmd { pmd {
sourceSets = listOf(java.sourceSets.findByName("main")) sourceSets = listOf(java.sourceSets.findByName("main"))
isConsoleOutput = true isConsoleOutput = true
toolVersion = "7.9.0" toolVersion = "7.15.0"
rulesMinimumPriority.set(5) rulesMinimumPriority.set(5)
ruleSetFiles = files("pmd-rules.xml") ruleSetFiles = files("pmd-rules.xml")
} }
@@ -125,7 +125,7 @@ spotless {
} }
java { java {
googleJavaFormat("1.25.2").reflowLongStrings() googleJavaFormat("1.28.0").reflowLongStrings()
formatAnnotations() formatAnnotations()
} }

10
backend/src/main/java/com/zl/mjga/aspect/LoggingAspect.java
View File

@@ -48,11 +48,11 @@ public class LoggingAspect {
return processWithLogging(joinPoint, aopLog); return processWithLogging(joinPoint, aopLog);
} }
// @Around("execution(* com.zl.mjga.service..*(..))") // @Around("execution(* com.zl.mjga.service..*(..))")
// public Object logService(ProceedingJoinPoint joinPoint) throws Throwable { // public Object logService(ProceedingJoinPoint joinPoint) throws Throwable {
// AopLog aopLog = new AopLog(); // AopLog aopLog = new AopLog();
// return processWithLogging(joinPoint, aopLog); // return processWithLogging(joinPoint, aopLog);
// } // }
private Object processWithLogging(ProceedingJoinPoint joinPoint, AopLog aopLog) throws Throwable { private Object processWithLogging(ProceedingJoinPoint joinPoint, AopLog aopLog) throws Throwable {
if (shouldSkipLogging(joinPoint) || !isUserAuthenticated()) { if (shouldSkipLogging(joinPoint) || !isUserAuthenticated()) {

2
backend/src/main/java/com/zl/mjga/dto/aoplog/AopLogQueryDto.java
View File

@@ -1,8 +1,6 @@
package com.zl.mjga.dto.aoplog; package com.zl.mjga.dto.aoplog;
import java.time.LocalDateTime;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

14
backend/src/main/java/com/zl/mjga/repository/AopLogRepository.java
View File

@@ -47,14 +47,16 @@ public class AopLogRepository extends AopLogDao {
.where(buildConditions(queryDto)); .where(buildConditions(queryDto));
} }
public SelectConditionStep<Record> selectByWithoutReturnValue(AopLogQueryDto queryDto) { public SelectConditionStep<Record> selectByWithoutReturnValue(AopLogQueryDto queryDto) {
return ctx() return ctx()
.select(AOP_LOG.asterisk().except(AOP_LOG.RETURN_VALUE, AOP_LOG.METHOD_ARGS), USER.USERNAME, DSL.count().over().as("total_count")) .select(
.from(AOP_LOG) AOP_LOG.asterisk().except(AOP_LOG.RETURN_VALUE, AOP_LOG.METHOD_ARGS),
.leftJoin(USER) USER.USERNAME,
.on(AOP_LOG.USER_ID.eq(USER.ID)) DSL.count().over().as("total_count"))
.where(buildConditions(queryDto)); .from(AOP_LOG)
.leftJoin(USER)
.on(AOP_LOG.USER_ID.eq(USER.ID))
.where(buildConditions(queryDto));
} }
private Condition buildConditions(AopLogQueryDto queryDto) { private Condition buildConditions(AopLogQueryDto queryDto) {

4
backend/src/test/java/com/zl/mjga/integration/e2e/SignE2ETest.java
View File

@@ -53,7 +53,7 @@ public class SignE2ETest {
.uri("/auth/sign-up") .uri("/auth/sign-up")
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.bodyValue( .bodyValue(
""" """
{ {
"username": "test_5fab32c22a3e", "username": "test_5fab32c22a3e",
"password": "test_eab28b939ba1" "password": "test_eab28b939ba1"
@@ -75,7 +75,7 @@ public class SignE2ETest {
.uri("/auth/sign-in") .uri("/auth/sign-in")
.contentType(MediaType.APPLICATION_JSON) .contentType(MediaType.APPLICATION_JSON)
.bodyValue( .bodyValue(
""" """
{ {
"username": "test_5fab32c22a3e", "username": "test_5fab32c22a3e",
"password": "test_eab28b939ba1" "password": "test_eab28b939ba1"