Skip to content

Commit 05ec59c

Browse files
yu-so-young2yu-so-young2
authored
Merge pull request #196 from dreamyPatisiel/develop
픽픽픽 V2 main 배포
2 parents 2e7ac07 + 5bd542e commit 05ec59c

60 files changed

Lines changed: 3846 additions & 121 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Dockerfile-dev‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM openjdk:21-jdk
1+
FROM eclipse-temurin:21-jdk
22
# JAR 파일 메인 디렉토리에 복사
33
COPY build/libs/*.jar app.jar
44

55
# 타임존 설정
66
ENV TZ Asia/Seoul
77

88
# 시스템 진입점 정의
9-
CMD java -jar -Dspring.profiles.active=dev /app.jar
9+
CMD java -jar -Dspring.profiles.active=dev /app.jar

‎build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ dependencies {
9393
// mybatis
9494
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.4'
9595

96+
// markdown parser
97+
implementation 'org.commonmark:commonmark:0.21.0'
98+
9699
compileOnly 'org.projectlombok:lombok'
97100
runtimeOnly 'com.h2database:h2'
98101
runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'

src/docs/asciidoc/api/pick/pick-delete.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-delete.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-detail.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-detail.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-main.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-main.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-modify.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-modify.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-option-delete-image.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-option-delete-image.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-option-register-image.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-option-register-image.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-register.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-register.adoc

File renamed without changes.

src/docs/asciidoc/api/pick/pick-similarity.adoc renamed to src/docs/asciidoc/api/pick/v1/pick-similarity.adoc

File renamed without changes.

0 commit comments

Comments
 (0)