From 3bd9c82bf2b67833ad60fc9522da0b50b63f5d2a Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang@960204@163.com>
Date: 星期二, 02 十二月 2025 19:42:07 +0800
Subject: [PATCH] fix：完善逻辑
---
src/main/java/com/wgcloud/service/RouterConnectionService.java | 51 +++++-------
src/main/java/com/wgcloud/task/ScheduledTask.java | 3
src/main/java/com/wgcloud/service/OspfInfoService.java | 22 +++++
wgcloud-server.iml | 127 -------------------------------
4 files changed, 46 insertions(+), 157 deletions(-)
diff --git a/src/main/java/com/wgcloud/service/OspfInfoService.java b/src/main/java/com/wgcloud/service/OspfInfoService.java
index 26c4432..6f25626 100644
--- a/src/main/java/com/wgcloud/service/OspfInfoService.java
+++ b/src/main/java/com/wgcloud/service/OspfInfoService.java
@@ -153,8 +153,30 @@
.body();
System.out.println(responseBody);
+ if(responseBody.equals("1")){
+ HashMap<String, Object> hashMap = new HashMap<>();
+ hashMap.put("state","1");
+ hashMap.put("hostname",ospfInfo.getHostname());
+ List<OspfErrorLog> ospfErrorLogs = errorLogMapper.selectAllByParams(hashMap);
+ if(ospfErrorLogs==null||ospfErrorLogs.size()==0){
+ OspfErrorLog ospfErrorLog = new OspfErrorLog();
+ ospfErrorLog.setInfoContent(ospfInfo.getInfoContent());
+ ospfErrorLog.setHostname(ospfInfo.getHostname());
+ ospfErrorLog.setState("1");
+ try {
+ errorLogMapper.save(ospfErrorLog);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ }
+ }
+ ospfInfo.setState(responseBody);
+ OspfInfoMapper.updateById(ospfInfo);
+
} catch (Exception e) {
e.printStackTrace();
+ ospfInfo.setState("1");
+ OspfInfoMapper.updateById(ospfInfo);
}
}
}
diff --git a/src/main/java/com/wgcloud/service/RouterConnectionService.java b/src/main/java/com/wgcloud/service/RouterConnectionService.java
index 2ffdc2c..3490c57 100644
--- a/src/main/java/com/wgcloud/service/RouterConnectionService.java
+++ b/src/main/java/com/wgcloud/service/RouterConnectionService.java
@@ -14,38 +14,29 @@
@Service
public class RouterConnectionService {
- @Value("${router.host}")
- private String routerHost;
-
- @Value("${router.username}")
- private String routerUsername;
-
- @Value("${router.password}")
- private String routerPassword;
-
private Session session;
- /**
- * 杩炴帴鍒拌矾鐢卞櫒
- */
- public boolean connect() {
- try {
- JSch jsch = new JSch();
- session = jsch.getSession(routerUsername, routerHost, 22);
- session.setPassword(routerPassword);
-
- // 璁剧疆涓嶈繘琛屼富鏈哄瘑閽ユ鏌�
- Properties config = new Properties();
- config.put("StrictHostKeyChecking", "no");
- session.setConfig(config);
-
- session.connect(5000); // 5绉掕秴鏃�
- return true;
- } catch (JSchException e) {
- System.err.println("杩炴帴璺敱鍣ㄥけ璐�: " + e.getMessage());
- return false;
- }
- }
+// /**
+// * 杩炴帴鍒拌矾鐢卞櫒
+// */
+// public boolean connect() {
+// try {
+// JSch jsch = new JSch();
+// session = jsch.getSession(routerUsername, routerHost, 22);
+// session.setPassword(routerPassword);
+//
+// // 璁剧疆涓嶈繘琛屼富鏈哄瘑閽ユ鏌�
+// Properties config = new Properties();
+// config.put("StrictHostKeyChecking", "no");
+// session.setConfig(config);
+//
+// session.connect(5000); // 5绉掕秴鏃�
+// return true;
+// } catch (JSchException e) {
+// System.err.println("杩炴帴璺敱鍣ㄥけ璐�: " + e.getMessage());
+// return false;
+// }
+// }
/**
* 杩炴帴鍒拌矾鐢卞櫒
diff --git a/src/main/java/com/wgcloud/task/ScheduledTask.java b/src/main/java/com/wgcloud/task/ScheduledTask.java
index 9315994..2e32384 100644
--- a/src/main/java/com/wgcloud/task/ScheduledTask.java
+++ b/src/main/java/com/wgcloud/task/ScheduledTask.java
@@ -84,7 +84,8 @@
@Scheduled(initialDelay = 30000L, fixedRate = 2 * 60 * 1000)
public void ospfDownCheckTask() {
logger.info("ospf閾捐矾妫�娴嬩换鍔″紑濮�------------" + DateUtil.getDateTimeString(new Date()));
- ospfInfoService.getDetailedOspfNeighborInfo();
+ //ospfInfoService.getDetailedOspfNeighborInfo();
+ ospfInfoService.getRouterStatus();
logger.info("ospf閾捐矾妫�娴嬩换鍔＄粨鏉�------------" + DateUtil.getDateTimeString(new Date()));
}
diff --git a/wgcloud-server.iml b/wgcloud-server.iml
index 7f2fb8c..1daccae 100644
--- a/wgcloud-server.iml
+++ b/wgcloud-server.iml
@@ -1,133 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
<component name="FacetManager">
- <facet type="web" name="Web">
- <configuration>
- <webroots />
- </configuration>
- </facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
- </component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
- <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.11" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.17.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.2" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-core:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.29" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf-spring5:3.0.15.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf:thymeleaf:3.0.15.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.attoparser:attoparser:2.0.5.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.unbescape:unbescape:1.1.6.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.4.RELEASE" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.60" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.60" level="project" />
- <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.60" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-context:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.14.0-rc3" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.13.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.13.2" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.0-rc3" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.0-rc3" level="project" />
- <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.14.0-rc3" level="project" />
- <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.22" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.83" level="project" />
- <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.6.5" level="project" />
- <orderEntry type="library" name="Maven: mysql:mysql-connector-java:8.0.28" level="project" />
- <orderEntry type="library" name="Maven: org.mariadb.jdbc:mariadb-java-client:2.7.3" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-starter:1.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper-spring-boot-autoconfigure:1.4.2" level="project" />
- <orderEntry type="library" name="Maven: com.github.pagehelper:pagehelper:5.3.0" level="project" />
- <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.2" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:4.0.3" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.3.18" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis.spring.boot:mybatis-spring-boot-autoconfigure:2.1.4" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.6" level="project" />
- <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
- <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit:2.66.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" />
- <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" />
- <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-core-js:2.66.0" level="project" />
- <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:neko-htmlunit:2.66.0" level="project" />
- <orderEntry type="library" name="Maven: xerces:xercesImpl:2.12.2" level="project" />
- <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
- <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-cssparser:1.12.0" level="project" />
- <orderEntry type="library" name="Maven: net.sourceforge.htmlunit:htmlunit-xpath:2.66.0" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.10.0" level="project" />
- <orderEntry type="library" name="Maven: commons-io:commons-io:2.10.0" level="project" />
- <orderEntry type="library" name="Maven: commons-net:commons-net:3.8.0" level="project" />
- <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
- <orderEntry type="library" name="Maven: org.brotli:dec:0.1.2" level="project" />
- <orderEntry type="library" name="Maven: com.shapesecurity:salvation2:3.0.1" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-client:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-client:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-common:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.eclipse.jetty.websocket:websocket-api:9.4.45.v20220203" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-email:1.5" level="project" />
- <orderEntry type="library" name="Maven: com.sun.mail:javax.mail:1.5.6" level="project" />
- <orderEntry type="library" name="Maven: javax.activation:activation:1.1" level="project" />
- <orderEntry type="library" name="Maven: org.postgresql:postgresql:42.5.0" level="project" />
- <orderEntry type="library" scope="RUNTIME" name="Maven: org.checkerframework:checker-qual:3.5.0" level="project" />
- <orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.55" level="project" />
- <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.63.Final" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.2.10" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
- <orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
- <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
- <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
- <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
- <orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
- <orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.36" level="project" />
- <orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.9" level="project" />
- <orderEntry type="library" name="Maven: net.jodah:expiringmap:0.5.10" level="project" />
- <orderEntry type="library" name="Maven: com.googlecode.aviator:aviator:5.3.0" level="project" />
- <orderEntry type="library" name="Maven: org.snmp4j:snmp4j:2.8.10" level="project" />
- <orderEntry type="library" name="Maven: com.cronutils:cron-utils:9.1.6" level="project" />
- <orderEntry type="library" name="Maven: org.javassist:javassist:3.27.0-GA" level="project" />
- <orderEntry type="library" name="Maven: org.glassfish:javax.el:3.0.0" level="project" />
- <orderEntry type="library" name="Maven: redis.clients:jedis:4.3.1" level="project" />
- <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.11.1" level="project" />
- <orderEntry type="library" name="Maven: org.json:json:20220320" level="project" />
- <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" />
- <orderEntry type="library" name="Maven: org.mongodb:mongo-java-driver:3.12.11" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.6.6" level="project" />
- <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.6.6" level="project" />
</component>
</module>
\ No newline at end of file
--
Gitblit v1.9.1