From f6d7a3f65aea500a275fa5f3f4325730bff16ade Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 26 九月 2023 09:35:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/pom.xml | 40 ++++++++++++++++++++--------------------
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java | 2 ++
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java | 4 ----
ard-work/src/main/resources/templates/preview.html | 2 +-
4 files changed, 23 insertions(+), 25 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
index 27136cf..65e8448 100644
--- a/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
+++ b/ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java
@@ -103,13 +103,9 @@
}
} catch (ForestRuntimeException e) {
log.error("鏃犱汉鏈鸿繛鎺ヨ秴鏃�" + e.getMessage());
- e.printStackTrace();
} catch (JsonMappingException e) {
- e.printStackTrace();
} catch (JsonProcessingException e) {
- e.printStackTrace();
} catch (IOException e) {
- e.printStackTrace();
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
index 6f48201..676071c 100644
--- a/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java
@@ -106,6 +106,7 @@
}
} else {
mediaInfo.setSource(sourceUrl);
+ mediaInfo.setSourceondemand(true);
}
mediaInfo.setMaxReaders(100);
mediaInfo.setSourceprotocol("tcp");
@@ -159,6 +160,7 @@
}
} else {
mediaInfo.setSource(sourceUrl);
+ mediaInfo.setSourceondemand(true);
mediaInfo.setRunondemand("");
mediaInfo.setRunondemandrestart(false);
mediaInfo.setRunoninit("");
diff --git a/ard-work/src/main/resources/templates/preview.html b/ard-work/src/main/resources/templates/preview.html
index fd773b0..a115bf1 100644
--- a/ard-work/src/main/resources/templates/preview.html
+++ b/ard-work/src/main/resources/templates/preview.html
@@ -101,7 +101,7 @@
<button class="toggle-button" onclick="changeGrid(7, 7)">7x7</button>
<button class="toggle-button" onclick="changeGrid(8, 8)">8x8</button>
<button class="toggle-button" onclick="changeGrid(9, 9)">9x9</button>
- <input id="videoUrl" type="text" value="http://192.168.1.11:8889/164/" style="width: 250px"/>
+ <input id="videoUrl" type="text" value="http://192.168.1.227:8889/164/" style="width: 250px"/>
</div>
</div>
</div>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index dd16999..f232513 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -76,26 +76,26 @@
// 鍘嬬缉鍚巎ar鍖呯殑鍚姩鎸囦护 java -Dloader.path="lib/" -jar xxx.jar
// 鏈帇缂﹋ar鍖呯殑鍚姩鎸囦护 java -jar xxx.jar"
-->
-<!-- <plugin>-->
-<!-- <groupId>org.apache.maven.plugins</groupId>-->
-<!-- <artifactId>maven-dependency-plugin</artifactId>-->
-<!-- <executions>-->
-<!-- <execution>-->
-<!-- <id>copy-dependencies</id>-->
-<!-- <phase>package</phase>-->
-<!-- <goals>-->
-<!-- <goal>copy-dependencies</goal>-->
-<!-- </goals>-->
-<!-- <configuration>-->
-<!-- <!– 渚濊禆鍖呰緭鍑虹洰褰曪紝灏嗘潵涓嶆墦杩沯ar鍖呴噷 –>-->
-<!-- <outputDirectory>${project.build.directory}/jarLib</outputDirectory>-->
-<!-- <excludeTransitive>false</excludeTransitive>-->
-<!-- <stripVersion>false</stripVersion>-->
-<!-- <includeScope>runtime</includeScope>-->
-<!-- </configuration>-->
-<!-- </execution>-->
-<!-- </executions>-->
-<!-- </plugin>-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <!-- 渚濊禆鍖呰緭鍑虹洰褰曪紝灏嗘潵涓嶆墦杩沯ar鍖呴噷 -->
+ <outputDirectory>${project.build.directory}/jarLib</outputDirectory>
+ <excludeTransitive>false</excludeTransitive>
+ <stripVersion>false</stripVersion>
+ <includeScope>runtime</includeScope>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
--
Gitblit v1.9.3