Front jingi2

Backend-feedme/feedme/.gitignore

@@ -0,0 +1,39 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+.env
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

Backend-feedme/feedme/Dockerfile

@@ -20,11 +20,8 @@ RUN chmod +x ./gradlew
 # Build the application and skip tests
 RUN ./gradlew clean build -x test
 
-# Copy the built JAR file to the app directory
-# COPY build/libs/feedme-0.0.1-SNAPSHOT.jar /app/MailService.jar
+# Set the entry point to run the JAR file with the specified port
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "-Dserver.port=8085", "/app/build/libs/feedme-0.0.1-SNAPSHOT.jar"]
 
-# Set the entry point to run the JAR file
-ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=prod", "/app/build/libs/feedme-0.0.1-SNAPSHOT.jar"]
-
-# Expose port 8080
-EXPOSE 8080
+# Expose port 8085..
+EXPOSE 8085

Backend-feedme/feedme/build.gradle

@@ -37,18 +37,31 @@ dependencies {
 	// table 보이기
 	implementation("com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.1")
 
-	//스웨거 안됌 ㅠ
-	implementation 'org.springdoc:springdoc-openapi-ui:1.7.0'
-	implementation 'org.springdoc:springdoc-openapi-data-rest:1.7.0'
-	implementation 'org.springdoc:springdoc-openapi-security:1.7.0'
+	// 시큐리티 설정
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.thymeleaf.extras:thymeleaf-extras-springsecurity6'
+	testImplementation 'org.springframework.security:spring-security-test'
 
-	implementation 'io.springfox:springfox-boot-starter:3.0.0'
-	implementation 'io.springfox:springfox-swagger-ui:3.0.0'
-	//스웨거 끝
+	//스웨거
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
 
 	//MongoDB
 	implementation 'org.springframework.boot:spring-boot-starter-data-mongodb'
 
+	//JWT
+	testImplementation 'org.projectlombok:lombok'
+	implementation 'io.jsonwebtoken:jjwt:0.9.1'
+	implementation 'javax.xml.bind:jaxb-api:2.3.1'
+
+	//OAuth 2.0
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+	//redis
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+	// .env 받아오기
+	implementation 'io.github.cdimascio:java-dotenv:5.2.2'
+
 	//JUnit4 추가
 	testImplementation("org.junit.vintage:junit-vintage-engine") {
 		exclude group: "org.hamcrest", module: "hamcrest-core"

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/AlarmCheckRequestDTO.java

@@ -0,0 +1,10 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Getter;
+
+@Getter
+public class AlarmCheckRequestDTO {
+
+  private String checkTime;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/AlarmRequestDTO.java

@@ -0,0 +1,11 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Getter;
+
+@Getter
+public class AlarmRequestDTO {
+
+    private String token;
+    private String message;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/CreatureInfoResponseDTO.java

@@ -0,0 +1,15 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+@Data
+public class CreatureInfoResponseDTO {
+
+    private String name;
+    private String img;
+    private int exp;
+    private int day;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/CreatureMakeRequestDTO.java

@@ -0,0 +1,14 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class CreatureMakeRequestDTO {
+
+    String creatureName;
+
+    String keyword;
+
+//    MultipartFile photo;
+    String photo;
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/CreatureTodoDailyRequestDTO.java

@@ -0,0 +1,13 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class CreatureTodoDailyRequestDTO {
+
+    private LocalDate date;
+    private int next;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/CreatureTodoResponseDTO.java

@@ -0,0 +1,17 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Builder;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Builder
+@Data
+public class CreatureTodoResponseDTO {
+    private int id;
+    private String content;
+    private LocalDate createdAt;
+    private int isCompleted;
+
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/CretureTodoRequestDTO.java

@@ -0,0 +1,11 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class CretureTodoRequestDTO {
+    private LocalDate date;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedCommentDTO.java

@@ -0,0 +1,13 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FeedCommentDTO {
+    private String name;
+    private String comment;
+    private String time;
+    private List<FeedReplyDTO> replies;
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedCommentRequestDTO.java

@@ -0,0 +1,8 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class FeedCommentRequestDTO {
+    private String content;
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedCommentResponseDTO.java

@@ -0,0 +1,12 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class FeedCommentResponseDTO {
+    private String nickname;
+    private String content;
+    private LocalDateTime createdAt;
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedDTO.java

@@ -0,0 +1,17 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class FeedDTO {
+        private int id;
+        private String name;
+        private String img;
+        private String caption;
+        private String time;
+        private int likes;
+        private List<FeedCommentDTO> comments;
+    }
+

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedModifyRequest.java

@@ -0,0 +1,8 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class FeedModifyRequest {
+    private String content;
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedReplyDTO.java

@@ -0,0 +1,10 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class FeedReplyDTO {
+    private String name;
+    private String comment;
+    private String time;
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedRequestDTO.java

@@ -0,0 +1,14 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class FeedRequestDTO {
+
+    private LocalDate diaryDate; //언제
+
+    private String content;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FeedResponseDTO.java

@@ -0,0 +1,19 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+
+@Data
+public class FeedResponseDTO {
+
+    private int id;
+    private String img;
+    private String content;
+    private String author;
+    private String likeCnt;
+
+    private Timestamp createdAt;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FriendReqRequestDTO.java

@@ -0,0 +1,11 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Getter;
+
+@Getter
+public class FriendReqRequestDTO {
+
+  // 상대방 닉네임
+  private String counterpartNickname;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FriendReqResponseDTO.java

@@ -0,0 +1,14 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class FriendReqResponseDTO {
+
+  // 친구 요청 ID
+  private int id;
+
+  // 상대방 닉네임
+  private String counterpartNickname;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/FriendResponseDTO.java

@@ -0,0 +1,11 @@
+package com.todoslave.feedme.DTO;
+
+import lombok.Data;
+
+@Data
+public class FriendResponseDTO {
+
+  private int friendId;
+  private String counterpartNickname;
+
+}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/MemberChatBuildRequestDTO.java

@@ -0,0 +1,12 @@
+//맴버 채팅 주석
+
+//package com.todoslave.feedme.DTO;
+//
+//import lombok.Getter;
+//
+//@Getter
+//public class ChatFriendCreateRequestDTO {
+//
+//  private String CounterpartNickname;
+//
+//}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/MemberChatMessageRequestDTO.java

@@ -0,0 +1,12 @@
+//맴버 채팅 주석
+
+//package com.todoslave.feedme.DTO;
+//
+//import lombok.Getter;
+//
+//@Getter
+//public class ChatMessageRequestDTO {
+//
+//  private String message;
+//
+//}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/MemberChatMessageResponseDTO.java

@@ -0,0 +1,18 @@
+//맴버 채팅 주석
+
+//package com.todoslave.feedme.DTO;
+//
+//import java.time.LocalDate;
+//import java.time.LocalDateTime;
+//import lombok.Data;
+//import lombok.NoArgsConstructor;
+//
+//@Data
+//@NoArgsConstructor
+//public class ChatMessageResponseDTO {
+//
+//  private String sendNickname; // 보내는 사람 닉네임
+//  private String message; // 메세지 내용
+//  private LocalDateTime transmitAt; // 전송 시간
+//
+//}

Backend-feedme/feedme/src/main/java/com/todoslave/feedme/DTO/MemberSearchRequestDTO.java

@@ -0,0 +1,7 @@
+package com.todoslave.feedme.DTO;
+
+public class MemberSearchRequestDTO {
+
+    // STring 이라서 굳이 안쓸듯
+
+}