Merge pull request #641 from JNU-econovation/develop

[Release] Version 1.2.0 배포

Author: hwangdaesun

README.md

@@ -3,31 +3,36 @@
 
 ---
 
-![Image](https://github.com/user-attachments/assets/276b3db0-582b-4b20-a347-8f76e9ac05d3)
+<img src="https://github.com/user-attachments/assets/276b3db0-582b-4b20-a347-8f76e9ac05d3" width="1000">
+
 
 # 서비스 소개
 
----
 
 ## 홈화면 및 켈린더
 
 <p align="center">
-  <img src="https://github.com/user-attachments/assets/875bbf63-9b86-4b0c-a77c-736a0f35a494" width="200" height="360"/>
-  <img src="https://github.com/user-attachments/assets/b2118fef-4fca-4abd-aa2e-89333202a1a1" width="200" height="360"/>
+  <img src="https://github.com/user-attachments/assets/875bbf63-9b86-4b0c-a77c-736a0f35a494" width="300" height="530"/>
+  <img src="https://github.com/user-attachments/assets/b2118fef-4fca-4abd-aa2e-89333202a1a1" width="300" height="530"/>
+</p>
+
+<p align="center">
+  사용자가 섭취한 음식을 기반으로 칼로리와 영양 성분을 계산하고, 칼로리 캘린더를 통해 일일 권장 섭취 칼로리 달성률을 확인할 수 있습니다.
 </p>
 
-- 사용자가 섭취한 음식을 기반으로 칼로리와 영양 성분을 계산
-- 칼로리 캘린더를 통한 일일 권장 섭취 칼로리 달성률을 확인
+
 
 ## 알림 및 증량 조언
 
 <p align="center">
-  <img src="https://github.com/user-attachments/assets/c39edb1c-8544-4a34-9048-19f9cfba93fe" width="200" height="360"/>
-  <img src="https://github.com/user-attachments/assets/b41ce362-2898-4b3e-90d1-25f6df07b89d" width="200" height="360"/>
+  <img src="https://github.com/user-attachments/assets/c39edb1c-8544-4a34-9048-19f9cfba93fe" width="300" height="530"/>
+  <img src="https://github.com/user-attachments/assets/b41ce362-2898-4b3e-90d1-25f6df07b89d" width="300" height="530"/>
+</p>
+
+<p align="center">
+  알림을 통해 사용자가 설정한 시간에 음식을 섭취하도록 유도하여 건강한 체중 증가를 지원하며, 개인 맞춤형 식습관 분석을 통해 적절한 조언을 제공합니다.
 </p>
 
-- 알림을 통해 사용자가 음식을 설정한 시간에 섭취하도록 유도하여 건강한 체중 증가 지원
-- 개인 맞춤형 식습관 분석을 통해 적절한 조언 제공
 
 ## 기술 스택
 
@@ -40,13 +45,13 @@
 
 ## 시스템 아키텍처
 
-<img width="829" alt="Image" src="https://github.com/user-attachments/assets/d013fc64-3b3a-4354-83a9-50a4117ae629" />
+<img width="1000" alt="Image" src="https://github.com/user-attachments/assets/d013fc64-3b3a-4354-83a9-50a4117ae629">
 
 ## ERD
 
 
 
-<img width="1210" alt="Image" src="https://github.com/user-attachments/assets/f6405cc1-135f-4c93-a920-b53f22c6d067" />
+<img width="1000" alt="Image" src="https://github.com/user-attachments/assets/f6405cc1-135f-4c93-a920-b53f22c6d067">
 
 
 ## 개발자

build.gradle

@@ -1,32 +1,16 @@
-// Querydsl 버전 plugins
-buildscript {
-	ext {
-		queryDslVersion = "5.0.0"
-	}
-}
-
 plugins {
 	id 'java'
-	id 'org.springframework.boot' version '2.7.11'
-	id 'io.spring.dependency-management' version '1.1.4'
-	id "org.asciidoctor.jvm.convert" version "3.3.2"
-	id "me.champeau.jmh" version "0.7.2"
-	id 'com.diffplug.spotless' version '6.23.3'
+	id 'org.springframework.boot' version "${springBootVersion}"
+	id 'io.spring.dependency-management' version "${springDependencyManagementVersion}"
+	id 'com.diffplug.spotless' version "${spotlessVersion}"
 	id 'jacoco'
 }
 
-group = 'com.gaebaljip'
-version = '1.0.0'
+group = "${projectGroup}"
+version = "${applicationVersion}"
 
 java {
-	sourceCompatibility = '17'
-}
-
-configurations {
-	asciidoctorExt
-	compileOnly {
-		extendsFrom annotationProcessor
-	}
+	sourceCompatibility = "${javaVersion}"
 }
 
 repositories {
@@ -41,10 +25,11 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
 
 	// database
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	testImplementation 'org.projectlombok:lombok:1.18.26'
+	testImplementation 'org.projectlombok:lombok'
 	runtimeOnly 'org.mariadb.jdbc:mariadb-java-client'
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
@@ -55,54 +40,42 @@ dependencies {
 	//test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
-	testImplementation "org.testcontainers:mariadb:1.19.8"
-	testImplementation "org.testcontainers:testcontainers:1.19.8"
-	testImplementation "org.testcontainers:junit-jupiter:1.19.8"
-	testImplementation "org.testcontainers:localstack:1.19.8"
-	testImplementation "org.jeasy:easy-random-core:5.0.0"
-
+	testImplementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	testImplementation "org.testcontainers:mariadb:${testContainersVersion}"
+	testImplementation "org.testcontainers:testcontainers:${testContainersVersion}"
+	testImplementation "org.testcontainers:junit-jupiter:${testContainersVersion}"
+	testImplementation "org.testcontainers:localstack:${testContainersVersion}"
+	testImplementation "org.jeasy:easy-random-core:${easyRandomVersion}"
 
 
 	// querydsl
 	implementation 'com.querydsl:querydsl-jpa'
 	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jpa"
 
 	// s3
-	implementation 'io.awspring.cloud:spring-cloud-aws-s3:3.0.2'
+	implementation "io.awspring.cloud:spring-cloud-aws-s3:${s3Version}"
 
 
 	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
 	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 
 	// jwt
-	implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
-	runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
-	runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
-
-	asciidoctorExt 'org.springframework.restdocs:spring-restdocs-asciidoctor'
-	testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc'
+	implementation "io.jsonwebtoken:jjwt-api:${jjwtVersion}"
+	runtimeOnly "io.jsonwebtoken:jjwt-impl:${jjwtVersion}"
+	runtimeOnly "io.jsonwebtoken:jjwt-jackson:${jjwtVersion}"
 
 	//email
-	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-	implementation group: 'software.amazon.awssdk', name: 'ses', version: "2.19.29"
-	implementation 'com.sun.mail:javax.mail:1.6.2'
-
-	testImplementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+	implementation "software.amazon.awssdk:ses:${sesVersion}"
+	implementation "com.sun.mail:javax.mail:${javaxMailVersion}"
 
 	//Swagger
-	implementation 'org.springdoc:springdoc-openapi-ui:1.6.11'
-
-	//OpenCsv
-	implementation group: 'com.opencsv', name: 'opencsv', version: '5.7.1'
-
-	// Actuator
-	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+	implementation "org.springdoc:springdoc-openapi-ui:${swaggerVersion}"
 
-	// Prometheus
-	implementation 'io.micrometer:micrometer-registry-prometheus'
+	// OpenCsv
+	implementation "com.opencsv:opencsv:${opencsvVersion}"
 
-	// quartz
-	implementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.3.2'
+	// Quartz
+	implementation "org.quartz-scheduler:quartz:${quartzVersion}"
 }
 
 tasks.named('bootBuildImage') {
@@ -127,57 +100,10 @@ clean.doLast {
 	file(querydslDir).deleteDir()
 }
 
-ext {
-	snippetsDir = file('build/generated-snippets')
-}
-
-test {
-	outputs.dir snippetsDir
-	finalizedBy jacocoTestReport
-}
-
-asciidoctor {
-	inputs.dir snippetsDir
-	configurations 'asciidoctorExt'
-	dependsOn test
-}
-
-bootJar {
-	dependsOn asciidoctor
-	from ("${asciidoctor.outputDir}/html5") {
-		into 'static/docs'
-	}
-}
-
-asciidoctor.doFirst {	//(6) asciidoctor가 실행될 때 docs 하위 파일 삭제
-	delete file('src/main/resources/static/docs')
-}
-
-bootJar {	//(7) bootJar 시 asciidoctor 종속되고 build하위 스니펫츠 파일을 classes 하위로 복사
-	dependsOn asciidoctor
-	copy {
-		from "${asciidoctor.outputDir}"
-		into 'BOOT-INF/classes/static/docs'
-	}
-}
-
-task copyDocument(type: Copy) {		//(8) from의 파일을 into로 복사
-	dependsOn asciidoctor
-	from file("build/docs/asciidoc")
-	into file("src/main/resources/static/docs")
-}
-
-build {        //(9) build 시 copyDocument 실행
-	dependsOn copyDocument
-}
 tasks.named('compileJava') {
 	dependsOn 'spotlessApply'
 }
 
-jar {
-	enabled = false
-}
-
 spotless {
 	java {
 		// Google Java 포맷 적용
@@ -262,4 +188,4 @@ jacocoTestCoverageVerification {
 			]
 		}
 	}
-}
+}

docker-compose-monitoring.yml

@@ -0,0 +1,27 @@
+### Application Version ###
+applicationVersion=1.0.0
+
+### Project Configs ###
+projectGroup=com.gaebaljip
+javaVersion=17
+
+### Spring Dependencies ###
+springBootVersion=2.7.11
+springDependencyManagementVersion=1.1.4
+
+### QueryDSL ###
+queryDSLVersion=5.0.0
+
+### TestContainer ###
+testContainersVersion=1.19.8
+
+## ?? ##
+spotlessVersion=6.23.3
+easyRandomVersion=5.0.0
+quartzVersion=2.3.2
+opencsvVersion=5.7.1
+swaggerVersion=1.6.11
+javaxMailVersion=1.6.2
+sesVersion=2.19.29
+jjwtVersion=0.11.5
+s3Version=3.0.2