feat(security): 重构安全配置并添加用户认证功能
refactor: 将ResponseMessage移动到config包并增强功能 feat: 添加用户管理相关功能及密码加密配置 fix: 修复HelpController中README文件路径问题 docs: 更新application.properties配置注释 style: 清理无用导入和日志文件
This commit is contained in:
qingfeng1121
@@ -1,7 +1,7 @@
|
||||
package com.qf.myafterprojecy.service;
|
||||
|
||||
import com.qf.myafterprojecy.config.ResponseMessage;
|
||||
import com.qf.myafterprojecy.pojo.Message;
|
||||
import com.qf.myafterprojecy.pojo.ResponseMessage;
|
||||
import com.qf.myafterprojecy.pojo.dto.MessageDto;
|
||||
import com.qf.myafterprojecy.repository.MessageRepository;
|
||||
import com.qf.myafterprojecy.service.imp.IMessageService;
|
||||
@@ -33,10 +33,10 @@ public class MessageService implements IMessageService {
|
||||
try {
|
||||
logger.info("查询所有消息");
|
||||
Iterable<Message> messages = messageRepository.findAll();
|
||||
return ResponseMessage.success(messages, "查询成功", true);
|
||||
return ResponseMessage.success(messages, "查询成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("查询所有消息失败", e);
|
||||
return ResponseMessage.failure("查询消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,21 +44,21 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<Message> getMessageById(Integer id) {
|
||||
if (id == null || id <= 0) {
|
||||
logger.warn("获取消息时ID无效: {}", id);
|
||||
return ResponseMessage.failure("消息ID无效");
|
||||
return ResponseMessage.badRequest("消息ID无效");
|
||||
}
|
||||
|
||||
try {
|
||||
logger.info("根据ID查询消息: {}", id);
|
||||
Optional<Message> messageOptional = messageRepository.findById(id);
|
||||
if (messageOptional.isPresent()) {
|
||||
return ResponseMessage.success(messageOptional.get(), "查询成功", true);
|
||||
return ResponseMessage.success(messageOptional.get(), "查询成功");
|
||||
} else {
|
||||
logger.warn("未找到ID为{}的消息", id);
|
||||
return ResponseMessage.failure("未找到指定消息");
|
||||
return ResponseMessage.notFound("未找到指定消息");
|
||||
}
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("查询消息失败: {}", id, e);
|
||||
return ResponseMessage.failure("查询消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -94,16 +94,15 @@ public class MessageService implements IMessageService {
|
||||
if (messageDto.getParentid() != null && messageDto.getParentid() > 0) {
|
||||
if (!messageRepository.existsById(messageDto.getParentid())) {
|
||||
logger.warn("回复的父消息不存在: {}", messageDto.getParentid());
|
||||
return ResponseMessage.failure("回复的父消息不存在");
|
||||
return ResponseMessage.notFound("回复的父消息不存在");
|
||||
}
|
||||
}
|
||||
|
||||
Message savedMessage = messageRepository.save(message);
|
||||
logger.info("消息保存成功: {}", savedMessage.getMessageid());
|
||||
return ResponseMessage.success(savedMessage, "保存成功", true);
|
||||
return ResponseMessage.save(true, savedMessage);
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("保存消息失败", e);
|
||||
return ResponseMessage.failure("保存消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("保存消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,7 +111,7 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<Message> deleteMessage(Integer id) {
|
||||
if (id == null || id <= 0) {
|
||||
logger.warn("删除消息时ID无效: {}", id);
|
||||
return ResponseMessage.failure("消息ID无效");
|
||||
return ResponseMessage.badRequest("消息ID无效");
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -126,14 +125,14 @@ public class MessageService implements IMessageService {
|
||||
logger.info("同时删除了{}条回复消息", replies.size());
|
||||
}
|
||||
logger.info("消息删除成功: {}", id);
|
||||
return ResponseMessage.success(null, "删除成功", true);
|
||||
return ResponseMessage.delete(true);
|
||||
} else {
|
||||
logger.warn("未找到要删除的消息: {}", id);
|
||||
return ResponseMessage.failure("未找到要删除的消息");
|
||||
return ResponseMessage.notFound("未找到要删除的消息");
|
||||
}
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("删除消息失败: {}", id, e);
|
||||
return ResponseMessage.failure("删除消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("删除消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,16 +140,16 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<List<Message>> getMessagesByArticleId(Integer articleId) {
|
||||
if (articleId == null || articleId <= 0) {
|
||||
logger.warn("根据文章ID查询消息时ID无效: {}", articleId);
|
||||
return ResponseMessage.failure("文章ID无效");
|
||||
return ResponseMessage.badRequest("文章ID无效");
|
||||
}
|
||||
|
||||
try {
|
||||
logger.info("根据文章ID查询消息: {}", articleId);
|
||||
List<Message> messages = messageRepository.findByArticleid(articleId);
|
||||
return ResponseMessage.success(messages, "查询成功", true);
|
||||
return ResponseMessage.success(messages, "查询成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("根据文章ID查询消息失败: {}", articleId, e);
|
||||
return ResponseMessage.failure("查询消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -159,10 +158,10 @@ public class MessageService implements IMessageService {
|
||||
try {
|
||||
logger.info("查询所有根消息");
|
||||
List<Message> messages = messageRepository.findByParentidIsNull();
|
||||
return ResponseMessage.success(messages, "查询成功", true);
|
||||
return ResponseMessage.success(messages, "查询成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("查询根消息失败", e);
|
||||
return ResponseMessage.failure("查询消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -170,15 +169,15 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<List<Message>> getRepliesByParentId(Integer parentId) {
|
||||
if (parentId == null || parentId <= 0) {
|
||||
logger.warn("根据父消息ID查询回复时ID无效: {}", parentId);
|
||||
return ResponseMessage.failure("父消息ID无效");
|
||||
return ResponseMessage.badRequest("父消息ID无效");
|
||||
}
|
||||
try {
|
||||
logger.info("根据父消息ID查询回复: {}", parentId);
|
||||
List<Message> replies = messageRepository.findByParentid(parentId);
|
||||
return ResponseMessage.success(replies, "查询成功", true);
|
||||
return ResponseMessage.success(replies, "查询成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("查询回复消息失败: {}", parentId, e);
|
||||
return ResponseMessage.failure("查询消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -188,16 +187,16 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<Message> likeMessage(Integer id) {
|
||||
if (id == null || id <= 0) {
|
||||
logger.warn("点赞消息时ID无效: {}", id);
|
||||
return ResponseMessage.failure("消息ID无效");
|
||||
return ResponseMessage.badRequest("消息ID无效");
|
||||
}
|
||||
try {
|
||||
logger.info("点赞消息: {}", id);
|
||||
messageRepository.incrementLikes(id);
|
||||
Message likedMessage = messageRepository.findById(id).orElse(null);
|
||||
return ResponseMessage.success(likedMessage, "点赞成功", true);
|
||||
return ResponseMessage.success(likedMessage, "点赞成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("点赞消息失败: {}", id, e);
|
||||
return ResponseMessage.failure("点赞消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("点赞消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,16 +204,16 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<List<Message>> searchMessagesByNickname(String nickname) {
|
||||
if (StringUtils.isEmpty(nickname)) {
|
||||
logger.warn("根据昵称查询消息时昵称为空");
|
||||
return ResponseMessage.failure("昵称不能为空");
|
||||
return ResponseMessage.badRequest("昵称不能为空");
|
||||
}
|
||||
|
||||
try {
|
||||
logger.info("根据昵称查询消息: {}", nickname);
|
||||
List<Message> messages = messageRepository.findByNicknameContaining(nickname);
|
||||
return ResponseMessage.success(messages, "查询成功", true);
|
||||
return ResponseMessage.success(messages, "查询成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("根据昵称查询消息失败: {}", nickname, e);
|
||||
return ResponseMessage.failure("查询消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -225,10 +224,10 @@ public class MessageService implements IMessageService {
|
||||
try {
|
||||
logger.info("删除所有消息");
|
||||
messageRepository.deleteAll();
|
||||
return ResponseMessage.success(null, "删除成功", true);
|
||||
return ResponseMessage.delete(true);
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("删除所有消息失败", e);
|
||||
return ResponseMessage.failure("删除消息失败：" + e.getMessage());
|
||||
return ResponseMessage.error("删除消息失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -236,16 +235,16 @@ public class MessageService implements IMessageService {
|
||||
public ResponseMessage<Long> getMessageCountByArticleId(Integer articleId) {
|
||||
if (articleId == null || articleId <= 0) {
|
||||
logger.warn("获取文章评论数量时ID无效: {}", articleId);
|
||||
return ResponseMessage.failure("文章ID无效");
|
||||
return ResponseMessage.badRequest("文章ID无效");
|
||||
}
|
||||
|
||||
try {
|
||||
logger.info("获取文章评论数量: {}", articleId);
|
||||
Long count = messageRepository.countByArticleId(articleId);
|
||||
return ResponseMessage.success(count, "查询成功", true);
|
||||
return ResponseMessage.success(count, "查询成功");
|
||||
} catch (DataAccessException e) {
|
||||
logger.error("获取文章评论数量失败: {}", articleId, e);
|
||||
return ResponseMessage.failure("查询评论数量失败：" + e.getMessage());
|
||||
return ResponseMessage.error("查询评论数量失败：" + e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user