From 1aa8203011782dbbe379c4f617a974d58dfa04a2 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 10 May 2023 15:49:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5websocket=E7=9A=84=E8=BF=9E=E6=8E=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/common/mnt/websocket/WebSocketServer.java | 2 +- .../org/nl/common/security/satoken/SaTokenConfigure.java | 5 +++-- .../src/main/java/org/nl/config/WebSocketConfig.java | 2 +- .../main/java/org/nl/system/service/menu/dao/SysMenu.java | 3 +++ .../nl/system/service/notice/impl/SysNoticeServiceImpl.java | 5 ++++- .../nlsso-server/src/main/resources/config/application.yml | 1 - nladmin-ui/public/config.js | 1 - nladmin-ui/src/layout/components/Navbar.vue | 6 +++--- nladmin-ui/src/views/system/notice/NoticeIcon.vue | 5 ++++- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java index 716657d..d2c7920 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java @@ -104,7 +104,7 @@ public class WebSocketServer { /** * 群发自定义消息 * */ - public static void sendInfo(SocketMsg socketMsg,@PathParam("sid") String sid) throws IOException { + public static void sendInfo(SocketMsg socketMsg, @PathParam("sid") String sid) throws IOException { String message = JSONObject.toJSONString(socketMsg); log.info("推送消息到"+sid+"，推送内容:"+message); for (WebSocketServer item : webSocketSet) { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java b/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java index ccb7d08..ab83e17 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java @@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; @@ -17,12 +18,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; * @Date: 2022-09-20 */ @Slf4j -@RequiredArgsConstructor @Configuration public class SaTokenConfigure implements WebMvcConfigurer { // 白名单 - private final SecurityProperties securityProperties; + @Autowired + private SecurityProperties securityProperties; // Sa-Token 整合 jwt (Simple 简单模式) @Bean diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java b/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java index ec08886..28a447c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java @@ -23,7 +23,7 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; * @author ZhangHouYing * @date 2019-08-24 15:44 */ -//@Configuration +@Configuration public class WebSocketConfig { @Bean diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java index 749e969..33d4d78 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/SysMenu.java @@ -1,6 +1,7 @@ package org.nl.system.service.menu.dao; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; @@ -117,6 +118,7 @@ public class SysMenu implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date create_time; /** @@ -132,6 +134,7 @@ public class SysMenu implements Serializable { /** * 修改时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date update_time; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java index 17de744..bb8506c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.NoticeEnum; @@ -26,6 +27,7 @@ import org.nl.system.service.notice.dao.SysNotice; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.io.IOException; import java.util.LinkedList; import java.util.List; @@ -48,7 +50,7 @@ public class SysNoticeServiceImpl extends ServiceImpl sysNotices = sysNoticeMapper.selectList(new LambdaQueryWrapper().eq(SysNotice::getNotice_title, title)); if (ObjectUtil.isNotEmpty(sysNotices)) return; diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 1df2c54..ac11b14 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -75,7 +75,6 @@ security: # actuator 监控配置 - /actuator - /actuator/** - - /** # 上传 - /api/localStorage/pictures # 参数 diff --git a/nladmin-ui/public/config.js b/nladmin-ui/public/config.js index c4d32ea..441302a 100644 --- a/nladmin-ui/public/config.js +++ b/nladmin-ui/public/config.js @@ -4,7 +4,6 @@ window.g = { }, prod: { VUE_APP_BASE_API: 'http://127.0.0.1:8010' - } } diff --git a/nladmin-ui/src/layout/components/Navbar.vue b/nladmin-ui/src/layout/components/Navbar.vue index fc4c9e4..011b261 100644 --- a/nladmin-ui/src/layout/components/Navbar.vue +++ b/nladmin-ui/src/layout/components/Navbar.vue @@ -76,6 +76,9 @@ export default { Doc, TopNav }, + created() { + this.initWebSocket() + }, data() { return { Avatar: Avatar, @@ -106,9 +109,6 @@ export default { } } }, - created() { - this.initWebSocket() - }, methods: { toggleSideBar() { this.$store.dispatch('app/toggleSideBar') diff --git a/nladmin-ui/src/views/system/notice/NoticeIcon.vue b/nladmin-ui/src/views/system/notice/NoticeIcon.vue index 3b5a18d..63f50b9 100644 --- a/nladmin-ui/src/views/system/notice/NoticeIcon.vue +++ b/nladmin-ui/src/views/system/notice/NoticeIcon.vue @@ -7,7 +7,7 @@
- +