From 745dc5c6100fd670fbaf5ccbc18631731ee860e5 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期三, 11 十月 2023 21:37:52 +0800
Subject: [PATCH] 增加了文件
---
ruoyi-admin/src/main/resources/www.bendudu.com.pfx | 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java | 1 -
ruoyi-admin/src/main/resources/application.yml | 14 +++++++-------
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java
index b3475fe..6826295 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/EsSearchController.java
@@ -3,7 +3,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.EsModel;
import com.ruoyi.service.EsService;
-import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index e6303c7..f2fd417 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -19,13 +19,13 @@
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
port: 8080
-# ssl: #ssl閰嶇疆
-# # resources鏍圭洰褰曠殑鈥濊瘉涔︽簮鏂囦欢.pfx鈥�
-# key-store: www.bendudu.com.pfx
-# # 鈥�.pfx鈥濊瘉涔﹀搴旀牸寮忥紝鈥�.jks"璇佷功瀵瑰簲鈥淩SA鈥�
-# key-store-type: PKCS12
-# key-store-password: tc6h7mav
-# #key-password: 绉侀挜瀵嗙爜
+ ssl: #ssl閰嶇疆
+ # resources鏍圭洰褰曠殑鈥濊瘉涔︽簮鏂囦欢.pfx鈥�
+ key-store: classpath:www.bendudu.com.pfx
+ # 鈥�.pfx鈥濊瘉涔﹀搴旀牸寮忥紝鈥�.jks"璇佷功瀵瑰簲鈥淩SA鈥�
+ key-store-type: PKCS12
+ key-store-password: tc6h7mav
+ #key-password: 绉侀挜瀵嗙爜
servlet:
# 搴旂敤鐨勮闂矾寰�
diff --git a/ruoyi-admin/src/main/resources/www.bendudu.com.pfx b/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
new file mode 100644
index 0000000..394c0df
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/www.bendudu.com.pfx
Binary files differ
--
Gitblit v1.9.1