hotfix : main으로 잘못 병합된거 수정

tukcomCD2024 · Jun 19, 2024 · 5d7a659 · 5d7a659
1 parent b430fb8
commit 5d7a659
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java b/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java
@@ -26,13 +26,8 @@ public String sendNotificationByToken(FCMNotificationRequestDto requestDto) {
         if (member.isPresent()) {
             if (member.get().getFirebaseToken() != null) {
                 Map<String, String> data = new HashMap<>();
-<<<<<<< HEAD
                 data.put("title",requestDto.getTitle());
                 data.put("body",requestDto.getBody());
-=======
-                data.put("title", requestDto.getTitle());
-                data.put("body", requestDto.getBody());
->>>>>>> 2f5eb62125f5c6701b7cf15180a0af3f1751349b
 
                 Message message = Message.builder()
                         .setToken(member.get().getFirebaseToken())

diff --git a/BackEnd/src/main/resources/application.yml b/BackEnd/src/main/resources/application.yml
@@ -11,22 +11,22 @@ springdoc:
 
 
 #SSL
-#server:
-#  ssl:
-#    key-store: file:/home/ubuntu/key/ssl/keystore.p12
-#    key-store-type: PKCS12
-#    key-store-password: 1234
+server:
+  ssl:
+    key-store: file:/home/ubuntu/key/ssl/keystore.p12
+    key-store-type: PKCS12
+    key-store-password: 1234
 
 #MySQL
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: ${MYSQL_DATABASE_URL}
-#    username: ${MYSQL_DATABASE_USERNAME}
-#    password: ${MYSQL_DATABASE_PASSWORD}
-    url: "jdbc:mysql://localhost:3306/JPA?characterEncoding=UTF-8&serverTimezone=UTC"
-    username: "springDB"
-    password:
+    url: ${MYSQL_DATABASE_URL}
+    username: ${MYSQL_DATABASE_USERNAME}
+    password: ${MYSQL_DATABASE_PASSWORD}
+#    url: "jdbc:mysql://localhost:3306/JPA?characterEncoding=UTF-8&serverTimezone=UTC"
+#    username: "springDB"
+#    password:
   jpa:
     show-sql: true
     hibernate: