保誠-保戶業務員媒合平台
wayne
2021-11-19 205ae77062d62f785196e351b747188e6ea61506
[update] spring boot降版

因spring 2.5.X版本有與jboss 的EL有衝突,詳情可看otis dev team todo 130509
刪除1個檔案
修改5個檔案
新增1個檔案
16 ■■■■ 已變更過的檔案
pamapi/.gitignore 2 ●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/pom.xml 8 ●●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/java/com/pollex/pam/config/JacksonConfiguration.java 2 ●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java 2 ●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java 2 ●●● 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/resources/WEB-INF/lib/spring-core-5.3.10.jar 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/src/main/resources/WEB-INF/lib/spring-core-5.3.5.jar 修補檔 | 檢視 | 原始 | 究查 | 歷程
pamapi/.gitignore
@@ -95,7 +95,7 @@
*.ear
*.db
!pcalife-otp.jar
!spring-core-5.3.10.jar
!spring-core-5.3.5.jar
######################
# Windows
pamapi/pom.xml
@@ -41,10 +41,10 @@
        <profile.tls />
        <!-- Dependency versions -->
        <jhipster-dependencies.version>7.3.0</jhipster-dependencies.version>
        <jhipster-dependencies.version>7.0.1</jhipster-dependencies.version>
        <!-- The spring-boot version should match the one managed by
        https://mvnrepository.com/artifact/tech.jhipster/jhipster-dependencies/${jhipster-dependencies.version} -->
        <spring-boot.version>2.5.5</spring-boot.version>
        <spring-boot.version>2.4.4</spring-boot.version>
        <!-- The hibernate version should match the one managed by
        https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
        <hibernate.version>5.4.32.Final</hibernate.version>
@@ -367,9 +367,9 @@
        <dependency>
            <groupId>org.springframework</groupId>
            <artifactId>spring-core</artifactId>
            <version>5.3.10</version>
            <version>5.3.5</version>
            <scope>system</scope>
            <systemPath>${project.basedir}/src/main/resources/WEB-INF/lib/spring-core-5.3.10.jar</systemPath>
            <systemPath>${project.basedir}/src/main/resources/WEB-INF/lib/spring-core-5.3.5.jar</systemPath>
        </dependency>
        <!-- jhipster-needle-maven-add-dependency -->
    </dependencies>
pamapi/src/main/java/com/pollex/pam/config/JacksonConfiguration.java
@@ -5,7 +5,7 @@
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.zalando.problem.jackson.ProblemModule;
import org.zalando.problem.ProblemModule;
import org.zalando.problem.violations.ConstraintViolationProblemModule;
@Configuration
pamapi/src/main/java/com/pollex/pam/config/SecurityConfiguration.java
@@ -69,7 +69,7 @@
        .and()
            .referrerPolicy(ReferrerPolicyHeaderWriter.ReferrerPolicy.STRICT_ORIGIN_WHEN_CROSS_ORIGIN)
        .and()
            .permissionsPolicy().policy("camera=(), fullscreen=(self), geolocation=(), gyroscope=(), magnetometer=(), microphone=(), midi=(), payment=(), sync-xhr=()")
            .featurePolicy("geolocation 'none'; midi 'none'; sync-xhr 'none'; microphone 'none'; camera 'none'; magnetometer 'none'; gyroscope 'none'; fullscreen 'self'; payment 'none'")
        .and()
            .frameOptions()
            .deny()
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -51,7 +51,7 @@
    public void markAsContacted(Long appointmentId) {
        Appointment appointment = appointmentRepository.getById(appointmentId);
        Appointment appointment = appointmentRepository.findById(appointmentId).get();
        appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
        appointmentRepository.save(appointment);
    }
pamapi/src/main/resources/WEB-INF/lib/spring-core-5.3.10.jar
Binary files differ
pamapi/src/main/resources/WEB-INF/lib/spring-core-5.3.5.jar
Binary files differ