Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

πŸš€ feat(prod): λ°°ν¬μ„œλ²„ v0.0.1 배포 #82

Merged
merged 110 commits into from
Nov 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
7d2d936
:rocket: feat(user): μœ μ € μ—”ν‹°ν‹° κ΅¬ν˜„ #18
gengminy Sep 24, 2022
f6ec9c8
:rocket: feat(user): νšŒμ›κ°€μž… κ΅¬ν˜„ 및 Enum Validator μΆ”κ°€ #18
gengminy Sep 24, 2022
2adc047
:hammer: fix(user): 둜그인 κΈ°λŠ₯ 였λ₯˜ μˆ˜μ • #18
gengminy Sep 25, 2022
1ad3940
:hammer: fix(user): 둜그인 μ„œλΉ„μŠ€ μˆ˜μ • #18
gengminy Sep 26, 2022
9cbad73
:rocket: feat(user): JWT νšŒμ›κ°€μž… 및 둜그인 μ΅œμ†Œ κΈ°λŠ₯ #18
gengminy Sep 26, 2022
9b3780d
Merge pull request #21 from team-tiki-taka/feat/entity
gengminy Sep 26, 2022
be6284f
:rocket: feat(entity): μ—”ν‹°ν‹° κ΅¬ν˜„ 및 연관관계 μ„€μ • #18
gengminy Sep 29, 2022
229b678
:rocket: feat(user): 멀버 λ””ν…ŒμΌ μ„€μ • 및 쑰회 κ΅¬ν˜„ #18
gengminy Sep 29, 2022
b76d880
πŸš€ [Feature] - μœ μ € 연관관계, 쑰회 및 λ””ν…ŒμΌ μ„€μ • κ΅¬ν˜„
gengminy Sep 29, 2022
6ddbe49
:rocket: feat(user): registerToken μΆ”κ°€ 및 μΆ”μ²œ api 섀계 #20 #23
gengminy Oct 1, 2022
ad110f9
Merge pull request #24 from team-tiki-taka/feat/entity
gengminy Oct 1, 2022
ee390c2
:hammer: fix(jwt): μœ μ € κΆŒν•œ μ„€μ • μΆ”κ°€ #6
gengminy Oct 1, 2022
54be8d1
:rocket: feat(join): κ°€μž… ν”Œλ‘œμš° 초기 ꡬ성 #20
gengminy Oct 1, 2022
78d18fc
πŸš€ [Feature] - κ°€μž… ν”Œλ‘œμš° 초기 ꡬ성 및 κΆŒν•œ μ„€μ • μΆ”κ°€
gengminy Oct 3, 2022
8cf714f
:rocket: feat(user): νšŒμ›κ°€μž… dto μˆ˜μ • 및 url λ³€κ²½ #20
gengminy Oct 3, 2022
31458b2
Merge pull request #26 from team-tiki-taka/feat/entity
gengminy Oct 3, 2022
3c62ba4
:hammer: fix(user): μ˜ˆμ™Έ μ—λŸ¬μ½”λ“œ μΆ”κ°€ #20
gengminy Oct 5, 2022
fd4debe
:hammer: fix(user): μž„μ‹œνšŒμ›μ˜ μΆ”μ²œμ‚¬ μž‘μ„± μˆ˜μ • #28
gengminy Oct 5, 2022
e3f3e62
Merge pull request #29 from team-tiki-taka/feat/entity
gengminy Oct 6, 2022
bfc7a2b
:hammer: fix(prod): HealthCheckController μ„€μ • #5
gengminy Oct 6, 2022
6a45375
Merge pull request #30 from team-tiki-taka/feat/entity
gengminy Oct 6, 2022
0529860
:hammer: fix(user): ν•™λ ₯ ν•„λ“œ Member 둜 이동 및 url μΆ”κ°€ #20
gengminy Oct 6, 2022
1811a29
:hammer: fix(rec): μΆ”μ²œ dto μˆ˜μ • #20
gengminy Oct 6, 2022
8f38dba
:hammer: fix(user): μœ μ € κ°€μž… url μˆ˜μ • #20
gengminy Oct 6, 2022
1f558b2
:hammer: refactor(url): 멀버와 μΆ”μ²œ url κΈ°λŠ₯별 뢄리 #32
gengminy Oct 7, 2022
798bb89
Merge pull request #33 from team-tiki-taka/feat/entity
gengminy Oct 7, 2022
17b54b4
:hammer: fix(test): ν…ŒμŠ€νŠΈ μ½”λ“œ μˆ˜μ • #27
gengminy Oct 7, 2022
1aa2365
Merge pull request #34 from team-tiki-taka/feat/entity
gengminy Oct 7, 2022
5f84084
:rocket: feat(s3): AWS S3 μ—°κ²° 및 κΈ°λŠ₯ μΆ”κ°€ #35
gengminy Oct 8, 2022
01fa2ad
Merge pull request #36 from team-tiki-taka/feat/s3
gengminy Oct 8, 2022
44b8ac1
:hammer: fix(s3): 이미지 컨트둀러 URL μˆ˜μ • #35
gengminy Oct 8, 2022
62cf104
:rocket: feat(pend): 사진 인증 μ—”ν‹°ν‹° 기초 κ΅¬ν˜„ #37
gengminy Oct 9, 2022
9d51f61
:rocket: feat(pend): 사진 인증 μ„œλΉ„μŠ€ κ΅¬ν˜„ 및 μ—°κ²° #37
gengminy Oct 10, 2022
1348bbc
:rocket: feat(pend): μ–΄λ“œλ―Ό μš”μ²­ 승인 및 거절 κ΅¬ν˜„ #37
gengminy Oct 10, 2022
8c3fc1f
Merge pull request #38 from team-tiki-taka/feat/pending
gengminy Oct 10, 2022
2facde4
:rocket: feat(match): 맀칭 κΈ°λ³Έ 클래슀 생성 #19
gengminy Oct 11, 2022
3f2330f
:rocket: feat(match): 맀칭 μ—”ν‹°ν‹° 연관관계 μ„€μ • #19
gengminy Oct 11, 2022
9a0e4b2
:hammer: fix(recommend): μΆ”μ²œ ν•„λ“œ λˆ„λ½ λΆ€λΆ„ μΆ”κ°€ #39
gengminy Oct 13, 2022
c333599
Merge pull request #40 from team-tiki-taka/feat/match
gengminy Oct 17, 2022
36207a2
:rocket: feat(card): 랜덀 μΆ”μ²œ μΉ΄λ“œ μ—”ν‹°ν‹° 생성 및 연관관계 μ„€μ • #41
gengminy Oct 17, 2022
a9ea860
:rocket: feat(card): λ‹€λ₯Έ 성별 μœ μ € 쀑볡없이 κ°€μ Έμ˜€κΈ° κ΅¬ν˜„ #41
gengminy Oct 18, 2022
f306ee0
:rocket: feat(card): μΉ΄λ“œ μƒλŒ€λ°© μœ μ € ν”„λ‘œν•„ κ°€μ Έμ˜€λŠ” 둜직 μΆ”κ°€ #41
gengminy Oct 18, 2022
a07f111
:hammer: fix(card): μΉ΄λ“œ 썸넀일 정보 ν¬ν•¨ν•˜λ„λ‘ μˆ˜μ • #41
gengminy Oct 18, 2022
24bd211
:hammer: fix(card): μΆ”μ²œ μΉ΄λ“œ DTO ν•„λ“œ μˆ˜μ • #41
gengminy Oct 19, 2022
0e8dfda
:rocket: feat(card): μΆ”μ²œ λ¦¬ν”„λ ˆμ‹œ 3회 μ œν•œ μ •μ±… μΆ”κ°€ #41
gengminy Oct 22, 2022
c382563
Merge pull request #42 from team-tiki-taka/feat/match
gengminy Oct 22, 2022
b3c8499
:hammer: fix(test): TestController μˆ˜μ •
gengminy Oct 22, 2022
9815d36
:rocket: feat(card): μΆ”μ²œ μΉ΄λ“œ 랜덀 제곡 κ΅¬ν˜„ #41
gengminy Oct 22, 2022
c63547b
:hammer: fix(sms): κ°œλ°œμ„œλ²„ sms μ •μ±… μž„μ‹œ μˆ˜μ • #43
gengminy Oct 24, 2022
e0be133
Merge branch 'dev' of https://github.com/team-tiki-taka/naechinso-ser…
gengminy Oct 24, 2022
4e3bb6b
:hammer: fix(card): μΉ΄λ“œ λ°˜ν™˜ DTO ν•„λ“œ μˆ˜μ • #41
gengminy Oct 26, 2022
d03d948
:rocket: feat(match): 호감 보내기 및 수락 κ΅¬ν˜„ #41
gengminy Oct 26, 2022
92ac597
Merge pull request #44 from team-tiki-taka/feat/match
gengminy Oct 26, 2022
cb1d397
:rocket: feat(match): 맀칭 μƒλŒ€ ν”„λ‘œν•„ 번호 μ˜€ν”ˆ κ΅¬ν˜„ #45
gengminy Oct 26, 2022
c87734c
:rocket: feat(match): 남은 μΆ”μ²œ 횟수 λ°˜ν™˜ κ΅¬ν˜„ #45
gengminy Oct 26, 2022
94fa25e
Merge pull request #46 from team-tiki-taka/feat/match
gengminy Oct 26, 2022
d9e6707
:hammer: fix(match): 맀칭 곡톡 DTO ν•„λ“œ μˆ˜μ • #45
gengminy Oct 26, 2022
6b3ea26
Merge pull request #47 from team-tiki-taka/feat/match
gengminy Oct 26, 2022
bbd0a1c
:rocket: feat(point): 포인트 μ—”ν‹°ν‹° μ •μ˜ #48
gengminy Oct 26, 2022
d4fe3b6
Merge pull request #49 from team-tiki-taka/feat/point
gengminy Oct 26, 2022
edc8019
:rocket: feat(point): 포인트 μΆ©μ „ 및 μ‚¬μš© κ΅¬ν˜„ #48
gengminy Oct 27, 2022
cd81872
Merge pull request #51 from team-tiki-taka/feat/point
gengminy Oct 27, 2022
b00721e
:rocket: feat(notify): μ•Œλ¦Ό μ—”ν‹°ν‹° κ΅¬ν˜„ #50
gengminy Oct 27, 2022
96549e1
:rocket: feat(notify): ν‘Έμ‹œ μ•Œλ¦Ό ν”„λ‘œν† νƒ€μž… #50
gengminy Oct 30, 2022
885c60c
:rocket: feat(notify): 멀버 ν‘Έμ‹œ μ•Œλ¦Ό 토큰 등둝 κΈ°λŠ₯ μΆ”κ°€ #50
gengminy Oct 30, 2022
8b1bd22
:rocket: feat(notify): μœ μ € ν‘Έμ‹œμ•Œλ¦Ό μˆ˜μ‹  μ—¬λΆ€ λ³€κ²½ μΆ”κ°€ #50
gengminy Oct 30, 2022
883fc52
Merge pull request #52 from team-tiki-taka/feat/notify
gengminy Oct 30, 2022
a690252
:hammer: fix(card): λ‚΄ μΉ΄λ“œ κ°€μ Έμ˜€κΈ° λ°˜ν™˜κ°’ λ³€κ²½ #41
gengminy Oct 30, 2022
0eeb6b5
Merge pull request #54 from team-tiki-taka/feat/del
gengminy Oct 30, 2022
d46159e
:rocket: feat(jwt): μžλ™ λ‘œκ·ΈμΈμ„ μœ„ν•œ λ¦¬ν”„λ ˆμ‹œ 토큰 μž¬λ°œκΈ‰ κ΅¬ν˜„ #6
gengminy Oct 30, 2022
6ea68af
Merge pull request #55 from team-tiki-taka/feat/del
gengminy Oct 30, 2022
0ea8f3e
Update deploy-dev.yml
gengminy Oct 30, 2022
48727fa
:hammer: fix(s3): multipart μ΅œλŒ€ μš©λŸ‰ μ„€μ • #35
gengminy Nov 1, 2022
ef55f46
Merge pull request #56 from team-tiki-taka/feat/del
gengminy Nov 1, 2022
e1abbc7
:hammer: fix(s3): nginx max body μˆ˜μ • #57
gengminy Nov 1, 2022
3309a22
:hammer: fix(s3): tomcat max file size μ„€μ • #57
gengminy Nov 1, 2022
d16d987
Merge pull request #58 from team-tiki-taka/feat/del
gengminy Nov 1, 2022
ea880a3
:hammer: fix(erorr): RequestPartException μΆ”κ°€ #57
gengminy Nov 1, 2022
213871d
:hammer: fix(test): ν…ŒμŠ€νŠΈμš© 컨트둀러 pending μ΄ˆκΈ°ν™” μΆ”κ°€ #27
gengminy Nov 3, 2022
3b7d69b
Merge pull request #59 from team-tiki-taka/feat/del
gengminy Nov 3, 2022
96d0816
:hammer: fix(member): appeals, personalities ν•„λ“œ λ³€κ²½ #39
gengminy Nov 3, 2022
f850754
Merge pull request #60 from team-tiki-taka/feat/del
gengminy Nov 3, 2022
6bc72c1
:hammer: fix(prod): 파일 μ΅œλŒ€ μš©λŸ‰ μ„€μ • λ³€κ²½ #57
gengminy Nov 4, 2022
c04a816
Merge pull request #61 from team-tiki-taka/feat/del
gengminy Nov 4, 2022
5d0b06c
:hammer: fix(card): μΆ”μ²œ μΉ΄λ“œ 응닡에 μƒλŒ€ id μΆ”κ°€ #41
gengminy Nov 5, 2022
23a9eab
Merge pull request #63 from team-tiki-taka/feat/del
gengminy Nov 5, 2022
18ab671
:hammer: fix(member): 토큰 μž¬λ°œκΈ‰ 응닡 κ°’ λ³€κ²½ #65
gengminy Nov 5, 2022
ec08e24
:hammer: fix(member): μ •νšŒμ› κ°€μž… μ‹œ 기본정보 μ—…λ°μ΄νŠΈ #66
gengminy Nov 5, 2022
d801d27
:hammer: fix(member): λ‚˜μ΄ 정보 μ—°λ„λ‘œ μˆ˜μ • #39
gengminy Nov 5, 2022
fc72117
Merge pull request #67 from team-tiki-taka/feat/card
gengminy Nov 5, 2022
61ad4b1
:hammer: fix(recommend): μΆ”μ²œμ‚¬ λ‚˜μ΄ ν•„λ“œ dto λ³€κ²½ #39
gengminy Nov 5, 2022
a5cbcb3
:rocket: feat(match): 맀칭 μŠ€μΌ€μ₯΄λ§ κΈ°λŠ₯ κ΅¬ν˜„ #64
gengminy Nov 5, 2022
e3fd15d
Merge pull request #68 from team-tiki-taka/feat/card
gengminy Nov 5, 2022
8b445a3
:hammer: fix(match): 맀칭 λ§Œλ£Œμ— λŒ€ν•œ λ°˜ν™˜κ°’ 및 였λ₯˜ λ³€κ²½ #64
gengminy Nov 5, 2022
1b6868a
Merge pull request #69 from team-tiki-taka/feat/card
gengminy Nov 5, 2022
699d74d
:hammer: fix(member): 멀버 승인 둜직 μž„μ‹œ λ³€κ²½ #43
gengminy Nov 5, 2022
3d0c67d
Merge pull request #70 from team-tiki-taka/feat/card
gengminy Nov 5, 2022
0cedb42
:hammer: fix(card): μΉ΄λ“œ 썸넀일 정보 λ³€κ²½ #71
gengminy Nov 6, 2022
632eb1c
Merge pull request #72 from team-tiki-taka/feat/card
gengminy Nov 6, 2022
25428e6
:hammer: fix(card): due date ν”„λ‘œνΌν‹° μ‚­μ œ #71
gengminy Nov 6, 2022
fa85ece
:hammer: fix(recommend): μΆ”μ²œμΈ 인증 였λ₯˜ μˆ˜μ • #73
gengminy Nov 6, 2022
081ef8f
Merge pull request #74 from team-tiki-taka/feat/card
gengminy Nov 6, 2022
96e2355
:hammer: fix(match): 맀칭 μƒλŒ€ ν”„λ‘œν•„ κ°€μ Έμ˜€κΈ° 였λ₯˜ μˆ˜μ • #75
gengminy Nov 8, 2022
7c8bb1e
Merge pull request #76 from team-tiki-taka/feat/card
gengminy Nov 8, 2022
689381b
:hammer: fix(match): 번호 μ˜€ν”ˆ μƒλŒ€ ν”„λ‘œν•„ κ°€μ Έμ˜€κΈ° 였λ₯˜ μˆ˜μ • #75
gengminy Nov 8, 2022
cc6f585
Merge pull request #77 from team-tiki-taka/feat/card
gengminy Nov 8, 2022
86e7120
:hammer: fix(recommend): κ°€μž… μ‹œ μΆ”μ²œμ‚¬μ—μ„œ 잘λͺ»λœ μΆ”μ²œμΈ 정보 였λ₯˜ μˆ˜μ • #78
gengminy Nov 9, 2022
2114dbe
Merge pull request #79 from team-tiki-taka/feat/card
gengminy Nov 9, 2022
f273908
:hammer: fix(recommend): 응닡 DTO에 μΆ”μ²œμΈμ˜ 이름 μΆ”κ°€ #80
gengminy Nov 9, 2022
291fab4
Merge pull request #81 from team-tiki-taka/feat/card
gengminy Nov 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: beanstalk-springboot-deploy
name: dev-beanstalk-springboot-deploy

on:
push:
Expand All @@ -25,8 +25,11 @@ jobs:
run: |
touch ./src/main/resources/application-dev.yml
echo "$ENV_PROPERTIES_DEV" > ./src/main/resources/application-dev.yml
touch ./src/main/resources/naechinso-fcm.json
echo "$FCM_JSON" > ./src/main/resources/naechinso-fcm.json
env:
ENV_PROPERTIES_DEV: ${{ secrets.ENV_PROPERTIES_DEV }}
FCM_JSON: ${{ secrets.FCM_JSON }}

#Grant gradlew Permission
- name: Grant execute permission for gradlew
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: beanstalk-springboot-deploy
name: prod-beanstalk-springboot-deploy

on:
push:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ out/
!**/src/main/resources/application-**.yml
src/main/resources/application-dev.yml
src/main/resources/application-local.yml
src/main/resources/application-prod.yml
src/main/resources/application-prod.yml
/src/main/resources/**.json
2 changes: 2 additions & 0 deletions .platform/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ http {
include /etc/nginx/mime.types;
default_type application/octet-stream;

client_max_body_size 10M;

log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';
Expand Down
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ dependencies {
runtimeOnly 'org.postgresql:postgresql'
implementation 'org.springframework.boot:spring-boot-starter-data-redis'

//AWS S3
implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.2'

//Firebase FCM
implementation group: 'com.google.firebase', name: 'firebase-admin', version: '6.8.1'

//jwt
implementation group: 'io.jsonwebtoken', name: 'jjwt', version: '0.9.1'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableScheduling;

@SpringBootApplication
@EnableScheduling //scheduler μ‚¬μš©
@EnableJpaAuditing //jpa entity μžλ™ κ°μ‹œ
@SpringBootApplication
public class NaechinsoApplication {
public static void main(String[] args) {
SpringApplication.run(NaechinsoApplication.class, args);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
package com.tikitaka.naechinso.domain;

import com.tikitaka.naechinso.domain.sms.dto.SmsVerificationCodeRequestDTO;
import com.tikitaka.naechinso.global.config.CommonApiResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;

@Slf4j
@RestController
@RequiredArgsConstructor
public class MainController {
@GetMapping("/")
public CommonApiResponse<Boolean> rootEndPoint() {
public class HealthCheckController {
@GetMapping
public CommonApiResponse<Boolean> healthCheck() {
return CommonApiResponse.of(true);
}
}
Loading