Commit 05c94087260eb57e916b380696aba20db0646859

Authored by guzijian
1 parent 9c0afa62

feat: 修改配置

src/main/resources/application-dev.yml
@@ -77,7 +77,7 @@ sip: @@ -77,7 +77,7 @@ sip:
77 77
78 #zlm 默认服务器配置 78 #zlm 默认服务器配置
79 media: 79 media:
80 - id: your_server_id 80 + id: guzijian
81 # [必须修改] zlm服务器的内网IP 81 # [必须修改] zlm服务器的内网IP
82 ip: 192.168.168.124 82 ip: 192.168.168.124
83 # [必须修改] zlm服务器的http.port 83 # [必须修改] zlm服务器的http.port
@@ -85,13 +85,13 @@ media: @@ -85,13 +85,13 @@ media:
85 # [可选] 返回流地址时的ip,置空使用 media.ip 85 # [可选] 返回流地址时的ip,置空使用 media.ip
86 stream-ip: 61.169.120.202 86 stream-ip: 61.169.120.202
87 # [可选] wvp在国标信令中使用的ip,此ip为摄像机可以访问到的ip, 置空使用 media.ip 87 # [可选] wvp在国标信令中使用的ip,此ip为摄像机可以访问到的ip, 置空使用 media.ip
88 - sdp-ip: 192.168.168.124 88 + sdp-ip: 61.169.120.202
89 # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip 89 # [可选] zlm服务器的hook所使用的IP, 默认使用sip.ip
90 hook-ip: 192.168.168.124 90 hook-ip: 192.168.168.124
91 # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置 91 # [可选] zlm服务器的http.sslport, 置空使用zlm配置文件配置
92 http-ssl-port: 7443 92 http-ssl-port: 7443
93 # [可选] zlm服务器的hook.admin_params=secret 93 # [可选] zlm服务器的hook.admin_params=secret
94 - secret: rXozUVm6qLWysTtQjV1mm3NhEWxgPFGS 94 + secret: RPorcBlIw26uHGnEHYGesIYyFDXpgjkP
95 # 启用多端口模式, 多端口模式使用端口区分每路流,兼容性更好。 单端口使用流的ssrc区分, 点播超时建议使用多端口测试 95 # 启用多端口模式, 多端口模式使用端口区分每路流,兼容性更好。 单端口使用流的ssrc区分, 点播超时建议使用多端口测试
96 rtp: 96 rtp:
97 # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输 97 # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
web_src/config/index.js
1 -'use strict' 1 +"use strict";
2 // Template version: 1.3.1 2 // Template version: 1.3.1
3 // see http://vuejs-templates.github.io/webpack for documentation. 3 // see http://vuejs-templates.github.io/webpack for documentation.
4 4
5 -const path = require('path') 5 +const path = require("path");
6 6
7 module.exports = { 7 module.exports = {
8 dev: { 8 dev: {
9 -  
10 // Paths 9 // Paths
11 - assetsSubDirectory: 'static',  
12 - assetsPublicPath: '/', 10 + assetsSubDirectory: "static",
  11 + assetsPublicPath: "/",
13 proxyTable: { 12 proxyTable: {
14 - '/debug': {  
15 - target: 'https://61.169.120.202:18080', 13 + "/debug": {
  14 + target: "https://61.169.120.202:18080",
16 changeOrigin: true, 15 changeOrigin: true,
17 pathRewrite: { 16 pathRewrite: {
18 - '^/debug': '/'  
19 - } 17 + "^/debug": "/",
  18 + },
20 }, 19 },
21 - '/static/snap': {  
22 - target: 'https://61.169.120.202:18080', 20 + "/static/snap": {
  21 + target: "https://61.169.120.202:18080",
23 changeOrigin: true, 22 changeOrigin: true,
24 // pathRewrite: { 23 // pathRewrite: {
25 // '^/static/snap': '/static/snap' 24 // '^/static/snap': '/static/snap'
26 // } 25 // }
27 }, 26 },
28 -  
29 }, 27 },
30 28
31 // Various Dev Server settings 29 // Various Dev Server settings
32 - host:"127.0.0.1", 30 + host: "127.0.0.1",
33 useLocalIp: false, // can be overwritten by process.env.HOST 31 useLocalIp: false, // can be overwritten by process.env.HOST
34 port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined 32 port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
35 autoOpenBrowser: false, 33 autoOpenBrowser: false,
36 errorOverlay: true, 34 errorOverlay: true,
37 notifyOnErrors: true, 35 notifyOnErrors: true,
38 - hot: true,//自动保存 36 + hot: true, //自动保存
39 poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- 37 poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
40 38
41 -  
42 /** 39 /**
43 * Source Maps 40 * Source Maps
44 */ 41 */
45 42
46 // https://webpack.js.org/configuration/devtool/#development 43 // https://webpack.js.org/configuration/devtool/#development
47 - devtool: 'cheap-module-eval-source-map', 44 + devtool: "cheap-module-eval-source-map",
48 45
49 // If you have problems debugging vue-files in devtools, 46 // If you have problems debugging vue-files in devtools,
50 // set this to false - it *may* help 47 // set this to false - it *may* help
51 // https://vue-loader.vuejs.org/en/options.html#cachebusting 48 // https://vue-loader.vuejs.org/en/options.html#cachebusting
52 cacheBusting: true, 49 cacheBusting: true,
53 50
54 - cssSourceMap: true 51 + cssSourceMap: true,
55 }, 52 },
56 53
57 build: { 54 build: {
58 // Template for index.html 55 // Template for index.html
59 - index: path.resolve(__dirname, '../../src/main/resources/static/index.html'), 56 + index: path.resolve(
  57 + __dirname,
  58 + "../../src/main/resources/static/index.html"
  59 + ),
60 60
61 // Paths 61 // Paths
62 - assetsRoot: path.resolve(__dirname, '../../src/main/resources/static/'),  
63 - assetsSubDirectory: './static',  
64 - assetsPublicPath: '/', 62 + assetsRoot: path.resolve(__dirname, "../../src/main/resources/static/"),
  63 + assetsSubDirectory: "./static",
  64 + assetsPublicPath: "/",
65 65
66 /** 66 /**
67 * Source Maps 67 * Source Maps
@@ -69,19 +69,19 @@ module.exports = { @@ -69,19 +69,19 @@ module.exports = {
69 69
70 productionSourceMap: true, 70 productionSourceMap: true,
71 // https://webpack.js.org/configuration/devtool/#production 71 // https://webpack.js.org/configuration/devtool/#production
72 - devtool: '#source-map', 72 + devtool: "#source-map",
73 73
74 // Gzip off by default as many popular static hosts such as 74 // Gzip off by default as many popular static hosts such as
75 // Surge or Netlify already gzip all static assets for you. 75 // Surge or Netlify already gzip all static assets for you.
76 // Before setting to `true`, make sure to: 76 // Before setting to `true`, make sure to:
77 // npm install --save-dev compression-webpack-plugin 77 // npm install --save-dev compression-webpack-plugin
78 productionGzip: false, 78 productionGzip: false,
79 - productionGzipExtensions: ['js', 'css'], 79 + productionGzipExtensions: ["js", "css"],
80 80
81 // Run the build command with an extra argument to 81 // Run the build command with an extra argument to
82 // View the bundle analyzer report after build finishes: 82 // View the bundle analyzer report after build finishes:
83 // `npm run build --report` 83 // `npm run build --report`
84 // Set to `true` or `false` to always turn it on or off 84 // Set to `true` or `false` to always turn it on or off
85 - bundleAnalyzerReport: process.env.npm_config_report  
86 - }  
87 -} 85 + bundleAnalyzerReport: process.env.npm_config_report,
  86 + },
  87 +};
web_src/static/js/config.js
1 -  
2 -window.baseUrl = "https://61.169.120.202:18080" 1 +window.baseUrl = "https://61.169.120.202:18080";
3 2
4 // map组件全局参数, 注释此内容可以关闭地图功能 3 // map组件全局参数, 注释此内容可以关闭地图功能
5 window.mapParam = { 4 window.mapParam = {
@@ -8,15 +7,16 @@ window.mapParam = { @@ -8,15 +7,16 @@ window.mapParam = {
8 // 坐标系 GCJ-02 WGS-84, 7 // 坐标系 GCJ-02 WGS-84,
9 coordinateSystem: "GCJ-02", 8 coordinateSystem: "GCJ-02",
10 // 地图瓦片地址 9 // 地图瓦片地址
11 - tilesUrl: "http://webrd0{1-4}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8", 10 + tilesUrl:
  11 + "http://webrd0{1-4}.is.autonavi.com/appmaptile?x={x}&y={y}&z={z}&lang=zh_cn&size=1&scale=1&style=8",
12 // 瓦片大小 12 // 瓦片大小
13 tileSize: 256, 13 tileSize: 256,
14 // 默认层级 14 // 默认层级
15 - zoom:10, 15 + zoom: 10,
16 // 默认地图中心点 16 // 默认地图中心点
17 - center:[116.41020, 39.915119], 17 + center: [116.4102, 39.915119],
18 // 地图最大层级 18 // 地图最大层级
19 - maxZoom:18, 19 + maxZoom: 18,
20 // 地图最小层级 20 // 地图最小层级
21 - minZoom: 3  
22 -} 21 + minZoom: 3,
  22 +};