diff --git a/february-vehicle-server/pom.xml b/february-vehicle-server/pom.xml index 537ed2a..6d6ce40 100644 --- a/february-vehicle-server/pom.xml +++ b/february-vehicle-server/pom.xml @@ -57,7 +57,18 @@ com.google.code.gson gson - 2.8.5 + 2.8.9 + + + + org.springframework.boot + spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter-logging diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/TrajectoryApplication.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/TrajectoryApplication.java index 1015663..220a489 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/TrajectoryApplication.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/TrajectoryApplication.java @@ -5,6 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.EnableAspectJAutoProxy; + @SpringBootApplication @EnableAspectJAutoProxy public class TrajectoryApplication { diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/aspect/WebLog.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/aspect/WebLog.java similarity index 82% rename from february-vehicle-common/src/main/java/com/february/common/domain/aspect/WebLog.java rename to february-vehicle-server/src/main/java/com/vehicle/trajectory/aspect/WebLog.java index f9b0b94..d7aec0e 100644 --- a/february-vehicle-common/src/main/java/com/february/common/domain/aspect/WebLog.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/aspect/WebLog.java @@ -1,8 +1,8 @@ -package com.february.common.domain.aspect; +package com.vehicle.trajectory.aspect; import java.lang.annotation.*; /** - * 切面 + * 切面类 */ @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) diff --git a/february-vehicle-common/src/main/java/com/february/common/domain/aspect/WebLogAspect.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/aspect/WebLogAspect.java similarity index 96% rename from february-vehicle-common/src/main/java/com/february/common/domain/aspect/WebLogAspect.java rename to february-vehicle-server/src/main/java/com/vehicle/trajectory/aspect/WebLogAspect.java index 453954f..0de3e32 100644 --- a/february-vehicle-common/src/main/java/com/february/common/domain/aspect/WebLogAspect.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/aspect/WebLogAspect.java @@ -1,4 +1,4 @@ -package com.february.common.domain.aspect; +package com.vehicle.trajectory.aspect; import com.google.gson.Gson; import org.aspectj.lang.JoinPoint; @@ -24,7 +24,7 @@ public class WebLogAspect { private static final Gson gson = new Gson(); // 用于重复使用Gson实例 private static final String LINE_SEPARATOR = System.lineSeparator(); - @Pointcut("@annotation(com.february.common.domain.aspect.WebLog)") + @Pointcut("@annotation(com.vehicle.trajectory.aspect.WebLog)") public void webLog() {} @Before("webLog()") diff --git a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java index e7a28d5..773d7e2 100644 --- a/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java +++ b/february-vehicle-server/src/main/java/com/vehicle/trajectory/controller/TrajectoryController.java @@ -5,7 +5,7 @@ import com.february.common.core.domain.Result; import com.february.common.domain.RealData; import com.february.common.domain.Vehicle; import com.february.common.domain.VehicleType; -import com.february.common.domain.aspect.WebLog; +import com.vehicle.trajectory.aspect.WebLog; import com.vehicle.trajectory.service.TrajectoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/february-vehicle-server/src/main/resources/bootstrap.yml b/february-vehicle-server/src/main/resources/bootstrap.yml index 8c75861..686e079 100644 --- a/february-vehicle-server/src/main/resources/bootstrap.yml +++ b/february-vehicle-server/src/main/resources/bootstrap.yml @@ -23,9 +23,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -# application.yml -logging: - level: - com.vehicle.trajectory.controller: INFO - pattern: - console: '%d{yyyy-MM-dd HH:mm:ss} - %msg%n' +