From c6550a4d9bd69e59e9bb6ac6ad740e509edbd215 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 11 十二月 2024 18:10:29 +0800
Subject: [PATCH] 1
---
se-modules/se-system/src/main/java/com/se/system/service/impl/SysSoftServiceImpl.java | 6 ++-
se-modules/se-system/src/main/java/com/se/system/utils/ConnectUtils.java | 25 +++++++++---
se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java | 2
se-modules/se-system/src/main/java/com/se/system/service/impl/SysStatusCtrlServiceImpl.java | 20 ++++++++-
说明.txt | 2 +
se-modules/se-system/src/main/java/com/se/system/mapper/SysStatusCtrlMapper.java | 19 +++++----
se-modules/se-system/src/main/resources/mapper/system/SysStatusCtrlMapper.xml | 8 ++++
docker-compose/mysql/initdb/se_cloud_20240629.sql | 4 +-
se-modules/se-system/src/main/java/com/se/system/utils/RyTask.java | 4 +-
9 files changed, 66 insertions(+), 24 deletions(-)
diff --git a/docker-compose/mysql/initdb/se_cloud_20240629.sql b/docker-compose/mysql/initdb/se_cloud_20240629.sql
index f2510cd..a2ecb8c 100644
--- a/docker-compose/mysql/initdb/se_cloud_20240629.sql
+++ b/docker-compose/mysql/initdb/se_cloud_20240629.sql
@@ -634,8 +634,8 @@
primary key (job_id, job_name, job_group)
) engine=innodb auto_increment=4 comment = '瀹氭椂浠诲姟璋冨害琛�';
-insert into sys_job values(1, '杞欢鐘舵�佹娴嬪畾鏃朵换鍔�', 'DEFAULT', 'ryTask.runSoftTest', '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-insert into sys_job values(2, '绯荤粺鐘舵�佹娴嬪畾鏃朵换鍔�', 'DEFAULT', 'ryTask.runSubSysTest', '0/10 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+insert into sys_job values(1, '杞欢鐘舵�佹娴嬪畾鏃朵换鍔�', 'DEFAULT', 'ryTask.runSoftTest', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
+insert into sys_job values(2, '绯荤粺鐘舵�佹娴嬪畾鏃朵换鍔�', 'DEFAULT', 'ryTask.runSubSysTest', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-- insert into sys_job values(3, '绯荤粺榛樿锛堝鍙傦級', 'DEFAULT', 'ryTask.ryMultipleParams(\'ry\', true, 2000L, 316.50D, 100)', '0/20 * * * * ?', '3', '1', '1', 'admin', sysdate(), '', null, '');
-- select * from sys_job order by job_id;
diff --git a/se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java
index beaf73f..82c9474 100644
--- a/se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java
+++ b/se-common/se-common-core/src/main/java/com/se/common/core/utils/ServletUtils.java
@@ -283,7 +283,7 @@
*/
public static Mono<Void> webFluxResponseWriter(ServerHttpResponse response, Object value)
{
- return webFluxResponseWriter(response, HttpStatus.OK, value, R.FAIL);
+ return webFluxResponseWriter(response, HttpStatus.INTERNAL_SERVER_ERROR, value, R.FAIL);
}
/**
diff --git a/se-modules/se-system/src/main/java/com/se/system/mapper/SysStatusCtrlMapper.java b/se-modules/se-system/src/main/java/com/se/system/mapper/SysStatusCtrlMapper.java
index 66e868b..19dbd64 100644
--- a/se-modules/se-system/src/main/java/com/se/system/mapper/SysStatusCtrlMapper.java
+++ b/se-modules/se-system/src/main/java/com/se/system/mapper/SysStatusCtrlMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.se.system.domain.SysStatusCtrl;
+import org.apache.ibatis.annotations.Param;
/**
* 绯荤粺鐘舵�佺洃鎺apper鎺ュ彛
@@ -9,11 +10,11 @@
* @author se
* @date 2024-12-07
*/
-public interface SysStatusCtrlMapper
-{
+@SuppressWarnings("ALL")
+public interface SysStatusCtrlMapper {
/**
* 鏌ヨ绯荤粺鐘舵�佺洃鎺�
- *
+ *
* @param statusId 绯荤粺鐘舵�佺洃鎺т富閿�
* @return 绯荤粺鐘舵�佺洃鎺�
*/
@@ -21,7 +22,7 @@
/**
* 鏌ヨ绯荤粺鐘舵�佺洃鎺у垪琛�
- *
+ *
* @param sysStatusCtrl 绯荤粺鐘舵�佺洃鎺�
* @return 绯荤粺鐘舵�佺洃鎺ч泦鍚�
*/
@@ -29,7 +30,7 @@
/**
* 鏂板绯荤粺鐘舵�佺洃鎺�
- *
+ *
* @param sysStatusCtrl 绯荤粺鐘舵�佺洃鎺�
* @return 缁撴灉
*/
@@ -37,7 +38,7 @@
/**
* 淇敼绯荤粺鐘舵�佺洃鎺�
- *
+ *
* @param sysStatusCtrl 绯荤粺鐘舵�佺洃鎺�
* @return 缁撴灉
*/
@@ -45,7 +46,7 @@
/**
* 鍒犻櫎绯荤粺鐘舵�佺洃鎺�
- *
+ *
* @param statusId 绯荤粺鐘舵�佺洃鎺т富閿�
* @return 缁撴灉
*/
@@ -53,9 +54,11 @@
/**
* 鎵归噺鍒犻櫎绯荤粺鐘舵�佺洃鎺�
- *
+ *
* @param statusIds 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
public int deleteSysStatusCtrlByStatusIds(Long[] statusIds);
+
+ public int updates(@Param("list") List<SysStatusCtrl> list);
}
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysSoftServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysSoftServiceImpl.java
index d4c0b65..3ba2f7a 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysSoftServiceImpl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysSoftServiceImpl.java
@@ -107,10 +107,12 @@
return list;
}
- public void runSoftTest() throws Exception {
+ public void runSoftTest() {
List<SysSoft> list = getList();
if (CollectionUtils.isEmpty(list)) return;
- //
+ for (SysSoft soft : list) {
+ //docker
+ }
}
}
diff --git a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysStatusCtrlServiceImpl.java b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysStatusCtrlServiceImpl.java
index abdfda4..ce041b5 100644
--- a/se-modules/se-system/src/main/java/com/se/system/service/impl/SysStatusCtrlServiceImpl.java
+++ b/se-modules/se-system/src/main/java/com/se/system/service/impl/SysStatusCtrlServiceImpl.java
@@ -2,8 +2,9 @@
import java.util.List;
import com.se.common.core.utils.DateUtils;
-import com.se.system.domain.SysSoft;
import com.se.system.utils.CaffeineUtils;
+import com.se.system.utils.ConnectUtils;
+import com.se.system.utils.StringUtils;
import org.springframework.stereotype.Service;
import com.se.system.mapper.SysStatusCtrlMapper;
import com.se.system.domain.SysStatusCtrl;
@@ -108,10 +109,23 @@
return list;
}
- public void runSubSysTest() throws Exception {
+ public void runSubSysTest() {
List<SysStatusCtrl> list = getList();
if (CollectionUtils.isEmpty(list)) return;
- //
+ for (SysStatusCtrl ctrl : list) {
+ ctrl.setStatus("0");
+ ctrl.setRemark("");
+ if (!StringUtils.isEmpty(ctrl.getIp()) && !ConnectUtils.isReachable(ctrl.getIp())) {
+ ctrl.setStatus("1");
+ ctrl.setRemark("IP涓嶈繛閫�");
+ }
+ if (!StringUtils.isEmpty(ctrl.getUrl()) && !ConnectUtils.testUrl(ctrl.getUrl(), ctrl.getMethod())) {
+ ctrl.setStatus("1");
+ ctrl.setRemark((ctrl.getRemark().length() > 0 ? ctrl.getRemark() + "锛�" : "") + "URL杩炴帴涓嶄笂");
+ }
+ }
+
+ sysStatusCtrlMapper.updates(list);
}
}
diff --git a/se-modules/se-system/src/main/java/com/se/system/utils/ConnectUtils.java b/se-modules/se-system/src/main/java/com/se/system/utils/ConnectUtils.java
index 9d1741d..5c5ea2a 100644
--- a/se-modules/se-system/src/main/java/com/se/system/utils/ConnectUtils.java
+++ b/se-modules/se-system/src/main/java/com/se/system/utils/ConnectUtils.java
@@ -1,8 +1,6 @@
package com.se.system.utils;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.URL;
+import java.net.*;
@SuppressWarnings("ALL")
public class ConnectUtils {
@@ -10,18 +8,33 @@
try {
InetAddress inetAddress = InetAddress.getByName(ip);
- return inetAddress.isReachable(1000);
+ return inetAddress.isReachable(1500);
} catch (Exception ex) {
return false;
}
}
- public static boolean getUrl(String uri, String method) {
+ public static boolean isReachable(String addr) {
+ try {
+ String[] strs = addr.split(":");
+ InetSocketAddress socketAddress = new InetSocketAddress(strs[0], strs.length < 2 || StringUtils.isEmpty(strs[1]) ? 80 : Integer.parseInt(strs[1]));
+
+ Socket socket = new Socket();
+ socket.connect(socketAddress, 1500);
+ socket.close();
+
+ return true;
+ } catch (Exception ex) {
+ return false;
+ }
+ }
+
+ public static boolean testUrl(String uri, String method) {
try {
URL url = new URL(uri);
HttpURLConnection con = (HttpURLConnection) url.openConnection();
- con.setRequestMethod(method);
+ con.setRequestMethod(StringUtils.isEmpty(method) ? "GET" : method);
con.setConnectTimeout(1000);
con.setReadTimeout(1000);
diff --git a/se-modules/se-system/src/main/java/com/se/system/utils/RyTask.java b/se-modules/se-system/src/main/java/com/se/system/utils/RyTask.java
index f4b2ec3..948848b 100644
--- a/se-modules/se-system/src/main/java/com/se/system/utils/RyTask.java
+++ b/se-modules/se-system/src/main/java/com/se/system/utils/RyTask.java
@@ -36,12 +36,12 @@
System.out.println("鎵ц鏃犲弬鏂规硶");
}
- public void runSoftTest() throws Exception {
+ public void runSoftTest() {
System.out.println("ryTask.runSoftTest()");
sysSoftService.runSoftTest();
}
- public void runSubSysTest() throws Exception {
+ public void runSubSysTest() {
System.out.println("ryTask.runSubSysTest()");
sysStatusCtrlService.runSubSysTest();
}
diff --git a/se-modules/se-system/src/main/resources/mapper/system/SysStatusCtrlMapper.xml b/se-modules/se-system/src/main/resources/mapper/system/SysStatusCtrlMapper.xml
index 800f514..c28df75 100644
--- a/se-modules/se-system/src/main/resources/mapper/system/SysStatusCtrlMapper.xml
+++ b/se-modules/se-system/src/main/resources/mapper/system/SysStatusCtrlMapper.xml
@@ -98,4 +98,12 @@
#{statusId}
</foreach>
</delete>
+
+ <update id="updates">
+ <foreach collection="list" item="item" index="index" separator=";">
+ update sys_status_ctrl
+ set status = #{item.status}, remark = #{item.remark}, update_time = now()
+ where status_id = #{item.statusId}
+ </foreach>
+ </update>
</mapper>
\ No newline at end of file
diff --git "a/\350\257\264\346\230\216.txt" "b/\350\257\264\346\230\216.txt"
index b539816..c151e2b 100644
--- "a/\350\257\264\346\230\216.txt"
+++ "b/\350\257\264\346\230\216.txt"
@@ -109,3 +109,5 @@
top -N 10
ps -ef | grep wgcloud
kill -9 10086
+
+url: jdbc:mysql://localhost:3306/se-cloud?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
--
Gitblit v1.9.3