From f97d74f9f851ef70048fab599d7bc54d7932afc7 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 23 八月 2023 17:29:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/templates/test.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/templates/test.html b/ard-work/src/main/resources/templates/test.html
index fbe56d5..15e9981 100644
--- a/ard-work/src/main/resources/templates/test.html
+++ b/ard-work/src/main/resources/templates/test.html
@@ -162,7 +162,7 @@
}
})
- opt = {"username": "liusuyi", "password": "5959932"};
+ opt = {"username": "admin", "password": "admin123"};
$.ajax({
headers: {
'Accept': 'application/json',
@@ -782,7 +782,7 @@
} else if (camera.type == "dh") {
realViewDh("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
} else {
- realViewHik("192.168.1.15", ID, camera.username, camera.password, camera.ipaddr, camera.port);
+ realViewHik("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
}
}
});
--
Gitblit v1.9.3