From ea94079e74182be590b9fff356c97f522d9a7828 Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期二, 18 十月 2022 09:26:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
index 3ed2b2f..2203b8f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxConstant.java
@@ -32,15 +32,18 @@
     private String screenShotNotifyUrl;
     @Value("${nova-conf.status-notify-url}")
     private String statusNotifyUrl;
+    @Value("${nova-conf.username}")
+    private String userName;
+    @Value("${nova-conf.password}")
+    private String passWord;
 
 
     public static String NOTIFY_URL;
     public static String SCREEN_SHOT_NOTIFY_URL;
     public static String STATUS_NOTIFY_URL;
-    public static String STATUS_NOTIFY_URL1;
 
-    public static final String username = "zhxm";
-    public static final String password = "xm2512209.";
+    public static String username;
+    public static String password;
 
     public static final Gson GSON = new Gson();
 
@@ -52,7 +55,10 @@
         SCREEN_SHOT_NOTIFY_URL = screenShotNotifyUrl;
 
         STATUS_NOTIFY_URL = statusNotifyUrl;
-        System.out.println(STATUS_NOTIFY_URL);
+
+        username = userName;
+
+        password = passWord;
 
 
     }

--
Gitblit v1.9.3