forked from ard/ruoyi-api
parent: 31fbe2 | patch | commitdiff
Administrator
2023-08-23 f97d74f9f851ef70048fab599d7bc54d7932afc7
refs
author Administrator <1144154118@qq.com>
Wednesday, August 23, 2023 17:29 +0800
committer Administrator <1144154118@qq.com>
Wednesday, August 23, 2023 17:29 +0800
commitf97d74f9f851ef70048fab599d7bc54d7932afc7
tree 01e3753386d9d3c5e808e4e9ac139b37bf23f303 tree | zip | gz
parent 31fbe2a0b88bd33b3aef4b362b1aa849f566cc17 view | diff
cf7a09fdfb98e41039e08af1ff5e9dacfbecfc03 view | diff 
Merge remote-tracking branch 'origin/master'
6 files added
4 files deleted
28 files modified
1 files renamed
1313 ■■■■■ changed files
ard-work/src/main/java/com/ruoyi/app/position/controller/ArdAppPositionController.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/app/position/service/impl/ArdAppPositionServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java 26 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/config/MinioClientSingleton.java 75 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 25 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTask.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/WebrtcService.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioConfig.java 35 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/storage/minio/utils/MinioUtils.java 158 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 48 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/test/ReadAccessDatabase.java 62 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumer.java 33 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/mqtt/MqttConsumerCallback.java 4 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/mqtt/PropertiesUtil.java 54 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/tools/GisTool.java 18 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/tools/Point.java 10 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/minio/StorageMinioEventMapper.xml 1 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/templates/test.html 2 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java 2 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-ard.yml 50 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-dev-druid.yml 58 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-dev.yml 101 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-druid.yml 61 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-prod-druid.yml 58 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application-prod.yml 101 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/application.yml 129 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/banner.txt 12 ●●●●● diff | view | raw | blame | history
ruoyi-admin/src/main/resources/logback.xml 60 ●●●●● diff | view | raw | blame | history
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysConfig.java 2 ●●●●● diff | view | raw | blame | history
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java 22 ●●●●● diff | view | raw | blame | history
ruoyi-common/src/main/java/com/ruoyi/common/utils/ConfigUtils.java 55 ●●●●● diff | view | raw | blame | history
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/MinioTask.java 7 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/authorize/common/AuthorizeUtil.java 12 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java 2 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java 2 ●●●●● diff | view | raw | blame | history
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java 3 ●●●●● diff | view | raw | blame | history