From 285b20e698b0f26bdb3e9182d367ecae2c5a63d0 Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期三, 03 十二月 2025 10:12:34 +0800
Subject: [PATCH] 推送修改
---
/dev/null | 8 --------
src/main/java/com/wgcloud/WgcloudServiceApplication.java | 2 +-
src/main/java/com/wgcloud/controller/dp/DpController.java | 14 ++++++++++++++
src/main/java/com/wgcloud/filter/AuthRestFilter.java | 2 +-
src/main/resources/application.yml | 2 +-
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/wgcloud/WgcloudServiceApplication.java b/src/main/java/com/wgcloud/WgcloudServiceApplication.java
index 0acffdc..3f01e40 100644
--- a/src/main/java/com/wgcloud/WgcloudServiceApplication.java
+++ b/src/main/java/com/wgcloud/WgcloudServiceApplication.java
@@ -31,7 +31,7 @@
@ServletComponentScan("com.wgcloud.filter")
@ComponentScan(basePackages = "com.wgcloud")
@EnableCaching
-@EnableScheduling
+//@EnableScheduling
public class WgcloudServiceApplication {
public static void main(String[] args) {
SpringApplication.run(WgcloudServiceApplication.class, args);
diff --git a/src/main/java/com/wgcloud/controller/dp/DpController.java b/src/main/java/com/wgcloud/controller/dp/DpController.java
index 63a6ae0..a053c5f 100644
--- a/src/main/java/com/wgcloud/controller/dp/DpController.java
+++ b/src/main/java/com/wgcloud/controller/dp/DpController.java
@@ -9,6 +9,7 @@
import com.wgcloud.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -84,6 +85,7 @@
HashMap<String, Object> map = new HashMap<>();
map.put("date",sdf.format(ospfInfo.getCreateTime()));
map.put("name",ospfInfo.getInfoContent());
+ map.put("id",ospfInfo.getId());
map.put("ipaddress",ospfInfo.getHostname());
map.put("status",ospfInfo.getState());
list.add(map);
@@ -128,5 +130,17 @@
return R.ok(list);
}
+ @GetMapping("/handle")
+ public R handle(String id) throws Exception {
+ OspfErrorLog ospfErrorLog = ospfErrorLogService.selectById(id);
+ if(ospfErrorLog.getState().equals("1")){
+ ospfErrorLog.setState("0");
+ ospfErrorLogService.updateById(ospfErrorLog);
+ return R.ok();
+ }else {
+ return R.ok();
+ }
+ }
+
}
diff --git a/src/main/java/com/wgcloud/filter/AuthRestFilter.java b/src/main/java/com/wgcloud/filter/AuthRestFilter.java
index ca72ddc..a4f7b86 100644
--- a/src/main/java/com/wgcloud/filter/AuthRestFilter.java
+++ b/src/main/java/com/wgcloud/filter/AuthRestFilter.java
@@ -33,7 +33,7 @@
"/systemInfoOpen/", "/systemInfo/agentList", "/agentLogGo/minTask", "/agentGo/minTask", "/agentDiskGo/minTask", "/dceInfo/agentList",
"/login/toLogin", "/login/login", "/appInfo/agentList", "/dockerInfo/agentList", "/portInfo/agentList", "/license/",
"/static/", "/resources/", "/log/agentList", "/customInfo/agentList", "/agentCustomGo/minTask", "/dbInfo/agentList", "/agentDbTableGo/minTask",
- "/agentHeathMonitorGo/minTask", "/agentDceInfoGo/minTask", "/agentSnmpInfoGo/minTask", "/snmpInfo/agentList","/api/","/dp/getTop","/dp/getWb","/dp/getError","/dp/getCount","/dp/getInfo"};
+ "/agentHeathMonitorGo/minTask", "/agentDceInfoGo/minTask", "/agentSnmpInfoGo/minTask", "/snmpInfo/agentList","/api/","/dp/getTop","/dp/getWb","/dp/getError","/dp/getCount","/dp/getInfo","/dp/handle"};
//鍏紬鐪嬫澘URL
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c96b5a2..793b5e3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
name: wgcloud-server
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://120.1.33.103:10001/wgcloud?characterEncoding=utf-8&characterSetResults=utf8&autoReconnect=true&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://127.0.0.1:3306/wgcloud?characterEncoding=utf-8&characterSetResults=utf8&autoReconnect=true&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
username: root
password: rootroot
# hikari杩炴帴姹犵殑鍙傛暟 鐩稿叧璁剧疆
diff --git a/wgcloud-server.iml b/wgcloud-server.iml
deleted file mode 100644
index 1daccae..0000000
--- a/wgcloud-server.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="4">
- <component name="FacetManager">
- <facet type="Spring" name="Spring">
- <configuration />
- </facet>
- </component>
-</module>
\ No newline at end of file
--
Gitblit v1.9.1