forked from ard/ruoyi-api
parent: c3e802 | patch | commitdiff
aijinhui
2023-10-16 59fcc48c8589b9df2af744fd6c77854061a52f54
refs
author aijinhui <aijinhui>
Monday, October 16, 2023 10:07 +0800
committer aijinhui <aijinhui>
Monday, October 16, 2023 10:07 +0800
commit59fcc48c8589b9df2af744fd6c77854061a52f54
tree a2870a1d007aa5d835f5ad687f5d5abf50dbcf76 tree | zip | gz
parent c3e802fd10bbd22989a5167172188e6e969ebd4b view | diff
69962e25b95593a0138f7be2b49dd51fa76ab8d7 view | diff 
Merge remote-tracking branch 'origin/master'
33 files added
11 files modified
41 files renamed
8234 ■■■■■ changed files
ard-work/pom.xml 7 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java 56 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/controller/CameraSdkController.java 361 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/domain/ArdCameras.java 6 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/Base64.java 553 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/BorderEx.java 16 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/CaseMenu.java 93 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/DateChooserJButton.java 606 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/DateChooserJButtonEx.java 568 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/DeviceManagerListener.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/ErrorCode.java 871 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/EventTaskCommonQueue.java 79 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/EventTaskHandler.java 6 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/ListPictureShowDialog.java 34 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/PaintPanel.java 32 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/Res.java 2883 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/SavePath.java 76 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/common/WindowCloseListener.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/controller/DhSdkController.java 78 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/ConfigModule.java 36 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/LoginModule.java 152 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/module/PtzControlModule.java 206 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/IDhClientService.java 35 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/dhsdk/service/impl/DhClientServiceImpl.java 255 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/common/GlobalVariable.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/sdk/LoginResultCallBack.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/IHikClientService.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 62 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/dynamic-lib-load.xml 41 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml 7 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/resources_en_US.properties 1071 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/resources_zh_CN.properties 1 ●●●●● diff | view | raw | blame | history
lib/dhDll/ImageAlg.dll diff | view | raw | blame | history
lib/dhDll/Infra.dll diff | view | raw | blame | history
lib/dhDll/IvsDrawer.dll diff | view | raw | blame | history
lib/dhDll/RenderEngine.dll diff | view | raw | blame | history
lib/dhDll/StreamConvertor.dll diff | view | raw | blame | history
lib/dhDll/avnetsdk.dll diff | view | raw | blame | history
lib/dhDll/dhconfigsdk.dll diff | view | raw | blame | history
lib/dhDll/dhnetsdk.dll diff | view | raw | blame | history
lib/dhDll/dhplay.dll diff | view | raw | blame | history
lib/hikDll/AudioRender.dll 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/GdiPlus.dll diff | view | raw | blame | history
lib/hikDll/HCCore.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDK.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/AudioIntercom.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/AudioRender.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCAlarm.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCAlarm.lib diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCCoreDevCfg.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCDisplay.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCGeneralCfgMgr.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCGeneralCfgMgr.lib diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCIndustry.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCPlayBack.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCPreview.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCPreview.lib diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/HCVoiceTalk.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/OpenAL32.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/StreamTransClient.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/SystemTransform.dll diff | view | raw | blame | history
lib/hikDll/HCNetSDKCom/libiconv2.dll diff | view | raw | blame | history
lib/hikDll/HXVA.dll diff | view | raw | blame | history
lib/hikDll/HmMerge.dll diff | view | raw | blame | history
lib/hikDll/MP_Render.dll diff | view | raw | blame | history
lib/hikDll/NPQos.dll diff | view | raw | blame | history
lib/hikDll/OpenAL32.dll diff | view | raw | blame | history
lib/hikDll/PlayCtrl.dll diff | view | raw | blame | history
lib/hikDll/SuperRender.dll diff | view | raw | blame | history
lib/hikDll/YUVProcess.dll diff | view | raw | blame | history
lib/hikDll/hlog.dll diff | view | raw | blame | history
lib/hikDll/hpr.dll diff | view | raw | blame | history
lib/hikDll/libcrypto-1_1-x64.dll diff | view | raw | blame | history
lib/hikDll/libmmd.dll diff | view | raw | blame | history
lib/hikDll/libssl-1_1-x64.dll diff | view | raw | blame | history
lib/hikDll/zlib1.dll diff | view | raw | blame | history
ruoyi-admin/src/main/resources/logback.xml 17 ●●●●● diff | view | raw | blame | history
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java 6 ●●●●● diff | view | raw | blame | history