From 3a1c15fe638b3ac2bda10fb85b8a7e26fb1ab9ab Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Fri, 10 Mar 2023 13:56:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91=20JobAlarmer.?= =?UTF-8?q?java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java index 797dc900..addeb2e3 100644 --- a/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java +++ b/jero-boot/jero-cloud-module/jero-cloud-xxljob/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java @@ -29,8 +29,8 @@ public class JobAlarmer implements ApplicationContextAware, InitializingBean { @Override public void afterPropertiesSet() throws Exception { Map serviceBeanMap = applicationContext.getBeansOfType(JobAlarm.class); - if (serviceBeanMap != null && serviceBeanMap.size() > 0) { - jobAlarmList = new ArrayList(serviceBeanMap.values()); + if (!serviceBeanMap.isEmpty()) { + jobAlarmList = new ArrayList<>(serviceBeanMap.values()); } } @@ -44,7 +44,7 @@ public class JobAlarmer implements ApplicationContextAware, InitializingBean { public boolean alarm(XxlJobInfo info, XxlJobLog jobLog) { boolean result = false; - if (jobAlarmList!=null && jobAlarmList.size()>0) { + if (jobAlarmList!=null && !jobAlarmList.isEmpty()) { result = true; // success means all-success for (JobAlarm alarm: jobAlarmList) { boolean resultItem = false; From 294be7eab53df379556897499f58aedf20267540 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Fri, 10 Mar 2023 14:01:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90fix=E3=80=91websocket=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=E8=B7=AF=E5=BE=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/components/tools/HeaderNotice.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue index ed493a8c..601ed7b5 100644 --- a/jero-web/src/components/tools/HeaderNotice.vue +++ b/jero-web/src/components/tools/HeaderNotice.vue @@ -198,7 +198,7 @@ export default { initWebSocket: function () { // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https const userId = store.getters.userInfo.id - const url = window._CONFIG.domianWebSocketURL.replace('https://', 'wss://').replace('http://', 'ws://') + '/websocket/' + userId + const url = window._CONFIG.domianWebSocketURL.replace('https://', 'wss://').replace('http://', 'ws://') + '/jero-boot/websocket/' + userId // console.log(url); this.websock = new WebSocket(url) this.websock.onopen = this.websocketOnopen