guzijian / wvp-GB28181-pro · Commits

Commit 3e07a623e1f3a3ede5f77e9176df70885a6f1226

Authored by guzijian
1 parent f6e01403

ci: 修改dev模块配置

Inline Side-by-side
Showing 6 changed files with 53 additions and 51 deletions
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <version>2.7.0</version> 14 <version>2.7.0</version>
15 <name>web video platform</name> 15 <name>web video platform</name>
16 <description>国标28181视频平台</description> 16 <description>国标28181视频平台</description>
17 - <packaging>${project.packaging}</packaging> 17 + <packaging>jar</packaging>
18 18
19 <repositories> 19 <repositories>
20 <repository> 20 <repository>
@@ -342,7 +342,7 @@ @@ -342,7 +342,7 @@
342 </dependencies> 342 </dependencies>
343 343
344 <build> 344 <build>
345 - <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName> 345 + <finalName>${project.artifactId}</finalName>
346 <plugins> 346 <plugins>
347 <plugin> 347 <plugin>
348 <groupId>org.springframework.boot</groupId> 348 <groupId>org.springframework.boot</groupId>
@@ -383,43 +383,43 @@ @@ -383,43 +383,43 @@
383 </configuration> 383 </configuration>
384 </plugin> 384 </plugin>
385 385
386 - <plugin>  
387 - <groupId>org.apache.maven.plugins</groupId>  
388 - <artifactId>maven-jar-plugin</artifactId>  
389 - <version>3.3.0</version>  
390 - <configuration>  
391 - <excludes>  
392 - <exclude>**/all-application.yml</exclude>  
393 - <exclude>**/application.yml</exclude>  
394 - <exclude>**/application-*.yml</exclude>  
395 - <exclude>**/local.jks</exclude>  
396 - </excludes>  
397 - </configuration>  
398 - </plugin>  
399 - <plugin>  
400 - <artifactId>maven-resources-plugin</artifactId>  
401 - <executions>  
402 - <execution> <!-- 复制配置文件 -->  
403 - <id>copy-resources</id>  
404 - <phase>package</phase>  
405 - <goals>  
406 - <goal>copy-resources</goal>  
407 - </goals>  
408 - <configuration>  
409 - <resources>  
410 - <resource>  
411 - <directory>src/main/resources</directory>  
412 - <includes>  
413 - <include>application.yml</include>  
414 - <include>application-*.yml</include>  
415 - </includes>  
416 - </resource>  
417 - </resources>  
418 - <outputDirectory>${project.build.directory}</outputDirectory>  
419 - </configuration>  
420 - </execution>  
421 - </executions>  
422 - </plugin> 386 +<!-- <plugin>-->
  387 +<!-- <groupId>org.apache.maven.plugins</groupId>-->
  388 +<!-- <artifactId>maven-jar-plugin</artifactId>-->
  389 +<!-- <version>3.3.0</version>-->
  390 +<!-- <configuration>-->
  391 +<!-- <excludes>-->
  392 +<!-- <exclude>**/all-application.yml</exclude>-->
  393 +<!-- <exclude>**/application.yml</exclude>-->
  394 +<!-- <exclude>**/application-*.yml</exclude>-->
  395 +<!-- <exclude>**/local.jks</exclude>-->
  396 +<!-- </excludes>-->
  397 +<!-- </configuration>-->
  398 +<!-- </plugin>-->
  399 +<!-- <plugin>-->
  400 +<!-- <artifactId>maven-resources-plugin</artifactId>-->
  401 +<!-- <executions>-->
  402 +<!-- <execution> &lt;!&ndash; 复制配置文件 &ndash;&gt;-->
  403 +<!-- <id>copy-resources</id>-->
  404 +<!-- <phase>package</phase>-->
  405 +<!-- <goals>-->
  406 +<!-- <goal>copy-resources</goal>-->
  407 +<!-- </goals>-->
  408 +<!-- <configuration>-->
  409 +<!-- <resources>-->
  410 +<!-- <resource>-->
  411 +<!-- <directory>src/main/resources</directory>-->
  412 +<!-- <includes>-->
  413 +<!-- <include>application.yml</include>-->
  414 +<!-- <include>application-*.yml</include>-->
  415 +<!-- </includes>-->
  416 +<!-- </resource>-->
  417 +<!-- </resources>-->
  418 +<!-- <outputDirectory>${project.build.directory}</outputDirectory>-->
  419 +<!-- </configuration>-->
  420 +<!-- </execution>-->
  421 +<!-- </executions>-->
  422 +<!-- </plugin>-->
423 </plugins> 423 </plugins>
424 <resources> 424 <resources>
425 <resource> 425 <resource>
src/main/java/com/genersoft/iot/vmp/conf/ProxyServletConfig.java
  View file @3e07a62
@@ -36,7 +36,7 @@ public class ProxyServletConfig { @@ -36,7 +36,7 @@ public class ProxyServletConfig {
36 private IMediaServerService mediaServerService; 36 private IMediaServerService mediaServerService;
37 37
38 @Value("${server.port}") 38 @Value("${server.port}")
39 - private int serverPort; 39 + private Integer serverPort;
40 40
41 @Bean 41 @Bean
42 public ServletRegistrationBean zlmServletRegistrationBean(){ 42 public ServletRegistrationBean zlmServletRegistrationBean(){
src/main/java/com/genersoft/iot/vmp/conf/WVPTimerTask.java
  View file @3e07a62
@@ -18,7 +18,7 @@ public class WVPTimerTask { @@ -18,7 +18,7 @@ public class WVPTimerTask {
18 private IMediaServerService mediaServerService; 18 private IMediaServerService mediaServerService;
19 19
20 @Value("${server.port}") 20 @Value("${server.port}")
21 - private int serverPort; 21 + private Integer serverPort;
22 22
23 @Autowired 23 @Autowired
24 private SipConfig sipConfig; 24 private SipConfig sipConfig;
src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java
  View file @3e07a62
@@ -69,7 +69,7 @@ public class ServerController { @@ -69,7 +69,7 @@ public class ServerController {
69 69
70 70
71 @Value("${server.port}") 71 @Value("${server.port}")
72 - private int serverPort; 72 + private Integer serverPort;
73 73
74 74
75 @Autowired 75 @Autowired
src/main/resources/application-dev.yml
  View file @3e07a62
@@ -30,7 +30,7 @@ spring: @@ -30,7 +30,7 @@ spring:
30 master: 30 master:
31 type: com.zaxxer.hikari.HikariDataSource 31 type: com.zaxxer.hikari.HikariDataSource
32 driver-class-name: com.mysql.cj.jdbc.Driver 32 driver-class-name: com.mysql.cj.jdbc.Driver
33 - url: jdbc:mysql://192.168.168.124:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true 33 + url: jdbc:mysql://192.168.168.124:3306/latest_wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
34 username: root 34 username: root
35 password: guzijian 35 password: guzijian
36 hikari: 36 hikari:
@@ -42,15 +42,15 @@ spring: @@ -42,15 +42,15 @@ spring:
42 max-lifetime: 1200000 # 是池中连接关闭后的最长生命周期（以毫秒为单位) 42 max-lifetime: 1200000 # 是池中连接关闭后的最长生命周期（以毫秒为单位)
43 #[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口 43 #[可选] WVP监听的HTTP端口, 网页和接口调用都是这个端口
44 server: 44 server:
45 - port: 8080 45 + port: 18080
46 # [可选] HTTPS配置， 默认不开启 46 # [可选] HTTPS配置， 默认不开启
47 ssl: 47 ssl:
48 # [可选] 是否开启HTTPS访问 48 # [可选] 是否开启HTTPS访问
49 - enabled: false 49 + enabled: true
50 # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名 50 # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名
51 - key-store: classpath:test.monitor.89iot.cn.jks 51 + key-store: classpath:Aserver.keystore
52 # [可选] 证书密码 52 # [可选] 证书密码
53 - key-store-password: gpf64qmw 53 + key-store-password: guzijian
54 # [可选] 证书类型， 默认为jks，根据实际修改 54 # [可选] 证书类型， 默认为jks，根据实际修改
55 key-store-type: JKS 55 key-store-type: JKS
56 56
@@ -67,9 +67,9 @@ sip: @@ -67,9 +67,9 @@ sip:
67 # 后两位为行业编码，定义参照附录D.3 67 # 后两位为行业编码，定义参照附录D.3
68 # 3701020049标识山东济南历下区 信息行业接入 68 # 3701020049标识山东济南历下区 信息行业接入
69 # [可选] 69 # [可选]
70 - domain: 3402000000 70 + domain: 4401020049
71 # [可选] 71 # [可选]
72 - id: 34020000002000000001 72 + id: 44010200492000000001
73 # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验 73 # [可选] 默认设备认证密码，后续扩展使用设备单独密码, 移除密码将不进行校验
74 password: 12345678 74 password: 12345678
75 # 是否存储alarm信息 75 # 是否存储alarm信息
@@ -91,7 +91,7 @@ media: @@ -91,7 +91,7 @@ media:
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: 10000 94 + secret: rXozUVm6qLWysTtQjV1mm3NhEWxgPFGS
95 # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试 95 # 启用多端口模式, 多端口模式使用端口区分每路流，兼容性更好。 单端口使用流的ssrc区分， 点播超时建议使用多端口测试
96 rtp: 96 rtp:
97 # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输 97 # [可选] 是否启用多端口模式, 开启后会在portRange范围内选择端口用于媒体流传输
src/main/resources/application.yml
  View file @3e07a62
@@ -2,4 +2,6 @@ spring: @@ -2,4 +2,6 @@ spring:
2 application: 2 application:
3 name: wvp 3 name: wvp
4 profiles: 4 profiles:
5 - active: local  
6 \ No newline at end of file 5 \ No newline at end of file
  6 + active: local
  7 +server:
  8 + port: 18080
7 \ No newline at end of file 9 \ No newline at end of file