From bf5918ceffb1ff30db55052b1ed1bbea0b3c907b Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Thu, 17 Aug 2023 15:46:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E7=9F=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=97=A0=E6=9E=84=E9=80=A0=E6=96=B9=E6=B3=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nladmin-system/nlsso-server/pom.xml                    | 10 ++--------
 .../org/nl/system/service/notice/dao/SysNotice.java    |  2 ++
 nladmin-ui/src/views/system/notice/NoticeIcon.vue      |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml
index 5acc6d0..0291545 100644
--- a/nladmin-system/nlsso-server/pom.xml
+++ b/nladmin-system/nlsso-server/pom.xml
@@ -27,7 +27,7 @@
         <lucene.version>8.2.0</lucene.version>
 <!--        <lucene.version>7.6.0</lucene.version>-->
         <!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
-        <!--        <jna.version>5.8.0</jna.version>-->
+        <jna.version>5.9.0</jna.version>
         <configuration.version>1.9</configuration.version>
     </properties>
     <dependencies>
@@ -100,13 +100,7 @@
         <dependency>
             <groupId>com.github.oshi</groupId>
             <artifactId>oshi-core</artifactId>
-            <version>5.3.6</version>
-        </dependency>
-
-        <dependency>
-            <groupId>net.java.dev.jna</groupId>
-            <artifactId>jna</artifactId>
-            <version>5.6.0</version>
+            <version>5.0.1</version>
         </dependency>
 
         <!-- elasticsearch-->
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java
index 9b10d3a..b5a8daa 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -17,6 +18,7 @@ import java.io.Serializable;
 **/
 @Data
 @Builder
+@AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
 @TableName("sys_notice")
 public class SysNotice implements Serializable {
diff --git a/nladmin-ui/src/views/system/notice/NoticeIcon.vue b/nladmin-ui/src/views/system/notice/NoticeIcon.vue
index 63f50b9..4ae56e9 100644
--- a/nladmin-ui/src/views/system/notice/NoticeIcon.vue
+++ b/nladmin-ui/src/views/system/notice/NoticeIcon.vue
@@ -101,7 +101,7 @@ export default {
      */
     toSiteMessage() {
       this.$router.push({
-        path: '/monitor/notice'
+        path: '/monitor/sysNotice'
       })
       this.visible = false
     },