Skip to content

Commit 720091c

Browse files
nonaninonaKjiw0n
andauthored
[fix] git commit history 깔끔하게 수정 - project setting branch re-merge (#4)
* Docs: add README.md * Feat: 프로파일 설정 추가 * Feat: 테스트 용 User Controller 추가 --------- Co-authored-by: Kjiw0n <[email protected]>
1 parent 9741b3a commit 720091c

9 files changed

+57
-2
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# ChatDiary Backend API Server

build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ dependencies {
2626
compileOnly 'org.projectlombok:lombok'
2727
annotationProcessor 'org.projectlombok:lombok'
2828
testImplementation 'org.springframework.boot:spring-boot-starter-test'
29+
runtimeOnly('mysql:mysql-connector-java:8.0.30')
30+
runtimeOnly('com.h2database:h2')
2931
}
3032

3133
tasks.named('test') {

readme.md

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.kuit.chatdiary.controller;
2+
3+
import org.springframework.web.bind.annotation.GetMapping;
4+
import org.springframework.web.bind.annotation.RestController;
5+
6+
@RestController
7+
public class UserController {
8+
9+
@GetMapping("/user")
10+
public String user() {
11+
return "user";
12+
}
13+
}
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
spring:
2+
datasource:
3+
driver-class-name: com.mysql.cj.jdbc.Driver
4+
url: jdbc:mysql://localhost:3306/chatdiary?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul
5+
username: {DEV_DB_USER}
6+
password: {DEV_DB_PASSWORD}
7+
jpa:
8+
hibernate:
9+
ddl-auto: none
10+
11+
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
spring:
2+
datasource:
3+
driver-class-name: org.h2.Driver
4+
url: jdbc:h2:mem:test
5+
username: root
6+
password:
+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
spring:
2+
datasource:
3+
driver-class-name: com.mysql.cj.jdbc.Driver
4+
url: jdbc:mysql://localhost:3306/chatdiary?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul
5+
username: {PROD_DB_USER}
6+
password: {PROD_DB_PASSWORD}
7+
jpa:
8+
hibernate:
9+
ddl-auto: none

src/main/resources/application.properties

-1
This file was deleted.

src/main/resources/application.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
spring:
2+
profiles:
3+
active: prod
4+
5+
---
6+
7+
spring:
8+
profiles:
9+
active: dev
10+
11+
---
12+
13+
spring:
14+
profiles:
15+
active: local

0 commit comments

Comments
 (0)