Commit 942c5caa7c9bf5afe59ac8d5bd12d174a72b9710
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
Showing
2 changed files
with
6 additions
and
1 deletions
src/main/resources/8042900_www.wvp-pro.cn.jks deleted
100644 → 0
No preview for this file type
src/main/resources/all-application.yml
| @@ -79,9 +79,14 @@ server: | @@ -79,9 +79,14 @@ server: | ||
| 79 | # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名 | 79 | # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名 |
| 80 | key-store: classpath:xxx.jks | 80 | key-store: classpath:xxx.jks |
| 81 | # [可选] 证书密码 | 81 | # [可选] 证书密码 |
| 82 | - key-password: password | 82 | + key-store-password: password |
| 83 | # [可选] 证书类型， 默认为jks，根据实际修改 | 83 | # [可选] 证书类型， 默认为jks，根据实际修改 |
| 84 | key-store-type: JKS | 84 | key-store-type: JKS |
| 85 | + # 配置证书可以使用如下两项，如上面二选一即可 | ||
| 86 | + # PEM 编码证书 | ||
| 87 | + certificate: xx.pem | ||
| 88 | + # 私钥文件 | ||
| 89 | + certificate-private-key: xx.key | ||
| 85 | 90 | ||
| 86 | # 作为28181服务器的配置 | 91 | # 作为28181服务器的配置 |
| 87 | sip: | 92 | sip: |