From e5f5c488454c10ff438e559c690cdd384ce05fb2 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 30 Sep 2026 03:39:39 +0000 Subject: [PATCH] bug: upgrade Spring Boot parent to 2.7.10 to fix spring-expression SpEL DoS (CVE-2023-20861) --- UserFront/pom.xml | 6 +++--- .../UserServiceImpl/AppointmentServiceImpl.java | 2 +- UserFront/src/main/resources/application.properties | 10 ++++++++++ .../java/com/userFront/UserFrontApplicationTests.java | 5 +---- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/UserFront/pom.xml b/UserFront/pom.xml index 902ec2b3..a10a209b 100644 --- a/UserFront/pom.xml +++ b/UserFront/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.4.RELEASE + 2.7.10 @@ -46,8 +46,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java index 838ad223..0d62b84c 100644 --- a/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java +++ b/UserFront/src/main/java/com/userFront/service/UserServiceImpl/AppointmentServiceImpl.java @@ -24,7 +24,7 @@ public List findAll() { } public Appointment findAppointment(Long id) { - return appointmentDao.findOne(id); + return appointmentDao.findById(id).orElse(null); } public void confirmAppointment(Long id) { diff --git a/UserFront/src/main/resources/application.properties b/UserFront/src/main/resources/application.properties index d7e04942..155fb93c 100644 --- a/UserFront/src/main/resources/application.properties +++ b/UserFront/src/main/resources/application.properties @@ -1,3 +1,10 @@ +# =============================== +# = SPRING +# =============================== + +# UserServiceImpl and AccountServiceImpl depend on each other +spring.main.allow-circular-references = true + # =============================== # = DATA SOURCE # =============================== @@ -30,6 +37,9 @@ spring.jpa.show-sql = true # the project spring.jpa.hibernate.ddl-auto = update +# Keep GenerationType.AUTO on MySQL AUTO_INCREMENT columns instead of a hibernate_sequence table +spring.jpa.hibernate.use-new-id-generator-mappings = false + # Allows Hibernate to generate SQL optimized for a particular DBMS spring.jpa.properties.hibernate.dialect = org.hibernate.dialect.MySQL5Dialect diff --git a/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java b/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java index 81fed97b..3e51f21d 100644 --- a/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java +++ b/UserFront/src/test/java/com/userFront/UserFrontApplicationTests.java @@ -1,11 +1,8 @@ package com.userFront; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; -@RunWith(SpringRunner.class) @SpringBootTest public class UserFrontApplicationTests {