Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

hazard-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ base:
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
   # 摄像头配置
-  ffmpegPath: /usr/bin/ffmpeg
+  ffmpegPath: /usr/local/bin/ffmpeg
   filePath: /opt/streams/record/flv/
   webUrl: http://124.70.58.209:9080
   bakUrl: http://124.70.58.209:18891

pom.xml

@@ -118,7 +118,7 @@
         <repository>
             <id>custom_group</id>
             <name>Nexus Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_group/</url>
+            <url>http://47.94.132.61:18881/repository/custom_group/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -131,7 +131,7 @@
         <pluginRepository>
             <id>custom_group</id>
             <name>Nexus Plugin Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_group/</url>
+            <url>http://47.94.132.61:18881/repository/custom_group/</url>
             <snapshots>
                 <enabled>true</enabled>
             </snapshots>
@@ -145,12 +145,12 @@
         <repository><!--部署项目产生的构件到远程仓库需要的信息 -->
             <id>custom_releases</id><!-- 此处id和settings.xml的id保持一致 -->
             <name>Nexus Release Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_releases/</url>
+            <url>http://47.94.132.61:18881/repository/custom_releases/</url>
         </repository>
         <snapshotRepository><!--构件的快照部署到哪里？如果没有配置该元素，默认部署到repository元素配置的仓库，参见distributionManagement/repository元素 -->
             <id>custom_snapshots</id><!-- 此处id和settings.xml的id保持一致 -->
             <name>Nexus Snapshot Repository</name>
-            <url>http://124.71.171.71:18881/repository/custom_snapshots/</url>
+            <url>http://47.94.132.61:18881/repository/custom_snapshots/</url>
         </snapshotRepository>
     </distributionManagement>
 </project>