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.

Sign up for GitHub

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

Jump to bottom

Dev #40

Open
wants to merge 121 commits into
base: main
Choose a base branch
from
Open

Dev #40

wants to merge 121 commits into from

Conversation

MinchoGreenT
Copy link
Contributor

πŸ₯• Issue number and Link

이슈 번호 : #번호

🍠 Summary

ν•œ 쀄 μš”μ•½

πŸ₯” Commits

  • 1
  • 2

🌽 PR Type

  • Feature
  • Bugfix
  • Code Style Update
  • Refactoring
  • Documentation content change
  • Other

πŸ«› Other Information

MinchoGreenT and others added 30 commits October 20, 2023 16:13
@MinchoGreenT
Update actions.yml
d84017c
@MinchoGreenT
[feat] ꡬ글 μ†Œμ…œ 둜그인
ae467b5
@Ryeolee
Merge branch 'dev' into feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-λ‘œκ·Έμ•„μ›ƒ)
317c79a
@Ryeolee
Merge pull request #4 from Mojacknong/feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-λ‘œβ€¦
fa308a6 
…그아웃)

[feat] κ²Œμ΄νŠΈμ›¨μ΄ κΈ°μ€€ λ‘œκ·Έμ•„μ›ƒ, 토큰 μž¬λ°œκΈ‰ κ΅¬ν˜„
@MinchoGreenT
Merge branch 'google-login'
4da5562 
# Conflicts:
#	.github/workflows/actions.yml
#	src/main/java/modernfarmer/server/farmususer/user/controller/AuthController.java
#	src/main/java/modernfarmer/server/farmususer/user/service/AuthService.java
@MinchoGreenT
Merge branch 'dev' into feature_2/google-login
9fbf6be
@MinchoGreenT
Merge pull request #5 from Mojacknong/feature_2/google-login
0ebc1a7 
Feature 2/google login
@MinchoGreenT
Merge remote-tracking branch 'origin/feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-λ‘œκ·Έβ€¦
747f3c2 
…아웃)'

# Conflicts:
#	.github/workflows/actions.yml
@MinchoGreenT
[fix] μž¬λ°œκΈ‰, λ‘œκ·Έμ•„μ›ƒ 컨트둀러 λ³€κ²½
9f30539
@MinchoGreenT
Merge branch 'dev' into feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-λ‘œκ·Έμ•„μ›ƒ)
275a2b3
@MinchoGreenT
Merge pull request #6 from Mojacknong/feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-λ‘œβ€¦
0120979 
…그아웃)

Feature 1/μœ μ € auth κ΅¬ν˜„( 토큰 μž¬λ°œκΈ‰, λ‘œκ·Έμ•„μ›ƒ)
@MinchoGreenT
[fix] μž¬λ°œκΈ‰ λ©”μ„œλ“œ userId ν˜•λ³€ν™˜ μˆ˜μ •
c48078a
@MinchoGreenT
Merge remote-tracking branch 'origin/feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-λ‘œκ·Έβ€¦
63e6e99 
…아웃)'
@MinchoGreenT
[fix]
b5e5a0b 
λ¦¬ν”„λ ˆμ‰¬ 토큰에 μ„œλΈŒμ νŠΈ 정보 μ‚½μž…
λ¦¬ν”„λ ˆμ‰¬ 토큰 생성 λ©”μ„œλ“œλͺ… μ˜€νƒ€ μˆ˜μ •
(createRereshToken -> createRefreshToken)
@MinchoGreenT
[fix] λ¦¬ν”„λ ˆμ‰¬ 토큰 μ €μž₯ μ‹œ bearer 제거
a615cef
@MinchoGreenT
[fix] UserRepository의 findUserRole λ©”μ„œλ“œ λ°˜ν™˜κ°’ User -> String λ³€κ²½
559e9c5
@MinchoGreenT
[fix] 둜그인, λ‘œκ·Έμ•„μ›ƒ μ‹œ Bearer 뢙이지 μ•Šκ³  토큰 λ°˜ν™˜
69e0948
@MinchoGreenT
Merge pull request #10 from Mojacknong/feature_1/μœ μ €-auth-κ΅¬ν˜„(-토큰-μž¬λ°œκΈ‰,-…
7a8197f 
β€¦λ‘œκ·Έμ•„μ›ƒ)

Feature 1/μœ μ € auth κ΅¬ν˜„( 토큰 μž¬λ°œκΈ‰, λ‘œκ·Έμ•„μ›ƒ)
@Ryeolee
[feat] μ—λŸ¬μ²˜λ¦¬ μΆ”κ°€
5744641
@Ryeolee
[feat] μž¬λ°œκΈ‰ μ—λŸ¬μ²˜λ¦¬ 적용 확인 ν…ŒμŠ€νŠΈ
d9506d3
@Ryeolee
[fix] μΈμŠ€ν„΄μŠ€ 도컀 κΆŒν•œ 적용
72233dd
@Ryeolee
[fix] jwt secret λ³€κ²½
b976adf
@Ryeolee
[fix] 포트번호 λ³€κ²½
9997370
@Ryeolee
[fix] 포트번호 λ³€κ²½
5c88fb2
@Ryeolee
[fix] 포트번호 λ³€κ²½
9b2181b
@Ryeolee
[fix] 포트번호 λ³€κ²½ 8081
99cd678
@Ryeolee
[fix] unauthorizedException μ—λŸ¬ μ‚­μ œ
885b27b
@Ryeolee
[fix] 토큰 μž¬λ°œκΈ‰ μ‹œ λ¦¬ν”„λ ˆμ‹œ 토큰 빈 κ°’ 처리
217f533
@Ryeolee
[fix] 토큰 μž¬λ°œκΈ‰ μ‹œ λ¦¬ν”„λ ˆμ‹œ 토큰 빈 κ°’ 처리
b1503a5
@Ryeolee
[fix] 토큰 μž¬λ°œκΈ‰ μ‹œ λ¦¬ν”„λ ˆμ‹œ 토큰 빈 κ°’ 처리
8dcb729
Ryeolee and others added 30 commits November 15, 2023 19:20
@Ryeolee
[feat] νŒŒμ΄μ–΄λ² μ΄μŠ€ 토큰 μ‚­μ œ API μ™„λ£Œ
41e5a15
@Ryeolee
[feat] νŒŒμ΄μ–΄λ² μ΄μŠ€ λ©”μ‹œμ§€ 보내기
e2b0644
@Ryeolee
Merge pull request #28 from Mojacknong/feature_27/νŒŒμ΄μ–΄λ² μ΄μŠ€-관리
e0e8449 
Feature 27/νŒŒμ΄μ–΄λ² μ΄μŠ€ 관리
@Ryeolee
[fix] 전체적인 μ½”λ“œ λ¦¬νŒ©ν† λ§ (κ²½κ³  μ—†μ• κΈ°)
9d7022d
@Ryeolee
[fix] 배포 ν™˜κ²½μ— push
72004f0
@Ryeolee
[fix] config redis μˆ˜μ •
5245dd8
@Ryeolee
[fix] 유레카 적용
87c5d15
@Ryeolee
Merge pull request #30 from Mojacknong/feature_29/μ½”λ“œ-정리
59ab095 
Feature 29/μ½”λ“œ 정리
@Ryeolee
Merge pull request #31 from Mojacknong/feature_27/νŒŒμ΄μ–΄λ² μ΄μŠ€-관리
c67af56 
[fix] 유레카 적용
@Ryeolee
[feat] farm, community μ˜€ν”ˆ 페인 적용
103f4eb
@Ryeolee
[feat] farm, community μ˜€ν”ˆ 페인 적용
6129d9a
@Ryeolee
[fix] 유레카 ν•΄μ œ
6ee84f3
@Ryeolee
[fix] 유레카 적용
3060bed
@Ryeolee
[fix] 팜 μ‚­μ œ μ£Όμ„μ²˜λ¦¬
608f44f
@Ryeolee
[fix] entity cascade μˆ˜μ •
f5c01d2
@MinchoGreenT
[feat] 페인용 μœ μ € λ‚œμ΄λ„ 쑰회 api μž‘μ„±
8e4eb8f
@MinchoGreenT
Merge pull request #34 from Mojacknong/feature_33/μœ μ €-λ‚œμ΄λ„-쑰회-api
02b16fc 
[feat] 페인용 μœ μ € λ‚œμ΄λ„ 쑰회 api μž‘μ„±
@MinchoGreenT
[feat] 페인용 μœ μ € λ‚œμ΄λ„ 및 별λͺ… 쑰회 api
2629ab7
@MinchoGreenT
Merge pull request #35 from Mojacknong/feature_33/μœ μ €-λ‚œμ΄λ„-쑰회-api
d67d072 
[feat] 페인용 μœ μ € λ‚œμ΄λ„ 및 별λͺ… 쑰회 api
@MinchoGreenT
[fix] μœ μ € μ•‘μ„ΈμŠ€ 토큰 κΈ°ν•œ μˆ˜μ •
32d26b1
@MinchoGreenT
Merge pull request #37 from Mojacknong/feature_36/μ•‘μ„ΈμŠ€-토큰-κΈ°ν•œ-μˆ˜μ •
c010e44 
[fix] μœ μ € μ•‘μ„ΈμŠ€ 토큰 κΈ°ν•œ μˆ˜μ •
@MinchoGreenT
[feat] 페인용 μœ μ € λ‚œμ΄λ„ 쑰회 api μž‘μ„±
7641dd7
@MinchoGreenT
[feat] 페인용 μœ μ € λ‚œμ΄λ„ 및 별λͺ… 쑰회 api
5e91ee8
@MinchoGreenT
[fix] μœ μ € μ•‘μ„ΈμŠ€ 토큰 κΈ°ν•œ μˆ˜μ •
3ef3694
@MinchoGreenT
[fix] μœ μ € μ‚­μ œ μ‹œ κ²Œμ‹œκΈ€κ³Ό μ±„μ†Œ μ „λΆ€ μ‚­μ œ
9cfea35
@Ryeolee
Merge pull request #39 from Mojacknong/feature_32/계정-μ‚­μ œ-api
9945f0e 
Feature 32/계정 μ‚­μ œ api
@MinchoGreenT
[feat] 동기뢀여 메세지 api
e97844d
@MinchoGreenT
Update actions.yml
37c4546
@MinchoGreenT
[feat] 동기뢀여 메세지 api
4d906ea
@MinchoGreenT
Merge remote-tracking branch 'origin/dev' into dev
80dd2e6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@MinchoGreenT @Ryeolee