diff --git a/Dockerfile b/Dockerfile index b1b4e41..9e8e089 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM openjdk:latest +FROM eclipse-temurin:17-jre + VOLUME /tmp EXPOSE 8080 @@ -7,7 +8,6 @@ LABEL version="1.0" LABEL description="Backend API for the official website of acmcss" ARG JAR_FILE=target/backend-1.0.1.jar - -ADD ${JAR_FILE} app.jar +COPY ${JAR_FILE} app.jar ENTRYPOINT ["java","-jar","/app.jar"] diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 05ff1f3..d6ae145 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -11,7 +11,7 @@ spring: driver-class-name: org.postgresql.Driver jpa: hibernate: - ddl-auto: create + ddl-auto: update properties: hibernate: format_sql: true diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2e67407..830a06c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -23,9 +23,9 @@ spring: url: ${POSTGRESQL_DB_URL} username: ${POSTGRESQL_DB_USER} password: ${POSTGRESQL_DB_PASSWORD} -# url: jdbc:postgresql://localhost:5432/acm -# username: acmsecy -# password: acmheads + # url: jdbc:postgresql://localhost:5432/acm + # username: acmsecy + # password: acmheads hikari: maximumPoolSize: 20 minimumIdle: 5 diff --git a/target/backend-1.0.1.jar b/target/backend-1.0.1.jar index 108299a..66d8948 100644 Binary files a/target/backend-1.0.1.jar and b/target/backend-1.0.1.jar differ diff --git a/target/backend-1.0.1.jar.original b/target/backend-1.0.1.jar.original index 37a6f77..fcf133d 100644 Binary files a/target/backend-1.0.1.jar.original and b/target/backend-1.0.1.jar.original differ diff --git a/target/classes/application-local.yml b/target/classes/application-local.yml index 05ff1f3..d6ae145 100644 --- a/target/classes/application-local.yml +++ b/target/classes/application-local.yml @@ -11,7 +11,7 @@ spring: driver-class-name: org.postgresql.Driver jpa: hibernate: - ddl-auto: create + ddl-auto: update properties: hibernate: format_sql: true diff --git a/target/classes/application.yml b/target/classes/application.yml index 2e67407..830a06c 100644 --- a/target/classes/application.yml +++ b/target/classes/application.yml @@ -23,9 +23,9 @@ spring: url: ${POSTGRESQL_DB_URL} username: ${POSTGRESQL_DB_USER} password: ${POSTGRESQL_DB_PASSWORD} -# url: jdbc:postgresql://localhost:5432/acm -# username: acmsecy -# password: acmheads + # url: jdbc:postgresql://localhost:5432/acm + # username: acmsecy + # password: acmheads hikari: maximumPoolSize: 20 minimumIdle: 5 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst index 3c4254f..820503d 100644 --- a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -1,46 +1,46 @@ -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\constants\ErrorConstants.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\configuration\MyWebMvcConfigurer.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\UserRepository.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EmailController.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\exception\ExceptionResponseHandler.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\EmailRequest.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\configuration\CorsConfig.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\EventService.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\EmailService.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\UserEventDetails.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventSidDetails.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportEventResponse.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\filters\JwtFilter.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\JwtService.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\exception\AcmException.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\constants\Constants.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EventsController.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\AuthenticationResponse.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\SupportService.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\enums\Branch.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\TransactionRepository.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\UserController.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\Event.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\AuthenticationRequest.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\UserService.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\BackendApplication.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\VerificationToken.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\EventUserDetails.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\services\VerificationService.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\filters\SimpleCORSFilter.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\ErrorResponse.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\EventRepository.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\util\LoggingInterceptor.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\AssignRoleRequest.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\enums\Role.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\configuration\SecurityConfiguration.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\EventAttendeesResponse.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\Transaction.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\entities\User.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\SupportController.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportUserResponse.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventDetails.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\response\RegisterResponse.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\enums\EventRole.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\controllers\HealthController.java -D:\ACM\acm-website-backend\src\main\java\com\pecacm\backend\repository\VerificationTokenRepository.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\configuration\MyWebMvcConfigurer.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventDetails.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\exception\AcmException.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\constants\Constants.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EventsController.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\User.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\EndEventSidDetails.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\VerificationToken.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\UserController.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\VerificationService.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\Event.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\exception\ExceptionResponseHandler.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\enums\Branch.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\AuthenticationRequest.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\filters\SimpleCORSFilter.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\UserRepository.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\util\LoggingInterceptor.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\EventUserDetails.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\HealthController.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\ErrorResponse.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\SupportService.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportUserResponse.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\EventRepository.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\BackendApplication.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\UserEventDetails.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\SupportController.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\EventAttendeesResponse.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\EmailRequest.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\entities\Transaction.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\EventService.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\filters\JwtFilter.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\EmailService.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\enums\Role.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\AuthenticationResponse.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\constants\ErrorConstants.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\RegisterResponse.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\configuration\CorsConfig.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\controllers\EmailController.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\response\SupportEventResponse.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\configuration\SecurityConfiguration.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\TransactionRepository.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\JwtService.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\services\UserService.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\model\AssignRoleRequest.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\repository\VerificationTokenRepository.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\main\java\com\pecacm\backend\enums\EventRole.java diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst index 4f65960..452bb61 100644 --- a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -1 +1 @@ -D:\ACM\acm-website-backend\src\test\java\com\pecacm\backend\BackendApplicationTests.java +C:\Users\ASUS\Desktop\acm_website\backend\acm-website-backend\src\test\java\com\pecacm\backend\BackendApplicationTests.java