Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
bf010f1
Refactor: 토큰, 회원탈퇴 로직, Auth 관련 DTO 리팩토링
SonHyeok Mar 10, 2025
67bf72c
Refactor: 애플 회원탈퇴 로직 변경 및 토큰 관리 API 수정
SonHyeok Mar 11, 2025
dab10f3
Merge branch 'develop' of https://github.com/Daily-Drawer/server into…
SonHyeok Mar 11, 2025
4cc260a
Refactor: 토큰 갱신 파라미터 수정
SonHyeok Mar 11, 2025
ddb1424
Fix: jwt 토큰 에러처리 수정
SonHyeok Mar 11, 2025
fd5a110
conflict solve
SonHyeok Mar 11, 2025
1f89a16
Fix: security admin 권한 추가
SonHyeok Mar 16, 2025
520d58f
Fix: security admin 권한 추가
SonHyeok Mar 16, 2025
434199b
Fix: 비밀번호 수정 DTO 변경
SonHyeok Mar 16, 2025
6f15ec8
Fix: 비밀번호 수정 로직 변경
SonHyeok Mar 16, 2025
048e58f
Fix: Security config 수정
SonHyeok Mar 18, 2025
f86bdfd
Merge branch 'develop' of https://github.com/Daily-Drawer/server into…
SonHyeok Mar 19, 2025
01baf67
Refactor: 사용자 전화번호 암호화
SonHyeok Mar 19, 2025
702fa19
Fix: User 엔티티 PhoneHash 속성 옵션 변경
SonHyeok Mar 20, 2025
93e413a
Fix: 전화번호 반환값 복호화 진행 후 반환되도록 수정
SonHyeok Mar 20, 2025
f223ae2
Fix: user entity 수정
SonHyeok Mar 21, 2025
e10bb87
Fix: user entity 수정
SonHyeok Mar 21, 2025
d6d4b93
Fix: application.yml 옵션 변경
SonHyeok Mar 21, 2025
f34d46b
Fix: 전화번호 복호화 오류 수정
SonHyeok Mar 24, 2025
6d1d97e
Merge branch 'develop' of https://github.com/Daily-Drawer/server into…
SonHyeok Mar 24, 2025
cf85c19
Fix: 토큰 갱신 API 수정
SonHyeok Mar 25, 2025
f6fa007
Refactor: 로컬 Auth API 테스트 코드 작성
SonHyeok Mar 26, 2025
0ea9586
Merge branch 'develop' of https://github.com/Daily-Drawer/server into…
SonHyeok Mar 26, 2025
24f2fff
Refactor: 로컬 로그인, 회원가입 테스트 코드 작성
SonHyeok Mar 29, 2025
fd66ac0
Fix: S3Service 코드 수정
SonHyeok Mar 29, 2025
a13d3ec
Fix: test.yml 파일 수정
SonHyeok Mar 29, 2025
6ccc0c8
Fix: test.yml 파일 수정
SonHyeok Mar 29, 2025
25c26df
Fix: 로그인 테스트 코드 수정
SonHyeok Mar 29, 2025
3113969
Fix: workflow 파일 수정
SonHyeok Mar 29, 2025
76650d2
Fix: test.yml 파일 수정
SonHyeok Mar 29, 2025
b3136af
Merge branch 'develop' into refactor/auth
SonHyeok Mar 29, 2025
b1223dd
Fix: test.yml 파일 수정
SonHyeok Mar 29, 2025
ffe3f26
Fix: test.yml 파일 수정
SonHyeok Mar 29, 2025
3ffed32
Fix: test.yml 파일 수정
SonHyeok Mar 29, 2025
739e9ee
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
7a5d086
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
ba04011
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
ff50506
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
5986891
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
34e0d6e
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
c387f0c
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
6aee4cf
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
d35680e
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
90ffc1c
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
6597b70
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
f484618
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
b76544e
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
e3decec
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
f348c99
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
387a2ed
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
4ce8dd2
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
6ae8a28
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
c91bdf2
Fix: gradle.yml 수정
SonHyeok Mar 29, 2025
789ba4d
Fix: gradle.yml 수정
SonHyeok Mar 30, 2025
30a9b1e
Fix: gradle.yml 디버깅 코드 추가
SonHyeok Mar 30, 2025
3110963
Fix: gradle.yml 디버깅 코드 추가
SonHyeok Mar 30, 2025
b9d6f95
Fix: gradle.yml 디버깅 코드 추가
SonHyeok Mar 30, 2025
b9d8b98
Fix: gradle.yml 디버깅 코드 추가
SonHyeok Mar 30, 2025
576db16
Fix: gradle.yml 디버깅 코드 추가
SonHyeok Mar 30, 2025
d9d83a8
Fix: gradle.yml 디버깅 코드 삭제
SonHyeok Mar 30, 2025
e66cc0b
Fix: Update gradle.yml
SonHyeok Mar 30, 2025
81c591f
Fix: application-test.yml 수정
SonHyeok Mar 30, 2025
13663c1
Merge branch 'refactor/auth' of https://github.com/Daily-Drawer/serve…
SonHyeok Mar 30, 2025
a37ba97
Fix: application-test.yml 수정
SonHyeok Mar 30, 2025
8ee810d
Fix: application-test.yml 수정
SonHyeok Mar 30, 2025
525e245
Fix: gradle.yml MySQL 설정 변경
SonHyeok Mar 30, 2025
e17a8bb
Fix: gradle.yml MySQL 설정 변경
SonHyeok Mar 30, 2025
e3efe1f
Fix: gradle.yml MySQL 설정 변경
SonHyeok Mar 30, 2025
ef8b4e1
Fix: gradle.yml 디버깅 옵션 변경
SonHyeok Mar 30, 2025
92f7dfb
Fix: gradle.yml 디버깅 옵션 변경
SonHyeok Mar 30, 2025
ffdcdd1
Fix: gradle.yml 디버깅 옵션 변경
SonHyeok Mar 30, 2025
8eb95d4
Fix: gradle.yml 환경변수 추가
SonHyeok Mar 30, 2025
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
59 changes: 47 additions & 12 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,47 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: read

env:
DB_URL: ${{secrets.DB_URL}}
DB_DRIVER: ${{secrets.DB_DRIVER}}
DB_USER: ${{secrets.DB_USER}}
DB_PASSWORD: ${{secrets.DB_ROOT_PASSWORD}}
REDIS_HOST: ${{secrets.REDIS_HOST}}
REDIS_PORT: 6379
APPLE_CLIENT_ID: ${{secrets.APPLE_CLIENT_ID}}
APPLE_KEY_ID: ${{secrets.APPLE_KEY_ID}}
APPLE_PRIVATE_KEY_URL: ${{secrets.APPLE_PRIVATE_KEY_URL}}
APPLE_PUBLIC_KEY_URL: ${{secrets.APPLE_PUBLIC_KEY_URL}}
APPLE_TEAM_ID: ${{secrets.APPLE_TEAM_ID}}
EC2_HOST: ${{secrets.EC2_HOST}}
EC2_SSH_KEY: ${{secrets.EC2_SSH_KEY}}
EC2_USER: ${{secrets.EC2_USER}}
ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
JWT_ACCESS_EXPIRATION: ${{secrets.JWT_ACCESS_EXPIRATION}}
JWT_REFRESH_EXPIRATION: ${{secrets.JWT_REFRESH_EXPIRATION}}
JWT_SECRET: ${{secrets.JWT_SECRET}}
KAKAO_REDIRECT_URL: ${{secrets.KAKAO_REDIRECT_URL}}
KAKAO_REST_API_KEY: ${{secrets.KAKAO_REST_API_KEY}}
KAKAO_STORE_API_URL: ${{secrets.KAKAO_STORE_API_URL}}
S3_ACCESS_KEY: ${{secrets.S3_ACCESS_KEY}}
S3_BUCKET: ${{secrets.S3_BUCKET}}
S3_CLOUD_FRONT_URL: ${{secrets.S3_CLOUD_FRONT_URL}}
S3_REGION: ${{secrets.S3_REGION}}
S3_SECRET_KEY: ${{secrets.S3_SECRET_KEY}}
SMTP_ADDRESS: ${{secrets.SMTP_ADDRESS}}
SMTP_PASSWORD: ${{secrets.SMTP_PASSWORD}}
TEST_DB_URL: ${{secrets.TEST_DB_URL}}
services:
mysql:
image: mysql:8.0
env:
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
MYSQL_DATABASE: test

redis:
image: redis:7.2
ports:
- 3306:3306
- 6379:6379
options: >-
--health-cmd="mysqladmin ping --silent"
--health-interval=10s
--health-timeout=5s
--health-retries=3
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5

steps:
- uses: actions/checkout@v4
Expand All @@ -44,14 +71,22 @@ jobs:

# Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
# See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
- name: setup MySQL
uses: mirromutth/[email protected]
with:
host port: 3306
container port: 3306
mysql database: 'test'
mysql root password: ${{secrets.DB_ROOT_PASSWORD}}

- name: Setup Gradle
uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle Wrapper
run: ./gradlew build
run: ./gradlew build -Dspring.profiles.active=test -i

# artifact(jar 파일) 업로드
- name: Upload JAR artifact
Expand Down
9 changes: 4 additions & 5 deletions src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@ spring:
resources:
add-mappings: false
datasource:
url: ${TEST_DB_URL}
driver-class-name: com.mysql.cj.jdbc.Driver
username: root
password:

url: ${TEST_DB_URL:jdbc:mysql://localhost:3306/test}
driver-class-name: ${DB_DRIVER:com.mysql.cj.jdbc.Driver}
username: ${DB_USER:root}
password: ${DB_PASSWORD:0000}
jpa:
show-sql: true
hibernate:
Expand Down
Loading