Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8

# Conflicts: # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/Jt1078ConfigBean.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/RtspConfigBean.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/TuohuaConfigBean.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/handler/HttpClientUtil.java # src/main/resources/application-local.yml # src/main/resources/application-localDev.yml

Merge remote-tracking branch 'origin/pudong_jdk8' into pudong_jdk8
# Conflicts: # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/Jt1078OfCarController.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/Jt1078ConfigBean.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/RtspConfigBean.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/config/TuohuaConfigBean.java # src/main/java/com/genersoft/iot/vmp/vmanager/jt1078/platform/handler/HttpClientUtil.java # src/main/resources/application-local.yml # src/main/resources/application-localDev.yml
liujun001
2 parents 84155f73 e58a56fc
Showing 4 changed files with 21 additions and 12 deletions
src/main/java/com/genersoft/iot/vmp/utils/DateUtil.java
src/main/resources/application-local.yml
web_src/src/layout/UiHeader.vue
web_src/src/router/index.js
@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.utils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
 import java.time.Instant;
 import java.time.LocalDate;
@@ -66,6 +67,8 @@ public class DateUtil {
     public static final DateTimeFormatter DateFormatter = DateTimeFormatter.ofPattern(date_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
     public static final DateTimeFormatter urlFormatter = DateTimeFormatter.ofPattern(URL_PATTERN, Locale.getDefault()).withZone(ZoneId.of(zoneStr));
+    public static final FastDateFormat FAST_DATE_FORMAT_PATTERN= FastDateFormat.getInstance(PATTERN);
+
 	public static String yyyy_MM_dd_HH_mm_ssToISO8601(String formatTime) {
         return formatterISO8601.format(formatter.parse(formatTime));
@@ -13,7 +13,7 @@ spring:
   # REDIS数据库配置
   redis:
     # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
-    host: 192.168.169.100
+    host: 127.0.0.1
     # [必须修改] 端口号
     port: 6379
     # [可选] 数据库 DB
@@ -60,7 +60,7 @@ sip:
   # 如果要监听多张网卡，可以使用逗号分隔多个IP， 例如： 192.168.1.4,10.0.0.4
   # 如果不明白，就使用0.0.0.0，大部分情况都是可以的
   # 请不要使用127.0.0.1，任何包括localhost在内的域名都是不可以的。
-  ip: 192.169.1.92
+  ip: 192.169.1.89
   # [可选] 28181服务监听的端口
   port: 5060
@@ -84,15 +84,15 @@ media:
   # [必须修改] zlm服务器的http.port
   http-port: 1091
   # [可选] 返回流地址时的ip，置空使用 media.ip
-  stream-ip:  192.169.1.92
+  stream-ip:  192.168.169.100
   # [可选] wvp在国标信令中使用的ip，此ip为摄像机可以访问到的ip， 置空使用 media.ip
-  sdp-ip:  192.169.1.92
+  sdp-ip:  192.168.169.100
   # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
-  hook-ip:  192.169.1.92
+  hook-ip:  192.168.169.100
   # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
   http-ssl-port: 443
   # [可选] zlm服务器的hook.admin_params=secret
-  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP1
+  secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP
   # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
   rtp:
     # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
@@ -132,16 +132,15 @@ tuohua:
   bsth:
     login:
       pageURL: http://192.169.1.92:9088/user/login/jCryptionKey
-      url: http://127.0.0.1:9088/user/login
+      url: http://192.169.1.92:9088/user/login
       userName: yuanxiaohu
       password: Yxiaohu1.0
     tree:
       url:
-        company: http://127.0.0.1:9088/video/tree
-        car: http://127.0.0.1:9088/video/tree/carNo/{0}
-        sim: http://127.0.0.1:9088/video//tree/caNO/sim/{0}
+        company: http://192.169.1.92:9088/video/tree
+        car: http://192.169.1.92:9088/video/tree/carNo/{0}
+        sim: http://192.169.1.92:9088/video//tree/caNO/sim/{0}
     wvp28181:
-
       rtsp:
         tcpPort: 1078
         udpPort: 1078
@@ -151,7 +150,7 @@ tuohua:
     jt1078:
        url: http://192.168.168.241:8100/device/{0}
        historyListPort: 9205
-       playHistoryPort: 9201
+       historyPlayPort: 9201
        sendPort: 9101
        stopSendPort: 9102
        playURL: /play/wasm/ws%3A%2F%2F{ip}%3A{port}%2Fschedule%2F{sim}-{channel}.live.flv%3FcallId%{publickey}
@@ -9,6 +9,7 @@
       <el-menu-item index="/deviceList">国标设备</el-menu-item>
       <el-menu-item index="/deviceList1078">1078设备</el-menu-item>
       <el-menu-item index="/map">电子地图</el-menu-item>
+      <el-menu-item index="/deviceList1078">1078设备</el-menu-item>
       <el-menu-item index="/pushVideoList">推流列表</el-menu-item>
       <el-menu-item index="/streamProxyList">拉流代理</el-menu-item>
       <el-menu-item index="/cloudRecord">云端录像</el-menu-item>
@@ -20,6 +20,7 @@ import minhangChannel from &#39;../components/common/minhangChannel.vue&#39;
 import console from '../components/console.vue'
 import live from '../components/live.vue'
 import map from '../components/map.vue'
+import map1078 from '../components/map1078.vue'
 import media from '../components/setting/Media.vue'
 import sip from '../components/setting/Sip.vue'
 import web from '../components/setting/Web.vue'
@@ -99,6 +100,11 @@ export default new VueRouter({
           component: map,
         },
         {
+          path: '/map1078',
+          name: 'map1078',
+          component: map1078,
+        },
+        {
           path: '/cloudRecord',
           name: 'cloudRecord',
           component: cloudRecord,