From 0abccf5e570dce53a802bca4ce25118dd900692c Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 23 二月 2024 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-admin/src/main/resources/application-prod.yml |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 97b38c7..e0ebd19 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -2,6 +2,17 @@
 server:
   # 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
   port: 8080
+  ssl:
+    # 寮�鍚疕TTPS锛屽苟閰嶇疆鑷鍚嶈瘉涔�
+    enabled: true
+    #绉橀挜搴撴枃浠跺悕绉帮紝鍗充笂闈㈢敓鎴愮殑鑷鍚嶈瘉涔�
+    key-store: classpath:keystore
+    # 鐢熸垚绉橀挜搴撴枃浠剁殑瀵嗙爜
+    key-store-password: 123456
+    # 绉橀挜搴撶被鍨嬶紙JKS涓簀dk鐨刱eytool宸ュ叿榛樿鐢熸垚鐨勭閽ュ簱绫诲瀷锛�
+    key-store-type: JKS
+    # 绉橀挜鍒悕
+    key-alias: tomcat
   servlet:
     # 搴旂敤鐨勮闂矾寰�
     context-path: /

--
Gitblit v1.9.3