阿里云环境部署完成后，配置项修改提交

elevator-admin/src/main/java/com/inspur/idm/media/schedule/RefreshOnlineStatus.java

@@ -42,9 +42,10 @@ public class RefreshOnlineStatus {
     private void refreshOnlineStatus() {
         String apiPrefix = pubConfigService.getPubConfigValue(CommConstant.WVP_API);
         // 摄像头在线状态，根据摄像头的编号和通道号去wvp的api查询
-        if (StringUtils.isBlank(CommConstant.WVP_TOKEN)) {
+        /*if (StringUtils.isBlank(CommConstant.WVP_TOKEN)) {
             gbUtil.refreshToken();
-        }
+        }*/
+        gbUtil.refreshToken();
         AtomicInteger page = new AtomicInteger(1);
         while (true) {
             String deviceListUrl = apiPrefix + "device/query/devices?page=" + page.getAndIncrement() + "&count=15";

elevator-admin/src/main/resources/application-dev.yml

@@ -67,10 +67,10 @@ spring:
       name: druid-datasource
       #动态刷新配置将导致druid直接使用加密后的参数重新建立连接，而非先解密再使用，会导致后续的连接创建失败
       username: root
-      password: 7TuefPhoTnBxUWU2
+      password: Hycpb@123
       #数据库地址(***)
       #url: jdbc:mysql://127.0.0.1:3306/media-admin?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&useSSL=false
-      url: jdbc:mysql://192.168.2.120:3306/elevator?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL
+      url: jdbc:mysql://127.0.0.1:3306/elevator?useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&useSSL=false&zeroDateTimeBehavior=CONVERT_TO_NULL
 
   redis:
     #redis配置，用于保存缓存数据(***)
@@ -98,7 +98,7 @@ spring:
     timeout: 5s
   data:
     mongodb:
-      uri: mongodb://192.168.2.120:27017/elevator
+      uri: mongodb://127.0.0.1:27017/elevator
       auto-index-creation: false
 #mybatis:
 #  #  config-location: classpath:mybatis.xml

elevator-admin/src/main/resources/bootstrap.yml

@@ -16,11 +16,11 @@ spring:
       config:
         #配置中心获取配置
         enabled: false
-        server-addr: 192.168.2.120:8848
+        server-addr: 127.0.0.1:8848
         file-extension: yaml
       discovery:
         #发现中心(***)
-        server-addr: 192.168.2.120:8848
+        server-addr: 127.0.0.1:8848
         enabled: false
         metadata:
           group: ${GROUP:green}

elevator-data-analysis/pom.xml

@@ -11,8 +11,8 @@
     <groupId>com.example</groupId>
     <artifactId>elevator-data-analysis</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>evedemo</name>
-    <description>evedemo</description>
+    <name>elevator-data-analysis</name>
+    <description>elevator-data-analysis</description>
     <properties>
         <java.version>1.8</java.version>
         <mysql-driver-version>5.1.48</mysql-driver-version>

elevator-data-analysis/src/main/resources/application.yml

@@ -26,13 +26,13 @@ spring:
       filters: stat
       username: ${elevatorDatasourceUserName:root}
       password: ${elevatorDatasourcePassword:Hycpb@123}
-      url: ${elevatorDatasourceUrl:jdbc:mysql://192.168.2.120:3306/elevator?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true&amp}
+      url: ${elevatorDatasourceUrl:jdbc:mysql://127.0.0.1:3306/elevator?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&allowMultiQueries=true&amp}
 
 
   data:
     # mongodb配置
     mongodb:
-      host: 192.168.2.120
+      host: 127.0.0.1
       port: 27017
       #username: mongoUsername
       #password: mongoPassword
@@ -77,4 +77,4 @@ jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES
     iv-generator-classname: org.jasypt.iv.NoIvGenerator
-    password: ${sys_jasypt_passwd}
+    password: ${sys_jasypt_passwd}

elevator-data-collect/pom.xml

@@ -121,6 +121,13 @@
             <version>2.0.1.RELEASE</version>
         </dependency>
 
+        <!--工具包-->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.20</version>
+        </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.cloud</groupId>-->
 <!--            <artifactId>spring-cloud-starter-bootstrap</artifactId>-->

elevator-data-collect/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 time-zone: Asia/Shanghai
 
 server:
-  port: ${randomPort:8081}
+  port: ${randomPort:9081}
 
 
 spring:
@@ -38,11 +38,11 @@ spring:
       filters: stat
       username: ${elevatorDatasourceUserName:root}
       password: ${elevatorDatasourcePassword:Hycpb@123}
-      url: ${elevatorDatasourceUrl:jdbc:mysql://192.168.2.120:3306/elevator?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true}
+      url: ${elevatorDatasourceUrl:jdbc:mysql://127.0.0.1:3306/elevator?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true}
   data:
 
     mongodb:
-      host: ${mongodbHost:192.168.2.120}
+      host: ${mongodbHost:127.0.0.1}
       port: ${mongodbPost:27017}
       database: ${mongodbDatabase:elevator}
 #      username: ${mongodbUsername:root}
@@ -52,9 +52,9 @@ spring:
     #    cluster:
     #      nodes: 192.168.255.101:6666,192.168.255.101:6667,192.168.255.102:6666,192.168.255.102:6667,192.168.255.103:6666,192.168.255.103:6667
     #      max-redirects: 3
-    host: ${redisHost:192.168.2.120}
+    host: ${redisHost:127.0.0.1}
     port: ${redisPort:6379}
-    password: ${redisPassword:Hycpb@123}
+    password:
     database: 1
     jedis:
       pool:
@@ -78,9 +78,9 @@ mybatis:
 
 
 mqtt:
-  urls: tcp://192.168.2.120:1883
-#  userName: admin
-#  password: 123456a?
+  urls: tcp://127.0.0.1:1883
+  userName: elevator
+  password: elevator_123
 #  topics: device_realtime_info,device_statistics_info,device_alarm_info,device_start_info,device_param_info_ack#
   topics: $share/g1/ele/#
   clientId: inspurClient02
@@ -88,4 +88,4 @@ mqtt:
   # mqtt completion timeout for operations 单位ms
   completionTimeout: 30000
   # redis中实时数据过期时间，单位s
-  expireTime: 3600
+  expireTime: 3600

elevator-data-collect/src/main/resources/bootstrap.yml

@@ -13,11 +13,11 @@ spring:
       config:
         #配置中心获取配置
         enabled: false
-        server-addr: 192.168.2.120:8848
+        server-addr: 127.0.0.1:8848
         file-extension: yaml
       discovery:
         #发现中心(***)
-        server-addr: 192.168.2.120:8848
+        server-addr: 127.0.0.1:8848
         enabled: true
 #        metadata:
 #          group: ${GROUP:green}
@@ -40,4 +40,4 @@ jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES
     iv-generator-classname: org.jasypt.iv.NoIvGenerator
-    password: ${sys_jasypt_passwd}
+    password: ${sys_jasypt_passwd}

elevator-data-schedule/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 time-zone: Asia/Shanghai
 
 server:
-  port: 8081
+  port: 9091
 
 
 spring:
@@ -40,11 +40,11 @@ spring:
       filters: stat
       username: ${elevatorDatasourceUserName:root}
       password: ${elevatorDatasourcePassword:Hycpb@123}
-      url: ${elevatorDatasourceUrl:jdbc:mysql://192.168.2.120:3306/elevator?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true}
+      url: ${elevatorDatasourceUrl:jdbc:mysql://127.0.0.1:3306/elevator?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true}
   data:
 
     mongodb:
-      host: ${mongodbHost:192.168.2.120}
+      host: ${mongodbHost:127.0.0.1}
       port: ${mongodbPost:27017}
       database: ${mongodbDatabase:elevator}
 #      username: ${mongodbUsername:root}
@@ -54,9 +54,9 @@ spring:
     #    cluster:
     #      nodes: 192.168.255.101:6666,192.168.255.101:6667,192.168.255.102:6666,192.168.255.102:6667,192.168.255.103:6666,192.168.255.103:6667
     #      max-redirects: 3
-    host: ${redisHost:192.168.2.120}
+    host: ${redisHost:127.0.0.1}
     port: ${redisPort:6379}
-    password: ${redisPassword:Hycpb@123}
+    password:
     database: 1
     jedis:
       pool:

elevator-hn-adapter/src/main/resources/application.yml

@@ -5,11 +5,11 @@ spring:
     # 数据库
     database: 1
     #redis机器ip
-    host: 192.168.2.120
+    host: 127.0.0.1
     #redis端口
     port: 6379
     #redis密码
-    password: Hycpb@123
+    password:
     #redis超时时间（毫秒），如果不设置，取默认值2000
     timeout: 10000
     #最大空闲数
@@ -46,24 +46,32 @@ logging:
     org.springframework.web: INFO
 mqtt:
   enabled: true
-  host: tcp://192.168.2.120:1883
+  host: tcp://127.0.0.1:1883
   #tcp://idmlab.kmdns.net:23121
   #tcp://ele-mq.inspuriit.com:23121
-  user-name:
-  pwd:
+  user-name: elevator
+  pwd: elevator_123
   clean-session: true
   reconnect: true
-  # 订阅主题
+  # 订阅主题 海纳云
   receive-topic: CAMERA_SRV_TOPIC/+
+  # 订阅主题 大华
+  receive-topic-dahua: /API/V1/Up/+/+
   # 发送主题
   send-topic: CAMERA_CLIENT_TOPIC/{sn}
+  # qos 海纳云
   qos: 2
+  # qos 大华
+  qos-dahua: 1
+  # 海纳云 client id
   client-id: HN-ADAPTER-
+  # 大华 client id
+  client-id-dahua: DAHUA-ADAPTER-
 # 国标281服务配置
 gb28181:
   enabled: true
   server-id: 37010200492000000001
   server-domain: 3701020000
-  server-addr: 117.73.3.103
+  server-addr: 118.178.91.140
   server-port: 5060
-  passwd: inspur1234,
+  passwd: inspur1234,

elevator-media-gb/src/main/resources/application-dev.yml

@@ -12,13 +12,13 @@ spring:
     timeout: 10000
     # 以下为单机配置
     # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
-    host: 192.168.2.120
+    host: 127.0.0.1
     #  # [必须修改] 端口号
     port: 6379
     # [可选] 数据库 DB
     database: 1
     # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
-    password: Hycpb@123
+    password: VUMOzyN7edjytXDu
   # 以下为集群配置
   #  cluster:
   #    nodes: 192.168.1.66:9001,192.168.1.66:9002,192.168.1.66:9003,192.168.1.66:9004,192.168.1.66:9005,192.168.1.66:9006
@@ -31,9 +31,9 @@ spring:
         master:
           type: com.zaxxer.hikari.HikariDataSource
           driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://192.168.2.120:3306/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://127.0.0.1:20010/wvp?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
           username: root
-          password: Hycpb@123
+          password: 7TuefPhoTnBxUWU2
           hikari:
             connection-timeout: 20000       # 是客户端等待连接池连接的最大毫秒数
             maximum-pool-size: 200        # 连接池最大连接数
@@ -59,18 +59,18 @@ sip:
   # [可选]
   id: 37010200492000000001
   # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验
-  password: Hycpb@123
+  password: inspur1234,
 
 #zlm 默认服务器配置
 media:
   # [必须修改] zlm服务器唯一id，用于触发hook时区别是哪台服务器,general.mediaServerId
   id: zlmediakit-local
   # [必须修改] zlm服务器的内网IP
-  ip: 192.168.2.120
+  ip: 127.0.0.1
   # [必须修改] zlm服务器的http.port
   http-port: 83
   # [可选] zlm服务器的hook.admin_params=secret
-  secret: Hycpb@123
+  secret: 10000
   # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
   rtp:
     # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
@@ -119,7 +119,9 @@ user-settings:
   # 1： 对于离线设备，收到心跳就把设备设置为上线，并更新注册时间为上次这次心跳的时间。防止过期时间判断异常
   gb-device-online: 1
   allowed-origins:
-    - http://117.73.3.103
-    - http://117.73.3.103:81
+    # - http://117.73.3.103
+    - http://172.31.33.2
+    # - http://117.73.3.103:81
+    - http://172.31.33.2:20000
     - http://localhost
-    - http://127.0.0.1
+    - http://127.0.0.1

elevator-media-gb/web_src/config/index.js

@@ -12,14 +12,14 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/debug': {
-        target: 'http://127.0.0.1:82',
+        target: 'http://221.214.76.110:82',
         changeOrigin: true,
         pathRewrite: {
           '^/debug': '/'
         }
       },
       '/static/snap': {
-        target: 'http://127.0.0.1:82',
+        target: 'http://221.214.76.110:82',
         changeOrigin: true,
         // pathRewrite: {
         //   '^/static/snap': '/static/snap'

elevator-media-gb/web_src/static/js/config.js

@@ -1,5 +1,5 @@
 
-window.baseUrl = ""
+window.baseUrl = "http://172.31.33.2:82"
 
 // map组件全局参数, 注释此内容可以关闭地图功能
 window.mapParam = {

elevator-media-gb/wvp-web/static/js/config.js

@@ -1,22 +0,0 @@
-
-window.baseUrl = "http://117.73.3.103:82"
-
-// map组件全局参数, 注释此内容可以关闭地图功能
-window.mapParam = {
-  // 开启/关闭地图功能
-  enable: true,
-  // 坐标系 GCJ-02 WGS-84,
-  coordinateSystem: "GCJ-02",
-  // 地图瓦片地址
-  tilesUrl: "http://webrd0{1-4}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8",
-  // 瓦片大小
-  tileSize: 256,
-  // 默认层级
-  zoom:10,
-  // 默认地图中心点
-  center:[116.41020, 39.915119],
-  // 地图最大层级
-  maxZoom:18,
-  // 地图最小层级
-  minZoom: 3
-}

elevator-media-gb/数据库/2.7.2/初始化-mysql-2.7.2.sql

@@ -0,0 +1,343 @@
+/*建表*/
+create table wvp_device (
+                            id serial primary key ,
+                            device_id character varying(50) not null ,
+                            name character varying(255),
+                            manufacturer character varying(255),
+                            model character varying(255),
+                            firmware character varying(255),
+                            transport character varying(50),
+                            stream_mode character varying(50),
+                            on_line bool default false,
+                            register_time character varying(50),
+                            keepalive_time character varying(50),
+                            ip character varying(50),
+                            create_time character varying(50),
+                            update_time character varying(50),
+                            port integer,
+                            expires integer,
+                            subscribe_cycle_for_catalog integer DEFAULT 0,
+                            subscribe_cycle_for_mobile_position integer DEFAULT 0,
+                            mobile_position_submission_interval integer DEFAULT 5,
+                            subscribe_cycle_for_alarm integer DEFAULT 0,
+                            host_address character varying(50),
+                            charset character varying(50),
+                            ssrc_check bool default false,
+                            geo_coord_sys character varying(50),
+                            media_server_id character varying(50),
+                            custom_name character varying(255),
+                            sdp_ip character varying(50),
+                            local_ip character varying(50),
+                            password character varying(255),
+                            as_message_channel bool default false,
+                            keepalive_interval_time integer,
+                            broadcast_push_after_ack bool default false,
+                            category tinyint not null default 1,
+                            constraint uk_device_device unique (device_id)
+);
+
+create table wvp_device_alarm (
+                                  id serial primary key ,
+                                  device_id character varying(50) not null,
+                                  channel_id character varying(50) not null,
+                                  alarm_priority character varying(50),
+                                  alarm_method character varying(50),
+                                  alarm_time character varying(50),
+                                  alarm_description character varying(255),
+                                  longitude double precision,
+                                  latitude double precision,
+                                  alarm_type character varying(50),
+                                  create_time character varying(50) not null
+);
+
+create table wvp_device_channel (
+                                    id serial primary key ,
+                                    channel_id character varying(50) not null,
+                                    name character varying(255),
+                                    custom_name character varying(255),
+                                    manufacture character varying(50),
+                                    model character varying(50),
+                                    owner character varying(50),
+                                    civil_code character varying(50),
+                                    block character varying(50),
+                                    address character varying(50),
+                                    parent_id character varying(50),
+                                    safety_way integer,
+                                    register_way integer,
+                                    cert_num character varying(50),
+                                    certifiable integer,
+                                    err_code integer,
+                                    end_time character varying(50),
+                                    secrecy character varying(50),
+                                    ip_address character varying(50),
+                                    port integer,
+                                    password character varying(255),
+                                    ptz_type integer,
+                                    custom_ptz_type integer,
+                                    status bool default false,
+                                    longitude double precision,
+                                    custom_longitude double precision,
+                                    latitude double precision,
+                                    custom_latitude double precision,
+                                    stream_id character varying(255),
+                                    device_id character varying(50) not null,
+                                    parental character varying(50),
+                                    has_audio bool default false,
+                                    create_time character varying(50) not null,
+                                    update_time character varying(50) not null,
+                                    sub_count integer,
+                                    longitude_gcj02 double precision,
+                                    latitude_gcj02 double precision,
+                                    longitude_wgs84 double precision,
+                                    latitude_wgs84 double precision,
+                                    business_group_id character varying(50),
+                                    gps_time character varying(50),
+                                    stream_identification character varying(50),
+                                    constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id)
+);
+
+create table wvp_device_mobile_position (
+                                            id serial primary key,
+                                            device_id character varying(50) not null,
+                                            channel_id character varying(50) not null,
+                                            device_name character varying(255),
+                                            time character varying(50),
+                                            longitude double precision,
+                                            latitude double precision,
+                                            altitude double precision,
+                                            speed double precision,
+                                            direction double precision,
+                                            report_source character varying(50),
+                                            longitude_gcj02 double precision,
+                                            latitude_gcj02 double precision,
+                                            longitude_wgs84 double precision,
+                                            latitude_wgs84 double precision,
+                                            create_time character varying(50)
+);
+
+create table wvp_gb_stream (
+                               gb_stream_id serial primary key,
+                               app character varying(255) not null,
+                               stream character varying(255) not null,
+                               gb_id character varying(50) not null,
+                               name character varying(255),
+                               longitude double precision,
+                               latitude double precision,
+                               stream_type character varying(50),
+                               media_server_id character varying(50),
+                               create_time character varying(50),
+                               constraint uk_gb_stream_unique_gb_id unique (gb_id),
+                               constraint uk_gb_stream_unique_app_stream unique (app, stream)
+);
+
+create table wvp_log (
+                         id serial primary key ,
+                         name character varying(50),
+                         type character varying(50),
+                         uri character varying(200),
+                         address character varying(50),
+                         result character varying(50),
+                         timing bigint,
+                         username character varying(50),
+                         create_time character varying(50)
+);
+
+create table wvp_media_server (
+                                  id character varying(255) primary key ,
+                                  ip character varying(50),
+                                  hook_ip character varying(50),
+                                  sdp_ip character varying(50),
+                                  stream_ip character varying(50),
+                                  http_port integer,
+                                  http_ssl_port integer,
+                                  rtmp_port integer,
+                                  rtmp_ssl_port integer,
+                                  rtp_proxy_port integer,
+                                  rtsp_port integer,
+                                  rtsp_ssl_port integer,
+                                  flv_port integer,
+                                  flv_ssl_port integer,
+                                  ws_flv_port integer,
+                                  ws_flv_ssl_port integer,
+                                  auto_config bool default false,
+                                  secret character varying(50),
+                                  type character varying(50) default 'zlm',
+                                  rtp_enable bool default false,
+                                  rtp_port_range character varying(50),
+                                  send_rtp_port_range character varying(50),
+                                  record_assist_port integer,
+                                  default_server bool default false,
+                                  create_time character varying(50),
+                                  update_time character varying(50),
+                                  hook_alive_interval integer,
+                                  record_path character varying(255),
+                                  record_day integer default 7,
+                                  transcode_suffix character varying(255),
+                                  constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
+);
+
+create table wvp_platform (
+                              id serial primary key ,
+                              enable bool default false,
+                              name character varying(255),
+                              server_gb_id character varying(50),
+                              server_gb_domain character varying(50),
+                              server_ip character varying(50),
+                              server_port integer,
+                              device_gb_id character varying(50),
+                              device_ip character varying(50),
+                              device_port character varying(50),
+                              username character varying(255),
+                              password character varying(50),
+                              expires character varying(50),
+                              keep_timeout character varying(50),
+                              transport character varying(50),
+                              character_set character varying(50),
+                              catalog_id character varying(50),
+                              ptz bool default false,
+                              rtcp bool default false,
+                              status bool default false,
+                              start_offline_push bool default false,
+                              administrative_division character varying(50),
+                              catalog_group integer,
+                              create_time character varying(50),
+                              update_time character varying(50),
+                              as_message_channel bool default false,
+                              auto_push_channel bool default false,
+                              send_stream_ip character varying(50),
+                              constraint uk_platform_unique_server_gb_id unique (server_gb_id)
+);
+
+create table wvp_platform_catalog (
+                                      id character varying(50),
+                                      platform_id character varying(50),
+                                      name character varying(255),
+                                      parent_id character varying(50),
+                                      civil_code character varying(50),
+                                      business_group_id character varying(50),
+                                      constraint uk_platform_catalog_id_platform_id unique (id, platform_id)
+);
+
+create table wvp_platform_gb_channel (
+                                         id serial primary key ,
+                                         platform_id character varying(50),
+                                         catalog_id character varying(50),
+                                         device_channel_id integer,
+                                         constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id)
+);
+
+create table wvp_platform_gb_stream (
+                                        id serial primary key,
+                                        platform_id character varying(50),
+                                        catalog_id character varying(50),
+                                        gb_stream_id integer,
+                                        constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id)
+);
+
+create table wvp_stream_proxy (
+                                  id serial primary key,
+                                  type character varying(50),
+                                  app character varying(255),
+                                  stream character varying(255),
+                                  url character varying(255),
+                                  src_url character varying(255),
+                                  dst_url character varying(255),
+                                  timeout_ms integer,
+                                  ffmpeg_cmd_key character varying(255),
+                                  rtp_type character varying(50),
+                                  media_server_id character varying(50),
+                                  enable_audio bool default false,
+                                  enable_mp4 bool default false,
+                                  enable bool default false,
+                                  status boolean,
+                                  enable_remove_none_reader bool default false,
+                                  create_time character varying(50),
+                                  name character varying(255),
+                                  update_time character varying(50),
+                                  stream_key character varying(255),
+                                  enable_disable_none_reader bool default false,
+                                  constraint uk_stream_proxy_app_stream unique (app, stream)
+);
+
+create table wvp_stream_push (
+                                 id serial primary key,
+                                 app character varying(255),
+                                 stream character varying(255),
+                                 total_reader_count character varying(50),
+                                 origin_type integer,
+                                 origin_type_str character varying(50),
+                                 create_time character varying(50),
+                                 alive_second integer,
+                                 media_server_id character varying(50),
+                                 server_id character varying(50),
+                                 push_time character varying(50),
+                                 status bool default false,
+                                 update_time character varying(50),
+                                 push_ing bool default false,
+                                 self bool default false,
+                                 constraint uk_stream_push_app_stream unique (app, stream)
+);
+create table wvp_cloud_record (
+                                  id serial primary key,
+                                  app character varying(255),
+                                  stream character varying(255),
+                                  call_id character varying(255),
+                                  start_time bigint,
+                                  end_time bigint,
+                                  media_server_id character varying(50),
+                                  file_name character varying(255),
+                                  folder character varying(255),
+                                  file_path character varying(255),
+                                  collect bool default false,
+                                  file_size bigint,
+                                  time_len bigint,
+                                  constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+);
+
+create table wvp_user (
+                          id serial primary key,
+                          username character varying(255),
+                          password character varying(255),
+                          role_id integer,
+                          create_time character varying(50),
+                          update_time character varying(50),
+                          push_key character varying(50),
+                          constraint uk_user_username unique (username)
+);
+
+create table wvp_user_role (
+                               id serial primary key,
+                               name character varying(50),
+                               authority character varying(50),
+                               create_time character varying(50),
+                               update_time character varying(50)
+);
+create table wvp_resources_tree (
+                                    id serial primary key ,
+                                    is_catalog bool default true,
+                                    device_channel_id integer ,
+                                    gb_stream_id integer,
+                                    name character varying(255),
+                                    parentId integer,
+                                    path character varying(255)
+);
+
+create table wvp_user_api_key (
+                                  id serial primary key ,
+                                  user_id bigint,
+                                  app character varying(255) ,
+                                  api_key text,
+                                  expired_at bigint,
+                                  remark character varying(255),
+                                  enable bool default true,
+                                  create_time character varying(50),
+                                  update_time character varying(50)
+);
+
+
+/*初始数据*/
+INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
+INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
+
+
+

elevator-media-gb/数据库/2.7.2/初始化-postgresql-kingbase-2.7.2.sql

@@ -0,0 +1,342 @@
+/*建表*/
+create table wvp_device (
+                            id serial primary key ,
+                            device_id character varying(50) not null ,
+                            name character varying(255),
+                            manufacturer character varying(255),
+                            model character varying(255),
+                            firmware character varying(255),
+                            transport character varying(50),
+                            stream_mode character varying(50),
+                            on_line bool default false,
+                            register_time character varying(50),
+                            keepalive_time character varying(50),
+                            ip character varying(50),
+                            create_time character varying(50),
+                            update_time character varying(50),
+                            port integer,
+                            expires integer,
+                            subscribe_cycle_for_catalog integer DEFAULT 0,
+                            subscribe_cycle_for_mobile_position integer DEFAULT 0,
+                            mobile_position_submission_interval integer DEFAULT 5,
+                            subscribe_cycle_for_alarm integer DEFAULT 0,
+                            host_address character varying(50),
+                            charset character varying(50),
+                            ssrc_check bool default false,
+                            geo_coord_sys character varying(50),
+                            media_server_id character varying(50),
+                            custom_name character varying(255),
+                            sdp_ip character varying(50),
+                            local_ip character varying(50),
+                            password character varying(255),
+                            as_message_channel bool default false,
+                            keepalive_interval_time integer,
+                            broadcast_push_after_ack bool default false,
+                            constraint uk_device_device unique (device_id)
+);
+
+create table wvp_device_alarm (
+                                  id serial primary key ,
+                                  device_id character varying(50) not null,
+                                  channel_id character varying(50) not null,
+                                  alarm_priority character varying(50),
+                                  alarm_method character varying(50),
+                                  alarm_time character varying(50),
+                                  alarm_description character varying(255),
+                                  longitude double precision,
+                                  latitude double precision,
+                                  alarm_type character varying(50),
+                                  create_time character varying(50) not null
+);
+
+create table wvp_device_channel (
+                                    id serial primary key ,
+                                    channel_id character varying(50) not null,
+                                    name character varying(255),
+                                    custom_name character varying(255),
+                                    manufacture character varying(50),
+                                    model character varying(50),
+                                    owner character varying(50),
+                                    civil_code character varying(50),
+                                    block character varying(50),
+                                    address character varying(50),
+                                    parent_id character varying(50),
+                                    safety_way integer,
+                                    register_way integer,
+                                    cert_num character varying(50),
+                                    certifiable integer,
+                                    err_code integer,
+                                    end_time character varying(50),
+                                    secrecy character varying(50),
+                                    ip_address character varying(50),
+                                    port integer,
+                                    password character varying(255),
+                                    ptz_type integer,
+                                    custom_ptz_type integer,
+                                    status bool default false,
+                                    longitude double precision,
+                                    custom_longitude double precision,
+                                    latitude double precision,
+                                    custom_latitude double precision,
+                                    stream_id character varying(255),
+                                    device_id character varying(50) not null,
+                                    parental character varying(50),
+                                    has_audio bool default false,
+                                    create_time character varying(50) not null,
+                                    update_time character varying(50) not null,
+                                    sub_count integer,
+                                    longitude_gcj02 double precision,
+                                    latitude_gcj02 double precision,
+                                    longitude_wgs84 double precision,
+                                    latitude_wgs84 double precision,
+                                    business_group_id character varying(50),
+                                    gps_time character varying(50),
+                                    stream_identification character varying(50),
+                                    constraint uk_wvp_device_channel_unique_device_channel unique (device_id, channel_id)
+);
+
+create table wvp_device_mobile_position (
+                                            id serial primary key,
+                                            device_id character varying(50) not null,
+                                            channel_id character varying(50) not null,
+                                            device_name character varying(255),
+                                            time character varying(50),
+                                            longitude double precision,
+                                            latitude double precision,
+                                            altitude double precision,
+                                            speed double precision,
+                                            direction double precision,
+                                            report_source character varying(50),
+                                            longitude_gcj02 double precision,
+                                            latitude_gcj02 double precision,
+                                            longitude_wgs84 double precision,
+                                            latitude_wgs84 double precision,
+                                            create_time character varying(50)
+);
+
+create table wvp_gb_stream (
+                               gb_stream_id serial primary key,
+                               app character varying(255) not null,
+                               stream character varying(255) not null,
+                               gb_id character varying(50) not null,
+                               name character varying(255),
+                               longitude double precision,
+                               latitude double precision,
+                               stream_type character varying(50),
+                               media_server_id character varying(50),
+                               create_time character varying(50),
+                               constraint uk_gb_stream_unique_gb_id unique (gb_id),
+                               constraint uk_gb_stream_unique_app_stream unique (app, stream)
+);
+
+create table wvp_log (
+                         id serial primary key ,
+                         name character varying(50),
+                         type character varying(50),
+                         uri character varying(200),
+                         address character varying(50),
+                         result character varying(50),
+                         timing bigint,
+                         username character varying(50),
+                         create_time character varying(50)
+);
+
+create table wvp_media_server (
+                                  id character varying(255) primary key ,
+                                  ip character varying(50),
+                                  hook_ip character varying(50),
+                                  sdp_ip character varying(50),
+                                  stream_ip character varying(50),
+                                  http_port integer,
+                                  http_ssl_port integer,
+                                  rtmp_port integer,
+                                  rtmp_ssl_port integer,
+                                  rtp_proxy_port integer,
+                                  rtsp_port integer,
+                                  rtsp_ssl_port integer,
+                                  flv_port integer,
+                                  flv_ssl_port integer,
+                                  ws_flv_port integer,
+                                  ws_flv_ssl_port integer,
+                                  auto_config bool default false,
+                                  secret character varying(50),
+                                  type character varying(50) default 'zlm',
+                                  rtp_enable bool default false,
+                                  rtp_port_range character varying(50),
+                                  send_rtp_port_range character varying(50),
+                                  record_assist_port integer,
+                                  default_server bool default false,
+                                  create_time character varying(50),
+                                  update_time character varying(50),
+                                  hook_alive_interval integer,
+                                  record_path character varying(255),
+                                  record_day integer default 7,
+                                  transcode_suffix character varying(255),
+                                  constraint uk_media_server_unique_ip_http_port unique (ip, http_port)
+);
+
+create table wvp_platform (
+                              id serial primary key ,
+                              enable bool default false,
+                              name character varying(255),
+                              server_gb_id character varying(50),
+                              server_gb_domain character varying(50),
+                              server_ip character varying(50),
+                              server_port integer,
+                              device_gb_id character varying(50),
+                              device_ip character varying(50),
+                              device_port character varying(50),
+                              username character varying(255),
+                              password character varying(50),
+                              expires character varying(50),
+                              keep_timeout character varying(50),
+                              transport character varying(50),
+                              character_set character varying(50),
+                              catalog_id character varying(50),
+                              ptz bool default false,
+                              rtcp bool default false,
+                              status bool default false,
+                              start_offline_push bool default false,
+                              administrative_division character varying(50),
+                              catalog_group integer,
+                              create_time character varying(50),
+                              update_time character varying(50),
+                              as_message_channel bool default false,
+                              auto_push_channel bool default false,
+                              send_stream_ip character varying(50),
+                              constraint uk_platform_unique_server_gb_id unique (server_gb_id)
+);
+
+create table wvp_platform_catalog (
+                                      id character varying(50),
+                                      platform_id character varying(50),
+                                      name character varying(255),
+                                      parent_id character varying(50),
+                                      civil_code character varying(50),
+                                      business_group_id character varying(50),
+                                      constraint uk_platform_catalog_id_platform_id unique (id, platform_id)
+);
+
+create table wvp_platform_gb_channel (
+                                         id serial primary key ,
+                                         platform_id character varying(50),
+                                         catalog_id character varying(50),
+                                         device_channel_id integer,
+                                         constraint uk_platform_gb_channel_platform_id_catalog_id_device_channel_id unique (platform_id, catalog_id, device_channel_id)
+);
+
+create table wvp_platform_gb_stream (
+                                        id serial primary key,
+                                        platform_id character varying(50),
+                                        catalog_id character varying(50),
+                                        gb_stream_id integer,
+                                        constraint uk_platform_gb_stream_platform_id_catalog_id_gb_stream_id unique (platform_id, catalog_id, gb_stream_id)
+);
+
+create table wvp_stream_proxy (
+                                  id serial primary key,
+                                  type character varying(50),
+                                  app character varying(255),
+                                  stream character varying(255),
+                                  url character varying(255),
+                                  src_url character varying(255),
+                                  dst_url character varying(255),
+                                  timeout_ms integer,
+                                  ffmpeg_cmd_key character varying(255),
+                                  rtp_type character varying(50),
+                                  media_server_id character varying(50),
+                                  enable_audio bool default false,
+                                  enable_mp4 bool default false,
+                                  enable bool default false,
+                                  status boolean,
+                                  enable_remove_none_reader bool default false,
+                                  create_time character varying(50),
+                                  name character varying(255),
+                                  update_time character varying(50),
+                                  stream_key character varying(255),
+                                  enable_disable_none_reader bool default false,
+                                  constraint uk_stream_proxy_app_stream unique (app, stream)
+);
+
+create table wvp_stream_push (
+                                 id serial primary key,
+                                 app character varying(255),
+                                 stream character varying(255),
+                                 total_reader_count character varying(50),
+                                 origin_type integer,
+                                 origin_type_str character varying(50),
+                                 create_time character varying(50),
+                                 alive_second integer,
+                                 media_server_id character varying(50),
+                                 server_id character varying(50),
+                                 push_time character varying(50),
+                                 status bool default false,
+                                 update_time character varying(50),
+                                 push_ing bool default false,
+                                 self bool default false,
+                                 constraint uk_stream_push_app_stream unique (app, stream)
+);
+create table wvp_cloud_record (
+                                  id serial primary key,
+                                  app character varying(255),
+                                  stream character varying(255),
+                                  call_id character varying(255),
+                                  start_time int8,
+                                  end_time int8,
+                                  media_server_id character varying(50),
+                                  file_name character varying(255),
+                                  folder character varying(255),
+                                  file_path character varying(255),
+                                  collect bool default false,
+                                  file_size int8,
+                                  time_len int8,
+                                  constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+);
+
+create table wvp_user (
+                          id serial primary key,
+                          username character varying(255),
+                          password character varying(255),
+                          role_id integer,
+                          create_time character varying(50),
+                          update_time character varying(50),
+                          push_key character varying(50),
+                          constraint uk_user_username unique (username)
+);
+
+create table wvp_user_role (
+                               id serial primary key,
+                               name character varying(50),
+                               authority character varying(50),
+                               create_time character varying(50),
+                               update_time character varying(50)
+);
+create table wvp_resources_tree (
+                                    id serial primary key ,
+                                    is_catalog bool default true,
+                                    device_channel_id integer ,
+                                    gb_stream_id integer,
+                                    name character varying(255),
+                                    parentId integer,
+                                    path character varying(255)
+);
+
+create table wvp_user_api_key (
+                                  id serial primary key ,
+                                  user_id bigint,
+                                  app character varying(255) ,
+                                  api_key text,
+                                  expired_at bigint,
+                                  remark character varying(255),
+                                  enable bool default true,
+                                  create_time character varying(50),
+                                  update_time character varying(50)
+);
+
+
+/*初始数据*/
+INSERT INTO wvp_user VALUES (1, 'admin','21232f297a57a5a743894a0e4a801fc3',1,'2021-04-13 14:14:57','2021-04-13 14:14:57','3e80d1762a324d5b0ff636e0bd16f1e3');
+INSERT INTO wvp_user_role VALUES (1, 'admin','0','2021-04-13 14:14:57','2021-04-13 14:14:57');
+
+
+

elevator-media-gb/数据库/2.7.2/更新-mysql-2.7.2.sql

@@ -0,0 +1,26 @@
+alter table wvp_media_server
+    add transcode_suffix character varying(255);
+
+alter table wvp_media_server
+    add  type character varying(50) default 'zlm';
+
+alter table wvp_media_server
+    add flv_port integer;
+alter table wvp_media_server
+    add flv_ssl_port integer;
+alter table wvp_media_server
+    add ws_flv_port integer;
+alter table wvp_media_server
+    add ws_flv_ssl_port integer;
+
+create table wvp_user_api_key (
+                                  id serial primary key ,
+                                  user_id bigint,
+                                  app character varying(255) ,
+                                  api_key text,
+                                  expired_at bigint,
+                                  remark character varying(255),
+                                  enable bool default true,
+                                  create_time character varying(50),
+                                  update_time character varying(50)
+);

elevator-media-gb/数据库/2.7.2/更新-postgresql-kingbase-2.7.2.sql

@@ -0,0 +1,26 @@
+alter table wvp_media_server
+    add transcode_suffix character varying(255);
+
+alter table wvp_media_server
+    add  type character varying(50) default 'zlm';
+
+alter table wvp_media_server
+    add flv_port integer;
+alter table wvp_media_server
+    add flv_ssl_port integer;
+alter table wvp_media_server
+    add ws_flv_port integer;
+alter table wvp_media_server
+    add ws_flv_ssl_port integer;
+
+create table wvp_user_api_key (
+                                  id serial primary key ,
+                                  user_id bigint,
+                                  app character varying(255) ,
+                                  api_key text,
+                                  expired_at bigint,
+                                  remark character varying(255),
+                                  enable bool default true,
+                                  create_time character varying(50),
+                                  update_time character varying(50)
+);

elevator-media-record/src/main/resources/application-dev.yml

@@ -2,13 +2,13 @@ spring:
     # REDIS数据库配置
     redis:
         # [必须修改] Redis服务器IP, REDIS安装在本机的,使用127.0.0.1
-        host: 192.168.2.120
+        host: 127.0.0.1
         # [必须修改] 端口号
         port: 6379
         # [可选] 数据库 DB
         database: 8
         # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
-        password: Hycpb@123
+        password: VUMOzyN7edjytXDu
         # [可选] 超时时间
         timeout: 10000
 
@@ -36,7 +36,8 @@ userSettings:
     # [可选 ] 限制 ffmpeg 合并文件使用的线程数，间接限制cpu使用率， 默认2 限制到50%
     threads: 2
     # [可选 ] 临时录像路径
-    record-temp: /home/ZLMediaKit/release/linux/Debug/www/record
+    # record-temp: /home/ZLMediaKit/release/linux/Debug/www/record
+    record-temp: /data/elevator/ZLMediaKit/release/linux/Debug/www/record
     # [可选 ] 录像保存时长（单位： 天）每天晚12点自动对过期文件执行清理, 不配置则不删除
     record-temp-day: 7
     # [可选 ] 录像下载合成临时文件保存时长， 不配置默认取值recordDay（单位： 天）每天晚12点自动对过期文件执行清理
@@ -55,4 +56,4 @@ logging:
         root: INFO
         top:
             panll:
-                assist: info
+                assist: info

elevator-webrtc/public/dist/js/SkyRTC-client.js

@@ -18,10 +18,10 @@ const SkyRTC = function () {
     const iceServer = {
         "iceServers": [
             {
-             "url":"stun:101.200.232.7:3478"
+             "url":"stun:118.178.91.140:3478"
             },
             {
-                "url": "turn:101.200.232.7:3478",
+                "url": "turn:118.178.91.140:3478",
                 "username": "iturn",
                 "credential": "Inspu9961234,"
             }

elevator-webrtc/public/dist/js/SkyRTC.js

@@ -98,8 +98,10 @@ function SkyRTC() {
         if (socket.role === "host") {
             // 通知后台，梯屏已进入房间
             const options = {
-                hostname: 'idmlab.kmdns.net',
-                port: 12000,
+                // hostname: 'elevator.inspuriit.com',
+                hostname: '127.0.0.1',
+                // port: 80,
+                port: 8081,
                 path: '/admin/joinroom/callback/' + room,
                 method: 'GET',
             };
@@ -268,8 +270,10 @@ SkyRTC.prototype.removeSocket = function (socket) {
         if (socket.role === "host") {
             // 通知后台，梯屏已退出房间
             const options = {
-                hostname: 'idmlab.kmdns.net',
-                port: 12000,
+                // hostname: 'elevator.inspuriit.com',
+                hostname: '127.0.0.1',
+                // port: 80,
+                port: 8081,
                 path: '/admin/exitroom/callback/' + room,
                 method: 'GET',
             };
@@ -414,4 +418,4 @@ module.exports.listen = function (server) {
 
 
     return SkyRTCServer;
-};
+};

elevator-webrtc/public/dist/js/conn.js

@@ -126,4 +126,4 @@ rtc.on('data_channel_message', function (channel, socketId, message) {
     msgs.appendChild(p);
 });
 //连接WebSocket服务器
-rtc.connect("wss://pub-test.inspuriit.com/wss", window.location.hash.slice(1));
+rtc.connect("wss://elevator.inspuriit.com/wss", window.location.hash.slice(1));

srs-stream/src/main/java/com/iptv/snmp/config/Constant.java

@@ -4,11 +4,12 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class Constant {
 
+    // public static final String SRS_API = "http://127.0.0.1:1896/api/v1/";
     public static final String SRS_API = "http://127.0.0.1:1985/api/v1/";
 
     public static final String WVP_STREAM_PREFIX = "http://127.0.0.1:83/";
     public static final String WVP_API_PREFIX = "http://127.0.0.1:82/";
-    public static final String WVP_LOGIN_URL = "http://127.0.0.1:82/api/user/login?username=admin&password=ec7ce0c3830f8999172c353309df0828";
+    public static final String WVP_LOGIN_URL = "http://127.0.0.1:82/api/user/login?username=admin&password=8e521fea91b03614bcf5feeeb842c064";
     public static final String SRS_STREAM_PREFIX = "rtmp://127.0.0.1:19350/";
 
     public static final String FFMPEG_PATH = "/usr/bin/ffmpeg";

srs-stream/src/main/resources/application.yml

@@ -13,7 +13,7 @@ server:
 logging:
   config: classpath:log4j2.xml
 conf:
-  lb-live-start-api: http://idmlab.kmdns.net:12000/lb-adapter/live/start
-  lb-live-stop-api: http://idmlab.kmdns.net:12000/lb-adapter/live/stop
-  lb-broadcast-start-api: http://idmlab.kmdns.net:12000/lb-adapter/broadcast/start
-  lb-broadcast-stop-api: http://idmlab.kmdns.net:12000/lb-adapter/broadcast/stop
+  lb-live-start-api:
+  lb-live-stop-api:
+  lb-broadcast-start-api:
+  lb-broadcast-stop-api: