forked from ard/ruoyi-api
parent: 8ad956 | patch | commitdiff
aijinhui
2023-10-24 8a87e4226aa802d6a0e3566c66824fedf68e77da
refs
author aijinhui <aijinhui>
Tuesday, October 24, 2023 16:30 +0800
committer aijinhui <aijinhui>
Tuesday, October 24, 2023 16:30 +0800
commit8a87e4226aa802d6a0e3566c66824fedf68e77da
tree e6b1b13ce0f2056609eb2ae50a9c3dcd19b10100 tree | zip | gz
parent 8ad9561f36bda4ccc8a3547d9157af706397c136 view | diff
5addedcb92fcd56239825f301502aabbeaf5e325 view | diff 
Merge remote-tracking branch 'origin/master'
2 files added
8 files deleted
41 files modified
158 files renamed
1 files copied
104791 ■■■■■ changed files
ard-work/pom.xml 397 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/config/AsyncConfiguration.java 22 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/cmd/startup.java 346 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java 730 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/ICameraSdkService.java 200 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/AsyncLogin.java 39 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java 1368 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/LibraryLoad.java 387 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/NetSDKLib.java 74661 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/Utils.java 420 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/CFG_MOTION_INFO.java 250 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/NET_ALARM_DEVICE_MODIFIED_INFO.java 50 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/NET_CFG_ACCESSCTL_SPECIALDAY_GROUP_INFO.java 88 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/NET_IN_PERSON_INFO_INPUT_RESULT.java 82 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/NET_IN_START_REDIRECT_SERVICE.java 86 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/UNPACKING_CHECK_INFO.java 176 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/CANDIDATE_INFO_CEX.java 134 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSLINE_INFO.java 316 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/DEV_EVENT_CROSSREGION_INFO.java 418 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/EVENT_INTELLI_COMM_INFO.java 68 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/lib/structure/customize/MEDIAFILE_FACERECOGNITION_INFO.java 140 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/CapturePictureModule.java 214 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java 25 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java 288 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/RealPlayModule.java 204 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/IDhClientService.java 6 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java 197 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java 47 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/ExceptionCallBack.java 44 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/HCNetSDK.java 21398 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java 223 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 283 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java 96 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/VtduServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/forest/MediaClient.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/dynamic-lib-load.xml 115 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/AudioRender.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/GdiPlus.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCCore.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDK.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/AnalyzeData.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/AudioIntercom.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/AudioRender.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCAlarm.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCAlarm.lib diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCCoreDevCfg.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCDisplay.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCGeneralCfgMgr.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCGeneralCfgMgr.lib diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCIndustry.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCPlayBack.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCPreview.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCPreview.lib diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/HCVoiceTalk.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/OpenAL32.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/StreamTransClient.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/SystemTransform.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HCNetSDKCom/libiconv2.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HXVA.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/HmMerge.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/ImageAlg.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/Infra.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/IvsDrawer.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/MP_Render.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/NPQos.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/OpenAL32.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/PlayCtrl.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/RenderEngine.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/StreamConvertor.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/SuperRender.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/YUVProcess.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/avnetsdk.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/dhconfigsdk.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/dhnetsdk.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/dhplay.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/hlog.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/hpr.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/libcrypto-1_1-x64.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/libmmd.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/libssl-1_1-x64.dll diff | view | raw | blame | history
ard-work/src/main/resources/lib/win64/zlib1.dll diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/ReadMe.txt 1 ●●●●● diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/calib.dll diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/iconv.dll diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/libcrypto-1_1-x64.dll diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/libssl-1_1-x64.dll diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/libxml2.dll diff | view | raw | blame | history
lib/hikDll/ClientDemoDll/zlib1.dll diff | view | raw | blame | history
lib/hikDll/OpenAL32.dll diff | view | raw | blame | history
pom.xml 512 ●●●●● diff | view | raw | blame | history
ruoyi-admin/pom.xml 48 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-dev.yml 2 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/logback.xml 667 ●●●●● diff | view | raw | blame | history
server/mediamtx/LICENSE diff | view | raw | blame | history
server/mediamtx/ffmpeg.exe diff | view | raw | blame | history
server/mediamtx/mediamtx.exe diff | view | raw | blame | history
server/mediamtx/mediamtx.yml 12 ●●●●● diff | view | raw | blame | history
server/minio/minio.exe diff | view | raw | blame | history
server/redis/EventLog.dll diff | view | raw | blame | history
server/redis/Redis on Windows Release Notes.docx diff | view | raw | blame | history
server/redis/Redis on Windows.docx diff | view | raw | blame | history
server/redis/Windows Service Documentation.docx diff | view | raw | blame | history
server/redis/dump.rdb diff | view | raw | blame | history
server/redis/redis-benchmark.exe diff | view | raw | blame | history
server/redis/redis-benchmark.pdb diff | view | raw | blame | history
server/redis/redis-check-aof.exe diff | view | raw | blame | history
server/redis/redis-check-aof.pdb diff | view | raw | blame | history
server/redis/redis-cli.exe diff | view | raw | blame | history
server/redis/redis-cli.pdb diff | view | raw | blame | history
server/redis/redis-desktop-manager-0.9.3.817.exe diff | view | raw | blame | history
server/redis/redis-server.exe diff | view | raw | blame | history
server/redis/redis-server.pdb diff | view | raw | blame | history
server/redis/redis.windows-service.conf diff | view | raw | blame | history
server/redis/redis.windows.conf diff | view | raw | blame | history
server/webrtc/Procfile diff | view | raw | blame | history
server/webrtc/config.json diff | view | raw | blame | history
server/webrtc/html/Bunny.html diff | view | raw | blame | history
server/webrtc/html/LICENSE diff | view | raw | blame | history
server/webrtc/html/README.md diff | view | raw | blame | history
server/webrtc/html/admin.html diff | view | raw | blame | history
server/webrtc/html/apprtc.html diff | view | raw | blame | history
server/webrtc/html/apprtc.json diff | view | raw | blame | history
server/webrtc/html/help.html diff | view | raw | blame | history
server/webrtc/html/htmlmapmarker.js diff | view | raw | blame | history
server/webrtc/html/index.html diff | view | raw | blame | history
server/webrtc/html/info.png diff | view | raw | blame | history
server/webrtc/html/janusconfig.js diff | view | raw | blame | history
server/webrtc/html/janustest.html diff | view | raw | blame | history
server/webrtc/html/janusvideoroom-element.js diff | view | raw | blame | history
server/webrtc/html/janusvideoroom.html diff | view | raw | blame | history
server/webrtc/html/janusvideoroom.js diff | view | raw | blame | history
server/webrtc/html/jitsi.ico diff | view | raw | blame | history
server/webrtc/html/jitsiroom.html diff | view | raw | blame | history
server/webrtc/html/jitsitest.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/JanusVideoRoom.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/WebRtcStreamer.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/XMPPVideoRoom.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Bold-webfont.eot diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Bold-webfont.svg diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Bold-webfont.woff diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-BoldItalic-webfont.eot diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-BoldItalic-webfont.svg diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-BoldItalic-webfont.woff diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Italic-webfont.eot diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Italic-webfont.svg diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Italic-webfont.woff diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Light-webfont.eot diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Light-webfont.svg diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Light-webfont.woff diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-LightItalic-webfont.eot diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-LightItalic-webfont.svg diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-LightItalic-webfont.woff diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Regular-webfont.eot diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Regular-webfont.svg diff | view | raw | blame | history
server/webrtc/html/jsdoc/fonts/OpenSans-Regular-webfont.woff diff | view | raw | blame | history
server/webrtc/html/jsdoc/index.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/janusvideoroom.js.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/scripts/linenumber.js diff | view | raw | blame | history
server/webrtc/html/jsdoc/scripts/prettify/Apache-License-2.0.txt diff | view | raw | blame | history
server/webrtc/html/jsdoc/scripts/prettify/lang-css.js diff | view | raw | blame | history
server/webrtc/html/jsdoc/scripts/prettify/prettify.js diff | view | raw | blame | history
server/webrtc/html/jsdoc/styles/jsdoc-default.css diff | view | raw | blame | history
server/webrtc/html/jsdoc/styles/prettify-jsdoc.css diff | view | raw | blame | history
server/webrtc/html/jsdoc/styles/prettify-tomorrow.css diff | view | raw | blame | history
server/webrtc/html/jsdoc/webrtcstreamer.js.html diff | view | raw | blame | history
server/webrtc/html/jsdoc/xmppvideoroom.js.html diff | view | raw | blame | history
server/webrtc/html/libs/EventEmitter.min.js diff | view | raw | blame | history
server/webrtc/html/libs/adapter.min.js diff | view | raw | blame | history
server/webrtc/html/libs/ag-grid.min.js diff | view | raw | blame | history
server/webrtc/html/libs/blazeface diff | view | raw | blame | history
server/webrtc/html/libs/body-pix diff | view | raw | blame | history
server/webrtc/html/libs/coco-ssd diff | view | raw | blame | history
server/webrtc/html/libs/deeplab diff | view | raw | blame | history
server/webrtc/html/libs/jquery-3.5.1.min.js diff | view | raw | blame | history
server/webrtc/html/libs/lib-jitsi-meet.min.js diff | view | raw | blame | history
server/webrtc/html/libs/posenet diff | view | raw | blame | history
server/webrtc/html/libs/strophe.disco.min.js diff | view | raw | blame | history
server/webrtc/html/libs/strophe.jingle.sdp.js diff | view | raw | blame | history
server/webrtc/html/libs/strophe.min.js diff | view | raw | blame | history
server/webrtc/html/libs/strophe.muc.min.js diff | view | raw | blame | history
server/webrtc/html/libs/tf-backend-wasm.js diff | view | raw | blame | history
server/webrtc/html/libs/tfjs diff | view | raw | blame | history
server/webrtc/html/libs/tfjs-backend-wasm-simd.wasm diff | view | raw | blame | history
server/webrtc/html/libs/tfjs-backend-wasm.wasm diff | view | raw | blame | history
server/webrtc/html/libs/whep-video.component.js diff | view | raw | blame | history
server/webrtc/html/map.html diff | view | raw | blame | history
server/webrtc/html/nav.css diff | view | raw | blame | history
server/webrtc/html/sendstream.html diff | view | raw | blame | history
server/webrtc/html/styles.css diff | view | raw | blame | history
server/webrtc/html/tensorflow.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-algo-element.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-element.html diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-element.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-footer-element.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-menu-element.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-options-element.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer-selector-element.js diff | view | raw | blame | history
server/webrtc/html/webrtc-streamer.html diff | view | raw | blame | history
server/webrtc/html/webrtc.png diff | view | raw | blame | history
server/webrtc/html/webrtcconfig.js diff | view | raw | blame | history
server/webrtc/html/webrtcstreamer.html diff | view | raw | blame | history
server/webrtc/html/webrtcstreamer.js diff | view | raw | blame | history
server/webrtc/html/whep.html diff | view | raw | blame | history
server/webrtc/html/xmppconfig.js diff | view | raw | blame | history
server/webrtc/html/xmppvideoroom.html diff | view | raw | blame | history
server/webrtc/html/xmppvideoroom.js diff | view | raw | blame | history
server/webrtc/webrtc-streamer.exe diff | view | raw | blame | history