forked from ard/ruoyi-api

‘liusuyi’
2023-05-06 6f09936092d5b567cd5a04e18a2fdfa195b1f2bb
优化
19 files deleted
3 files modified
1603 ■■■■■ changed files
.gitignore 1 ●●●● patch | view | raw | blame | history
.idea/.gitignore 10 ●●●●● patch | view | raw | blame | history
.idea/compiler.xml 20 ●●●●● patch | view | raw | blame | history
.idea/encodings.xml 21 ●●●●● patch | view | raw | blame | history
.idea/jarRepositories.xml 25 ●●●●● patch | view | raw | blame | history
.idea/misc.xml 12 ●●●●● patch | view | raw | blame | history
.idea/vcs.xml 7 ●●●●● patch | view | raw | blame | history
ard-work/src/main/resources/templates/test.html 10 ●●●● patch | view | raw | blame | history
ard-work/target/classes/templates/test.html 9 ●●●●● patch | view | raw | blame | history
ardLicense/license.cpy 1 ●●●● patch | view | raw | blame | history
ardLog/logs/Authorize.log patch | view | raw | blame | history
ardLog/logs/SdkLog_1_W.log 53 ●●●●● patch | view | raw | blame | history
ardLog/logs/hikSdk.log 44 ●●●●● patch | view | raw | blame | history
ardLog/logs/minio.log patch | view | raw | blame | history
ardLog/logs/stealAlarm.log patch | view | raw | blame | history
ardLog/logs/sys-error.log 1284 ●●●●● patch | view | raw | blame | history
ardLog/logs/sys-info.log 62 ●●●●● patch | view | raw | blame | history
ardLog/logs/sys-user.log 6 ●●●●● patch | view | raw | blame | history
ardLog/logs/websocket.log patch | view | raw | blame | history
bin/clean.bat 12 ●●●●● patch | view | raw | blame | history
bin/package.bat 12 ●●●●● patch | view | raw | blame | history
bin/run.bat 14 ●●●●● patch | view | raw | blame | history
.gitignore
@@ -1 +1,2 @@
/ardLog/logs/
/ardLog/
.idea/.gitignore
File was deleted
.idea/compiler.xml
File was deleted
.idea/encodings.xml
File was deleted
.idea/jarRepositories.xml
File was deleted
.idea/misc.xml
File was deleted
.idea/vcs.xml
File was deleted
ard-work/src/main/resources/templates/test.html
@@ -130,11 +130,11 @@
                for (var i = 0; i < arr.length; i++) {
                    console.log(arr[i].id);
                    var camera = {
                        type: arr[i].type,
                        type: arr[i].gdtype,
                        ipaddr: arr[i].ip,
                        username: arr[i].username,
                        password: arr[i].password,
                        port: 554
                        port: arr[i].rtspPort
                    };
                    cameraMap.set(arr[i].id, camera);
                    //先创建好select里面的option元素
@@ -146,6 +146,7 @@
                }
            }
        })
        opt = {"username": "admin", "password": "admin123"};
        $.ajax({
            headers: {
@@ -699,6 +700,7 @@
            })
        }
    })
    var cameraMap = new Map();
    /*云台公共方法*/
@@ -720,7 +722,6 @@
            }
        })
    }
    let webRtcServer = null;
    let videoMap = new Map();
    $('video').click(function (e) {
@@ -737,11 +738,10 @@
            } 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, "21500");
                realViewHik("192.168.1.15", ID, camera.username, camera.password, camera.ipaddr,  camera.port);
            }
        }
    });
    //预览海康相机
    function realViewHik(serverip, elem, username, password, ipaddr, port) {
ard-work/target/classes/templates/test.html
@@ -130,11 +130,11 @@
                for (var i = 0; i < arr.length; i++) {
                    console.log(arr[i].id);
                    var camera = {
                        type: arr[i].type,
                        type: arr[i].gdtype,
                        ipaddr: arr[i].ip,
                        username: arr[i].username,
                        password: arr[i].password,
                        port: 554
                        port: arr[i].rtspPort
                    };
                    cameraMap.set(arr[i].id, camera);
                    //先创建好select里面的option元素
@@ -146,6 +146,7 @@
                }
            }
        })
        opt = {"username": "admin", "password": "admin123"};
        $.ajax({
            headers: {
@@ -699,6 +700,7 @@
            })
        }
    })
    var cameraMap = new Map();
    /*云台公共方法*/
@@ -737,11 +739,10 @@
            } 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, "21500");
                realViewHik("192.168.1.15", ID, camera.username, camera.password, camera.ipaddr,  camera.port);
            }
        }
    });
    //预览海康相机
    function realViewHik(serverip, elem, username, password, ipaddr, port) {
ardLicense/license.cpy
File was deleted
ardLog/logs/Authorize.log
ardLog/logs/SdkLog_1_W.log
File was deleted
ardLog/logs/hikSdk.log
File was deleted
ardLog/logs/minio.log
ardLog/logs/stealAlarm.log
ardLog/logs/sys-error.log
File was deleted
ardLog/logs/sys-info.log
File was deleted
ardLog/logs/sys-user.log
File was deleted
ardLog/logs/websocket.log
bin/clean.bat
File was deleted
bin/package.bat
File was deleted
bin/run.bat
File was deleted