Skip to content

Commit 85d4e55

Browse files
authored
Merge pull request #43 from PetLog-project/feat/fcm
fcm 푸시 알림 구현
2 parents d5eb35a + d16d85c commit 85d4e55

30 files changed

Lines changed: 526 additions & 11 deletions

.github/workflows/ci-cd.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ jobs:
3434
- name: Grant execute permission for gradlew
3535
run: chmod +x gradlew\
3636

37+
- name: Setup Firebase service key
38+
run: |
39+
mkdir -p src/main/resources/firebase
40+
echo ${{ secrets.FIREBASE_SERVICE_KEY_BASE64_ENCODE }} | base64 -d > src/main/resources/firebase/petlog-firebase-key.json
41+
3742
- name: Build with gradle
3843
run: ./gradlew bootJar -Pspring.profiles.active=dev --info
3944

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ out/
3838

3939
### docker data ###
4040
/docker/data/mysql/petlog_local
41+
42+
# firebase
43+
src/main/resources/firebase

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ dependencies {
5555
//AWS S3
5656
implementation 'org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE'
5757

58+
// Firebase
59+
implementation 'com.google.firebase:firebase-admin:9.4.3'
60+
5861
// Test
5962
testImplementation 'org.springframework.boot:spring-boot-starter-test'
6063
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'

src/main/java/com/petlog/PetlogApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.scheduling.annotation.EnableScheduling;
56

7+
@EnableScheduling
68
@SpringBootApplication
79
public class PetlogApplication {
810

src/main/java/com/petlog/common/config/SecurityConfig.java renamed to src/main/java/com/petlog/auth/config/SecurityConfig.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.petlog.common.config;
1+
package com.petlog.auth.config;
22

3-
import com.petlog.common.config.jwt.TokenProvider;
4-
import com.petlog.common.config.jwt.filter.TokenAuthenticationFilter;
3+
import com.petlog.auth.jwt.TokenProvider;
4+
import com.petlog.auth.jwt.filter.TokenAuthenticationFilter;
55
import lombok.RequiredArgsConstructor;
66
import org.springframework.context.annotation.Bean;
77
import org.springframework.context.annotation.Configuration;

src/main/java/com/petlog/common/config/jwt/JwtProperties.java renamed to src/main/java/com/petlog/auth/jwt/JwtProperties.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.petlog.common.config.jwt;
1+
package com.petlog.auth.jwt;
22

33
import lombok.Getter;
44
import lombok.Setter;

src/main/java/com/petlog/common/config/jwt/TokenProvider.java renamed to src/main/java/com/petlog/auth/jwt/TokenProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.petlog.common.config.jwt;
1+
package com.petlog.auth.jwt;
22

33
import com.petlog.member.entity.Member;
44
import io.jsonwebtoken.Claims;

src/main/java/com/petlog/common/config/jwt/TokenType.java renamed to src/main/java/com/petlog/auth/jwt/TokenType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.petlog.common.config.jwt;
1+
package com.petlog.auth.jwt;
22

33
public enum TokenType {
44

src/main/java/com/petlog/common/config/jwt/filter/TokenAuthenticationFilter.java renamed to src/main/java/com/petlog/auth/jwt/filter/TokenAuthenticationFilter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.petlog.common.config.jwt.filter;
1+
package com.petlog.auth.jwt.filter;
22

3-
import com.petlog.common.config.jwt.TokenProvider;
3+
import com.petlog.auth.jwt.TokenProvider;
44
import jakarta.servlet.FilterChain;
55
import jakarta.servlet.ServletException;
66
import jakarta.servlet.http.HttpServletRequest;

src/main/java/com/petlog/auth/resolver/AuthenticatedArgumentResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.petlog.auth.resolver;
22

3-
import com.petlog.common.config.jwt.TokenProvider;
3+
import com.petlog.auth.jwt.TokenProvider;
44
import lombok.RequiredArgsConstructor;
55
import org.springframework.core.MethodParameter;
66
import org.springframework.stereotype.Component;

0 commit comments

Comments
 (0)