From 60c700451c2de6effcbe4567bc9bab7fab623d27 Mon Sep 17 00:00:00 2001 From: chuzhongzai Date: Fri, 8 Dec 2023 12:56:42 +0800 Subject: [PATCH] first commit --- .gitignore | 33 +++++++++++++++++++ pom.xml | 2 +- .../lion/sns/controller/FileController.java | 1 - .../sns/controller/SiteManageController.java | 1 - .../sns/dao/CustomConfigurationMapper.java | 2 +- .../com/lion/sns/interceptor/Interceptor.java | 4 +-- src/main/java/com/lion/sns/pojo/FileNode.java | 1 - .../lion/sns/service/CommunicateService.java | 8 ++--- .../com/lion/sns/service/ShareService.java | 2 -- .../com/lion/sns/service/SiteService.java | 1 - .../com/lion/sns/service/TaskService.java | 6 ---- .../lion/sns/service/WebSocketService.java | 2 +- .../java/com/lion/sns/util/CustomUtil.java | 1 - src/main/java/com/lion/sns/util/Response.java | 3 -- 14 files changed, 39 insertions(+), 28 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..549e00a --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/pom.xml b/pom.xml index b86400e..de8f667 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.3 + 3.2.0 com.lion diff --git a/src/main/java/com/lion/sns/controller/FileController.java b/src/main/java/com/lion/sns/controller/FileController.java index b63f5d4..43f22dd 100644 --- a/src/main/java/com/lion/sns/controller/FileController.java +++ b/src/main/java/com/lion/sns/controller/FileController.java @@ -6,7 +6,6 @@ import com.lion.sns.util.Response; import jakarta.annotation.Resource; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/lion/sns/controller/SiteManageController.java b/src/main/java/com/lion/sns/controller/SiteManageController.java index 9d81c0f..aaa679d 100644 --- a/src/main/java/com/lion/sns/controller/SiteManageController.java +++ b/src/main/java/com/lion/sns/controller/SiteManageController.java @@ -2,7 +2,6 @@ package com.lion.sns.controller; import com.lion.sns.pojo.Site; import com.lion.sns.service.SiteService; -import com.lion.sns.util.Response; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/lion/sns/dao/CustomConfigurationMapper.java b/src/main/java/com/lion/sns/dao/CustomConfigurationMapper.java index cee38bf..8d034d3 100644 --- a/src/main/java/com/lion/sns/dao/CustomConfigurationMapper.java +++ b/src/main/java/com/lion/sns/dao/CustomConfigurationMapper.java @@ -7,7 +7,7 @@ import org.apache.ibatis.annotations.Update; @Mapper public interface CustomConfigurationMapper { - static final String PATH = "path"; + String PATH = "path"; @Select("select value from custom_configuration where key=#{key}") diff --git a/src/main/java/com/lion/sns/interceptor/Interceptor.java b/src/main/java/com/lion/sns/interceptor/Interceptor.java index 4ae5a01..2e1e94d 100644 --- a/src/main/java/com/lion/sns/interceptor/Interceptor.java +++ b/src/main/java/com/lion/sns/interceptor/Interceptor.java @@ -12,8 +12,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.servlet.HandlerInterceptor; import java.util.HashMap; -import java.util.HashSet; -import java.util.Objects; @Getter @Component @@ -25,7 +23,7 @@ public class Interceptor implements HandlerInterceptor { sessionId2user = new HashMap<>(); String path = customConfigurationMapper.selectValue(CustomConfigurationMapper.PATH); if(path == null || path.isEmpty()) - new Thread(() -> {CustomUtil.initSns(customConfigurationMapper, siteMapper, userMapper);}).start(); + new Thread(() -> CustomUtil.initSns(customConfigurationMapper, siteMapper, userMapper)).start(); } //需要鉴别管理员接口 diff --git a/src/main/java/com/lion/sns/pojo/FileNode.java b/src/main/java/com/lion/sns/pojo/FileNode.java index 89588f3..a4479a9 100644 --- a/src/main/java/com/lion/sns/pojo/FileNode.java +++ b/src/main/java/com/lion/sns/pojo/FileNode.java @@ -5,7 +5,6 @@ import lombok.Data; import java.util.Date; -import java.util.TreeMap; @Data public class FileNode { diff --git a/src/main/java/com/lion/sns/service/CommunicateService.java b/src/main/java/com/lion/sns/service/CommunicateService.java index dfe4e2f..b80b45c 100644 --- a/src/main/java/com/lion/sns/service/CommunicateService.java +++ b/src/main/java/com/lion/sns/service/CommunicateService.java @@ -354,9 +354,7 @@ public class CommunicateService { } case AbstractMessage.MOVE_FILE_REQUEST_MESSAGE -> { MoveFileRequestMessage moveFileRequestMessage = (MoveFileRequestMessage) abstractMessage; - threadPool.submit(() -> { - receiveFile(ctx.channel(), moveFileRequestMessage); - }); + threadPool.submit(() -> receiveFile(ctx.channel(), moveFileRequestMessage)); } case AbstractMessage.MOVE_FILE_RESPONSE_MESSAGE -> { MoveFileResponseMessage moveFileResponseMessage = (MoveFileResponseMessage) abstractMessage; @@ -382,9 +380,7 @@ public class CommunicateService { } } } - case AbstractMessage.PAIR_MESSAGE -> { - proceedPair((PairMessage) abstractMessage, ctx.channel()); - } + case AbstractMessage.PAIR_MESSAGE -> proceedPair((PairMessage) abstractMessage, ctx.channel()); case AbstractMessage.CONNECT_MESSAGE -> { String ip = ctx.channel().remoteAddress().toString().replace("/", "").split(":")[0]; Site site = siteMapper.selectSiteByIp(ip); diff --git a/src/main/java/com/lion/sns/service/ShareService.java b/src/main/java/com/lion/sns/service/ShareService.java index 86d9839..3aa325d 100644 --- a/src/main/java/com/lion/sns/service/ShareService.java +++ b/src/main/java/com/lion/sns/service/ShareService.java @@ -1,8 +1,6 @@ package com.lion.sns.service; import cn.hutool.core.util.RandomUtil; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.lion.sns.dao.CustomConfigurationMapper; import com.lion.sns.dao.ShareFileMapper; diff --git a/src/main/java/com/lion/sns/service/SiteService.java b/src/main/java/com/lion/sns/service/SiteService.java index d9ec719..81b37b6 100644 --- a/src/main/java/com/lion/sns/service/SiteService.java +++ b/src/main/java/com/lion/sns/service/SiteService.java @@ -1,6 +1,5 @@ package com.lion.sns.service; -import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.file.PathUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.lion.sns.ScalableNetworkStorageApplication; diff --git a/src/main/java/com/lion/sns/service/TaskService.java b/src/main/java/com/lion/sns/service/TaskService.java index 6b190d9..2dabf19 100644 --- a/src/main/java/com/lion/sns/service/TaskService.java +++ b/src/main/java/com/lion/sns/service/TaskService.java @@ -9,7 +9,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; @Service @@ -18,13 +17,8 @@ public class TaskService { ScheduledExecutorService thread; - @Resource - WebSocketService webSocketService; - ReentrantLock lock; - - HashMap taskId2Site; public TaskService(){ diff --git a/src/main/java/com/lion/sns/service/WebSocketService.java b/src/main/java/com/lion/sns/service/WebSocketService.java index 5eff615..6ce3a8c 100644 --- a/src/main/java/com/lion/sns/service/WebSocketService.java +++ b/src/main/java/com/lion/sns/service/WebSocketService.java @@ -123,7 +123,7 @@ public class WebSocketService implements WebSocketHandler { } @Override - public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception { + public void handleTransportError(WebSocketSession session, Throwable exception){ } diff --git a/src/main/java/com/lion/sns/util/CustomUtil.java b/src/main/java/com/lion/sns/util/CustomUtil.java index 27af295..6766cbd 100644 --- a/src/main/java/com/lion/sns/util/CustomUtil.java +++ b/src/main/java/com/lion/sns/util/CustomUtil.java @@ -8,7 +8,6 @@ import com.lion.sns.dao.UserMapper; import com.lion.sns.message.PairMessage; import com.lion.sns.pojo.Site; import com.lion.sns.pojo.User; -import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import org.springframework.util.DigestUtils; diff --git a/src/main/java/com/lion/sns/util/Response.java b/src/main/java/com/lion/sns/util/Response.java index b7a6cf6..b69df1d 100644 --- a/src/main/java/com/lion/sns/util/Response.java +++ b/src/main/java/com/lion/sns/util/Response.java @@ -2,13 +2,10 @@ package com.lion.sns.util; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import java.util.HashMap; public class Response { -// HashMap result; ObjectNode result; public Response(){