diff --git a/.ebextensions_dev/00-makeFiles.config b/.ebextensions_dev/00-makeFiles.config new file mode 100644 index 0000000..ac43e12 --- /dev/null +++ b/.ebextensions_dev/00-makeFiles.config @@ -0,0 +1,12 @@ +files: + "/sbin/appstart": + mode: "000755" + owner: webapp + group: webapp + content: | + #!/usr/bin/env bash + JAR_PATH=/var/app/current/application.jar + + # run app + killall java + java -Dfile.encoding=UTF-8 -jar $JAR_PATH \ No newline at end of file diff --git a/.ebextensions_dev/01-set-timezone.config b/.ebextensions_dev/01-set-timezone.config new file mode 100644 index 0000000..4249da0 --- /dev/null +++ b/.ebextensions_dev/01-set-timezone.config @@ -0,0 +1,3 @@ +commands: + set_time_zone: + command: ln -f -s /usr/share/zoneinfo/Asia/Seoul /etc/localtime \ No newline at end of file diff --git a/.github/workflows/dev_deploy.yml b/.github/workflows/dev_deploy.yml index 6d30121..1fce3c2 100644 --- a/.github/workflows/dev_deploy.yml +++ b/.github/workflows/dev_deploy.yml @@ -44,7 +44,7 @@ jobs: mkdir -p deploy cp build/libs/*.jar deploy/application.jar cp Procfile deploy/Procfile - cp -r .ebextensions-dev deploy/.ebextensions + cp -r .ebextensions_dev deploy/.ebextensions cp -r .platform deploy/.platform cd deploy && zip -r deploy.zip . @@ -53,8 +53,8 @@ jobs: with: aws_access_key: ${{ secrets.AWS_ACTION_ACCESS_KEY_ID }} aws_secret_key: ${{ secrets.AWS_ACTION_SECRET_ACCESS_KEY }} - application_name: breifing-dev - environment_name: Breifing-dev-env + application_name: workbook2-dev + environment_name: workbook2-dev-env version_label: github-action-${{ steps.current-time.outputs.formattedTime }} region: ap-northeast-1 deployment_package: deploy/deploy.zip diff --git a/.gradle/8.14.2/executionHistory/executionHistory.lock b/.gradle/8.14.2/executionHistory/executionHistory.lock index f71aa0f..3170912 100644 Binary files a/.gradle/8.14.2/executionHistory/executionHistory.lock and b/.gradle/8.14.2/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.14.2/fileHashes/fileHashes.bin b/.gradle/8.14.2/fileHashes/fileHashes.bin index 00480cc..3e42e2f 100644 Binary files a/.gradle/8.14.2/fileHashes/fileHashes.bin and b/.gradle/8.14.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.14.2/fileHashes/fileHashes.lock b/.gradle/8.14.2/fileHashes/fileHashes.lock index 613db4e..fce4170 100644 Binary files a/.gradle/8.14.2/fileHashes/fileHashes.lock and b/.gradle/8.14.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b3cdecc..cf4b9ed 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe index 9ded512..415df58 100644 Binary files a/.gradle/file-system.probe and b/.gradle/file-system.probe differ diff --git a/.platform/nginx/conf.d/client_max_body_size.conf b/.platform/nginx/conf.d/client_max_body_size.conf new file mode 100644 index 0000000..8e8277e --- /dev/null +++ b/.platform/nginx/conf.d/client_max_body_size.conf @@ -0,0 +1 @@ +client_max_body_size 200M; \ No newline at end of file diff --git a/.platform/nginx/nginx.conf b/.platform/nginx/nginx.conf new file mode 100644 index 0000000..612092e --- /dev/null +++ b/.platform/nginx/nginx.conf @@ -0,0 +1,63 @@ +user nginx; +error_log /var/log/nginx/error.log warn; +pid /var/run/nginx.pid; +worker_processes auto; +worker_rlimit_nofile 33282; + +events { + use epoll; + worker_connections 1024; + multi_accept on; +} + +http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + + + log_format main '$remote_addr - $remote_user [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + + include conf.d/*.conf; + + map $http_upgrade $connection_upgrade { + default "upgrade"; + } + + upstream springboot { + server 127.0.0.1:8080; + keepalive 1024; + } + + server { + listen 80 default_server; + listen [::]:80 default_server; + + location / { + proxy_pass http://springboot; + # CORS 관련 헤더 추가 + add_header 'Access-Control-Allow-Origin' '*'; + add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, OPTIONS'; + add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type'; + proxy_http_version 1.1; + proxy_set_header Connection $connection_upgrade; + proxy_set_header Upgrade $http_upgrade; + + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + access_log /var/log/nginx/access.log main; + + client_header_timeout 60; + client_body_timeout 60; + keepalive_timeout 60; + gzip off; + gzip_comp_level 4; + + # Include the Elastic Beanstalk generated locations + include conf.d/elasticbeanstalk/healthd.conf; + } +} \ No newline at end of file diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..58dab8d --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: appstart \ No newline at end of file diff --git a/build.gradle b/build.gradle index a5f4f3d..64fff5c 100644 --- a/build.gradle +++ b/build.gradle @@ -38,3 +38,7 @@ dependencies { tasks.named('test') { useJUnitPlatform() } + +jar { + enabled = false +} \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 19b7f8c..f67d5bd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,10 +18,19 @@ spring: auto: update # create update default_batch_fetch_size: 1000 + servlet: + multipart: + enabled: true + maxFileSize: 200MB + maxRequestSize: 300MB + + springdoc: api-docs: enabled: true swagger-ui: enabled: true path: /swagger-ui.html - override-with-generic-response: false \ No newline at end of file + override-with-generic-response: false + +