master to feature/mypage merge

build.gradle

@@ -45,12 +45,11 @@ dependencies {
 	//이메일 보내기
 	implementation 'org.springframework.boot:spring-boot-starter-mail'
 
-
-//문자인증
-	implementation group: 'net.nurigo', name: 'javaSDK', version: '2.2'
-
-	//이메일 보내기
-	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	//채팅
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+	implementation 'org.springframework.boot:spring-boot-starter-websocket'
+	implementation group: 'org.webjars', name: 'stomp-websocket', version: '2.3.3-1'
+	implementation 'it.ozimov:embedded-redis:0.7.2'
 
 }
 

src/main/java/com/example/nanuer_server/NanuerServerApplication.java

@@ -12,7 +12,6 @@
 @SpringBootApplication
 public class NanuerServerApplication {
 
-
 	public static void main(String[] args) {
 		SpringApplication.run(NanuerServerApplication.class, args);
 		System.out.println("hello");

src/main/java/com/example/nanuer_server/config/BaseResponseStatus.java

@@ -24,18 +24,22 @@ public enum BaseResponseStatus {
 
     // users
     USERS_EMPTY_USER_EMAIL(false, 2010, "유저 이메일 값을 확인해주세요."),
+    USER_USER_EMPTY_USER(false, 2011, "존재하지 않는 유저입니다."),
 
     // [POST] /post
     POST_USERS_EMPTY_EMAIL(false, 2015, "아이디를 입력해주세요."),
     POST_USERS_INVALID_EMAIL(false, 2016, "이메일 형식을 확인해주세요."),
-    POST_USERS_EXISTS_EMAIL(false,2017,"중복된 아이디입니다."),
+    POST_USERS_EXISTS_EMAIL(false,2017,"중복된 이메일입니다."),
     POST_POST_INVALID_TITLE(false, 2018, "게시물의 제목을 확인해주세요."),
     POST_POST_INVALID_CONTENT(false, 2019, "게시물의 내용을 확인해주세요."),
+    POST_POST_EMPTY_POST(false,2020, "존재하지 않는 게시물입니다."),
+    POST_POST_INVALID_CATEGORY(false, 2021, "게시물의 카테고리를 확인해주세요."),
 
     // [POST] /users
     POST_USERS_EMPTY_ID(false, 2015, "아이디를 입력해주세요."),
     POST_USERS_INVALID_ID(false, 2016, "이메일 형식을 확인해주세요."),
-    POST_USERS_EXISTS_ID(false,2017,"중복된 아이디입니다."),
+    //POST_USERS_EXISTS_ID(false,2017,"중복된 이메일입니다."),
+    POST_USERS_EXISTS_PHONE(false, 2021, "중복된 휴대폰 번호입니다."),
 
     /**
      * 3000 : Response 오류

src/main/java/com/example/nanuer_server/config/Chat/StompHandler.java

@@ -0,0 +1,39 @@
+package com.example.nanuer_server.config.Chat;
+
+
+import com.example.nanuer_server.config.User.JwtTokenProvider;
+import com.example.nanuer_server.domain.entity.ChatMessageEntity;
+import com.example.nanuer_server.domain.repository.UserRepository;
+import com.example.nanuer_server.service.chat.ChatService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.stomp.StompCommand;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.stereotype.Component;
+
+import java.security.Principal;
+import java.util.Objects;
+import java.util.Optional;
+
+@Component
+@RequiredArgsConstructor
+public class StompHandler implements ChannelInterceptor {
+    private final JwtTokenProvider jwtTokenProvider;
+    //private final ChatService chatService;
+    private final UserRepository userRepository;
+
+    @Override
+    public Message<?> preSend(Message<?> message, MessageChannel channel) {
+        StompHeaderAccessor accessor = StompHeaderAccessor.wrap(message);
+        System.out.println("message:" + message);
+        System.out.println("헤더 : " + message.getHeaders());
+
+        if (StompCommand.CONNECT.equals(accessor.getCommand())) {
+            jwtTokenProvider.validateToken(Objects.requireNonNull(accessor.getFirstNativeHeader("X-AUTH-TOKEN")));
+            System.out.println("토큰 : " + accessor.getNativeHeader("X-AUTH-TOKEN"));
+        }
+        return message;
+    }
+}

src/main/java/com/example/nanuer_server/config/Chat/WebSocketConfig.java

@@ -0,0 +1,35 @@
+package com.example.nanuer_server.config.Chat;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.*;
+
+@Configuration
+@EnableWebSocketMessageBroker
+@RequiredArgsConstructor
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    private final StompHandler stompHandler;
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        registry.enableSimpleBroker("/sub");
+        registry.setApplicationDestinationPrefixes("/pub");
+    }
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry
+                .addEndpoint("/ws")
+                .setAllowedOrigins("*");
+    }
+/*
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+        registration.interceptors(stompHandler);
+    }*/
+}

src/main/java/com/example/nanuer_server/config/User/JwtTokenProvider.java

@@ -68,6 +68,7 @@ public String getUserPk(String token) {
         return (String) Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().getSubject();
     }
 
+
     // Request의 Header에서 token 값을 가져옵니다. "Authorization" : "TOKEN값'
     public String resolveToken(HttpServletRequest request) {
         return request.getHeader("X-AUTH-TOKEN");

src/main/java/com/example/nanuer_server/config/User/SecurityConfig.java

@@ -52,7 +52,9 @@ protected void configure(HttpSecurity http) throws Exception {
 
         //URL 인증여부.
         http.authorizeRequests()
-                .antMatchers( "/", "/user/**", "/css/**", "/api/mypage/**", "/exception/**", "/favicon.ico", "/post/**").permitAll()
+                .antMatchers("/user/**","/heart/**","/post/**","/mypage/**","/chat/**").hasAuthority("ROLE_USER")
+                .antMatchers( "/join","/login","/css/**", "/getEmail","/updatePw", "/chat/**", "/ws/**","/room/**","/hello/**","/chat/join/**","/message/**")
+                .permitAll()
                 .anyRequest().authenticated();
 
         //JwtFilter 추가

src/main/java/com/example/nanuer_server/controller/Chat/ChatController.java

@@ -0,0 +1,88 @@
+package com.example.nanuer_server.controller.Chat;
+
+import com.example.nanuer_server.config.BaseException;
+import com.example.nanuer_server.config.BaseResponse;
+import com.example.nanuer_server.config.User.JwtTokenProvider;
+import com.example.nanuer_server.domain.entity.ChatMessageEntity;
+import com.example.nanuer_server.domain.entity.ChatRoomEntity;
+import com.example.nanuer_server.domain.entity.UserEntity;
+import com.example.nanuer_server.domain.repository.Chat.ChatRoomRepository;
+import com.example.nanuer_server.domain.repository.UserRepository;
+import com.example.nanuer_server.dto.Chat.GetChatUserDto;
+import com.example.nanuer_server.service.User.UserService;
+import com.example.nanuer_server.service.chat.ChatService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.simp.SimpMessageSendingOperations;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/chat")
+public class ChatController {
+
+    private final SimpMessageSendingOperations simpMessageSendingOperations;
+    private final UserService userService;
+    private final ChatService chatService;
+    private final JwtTokenProvider jwtTokenProvider;
+    private final UserRepository userRepository;
+    private final ChatRoomRepository chatRoomRepository;
+
+    /*
+        /sub/channel/12345      - 구독(channelId:12345)
+        /pub/send        - 메시지 발행
+    */
+
+    //방번호(roomId), 유저Id(sender)
+    @GetMapping("/getInfo")
+    public BaseResponse<GetChatUserDto> GetChatUser(HttpServletRequest request, @RequestParam int post_id) throws BaseException {
+        int userId = userService.GetHeaderAndGetUser(request);
+        UserEntity userEntity = userRepository.findByUserId(userId).get();
+        int roomNumber = chatRoomRepository.findAllByPostId(post_id).get(0).getRoomNumber();
+        ChatRoomEntity room = chatService.createRoom(request, post_id);
+        GetChatUserDto getChatUserDto = GetChatUserDto.builder()
+                .userId(userId)
+                .roomNumber(roomNumber)
+                .nickName(userEntity.getNickName())
+                .profileImg(userEntity.getProfileImg())
+                .build();
+        return new BaseResponse<>(getChatUserDto);
+    }
+
+    @MessageMapping("/send") //채팅방에서 메세지 보내기 버튼
+    public ChatMessageEntity message(ChatMessageEntity message) {
+        //String userEmail = jwtTokenProvider.getUserPk(token);
+        //String nickName = userRepository.findByEmail(userEmail).get().getNickName();
+
+        UserEntity userEntity = userRepository.findByUserId(message.getSender()).get();
+        message.setNickName(userEntity.getNickName());
+        message.setProfileImg(userEntity.getProfileImg());
+        System.out.println("ChatController : message() => " + message.getData());
+        chatService.sendChatMessage(message);
+        return message;
+    }
+
+    //jwt 읽어서 isWriter(글작성자인지, 아닌지) return
+    /*
+    @GetMapping("/isWriter")
+    public BaseResponse<Boolean> IsWriter(){
+
+        Boolean result = ;
+        return new BaseResponse<>(result)
+    }
+*/
+
+    /*
+    @PostMapping("/join")
+    @ResponseBody
+    public BaseResponse<Integer> createRoom(HttpServletRequest request, @RequestParam int postId) throws BaseException {
+
+        ChatRoomEntity room = chatService.createRoom(request, postId);
+        return new BaseResponse<>(room.getRoomNumber());
+    }*/
+
+
+
+
+}

src/main/java/com/example/nanuer_server/controller/PermitController.java

@@ -0,0 +1,81 @@
+package com.example.nanuer_server.controller;
+
+import com.example.nanuer_server.config.BaseException;
+import com.example.nanuer_server.config.BaseResponse;
+import com.example.nanuer_server.config.User.JwtTokenProvider;
+import com.example.nanuer_server.domain.entity.UserEntity;
+import com.example.nanuer_server.domain.entity.UserRole;
+import com.example.nanuer_server.dto.User.JoinUserDto;
+import com.example.nanuer_server.dto.User.LoginUserDto;
+import com.example.nanuer_server.dto.User.UserInfoDto;
+import com.example.nanuer_server.service.User.UserService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Log4j2
+@RequiredArgsConstructor
+@RestController
+public class PermitController {
+
+    private final UserService userService;
+    private final JwtTokenProvider jwtTokenProvider;
+
+    @ResponseBody
+    @PostMapping("/join")
+    public BaseResponse<UserEntity> join(@RequestBody JoinUserDto joinUserDto) {
+        try {
+            UserEntity userEntity = userService.signup(joinUserDto);
+            return new BaseResponse<>(userEntity);
+        } catch (BaseException exception) {
+            return new BaseResponse<>((exception.getStatus()));
+        }
+    }
+
+    //로그인
+    @ResponseBody
+    @PostMapping("/login")
+    public BaseResponse<String> login(@RequestBody LoginUserDto loginUserDto) {
+        try {
+
+            UserInfoDto userInfoDto = userService.login(loginUserDto);
+            String Email = userInfoDto.getEmail();
+            UserRole role = userInfoDto.getRole();
+            String result = jwtTokenProvider.createToken(Email, role);
+            return new BaseResponse<>(result);
+        } catch (BaseException exception) {
+            return new BaseResponse<>((exception.getStatus()));
+        }
+    }
+
+    //아이디 찾기
+    @GetMapping("/getEmail")
+    public BaseResponse<String> GetUserEmail(@RequestParam String phone){
+        try{
+            UserInfoDto userInfoDto = userService.GetUserByPhone(phone);
+            String result =  userInfoDto.getEmail();
+            return  new BaseResponse<>(result);
+
+        }
+        catch (BaseException exception){
+            return new BaseResponse<>((exception.getStatus()));
+        }
+    }
+
+    //비밀번호 재설정
+    @PatchMapping("/updatePw")
+    public BaseResponse<String> ModifyPw(@RequestParam String phone, String password){
+        try {
+            userService.ModifyPw(phone,password);
+            UserInfoDto userInfoDto  = userService.GetUserByPhone(phone);
+            String result = "새 비밀번호 : " + userInfoDto.getPassword();
+            return new BaseResponse<>(result);
+        } catch(BaseException exception){
+            return new BaseResponse<>(exception.getStatus());
+        }
+    }
+
+
+}