项目结构修改

Xunle1 · Jun 7, 2022 · 313e22d · 313e22d
1 parent fea0968
commit 313e22d
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 41 deletions.
diff --git a/...atroom/utils/ConstantPropertiesUtils.java → ...troom/common/ConstantPropertiesUtils.java b/...atroom/utils/ConstantPropertiesUtils.java → ...troom/common/ConstantPropertiesUtils.java
@@ -1,4 +1,4 @@
-package com.xunle.chatroom.utils;
+package com.xunle.chatroom.common;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Value;

diff --git a/...va/com/xunle/chatroom/utils/Response.java → ...a/com/xunle/chatroom/common/Response.java b/...va/com/xunle/chatroom/utils/Response.java → ...a/com/xunle/chatroom/common/Response.java
@@ -1,4 +1,4 @@
-package com.xunle.chatroom.utils;
+package com.xunle.chatroom.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/...m/xunle/chatroom/utils/ResponseError.java → .../xunle/chatroom/common/ResponseError.java b/...m/xunle/chatroom/utils/ResponseError.java → .../xunle/chatroom/common/ResponseError.java
@@ -1,4 +1,4 @@
-package com.xunle.chatroom.utils;
+package com.xunle.chatroom.common;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

diff --git a/.../com/xunle/chatroom/utils/ResultCode.java → ...com/xunle/chatroom/common/ResultCode.java b/.../com/xunle/chatroom/utils/ResultCode.java → ...com/xunle/chatroom/common/ResultCode.java
@@ -1,4 +1,4 @@
-package com.xunle.chatroom.utils;
+package com.xunle.chatroom.common;
 
 /**
  * @author xunle

diff --git a/src/main/java/com/xunle/chatroom/controller/FriendController.java b/src/main/java/com/xunle/chatroom/controller/FriendController.java
@@ -2,12 +2,11 @@
 
 
 import com.xunle.chatroom.entity.FriendReq;
-import com.xunle.chatroom.entity.User;
 import com.xunle.chatroom.entity.vo.FriendReqVO;
 import com.xunle.chatroom.entity.vo.FriendVO;
 import com.xunle.chatroom.service.FriendReqService;
 import com.xunle.chatroom.service.FriendService;
-import com.xunle.chatroom.utils.Response;
+import com.xunle.chatroom.common.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/main/java/com/xunle/chatroom/controller/MessageController.java b/src/main/java/com/xunle/chatroom/controller/MessageController.java
@@ -5,7 +5,7 @@
 import com.xunle.chatroom.entity.Message;
 import com.xunle.chatroom.entity.vo.MessageVO;
 import com.xunle.chatroom.service.MessageService;
-import com.xunle.chatroom.utils.Response;
+import com.xunle.chatroom.common.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;

diff --git a/src/main/java/com/xunle/chatroom/controller/OssController.java b/src/main/java/com/xunle/chatroom/controller/OssController.java
@@ -1,7 +1,7 @@
 package com.xunle.chatroom.controller;
 
 import com.xunle.chatroom.service.OssService;
-import com.xunle.chatroom.utils.Response;
+import com.xunle.chatroom.common.Response;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;

diff --git a/src/main/java/com/xunle/chatroom/controller/RoomController.java b/src/main/java/com/xunle/chatroom/controller/RoomController.java
@@ -4,7 +4,7 @@
 import com.xunle.chatroom.entity.Room;
 import com.xunle.chatroom.entity.vo.UserVO;
 import com.xunle.chatroom.service.RoomService;
-import com.xunle.chatroom.utils.Response;
+import com.xunle.chatroom.common.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

diff --git a/src/main/java/com/xunle/chatroom/controller/UserCenterController.java b/src/main/java/com/xunle/chatroom/controller/UserCenterController.java
@@ -4,7 +4,7 @@
 import com.xunle.chatroom.entity.vo.UserLoginVo;
 import com.xunle.chatroom.service.UserCenterService;
 import com.xunle.chatroom.utils.JwtUtils;
-import com.xunle.chatroom.utils.Response;
+import com.xunle.chatroom.common.Response;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,8 +26,11 @@ public class UserCenterController {
     @PostMapping("/login")
     public Response loginUser(@RequestBody UserLoginVo user) {
         String token = userCenterService.login(user);
-        System.out.println("token = " + token);
-        return Response.ok().data("token", token);
+        if (token != null && token.length() > 0) {
+            return Response.ok().data("token", token);
+        } else {
+            return Response.error();
+        }
     }
 
     @PostMapping("/register")
@@ -48,7 +51,8 @@ public Response getUserInfo(HttpServletRequest request) {
         return Response.ok().data("id", userId)
                 .data("name", user.getUsername())
                 .data("roles", "admin")
-                .data("avatar", user.getAvatar());
+                .data("avatar", user.getAvatar())
+                .data("sign", user.getSign());
     }
 
 }
diff --git a/src/main/java/com/xunle/chatroom/controller/WebSocketController.java b/src/main/java/com/xunle/chatroom/controller/WebSocketController.java
@@ -2,20 +2,15 @@
 
 import com.xunle.chatroom.entity.MessageRequest;
 import com.xunle.chatroom.entity.MessageResponse;
-import com.xunle.chatroom.entity.vo.MessageVO;
-import com.xunle.chatroom.entity.vo.UserVO;
 import com.xunle.chatroom.handler.ServiceException;
 import com.xunle.chatroom.service.MessageService;
 import com.xunle.chatroom.service.RoomService;
-import com.xunle.chatroom.utils.ResultCode;
+import com.xunle.chatroom.common.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
 import org.springframework.messaging.handler.annotation.MessageMapping;
-import org.springframework.messaging.handler.annotation.SendTo;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.messaging.simp.annotation.SendToUser;
-import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
 import org.springframework.stereotype.Controller;
 
 

diff --git a/src/main/java/com/xunle/chatroom/handler/GlobalExceptionHandler.java b/src/main/java/com/xunle/chatroom/handler/GlobalExceptionHandler.java
@@ -1,10 +1,8 @@
 package com.xunle.chatroom.handler;
 
-import com.xunle.chatroom.utils.ResponseError;
-import com.xunle.chatroom.utils.Response;
-import com.xunle.chatroom.utils.ResultCode;
+import com.xunle.chatroom.common.ResponseError;
+import com.xunle.chatroom.common.Response;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
@@ -17,17 +15,6 @@
 @Slf4j
 public class GlobalExceptionHandler {
 
-    @ExceptionHandler(Exception.class)
-    public Response handleException(Exception e, HttpServletRequest request) {
-        log.error("出现未知异常 -> " + e);
-        ResponseError error = new ResponseError();
-        error.setCode(ResultCode.UNKNOWN.getCode());
-        error.setMessage(ResultCode.UNKNOWN.getMessage());
-        error.setRequestUrl(request.getRequestURL().toString());
-        error.setException(e.getClass().getName());
-        return error;
-    }
-
     @ExceptionHandler(ServiceException.class)
     public Response handleServiceException(ServiceException e, HttpServletRequest request) {
         log.error("业务异常 -> " + e);

diff --git a/src/main/java/com/xunle/chatroom/handler/ServiceException.java b/src/main/java/com/xunle/chatroom/handler/ServiceException.java
@@ -1,6 +1,5 @@
 package com.xunle.chatroom.handler;
 
-import com.xunle.chatroom.utils.ResultCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

diff --git a/src/main/java/com/xunle/chatroom/service/impl/FriendServiceImpl.java b/src/main/java/com/xunle/chatroom/service/impl/FriendServiceImpl.java
@@ -7,12 +7,11 @@
 import com.xunle.chatroom.entity.vo.FriendVO;
 import com.xunle.chatroom.handler.ServiceException;
 import com.xunle.chatroom.mapper.FriendMapper;
-import com.xunle.chatroom.mapper.UserMapper;
 import com.xunle.chatroom.service.FriendReqService;
 import com.xunle.chatroom.service.FriendService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunle.chatroom.service.UserService;
-import com.xunle.chatroom.utils.ResultCode;
+import com.xunle.chatroom.common.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

diff --git a/src/main/java/com/xunle/chatroom/service/impl/OssServiceImpl.java b/src/main/java/com/xunle/chatroom/service/impl/OssServiceImpl.java
@@ -6,7 +6,7 @@
 import com.aliyun.oss.model.GeneratePresignedUrlRequest;
 import com.aliyun.oss.model.ObjectMetadata;
 import com.xunle.chatroom.service.OssService;
-import com.xunle.chatroom.utils.ConstantPropertiesUtils;
+import com.xunle.chatroom.common.ConstantPropertiesUtils;
 import org.joda.time.DateTime;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -57,7 +57,7 @@ public String upload(MultipartFile file) {
             String url = null;
 
             // 指定签名URL过期时间为10分钟。
-            Date expiration = new Date(new Date().getTime() + 1000 * 60 * 10 );
+            Date expiration = new Date(new Date().getTime() + 1000 * 60 * 60 * 24 * 7 );
             GeneratePresignedUrlRequest req = new GeneratePresignedUrlRequest(bucketName, fileName, HttpMethod.GET);
             req.setExpiration(expiration);
             URL signedUrl = ossClient.generatePresignedUrl(req);

diff --git a/src/main/java/com/xunle/chatroom/service/impl/RoomServiceImpl.java b/src/main/java/com/xunle/chatroom/service/impl/RoomServiceImpl.java
@@ -11,7 +11,7 @@
 import com.xunle.chatroom.service.RoomService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunle.chatroom.service.UserService;
-import com.xunle.chatroom.utils.ResultCode;
+import com.xunle.chatroom.common.ResultCode;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

diff --git a/src/main/java/com/xunle/chatroom/service/impl/UserCenterServiceImpl.java b/src/main/java/com/xunle/chatroom/service/impl/UserCenterServiceImpl.java
@@ -10,7 +10,7 @@
 import com.xunle.chatroom.service.UserService;
 import com.xunle.chatroom.utils.JwtUtils;
 import com.xunle.chatroom.utils.MD5;
-import com.xunle.chatroom.utils.ResultCode;
+import com.xunle.chatroom.common.ResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;