From 942c5caa7c9bf5afe59ac8d5bd12d174a72b9710 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 23 八月 2022 11:00:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
/dev/null | 0
src/main/resources/all-application.yml | 7 ++++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/8042900_www.wvp-pro.cn.jks b/src/main/resources/8042900_www.wvp-pro.cn.jks
deleted file mode 100644
index 3e51206..0000000
--- a/src/main/resources/8042900_www.wvp-pro.cn.jks
+++ /dev/null
Binary files differ
diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 6a608f4..6679c0d 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -79,9 +79,14 @@
# [鍙�塢 璇佷功鏂囦欢璺緞锛屾斁缃湪resource/鐩綍涓嬪嵆鍙紝淇敼xxx涓烘枃浠跺悕
key-store: classpath:xxx.jks
# [鍙�塢 璇佷功瀵嗙爜
- key-password: password
+ key-store-password: password
# [鍙�塢 璇佷功绫诲瀷锛� 榛樿涓簀ks锛屾牴鎹疄闄呬慨鏀�
key-store-type: JKS
+ # 閰嶇疆璇佷功鍙互浣跨敤濡備笅涓ら」锛屽涓婇潰浜岄�変竴鍗冲彲
+ # PEM 缂栫爜璇佷功
+ certificate: xx.pem
+ # 绉侀挜鏂囦欢
+ certificate-private-key: xx.key
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
--
Gitblit v1.8.0