Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

648540858
2 parents f24b6fa1 89a2e627
Showing 2 changed files with 6 additions and 1 deletions
src/main/resources/8042900_www.wvp-pro.cn.jks
src/main/resources/all-application.yml
@@ -79,9 +79,14 @@ server:
         # [可选] 证书文件路径，放置在resource/目录下即可，修改xxx为文件名
         key-store: classpath:xxx.jks
         # [可选] 证书密码
-        key-password: password
+        key-store-password: password
         # [可选] 证书类型， 默认为jks，根据实际修改
         key-store-type: JKS
+        # 配置证书可以使用如下两项，如上面二选一即可
+        # PEM 编码证书
+        certificate: xx.pem
+        #   私钥文件
+        certificate-private-key: xx.key
  
 # 作为28181服务器的配置
 sip: