From 835744df0cd64f0924f49a102eb58e8373b68484 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 10 十月 2023 19:47:50 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
ruoyi-admin/src/main/resources/www.bendudu.com.pfx | 0
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java | 3 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java | 2 +-
ruoyi-admin/src/main/resources/application.yml | 8 ++++++++
4 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
index df3d6b2..5166d93 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
@@ -15,4 +15,7 @@
public static void main(String[] args) {
SpringApplication.run(RuoYiApplication.class, args);
}
+ //SpringBoot-v2.0+閰嶇疆鏂瑰紡
+
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java
index a0ad216..f028260 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZAuthorityController.java
@@ -43,7 +43,7 @@
/**
* 鏍规嵁鏉′欢鏌ョ湅鏉冮檺
*/
- @GetMapping("/condition")
+ @PostMapping("/condition")
public AjaxResult getAuthorityByCondition(@RequestBody AuthorityDto authorityDto){
return AjaxResult.success(zAuthorityService.getByCondition(authorityDto));
}
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 22db82a..9795e4b 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -19,6 +19,14 @@
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: 绉侀挜瀵嗙爜
+
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
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