v1.1.0

.githooks/commit-msg

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+# 커밋 메시지 파일
+commit_msg_file=$1
+
+# 커밋 메시지 읽기
+commit_msg=$(cat "$commit_msg_file")
+
+# 정규식 패턴 (feat|fix|docs|refactor|test|chore 등의 prefix 필수)
+pattern="^(feat|fix|docs|refactor|test|chore): .+"
+
+# 메시지 검증 (형식이 맞지 않으면 커밋 차단)
+if ! [[ $commit_msg =~ $pattern ]]; then
+  echo "❌ [ERROR] 커밋 메시지가 잘못되었습니다!"
+  echo "✅ 올바른 형식: feat: 기능 추가, fix: 버그 수정, docs: 문서 추가 등"
+  exit 1
+fi
+
+# 커밋 메시지 패턴에 따라 깃이모지 추가
+case "$commit_msg" in
+  feat:*) new_msg="✨ $commit_msg" ;;
+  fix:*) new_msg="🐛 $commit_msg" ;;
+  docs:*) new_msg="📚 $commit_msg" ;;
+  refactor:*) new_msg="♻️ $commit_msg" ;;
+  test:*) new_msg="🧪 $commit_msg" ;;
+  chore:*) new_msg="🛠️ $commit_msg" ;;
+  *) new_msg="$commit_msg" ;;  # 기본적으로 변경하지 않음
+esac
+
+# 수정된 메시지를 커밋 메시지 파일에 덮어쓰기
+echo "$new_msg" > "$commit_msg_file"
+
+exit 0

.github/workflows/dev-cd.yml

@@ -45,10 +45,35 @@ jobs:
           echo "${{ secrets.APPLE_AUTH }}" > ./src/main/resources/AUTHKEY_JUINJAG.p8
         shell: bash
 
+      # APPLE IN_APP 결제 관련 프로세스 시작
+      - name: Create certs and keys directories
+        run: |
+          mkdir -p ./src/main/resources/keys
+
+      - name: Create IAP .p8 Key
+        run: |
+          echo "${{ secrets.APPLE_IAP_KEY }}" > ./src/main/resources/keys/SubscriptionKey_Q5646J7W54.p8
+
+          # 키 파일 크기 확인 (내용은 로그에 출력하지 않음)
+          if [ -s "./src/main/resources/keys/SubscriptionKey_Q5646J7W54.p8" ]; then
+            echo "✅ IAP key file created: $(wc -c < ./src/main/resources/keys/SubscriptionKey_Q5646J7W54.p8) bytes"
+          else
+            echo "❌ IAP key file is empty!"
+            exit 1
+          fi
+
+          # PEM 형식 확인
+          if grep -q "BEGIN PRIVATE KEY" ./src/main/resources/keys/SubscriptionKey_Q5646J7W54.p8; then
+            echo "✅ IAP key file appears to be in PEM format"
+          else
+            echo "⚠️ IAP key file may not be in PEM format"
+          fi
+        shell: bash
+      # APPLE IN_APP 결제 관련 프로세스 끝
+
       - name: Build With Gradle
         run: ./gradlew build -x test
 
-
       - name: Login to Docker Hub
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin

.github/workflows/dev-ci.yml

@@ -32,5 +32,11 @@ jobs:
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      - name: Create application-dev.yml
+        run: |
+          mkdir -p ./src/main/resources
+          echo "${{ secrets.PROPERTIES_DEV }}" > ./src/main/resources/application-dev.yml
+        shell: bash
+
       - name: Build With Gradle
         run: ./gradlew build -x test

.github/workflows/prod-cd.yml

@@ -45,6 +45,17 @@ jobs:
           echo "${{ secrets.APPLE_AUTH }}" > ./src/main/resources/AUTHKEY_JUINJAG.p8
         shell: bash
 
+      # APPLE IN_APP 결제 관련 프로세스 시작
+      - name: Create certs and keys directories
+        run: |
+          mkdir -p ./src/main/resources/keys
+
+      - name: Create IAP .p8 Key
+        run: |
+          echo "${{ secrets.APPLE_IAP_KEY }}" > ./src/main/resources/keys/${{ secrets.APPLE_IAP_KEY_NAME }}
+        shell: bash
+      # APPLE IN_APP 결제 관련 프로세스 끝
+
       - name: Build With Gradle
         run: ./gradlew build -x test
 

.gitignore

@@ -44,6 +44,12 @@ out/
 /application.yml
 
 /src/main/resources/application-local.yml
+/src/main/resources/application.yml
 /src/main/resources/application-dev.yml
 /src/main/resources/application-prod.yml
-/src/main/generated/*
+/src/main/resources/*.json
+/src/main/generated/*
+/src/test/java/resources/application-*.yml
+
+src/main/resources/keys
+#src/main/resources/certs

Dockerfile-dev

@@ -1,8 +1,11 @@
 FROM openjdk:17-jdk
 
 ARG JAR_FILE=./build/libs/juinjang-0.0.1-SNAPSHOT.jar
+ENV GOOGLE_APPLICATION_CREDENTIALS=/app/config/service-account-key.json
 COPY ${JAR_FILE} app.jar
-ENTRYPOINT [ "java", "-jar", "-Dspring.profiles.active=dev", "/app.jar" ]
+
+ENTRYPOINT ["java", "-XX:+HeapDumpOnOutOfMemoryError", "-XX:HeapDumpPath=/var/heapdumps/juinjang", "-Dspring.profiles.active=dev", "-jar", "/app.jar"]
+
 
 
 

build.gradle

@@ -1,94 +1,114 @@
 plugins {
-	id 'java'
-	id 'org.springframework.boot' version '3.2.1'
-	id 'io.spring.dependency-management' version '1.1.4'
+    id 'java'
+    id 'org.springframework.boot' version '3.2.1'
+    id 'io.spring.dependency-management' version '1.1.4'
 }
 
 group = 'umc.5th'
 version = '0.0.1-SNAPSHOT'
 
 java {
-	sourceCompatibility = '17'
+    sourceCompatibility = '17'
 }
 ext {
-	springCloudVersion = "2023.0.0"
+    springCloudVersion = "2023.0.0"
 }
 
 dependencyManagement {
-	imports {
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
-	}
+    imports {
+        mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+    }
 }
 
 configurations {
-	compileOnly {
-		extendsFrom annotationProcessor
-	}
+    compileOnly {
+        extendsFrom annotationProcessor
+    }
 }
 
 repositories {
-	mavenCentral()
+    mavenCentral()
 }
 
 jar {
-	enabled = false
+    enabled = false
 }
 dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'org.springframework.boot:spring-boot-starter-security'
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
-	//
-	implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' // 4.1.0
+    implementation 'org.springframework.retry:spring-retry'
+    implementation 'org.springframework.boot:spring-boot-starter-aop'
+    implementation 'org.springframework.boot:spring-boot-starter-webflux'
+    //
+    implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' // 4.1.0
 //	implementation 'org.springframework.cloud:spring-cloud-commons:4.1.1'
 
     compileOnly 'org.projectlombok:lombok'
-	runtimeOnly 'com.mysql:mysql-connector-j'
+    testCompileOnly 'org.projectlombok:lombok'
+    testAnnotationProcessor 'org.projectlombok:lombok'
+
+    runtimeOnly 'com.mysql:mysql-connector-j'
 //	runtimeOnly 'mysql:mysql-connector-java'
 
-	annotationProcessor 'org.projectlombok:lombok'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    annotationProcessor 'org.projectlombok:lombok'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    // h2
+    runtimeOnly 'com.h2database:h2'
+
+    //security
+    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    testImplementation 'org.springframework.security:spring-security-test'
 
-	// h2
-	runtimeOnly 'com.h2database:h2'
+    //jwt
+    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+    runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
+    implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
 
-	//security
-	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-	implementation 'org.springframework.boot:spring-boot-starter-security'
-	testImplementation 'org.springframework.security:spring-security-test'
+    //S3
+    implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
 
-	//jwt
-	runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
-	runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
-	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+    // querydsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
-	//S3
-	implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
+    implementation 'commons-codec:commons-codec:1.16.0'  // Base64 인코딩을 위한 의존성
 
-	// querydsl
-	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
-	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
-	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
-	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+    // prometheus
+    implementation 'io.micrometer:micrometer-registry-prometheus'
 
-	implementation 'commons-codec:commons-codec:1.16.0'  // Base64 인코딩을 위한 의존성
+    // Redis
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
-	// prometheus
-	implementation 'io.micrometer:micrometer-registry-prometheus'
+    //Safe Search
+    implementation 'com.google.cloud:google-cloud-vision:3.58.0'
+
+    // Apple
+    implementation 'com.apple.itunes.storekit:app-store-server-library:3.4.0'
 }
 
 tasks.named('test') {
-	useJUnitPlatform()
+    useJUnitPlatform()
+    testLogging {
+        events("passed", "skipped", "failed")
+        showStandardStreams = false
+    }
 }
 
+
 def generated = 'src/main/generated'
 tasks.withType(JavaCompile).configureEach {
-	options.getGeneratedSourceOutputDirectory().set(file(generated))
+    options.getGeneratedSourceOutputDirectory().set(file(generated))
 }
 
 clean {
-	delete file(generated)
-}
+    delete file(generated)
+}

src/main/java/umc/th/juinjang/JuinjangApplication.java

@@ -3,16 +3,16 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
+import org.springframework.retry.annotation.EnableRetry;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
-@EnableJpaAuditing
-@EnableAsync
+// @EnableAsync
 @ImportAutoConfiguration({FeignAutoConfiguration.class})
+@EnableScheduling
+@EnableRetry
 public class JuinjangApplication {
 
 	public static void main(String[] args) {

src/main/java/umc/th/juinjang/api/address/service/AddressUpdater.java

@@ -0,0 +1,18 @@
+package umc.th.juinjang.api.address.service;
+
+import org.springframework.stereotype.Component;
+
+import lombok.RequiredArgsConstructor;
+import umc.th.juinjang.domain.limjang.model.Address;
+import umc.th.juinjang.domain.limjang.repository.AddressRepository;
+
+@Component
+@RequiredArgsConstructor
+public class AddressUpdater {
+
+	private final AddressRepository addressRepository;
+
+	public void save(Address address) {
+		addressRepository.save(address);
+	}
+}

src/main/java/umc/th/juinjang/api/appVersion/controller/AppVersionController.java

@@ -0,0 +1,24 @@
+package umc.th.juinjang.api.appVersion.controller;
+
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+import umc.th.juinjang.api.appVersion.controller.response.AppVersionResponse;
+import umc.th.juinjang.api.dto.ApiResponse;
+import umc.th.juinjang.config.AppVersionProperties;
+
+@RestController
+@RequestMapping("/api/app/version")
+@RequiredArgsConstructor
+public class AppVersionController {
+
+	private final AppVersionProperties appVersionProperties;
+
+	@GetMapping("/ios")
+	public ApiResponse<AppVersionResponse> getIOSVersion() {
+		return ApiResponse.onSuccess(AppVersionResponse.of(appVersionProperties.getIos()));
+	}
+
+}

src/main/java/umc/th/juinjang/api/appVersion/controller/response/AppVersionResponse.java

@@ -0,0 +1,9 @@
+package umc.th.juinjang.api.appVersion.controller.response;
+
+public record AppVersionResponse(
+	String version
+) {
+	public static AppVersionResponse of(String version) {
+		return new AppVersionResponse(version);
+	}
+}