From d7272ed03fd9610bacf59bc31e960081f3715edb Mon Sep 17 00:00:00 2001 From: DongHoon Lee Date: Tue, 8 Oct 2024 01:49:59 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[#237]=20delete(HELP.md):=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- HELP.md | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 HELP.md diff --git a/HELP.md b/HELP.md deleted file mode 100644 index 8826d98e..00000000 --- a/HELP.md +++ /dev/null @@ -1,30 +0,0 @@ -# Getting Started - -### Reference Documentation -For further reference, please consider the following sections: - -* [Official Gradle documentation](https://docs.gradle.org) -* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.3.1/gradle-plugin/reference/html/) -* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.3.1/gradle-plugin/reference/html/#build-image) -* [Spring Web](https://docs.spring.io/spring-boot/docs/3.3.1/reference/htmlsingle/index.html#web) -* [Spring Data JPA](https://docs.spring.io/spring-boot/docs/3.3.1/reference/htmlsingle/index.html#data.sql.jpa-and-spring-data) -* [Spring Security](https://docs.spring.io/spring-boot/docs/3.3.1/reference/htmlsingle/index.html#web.security) -* [Spring Boot DevTools](https://docs.spring.io/spring-boot/docs/3.3.1/reference/htmlsingle/index.html#using.devtools) - -### Guides -The following guides illustrate how to use some features concretely: - -* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) -* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) -* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) -* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) -* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) -* [Securing a Web Application](https://spring.io/guides/gs/securing-web/) -* [Spring Boot and OAuth2](https://spring.io/guides/tutorials/spring-boot-oauth2/) -* [Authenticating a User with LDAP](https://spring.io/guides/gs/authenticating-ldap/) - -### Additional Links -These additional references should also help you: - -* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) - From dc454058072e2f0f93fb259713f722ba2e05c125 Mon Sep 17 00:00:00 2001 From: DongHoon Lee Date: Tue, 8 Oct 2024 01:52:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[#237]=20chore:=20=EB=B2=84=EC=A0=80?= =?UTF-8?q?=EB=8B=9D=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EB=B0=8F=20?= =?UTF-8?q?url=20=EB=AA=85=EC=8B=9C=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-CI.yml | 1 + .github/workflows/prod-CI.yml | 1 + .../java/com/beat/global/swagger/SwaggerConfig.java | 10 ++++++++-- src/main/resources/application-dev.yml | 6 +++++- src/main/resources/application-prod.yml | 6 +++++- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev-CI.yml b/.github/workflows/dev-CI.yml index 457af248..3776a7c6 100644 --- a/.github/workflows/dev-CI.yml +++ b/.github/workflows/dev-CI.yml @@ -56,6 +56,7 @@ jobs: DEV_ACCESS_TOKEN_EXPIRE_TIME: ${{ secrets.DEV_ACCESS_TOKEN_EXPIRE_TIME }} DEV_REFRESH_TOKEN_EXPIRE_TIME: ${{ secrets.DEV_REFRESH_TOKEN_EXPIRE_TIME }} DEV_ALLOWED_ORIGINS: ${{ secrets.DEV_ALLOWED_ORIGINS }} + DEV_SERVER_URL: ${{ secrets.DEV_SERVER_URL }} run: | cd ./src/main/resources envsubst < application-dev.yml > application-dev.tmp.yml && mv application-dev.tmp.yml application-dev.yml diff --git a/.github/workflows/prod-CI.yml b/.github/workflows/prod-CI.yml index 0b5e9e8c..7af7a03e 100644 --- a/.github/workflows/prod-CI.yml +++ b/.github/workflows/prod-CI.yml @@ -56,6 +56,7 @@ jobs: PROD_ACCESS_TOKEN_EXPIRE_TIME: ${{ secrets.PROD_ACCESS_TOKEN_EXPIRE_TIME }} PROD_REFRESH_TOKEN_EXPIRE_TIME: ${{ secrets.PROD_REFRESH_TOKEN_EXPIRE_TIME }} PROD_ALLOWED_ORIGINS: ${{ secrets.PROD_ALLOWED_ORIGINS }} + PROD_SERVER_URL: ${{ secrets.PROD_SERVER_URL }} run: | cd ./src/main/resources envsubst < application-prod.yml > application-prod.tmp.yml && mv application-prod.tmp.yml application-prod.yml diff --git a/src/main/java/com/beat/global/swagger/SwaggerConfig.java b/src/main/java/com/beat/global/swagger/SwaggerConfig.java index 3357edfc..f3ffc34b 100644 --- a/src/main/java/com/beat/global/swagger/SwaggerConfig.java +++ b/src/main/java/com/beat/global/swagger/SwaggerConfig.java @@ -6,11 +6,17 @@ import io.swagger.v3.oas.models.security.SecurityRequirement; import io.swagger.v3.oas.models.security.SecurityScheme; import io.swagger.v3.oas.models.servers.Server; + +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class SwaggerConfig { + + @Value("${app.server.url}") + private String serverUrl; + @Bean public OpenAPI openAPI() { String jwt = "JWT"; @@ -21,7 +27,7 @@ public OpenAPI openAPI() { .scheme("bearer") .bearerFormat("JWT") ); - return new OpenAPI().addServersItem(new Server().url("/")) + return new OpenAPI().addServersItem(new Server().url(serverUrl)) .components(new Components()) .info(apiInfo()) .addSecurityItem(securityRequirement) @@ -31,6 +37,6 @@ private Info apiInfo() { return new Info() .title("BEAT Project API") .description("간편하게 소규모 공연을 등록하고 관리할 수 있는 티켓 예매 플랫폼") - .version("1.0.1"); + .version("1.1.0"); } } \ No newline at end of file diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 13b5a796..e9d0c438 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -76,4 +76,8 @@ logging: root: info # 추후 debug로 변경 cors: - allowed-origins: ${DEV_ALLOWED_ORIGINS} \ No newline at end of file + allowed-origins: ${DEV_ALLOWED_ORIGINS} + +app: + server: + url: ${DEV_SERVER_URL} \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 8cdb46cb..c9689bd2 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -76,4 +76,8 @@ logging: root: info cors: - allowed-origins: ${PROD_ALLOWED_ORIGINS} \ No newline at end of file + allowed-origins: ${PROD_ALLOWED_ORIGINS} + +app: + server: + url: ${PROD_SERVER_URL} \ No newline at end of file