From 1426fed0cfc5c79bc804cc64964f93a5a398f7fc Mon Sep 17 00:00:00 2001 From: be-student Date: Thu, 17 Aug 2023 12:52:32 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=202=EB=B2=88=20=EB=B9=8C=EB=93=9C?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-deploy.yml | 3 +++ .github/workflows/backend-dev-deploy.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/backend-deploy.yml b/.github/workflows/backend-deploy.yml index f0de45348..82b6128ec 100644 --- a/.github/workflows/backend-deploy.yml +++ b/.github/workflows/backend-deploy.yml @@ -38,6 +38,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Build for asciiDoc + run: ./gradlew bootjar + - name: Build with Gradle run: ./gradlew bootjar diff --git a/.github/workflows/backend-dev-deploy.yml b/.github/workflows/backend-dev-deploy.yml index 32d23da82..adb4e03d9 100644 --- a/.github/workflows/backend-dev-deploy.yml +++ b/.github/workflows/backend-dev-deploy.yml @@ -38,6 +38,9 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + - name: Build for asciiDoc + run: ./gradlew bootjar + - name: Build with Gradle run: ./gradlew bootjar From 86c41370cc72cb8cc7f01c204edbf123281091d5 Mon Sep 17 00:00:00 2001 From: be-student Date: Thu, 17 Aug 2023 12:56:00 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20gradle=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/build.gradle | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 795a99bcd..1cf650a6c 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -62,14 +62,22 @@ tasks.named('asciidoctor') { } asciidoctor { - inputs.dir snippetsDir - configurations 'asciidoctorExt' dependsOn test + configurations 'asciidoctorExt' + baseDirFollowsSourceFile() } -bootJar { + +tasks.register('copyApiDocument', Copy) { dependsOn asciidoctor - from("${asciidoctor.outputDir}") { - into 'static/docs' + doFirst { + delete file("src/main/resources/static/docs") // 기존 문서 삭제 } + + from asciidoctor.outputDir + into file("src/main/resources/static/docs") +} + +bootJar { + dependsOn copyApiDocument } From 0b1aa5be71b81b5e061a212ca1cc0b6ff7eebe6d Mon Sep 17 00:00:00 2001 From: be-student Date: Thu, 17 Aug 2023 13:04:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20index=20=EC=97=90=20adoc=20?= =?UTF-8?q?=EB=AA=A8=EB=91=90=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/.gitignore | 2 ++ backend/src/docs/asciidoc/index.adoc | 10 ++++++++-- backend/src/docs/asciidoc/member.adoc | 12 ++++++------ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/backend/.gitignore b/backend/.gitignore index 994d2e80a..891af5570 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -39,3 +39,5 @@ out/ src/main/resources/encryptKey.txt mysql + +/src/main/resources/static/docs/ diff --git a/backend/src/docs/asciidoc/index.adoc b/backend/src/docs/asciidoc/index.adoc index cc8f479ae..42af83056 100644 --- a/backend/src/docs/asciidoc/index.adoc +++ b/backend/src/docs/asciidoc/index.adoc @@ -7,6 +7,12 @@ endif::[] :source-highlighter: highlightjs :sectlinks: -include::station.adoc[] -include::filter.adoc[] +include::admin.adoc[] +include::auth.adoc[] include::car.adoc[] +include::filter.adoc[] +include::member.adoc[] +include::reply.adoc[] +include::report.adoc[] +include::review.adoc[] +include::station.adoc[] diff --git a/backend/src/docs/asciidoc/member.adoc b/backend/src/docs/asciidoc/member.adoc index 3e73f9ffd..c1f6dc869 100644 --- a/backend/src/docs/asciidoc/member.adoc +++ b/backend/src/docs/asciidoc/member.adoc @@ -9,15 +9,15 @@ === Request -include::{snippets}/member-controller-test/find_all_filters/request-headers.adoc[] -include::{snippets}/member-controller-test/find_all_filters/path-parameters.adoc[] -include::{snippets}/member-controller-test/find_all_filters/request-body.adoc[] -include::{snippets}/member-controller-test/find_all_filters/http-request.adoc[] +include::{snippets}/member-controller-test/find_member_filters/request-headers.adoc[] +include::{snippets}/member-controller-test/find_member_filters/path-parameters.adoc[] +include::{snippets}/member-controller-test/find_member_filters/request-body.adoc[] +include::{snippets}/member-controller-test/find_member_filters/http-request.adoc[] === Response -include::{snippets}/member-controller-test/find_all_filters/response-fields.adoc[] -include::{snippets}/member-controller-test/find_all_filters/http-response.adoc[] +include::{snippets}/member-controller-test/find_member_filters/response-fields.adoc[] +include::{snippets}/member-controller-test/find_member_filters/http-response.adoc[] == 회원의 선호 필터를 등록한다