aijinhui
2023-09-26 f6d7a3f65aea500a275fa5f3f4325730bff16ade
Merge remote-tracking branch 'origin/master'
已修改4个文件
48 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/device/uav/service/UavService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/templates/preview.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/pom.xml 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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();
        }
    }
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("");
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>
ruoyi-admin/pom.xml
@@ -76,26 +76,26 @@
            //  压缩后jar包的启动指令   java -Dloader.path="lib/" -jar xxx.jar
            //  未压缩jar包的启动指令   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>-->
<!--                            &lt;!&ndash; 依赖包输出目录,将来不打进jar包里 &ndash;&gt;-->
<!--                            <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>
                            <!-- 依赖包输出目录,将来不打进jar包里 -->
                            <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>