From 73c18c79b85c7aacefe62dd13862f5378477e088 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 13 Nov 2024 10:00:25 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E8=AE=A1=E5=88=92=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=90=8E=E4=BC=9A=E8=87=AA=E5=8A=A8=E6=89=A7?= =?UTF-8?q?=E8=A1=8C.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/asset/service/impl/ExecJobServiceImpl.java | 2 +- orion-visor-ui/src/utils/is.ts | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java index 344c8669..cb454f40 100644 --- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/ExecJobServiceImpl.java @@ -112,7 +112,7 @@ public class ExecJobServiceImpl implements ExecJobService { // 设置任务主机 execJobHostService.setHostIdByJobId(id, request.getHostIdList()); // 设置 quartz 状态 - this.setQuartzJobStatus(record, false, true); + // this.setQuartzJobStatus(record, false, false); log.info("ExecJobService-createExecJob id: {}, effect: {}", id, effect); return id; } diff --git a/orion-visor-ui/src/utils/is.ts b/orion-visor-ui/src/utils/is.ts index a93ca0e2..a4b6dca8 100644 --- a/orion-visor-ui/src/utils/is.ts +++ b/orion-visor-ui/src/utils/is.ts @@ -55,6 +55,14 @@ export function isWindow(el: any): el is Window { /** * 是否为移动端 ua */ -export function isMobile(userAgent: string) { +export function isMobile(userAgent: string): boolean { return /Mobi|Android|iPhone/i.test(userAgent); } + +/** + * 是否为 IPv4 + */ +export function isIPv4(ip: string): boolean { + const reg = /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/; + return reg.test(ip); +}