Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
56d83bc
feat: User도메인 마이페이지 조회 및 내 정보 수정 기능구현
munhyerin22 Apr 14, 2026
0dc1594
chore: AI 코드리뷰 내용 반영하여 수정
munhyerin22 Apr 14, 2026
9b4a626
fix: 병합 해결
munhyerin22 Apr 15, 2026
7c25410
Merge branch 'develop' into feat/User-domain#22
munhyerin22 Apr 16, 2026
580d3c2
Merge branch 'develop' into feat/User-updatePassword#37
munhyerin22 Apr 16, 2026
3856eb4
feat: 비밀번호 수정 로직 분리
munhyerin22 Apr 16, 2026
51a2134
chore: 사소한 변경
munhyerin22 Apr 16, 2026
b01b559
Merge branch 'feat/User-updatePassword#37' into develop
munhyerin22 Apr 16, 2026
555edc9
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 17, 2026
46df0b0
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 17, 2026
4d88449
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 17, 2026
ffb1caf
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 17, 2026
d4f5344
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 17, 2026
56b1a81
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 20, 2026
36f1114
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 21, 2026
8df6234
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 21, 2026
ca2ab8f
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 21, 2026
8299649
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 21, 2026
62eadd0
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 21, 2026
569e65b
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 21, 2026
98a258b
Merge remote-tracking branch 'origin/develop' into develop
munhyerin22 Apr 21, 2026
84ec807
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 23, 2026
a6792ee
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 23, 2026
c1d9028
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 24, 2026
1873774
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 26, 2026
ffab747
Merge branch 'develop' of https://github.com/Allday-Project/Allday-Pr…
munhyerin22 Apr 27, 2026
ccd4b6f
chore: 단순 수정
munhyerin22 Apr 27, 2026
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
7 changes: 0 additions & 7 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,3 @@ DB_USERNAME=<your_username>
DB_PASSWORD=<your_password>

JWT_SECRET_KEY=<SECRET_KEY>

# =============================
# PortOne
# =============================
PORTONE_API_SECRET=V2_API_Secret
PORTONE_STORE_ID=store-ID
PORTONE_CHANNEL_KEY=channel-key-
3 changes: 0 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-security'
testImplementation 'org.springframework.security:spring-security-test'

// OAuth2
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'

implementation 'io.github.openfeign.querydsl:querydsl-jpa:6.10.1'
annotationProcessor 'io.github.openfeign.querydsl:querydsl-apt:6.10.1:jakarta'
annotationProcessor 'jakarta.annotation:jakarta.annotation-api'
Expand Down
29 changes: 0 additions & 29 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,16 @@ spring:
active: ${SPRING_PROFILES_ACTIVE:local} # .env 또는 환경변수로 override 가능, 기본값 local
jpa:
open-in-view: false
security:
oauth2:
client:
registration:
google:
client-id: ${GOOGLE_CLIENT_ID}
client-secret: ${GOOGLE_CLIENT_SECRET}
scope: email, profile
kakao:
client-id: ${KAKAO_CLIENT_ID}
client-secret: ${KAKAO_CLIENT_SECRET}
client-authentication-method: client_secret_post
authorization-grant-type: authorization_code
redirect-uri: "{baseUrl}/login/oauth2/code/kakao"
scope: profile_nickname, account_email
provider:
kakao:
authorization-uri: https://kauth.kakao.com/oauth/authorize
token-uri: https://kauth.kakao.com/oauth/token
user-info-uri: https://kapi.kakao.com/v2/user/me
user-name-attribute: id
data:
redis:
host: ${REDIS_HOST:localhost}
port: ${REDIS_PORT:6379}

portone:
api-secret: ${PORTONE_API_SECRET}
store-id: ${PORTONE_STORE_ID}
channel-key: ${PORTONE_CHANNEL_KEY}

jwt:
secret-key: ${JWT_SECRET_KEY}
access-token-validity-time: 1800000 # 30분 (ms)
refresh-token-validity-time: 604800000 # 7일 (ms)

oauth2:
redirect-uri: http://localhost:3000/oauth2/callback

management:
endpoints:
web:
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/templates/checkout.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ <h2 class="checkout-block-title">주문 상품</h2>
<div class="checkout-info-content" id="orderer-info">
<!-- 미등록 상태 -->
<div class="checkout-info-empty" id="orderer-empty">
<p class="checkout-info-name" id="orderer-name" th:text="${orderer?.name ?: '박경화'}">박경화</p>
<p class="checkout-info-name" id="orderer-name" th:text="${orderer?.name ?: '르탄이'}">르탄이</p>
<p class="checkout-info-hint" id="orderer-hint">주문자를 등록해주세요.</p>
<button class="checkout-register-btn" id="btn-register-orderer">등록</button>
</div>
<!-- 등록 완료 상태 (숨김) -->
<div class="checkout-info-filled" id="orderer-filled" style="display:none;">
<p class="checkout-info-name" id="orderer-filled-name">박경화</p>
<p class="checkout-info-name" id="orderer-filled-name">르탄이</p>
<p class="checkout-info-detail" id="orderer-filled-email">example@gmail.com</p>
<p class="checkout-info-detail" id="orderer-filled-phone">01012345678</p>
<button class="checkout-change-btn" id="btn-change-orderer">변경</button>
Expand Down
Loading