From 5c86398b755715195e58584db152dfecf68b32ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Thu, 18 Sep 2025 15:05:01 +0800
Subject: [PATCH] =?UTF-8?q?09-18-=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
 =?UTF-8?q?=E5=8C=85=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96netty=E7=B3=BB=E7=BB=9F=E9=A6=96=E6=AC=A1=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/app/controller/SysPackageController.java    | 6 ++++--
 .../main/java/org/dromara/websocket/ChatServerHandler.java  | 4 ++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java
index e1591c06..bbdaacc6 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/app/controller/SysPackageController.java
@@ -42,7 +42,9 @@ public class SysPackageController {
     @Transactional
     @GetMapping("/uploadNewVersion")
     public R<SysPackage> uploadNewVersion(String version, String type, MultipartFile file) {
-        SysOssVo upload = sysOssService.upload(file);
+        SysOssVo path = sysOssService.upload(file);
+        String originalFileName = "apk/package/app-release.apk";
+        SysOssVo upload = sysOssService.upload(file, originalFileName);
         if (upload == null){
             return R.fail("上传失败");
         }
@@ -62,7 +64,7 @@ public class SysPackageController {
 
 
     /**
-     * 删除
+     * 删除 现在指向的是同一个文件
      */
     @Transactional
     @GetMapping("/remove")
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
index 197debc0..d4058963 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
@@ -486,6 +486,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 //发送方设置为99 表示系统消息
                 chatHistory.setSenderId(99L);
                 jsonObject.put("nickName","系统消息");
+                jsonObject.put("roomType",2);
             }
 
             //2:考勤消息
@@ -507,6 +508,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 //发送方设置为100 表示系统消息中的考勤消息
                 chatHistory.setSenderId(100L);
                 jsonObject.put("nickName","考勤消息");
+                jsonObject.put("roomType",3);
             }
 
             //安全消息
@@ -528,6 +530,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 //发送方设置为101 表示系统消息中的安全消息
                 chatHistory.setSenderId(101L);
                 jsonObject.put("nickName","安全消息");
+                jsonObject.put("roomType",4);
             }
 
             //质量消息
@@ -549,6 +552,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                 //发送方设置为102 表示系统消息中的质量消息
                 chatHistory.setSenderId(102L);
                 jsonObject.put("nickName","质量消息");
+                jsonObject.put("roomType",5);
             }
 
             default -> {