From 71972694f7d5f23cf42226366a9ddaad4b72b89f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 20 九月 2024 09:33:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
index ab6dbe5..f07f09f 100644
--- a/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
+++ b/ycl-server/src/main/java/com/ycl/thread/OSDCheckThread.java
@@ -13,21 +13,21 @@
@Slf4j
public class OSDCheckThread implements Callable<OSDResult> {
private TMonitor monitor;
- @Value("${HK.userName}")
public String HKUserName;
- @Value("${HK.password}")
public String HKPassword;
- @Value("${DH.userName}")
public String DHUserName;
- @Value("${DH.password}")
public String DHPassword;
- @Value("${YS.userName}")
public String YSUserName;
- @Value("${YS.password}")
public String YSPassword;
- public OSDCheckThread(TMonitor monitor) {
+ public OSDCheckThread(TMonitor monitor, String HKUserName, String HKPassword, String DHUserName, String DHPassword, String YSUserName, String YSPassword) {
this.monitor = monitor;
+ this.HKUserName = HKUserName;
+ this.HKPassword = HKPassword;
+ this.DHUserName = DHUserName;
+ this.DHPassword = DHPassword;
+ this.YSUserName = YSUserName;
+ this.YSPassword = YSPassword;
}
public TMonitor getMonitor() {
@@ -38,6 +38,54 @@
this.monitor = monitor;
}
+ public String getHKUserName() {
+ return HKUserName;
+ }
+
+ public void setHKUserName(String HKUserName) {
+ this.HKUserName = HKUserName;
+ }
+
+ public String getHKPassword() {
+ return HKPassword;
+ }
+
+ public void setHKPassword(String HKPassword) {
+ this.HKPassword = HKPassword;
+ }
+
+ public String getDHUserName() {
+ return DHUserName;
+ }
+
+ public void setDHUserName(String DHUserName) {
+ this.DHUserName = DHUserName;
+ }
+
+ public String getDHPassword() {
+ return DHPassword;
+ }
+
+ public void setDHPassword(String DHPassword) {
+ this.DHPassword = DHPassword;
+ }
+
+ public String getYSUserName() {
+ return YSUserName;
+ }
+
+ public void setYSUserName(String YSUserName) {
+ this.YSUserName = YSUserName;
+ }
+
+ public String getYSPassword() {
+ return YSPassword;
+ }
+
+ public void setYSPassword(String YSPassword) {
+ this.YSPassword = YSPassword;
+ }
+
@Override
public OSDResult call() throws Exception {
if (DeviceType.HK.getType().equals(monitor.getDeviceType())) {
--
Gitblit v1.8.0