From 1516226192ba01e97edcebea593cbd0114227b66 Mon Sep 17 00:00:00 2001
From: chuzhongzai <njy1822574439@outlook.com>
Date: Thu, 28 Dec 2023 16:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=8E=B7=E5=8F=96=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E8=BF=9B=E5=BA=A6=E6=96=B9=E5=BC=8F=E7=94=B1=E8=BD=AE?=
 =?UTF-8?q?=E8=AF=A2=E6=94=B9=E4=B8=BAWebsocket;=E5=8E=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   5 ++
 .../Configuration/WebsocketConfiguration.java |  22 ++++++
 .../Controller/GalleryManageController.java   |   1 -
 .../lion/lionwebsite/Domain/GalleryTask.java  |   8 +-
 .../Service/GalleryManageService.java         |  18 +----
 .../lionwebsite/Service/RemoteService.java    |   7 +-
 .../lionwebsite/Service/WebSocketService.java |  73 ++++++++++++++++++
 src/main/resources/LionWebsite.db             | Bin 442368 -> 442368 bytes
 8 files changed, 108 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/com/lion/lionwebsite/Configuration/WebsocketConfiguration.java
 create mode 100644 src/main/java/com/lion/lionwebsite/Service/WebSocketService.java

diff --git a/pom.xml b/pom.xml
index 162c136..ae7ce81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,6 +110,11 @@
             <version>6.9.1</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.lionsoul</groupId>
             <artifactId>ip2region</artifactId>
diff --git a/src/main/java/com/lion/lionwebsite/Configuration/WebsocketConfiguration.java b/src/main/java/com/lion/lionwebsite/Configuration/WebsocketConfiguration.java
new file mode 100644
index 0000000..fc35d5c
--- /dev/null
+++ b/src/main/java/com/lion/lionwebsite/Configuration/WebsocketConfiguration.java
@@ -0,0 +1,22 @@
+package com.lion.lionwebsite.Configuration;
+
+import com.lion.lionwebsite.Service.WebSocketService;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+
+@Configuration
+@EnableWebSocket
+public class WebsocketConfiguration implements WebSocketConfigurer {
+
+    WebSocketService webSocketService;
+    public WebsocketConfiguration(WebSocketService webSocketService) {
+       this.webSocketService = webSocketService;
+    }
+
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(webSocketService, "/ws/").setAllowedOriginPatterns("*");
+    }
+}
diff --git a/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java b/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java
index c799af5..443cdd6 100644
--- a/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java
+++ b/src/main/java/com/lion/lionwebsite/Controller/GalleryManageController.java
@@ -43,7 +43,6 @@ public class GalleryManageController {
             case "gid" -> galleryManageService.selectTaskByGid(Integer.parseInt(param));
             case "all" -> galleryManageService.selectAllGallery(userId);
             case "name" -> galleryManageService.selectGalleryByName(param);
-            case "undone" -> galleryManageService.selectUnDoneGallery();
             case "downloader" ->  galleryManageService.selectGalleryByDownloader(AuthCode);
             default -> Response._failure("参数错误");
         };
diff --git a/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java b/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java
index 99b4df4..1571a1f 100644
--- a/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java
+++ b/src/main/java/com/lion/lionwebsite/Domain/GalleryTask.java
@@ -6,17 +6,11 @@ import lombok.Data;
 
 @Data
 public class GalleryTask {
-
     public static byte DOWNLOADING = 1;
-
     public static byte DOWNLOAD_COMPLETE = 2;
-
-    public static byte DOWNLOAD_QUEUED = 3;
-
+    public static byte COMPRESSING = 3;
     public static byte COMPRESS_COMPLETE = 4;
 
-    public static byte COMPRESSING = 5;
-
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private String name;
 
diff --git a/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java b/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java
index f7e44d0..584685e 100644
--- a/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java
+++ b/src/main/java/com/lion/lionwebsite/Service/GalleryManageService.java
@@ -123,6 +123,7 @@ public class GalleryManageService {
         if (gallery.getStatus().equals("已提交")) {
             response.success(gallery.toString());
             gallery.setDownloader(user.getId());
+            gallery.set_download(true);
             galleryMapper.insertGallery(gallery);
 
             long usedAmount = Long.parseLong(configurationMapper.selectConfiguration(CustomConfiguration.WEEK_USED_AMOUNT).getValue());
@@ -230,23 +231,6 @@ public class GalleryManageService {
         return response.toJSONString();
     }
 
-    /**
-     * 查询未完成的本子
-     *
-     * @return 查询结果
-     */
-    public String selectUnDoneGallery() {
-        Response response = Response.generateResponse();
-        Gallery[] galleries = galleryMapper.selectUnDoneGalleries();
-
-        if (galleries.length > 0)
-            response.success(new ObjectMapper().valueToTree(galleries).toString());
-        else
-            response.failure();
-
-        return response.toJSONString();
-    }
-
     /**
      * 通过本子名查询本子
      *
diff --git a/src/main/java/com/lion/lionwebsite/Service/RemoteService.java b/src/main/java/com/lion/lionwebsite/Service/RemoteService.java
index 3a8af80..54aecd4 100644
--- a/src/main/java/com/lion/lionwebsite/Service/RemoteService.java
+++ b/src/main/java/com/lion/lionwebsite/Service/RemoteService.java
@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.IOException;
 import java.net.*;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -52,13 +53,16 @@ public class RemoteService {
 
     AtomicInteger atomicInteger;
 
-    public RemoteService(GalleryMapper galleryMapper, PushService pushService){
+    WebSocketService webSocketService;
+
+    public RemoteService(GalleryMapper galleryMapper, PushService pushService, WebSocketService webSocketService){
         this.galleryMapper = galleryMapper;
         this.pushService = pushService;
         atomicInteger = new AtomicInteger(0);
         eventLoopGroup = new DefaultEventLoop();
         downloadThread = Executors.newCachedThreadPool();
         promiseHashMap = new HashMap<>();
+        this.webSocketService = webSocketService;
 
         if(!initChannel()){     //如果远程服务器连接失败，则开启本地监听
             monitor = new Thread(this::monitorFunc);
@@ -190,6 +194,7 @@ public class RemoteService {
                     log.info(gallery.getName() + "下载进度:" + gallery.getProceeding() + "/" + gallery.getPages());
                     galleryMapper.updateGallery(gallery);
                 }
+                webSocketService.updateTaskProcessing(galleryTasks);
             }
             else if(msg instanceof ResponseMessage rsm)
                 promiseHashMap.get(rsm.messageId).setSuccess(rsm);
diff --git a/src/main/java/com/lion/lionwebsite/Service/WebSocketService.java b/src/main/java/com/lion/lionwebsite/Service/WebSocketService.java
new file mode 100644
index 0000000..9335f85
--- /dev/null
+++ b/src/main/java/com/lion/lionwebsite/Service/WebSocketService.java
@@ -0,0 +1,73 @@
+package com.lion.lionwebsite.Service;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.lion.lionwebsite.Domain.GalleryTask;
+import com.lion.lionwebsite.Util.CustomUtil;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.stereotype.Service;
+import org.springframework.web.socket.*;
+
+import java.util.ArrayList;
+
+@Service
+public class WebSocketService implements WebSocketHandler {
+
+    ArrayList<WebSocketSession> sessions;
+
+    ObjectMapper objectMapper;
+
+    public WebSocketService() {
+        sessions = new ArrayList<>();
+        objectMapper = CustomUtil.objectMapper;
+    }
+
+    public void updateTaskProcessing(GalleryTask[] galleryTasks){
+        if(sessions.isEmpty())
+            return;
+        for (GalleryTask galleryTask : galleryTasks)
+            if(galleryTask.getStatus() == GalleryTask.COMPRESS_COMPLETE) {
+                sessions.forEach(s -> {
+                    try {
+                        s.sendMessage(new TextMessage("{\"type\": \"fullUpdate\"}"));
+                    } catch (Exception ignore) {
+                    }
+                });
+                return;
+            }
+
+        ObjectNode objectNode = objectMapper.createObjectNode();
+        objectNode.put("type", "updateTasks");
+        objectNode.set("data", objectMapper.valueToTree(galleryTasks));
+        System.out.println(objectNode);
+        sessions.forEach(s -> {
+            try {
+                s.sendMessage(new TextMessage(objectNode.toString()));
+            }catch (Exception ignore){}
+        });
+    }
+
+    @Override
+    public void afterConnectionEstablished(@NotNull WebSocketSession session) throws Exception {}
+
+    @Override
+    public void handleMessage(@NotNull WebSocketSession session, @NotNull WebSocketMessage<?> message) throws Exception {
+        if(message.getPayload().toString().equals("DownloaderWebsocket"))
+            sessions.add(session);
+        else
+            session.close();
+    }
+
+    @Override
+    public void handleTransportError(@NotNull WebSocketSession session, @NotNull Throwable exception) throws Exception {}
+
+    @Override
+    public void afterConnectionClosed(@NotNull WebSocketSession session, @NotNull CloseStatus closeStatus) throws Exception {
+        sessions.remove(session);
+    }
+
+    @Override
+    public boolean supportsPartialMessages() {
+        return false;
+    }
+}
diff --git a/src/main/resources/LionWebsite.db b/src/main/resources/LionWebsite.db
index b7efde1d37a82b032391ca6ac027d0be84a64bfb..24bc397205568d71cfbd253e9f0224dbb5d58c1e 100644
GIT binary patch
delta 2297
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
SPw(?=_}CC?pWbf>-uNeGDB3sx

delta 1534
zcmZuweN0nV6u<ZO7Rqb;UXf84722}6DG2nt&?Sm4hJB!G)r=rIC{h@H!T3<V41F#Y
z9FCS0yl%`Hr`vF3Di$rEB6BnIuc5|GBRY-pT1l47MctD9F?U->Ty%e&ch9-M-}#+$
z?>*1$R=M3OUkZEZEC65=HIACOXTAj;Iy+P*S2Oy&JcH3_F`D%LZR$G4s?l3)M!ijM
z2s}`~mKKS1Hj~9>w)*oI?PV+)gTbaV*vuyXoki!Lvi1I<#SYmdz}#WL{lQ)1Mgna9
z0GICCnkW|K!1~7W(#F~fXM?M>&b7X#uA-e2KpbpvR;dEl-d?EDDcMQDJ>Y)fE^*`B
zFn56K<2+n5x0x&BR&fQKja$g6xdaZd57{s~#ZCsaihj18QDN|+B+L(nyG}DH5r2B*
z(@^iYG@1G^bfW9t(Y{Aa5)I;nk-l&jiC1DU4~9C2h4J7_$8N#Xg_y($96E4PII>Ur
zLL_hc%t66(LM%(bKn0gOo2oZA){CU^QOS>XhEMfiMiG^4_w5Sz9+PrW<n&;;_tax4
z8wmu@ndz}H#7Jo%5e9g{Gs-ZLl+bCfaLCKXVW5V>$OrejheClfh>=8jqr=l9UGcHe
z4)=D4$QPkKqxU-ZizG1^BtT(kC?+09z?rXmgoA^^H(wfOKK>j@MbU~Qo#Ed7C;?%R
z85iDjG~BgA_;4V+>#(rDTMDC${&8Wq=da^#tdV4}$LSP+#1k@nm=)*n1LsA7u_Faq
zEmsWE#ASdz#>UDo%lqZaWWUMAWFDDarjmXut&~drb1$aTyPqo#l>Ia)M#WqF_A7<{
z;wd>Q-W+iQ!&5yFt*-R{exo4JeX|*fO|(!}Kz934sR}0pIhp}zh7HNDP-RA%&L|{T
zB`7wHXeLlaK&Pli!I^VN4-r@zocldOqM-X%Gzx=PFQAOr4rqs8K|88_Nu&lclnZ1%
zQZLgV=aIY_yCLRPu@vRv4AEka&N!;|YZWV$d@Jv}yHNo)ma5=9jA5z@LcWOXtH&Py
z&D$v?r56<{so42DtqM@$OnpL1rKDoAwhy_Zq+5L`QOP@b-*cp_D2Yt<A%{^u3N&|J
z5tW3eDn%vBYqr!>6|B>&<Xz9TLO!X-okZJ!9f>6rd^S0gwDqFaJ&o9&v?GJ}-6)I)
ze6>^iR6Ub8uZy%~(^fnHMMOrBUAchwO}tBaRsYY+C)c;(Dw5xX9dp+3zV59G;FvwN
z3KGqqIFSUK@Ovb!89Nfpyw5#99_)a#VwA!+<Ex~og`x`H`{;dIDsNUG6_T+Qe4Mtj
zsTJELTX^qfr2;gPnuSn9Zug@WvbGJcjBBI&a+=3I0e)`79c1lxyfPu3_g<Pqfuh-R
zRB&QD{*LgUAx9Dbu;51<g&Y5clOk`qAbJJr)y|F8nzx)St_ABfuP?FNi#6{oDO|Q<
z^&2aey|PL(pY*K3T3L2>wx+~jG#m2FCUS`pspFscInGLx$&za}I<3Tg7A3dC)N@|f
z&I@VD29r+Lq_<}0T9z+Wpqz#rLq(3uNxv?q*=RMCn_Sj%ok?%97|hlRz1~%^-sLK%
zf!S=ZS}OHfw2;+m&C(lkby@m6gFb6RZB?nktjne={VkLaU#90tD*eyE@GZPg@$5F)
xSBLvarXM*@UPMq4LsK~rBC+}KR&e46lnjG^FM%Sq1Kvl}MAUE)-WNZf{0FKj)!hI9