From 793737d69dd13ec91b41925639f72b97dafc7b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 24 Nov 2023 10:00:37 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20OssFactory=20?=
 =?UTF-8?q?=E5=B9=B6=E5=8F=91=E5=A4=9A=E5=88=9B=E5=BB=BA=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/org/dromara/common/oss/factory/OssFactory.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
index 6503eb133..763b090e3 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
@@ -39,7 +39,7 @@ public class OssFactory {
     /**
      * 根据类型获取实例
      */
-    public static OssClient instance(String configKey) {
+    public static synchronized OssClient instance(String configKey) {
         String json = CacheUtils.get(CacheNames.SYS_OSS_CONFIG, configKey);
         if (json == null) {
             throw new OssException("系统异常, '" + configKey + "'配置信息不存在!");

From 6bed331971b4f8c0df666311ecdbb1f247064c77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Nov 2023 10:37:11 +0800
Subject: [PATCH 2/9] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E6=8E=A5=E5=8F=A3=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/satoken/config/SaTokenConfig.java       |  3 +--
 .../controller/system/SysSocialController.java     | 14 --------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
index aef8a66ae..ce8d85c0b 100644
--- a/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
+++ b/ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/config/SaTokenConfig.java
@@ -10,7 +10,6 @@ import org.dromara.common.satoken.core.service.SaPermissionImpl;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.PropertySource;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * sa-token 配置
@@ -19,7 +18,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
  */
 @AutoConfiguration
 @PropertySource(value = "classpath:common-satoken.yml", factory = YmlPropertySourceFactory.class)
-public class SaTokenConfig implements WebMvcConfigurer {
+public class SaTokenConfig {
 
     @Bean
     public StpLogic getStpLogicJwt() {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java
index 48755085c..b0281cf6b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysSocialController.java
@@ -1,6 +1,5 @@
 package org.dromara.system.controller.system;
 
-import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -9,7 +8,6 @@ import org.dromara.system.domain.vo.SysSocialVo;
 import org.dromara.system.service.ISysSocialService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -37,16 +35,4 @@ public class SysSocialController extends BaseController {
         return R.ok(socialUserService.queryListByUserId(LoginHelper.getUserId()));
     }
 
-
-    /**
-     * 获取社会化关系详细信息
-     *
-     * @param id 主键
-     */
-    @GetMapping("/{id}")
-    public R<SysSocialVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
-        return R.ok(socialUserService.queryById(id));
-    }
-
 }

From 3f1e5702a293f31c5b70255c888f8ebc68fe49be Mon Sep 17 00:00:00 2001
From: May <1742057357@qq.com>
Date: Mon, 27 Nov 2023 02:52:59 +0000
Subject: [PATCH 3/9] =?UTF-8?q?!454=20=E6=B7=BB=E5=8A=A0excel=E5=A4=9Ashee?=
 =?UTF-8?q?t=E9=A1=B5=E5=AF=BC=E5=87=BA=20*=20add=20=E6=B7=BB=E5=8A=A0exce?=
 =?UTF-8?q?l=E5=A4=9Asheet=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/common/excel/utils/ExcelUtil.java |  56 ++++++++++++++++++
 .../demo/controller/TestExcelController.java  |  35 +++++++++++
 .../src/main/resources/excel/多sheet列表.xlsx | Bin 0 -> 13359 bytes
 3 files changed, 91 insertions(+)
 create mode 100644 ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx

diff --git a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
index 329911d1e..a6c14ad51 100644
--- a/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-excel/src/main/java/org/dromara/common/excel/utils/ExcelUtil.java
@@ -269,6 +269,26 @@ public class ExcelUtil {
         }
     }
 
+    /**
+     * 多sheet模板导出 模板格式为 {key.属性}
+     *
+     * @param filename     文件名
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param response     响应体
+     */
+    public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String filename, String templatePath, HttpServletResponse response) {
+        try {
+            resetResponse(filename, response);
+            ServletOutputStream os = response.getOutputStream();
+            exportTemplateMultiSheet(data, templatePath, os);
+        } catch (IOException e) {
+            throw new RuntimeException("导出Excel异常");
+        }
+    }
+
     /**
      * 多表多数据模板导出 模板格式为 {key.属性}
      *
@@ -303,6 +323,42 @@ public class ExcelUtil {
         excelWriter.finish();
     }
 
+    /**
+     * 多sheet模板导出 模板格式为 {key.属性}
+     *
+     * @param templatePath 模板路径 resource 目录下的路径包括模板文件名
+     *                     例如: excel/temp.xlsx
+     *                     重点: 模板文件必须放置到启动类对应的 resource 目录下
+     * @param data         模板需要的数据
+     * @param os           输出流
+     */
+    public static void exportTemplateMultiSheet(List<Map<String, Object>> data, String templatePath, OutputStream os) {
+        ClassPathResource templateResource = new ClassPathResource(templatePath);
+        ExcelWriter excelWriter = EasyExcel.write(os)
+            .withTemplate(templateResource.getStream())
+            .autoCloseStream(false)
+            // 大数值自动转换 防止失真
+            .registerConverter(new ExcelBigNumberConvert())
+            .build();
+        if (CollUtil.isEmpty(data)) {
+            throw new IllegalArgumentException("数据为空");
+        }
+        for (int i = 0; i < data.size(); i++) {
+            WriteSheet writeSheet = EasyExcel.writerSheet(i).build();
+            for (Map.Entry<String, Object> map : data.get(i).entrySet()) {
+                // 设置列表后续还有数据
+                FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+                if (map.getValue() instanceof Collection) {
+                    // 多表导出必须使用 FillWrapper
+                    excelWriter.fill(new FillWrapper(map.getKey(), (Collection<?>) map.getValue()), fillConfig, writeSheet);
+                } else {
+                    excelWriter.fill(map.getValue(), writeSheet);
+                }
+            }
+        }
+        excelWriter.finish();
+    }
+
     /**
      * 重置响应体
      */
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java
index 418f7401e..3fd124c78 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java
@@ -94,6 +94,41 @@ public class TestExcelController {
         exportExcelService.exportWithOptions(response);
     }
 
+    /**
+     * 多个sheet导出
+     */
+    @GetMapping("/exportTemplateMultiSheet")
+    public void exportTemplateMultiSheet(HttpServletResponse response) {
+        List<TestObj1> list1 = new ArrayList<>();
+        list1.add(new TestObj1("list1测试1", "list1测试2", "list1测试3"));
+        list1.add(new TestObj1("list1测试4", "list1测试5", "list1测试6"));
+        List<TestObj1> list2 = new ArrayList<>();
+        list2.add(new TestObj1("list2测试1", "list2测试2", "list2测试3"));
+        list2.add(new TestObj1("list2测试4", "list2测试5", "list2测试6"));
+        List<TestObj1> list3 = new ArrayList<>();
+        list3.add(new TestObj1("list3测试1", "list3测试2", "list3测试3"));
+        list3.add(new TestObj1("list3测试4", "list3测试5", "list3测试6"));
+        List<TestObj1> list4 = new ArrayList<>();
+        list4.add(new TestObj1("list4测试1", "list4测试2", "list4测试3"));
+        list4.add(new TestObj1("list4测试4", "list4测试5", "list4测试6"));
+
+        List<Map<String, Object>> list = new ArrayList<>();
+        Map<String, Object> sheetMap1 = new HashMap<>();
+        sheetMap1.put("data1", list1);
+        Map<String, Object> sheetMap2 = new HashMap<>();
+        sheetMap2.put("data2", list2);
+        Map<String, Object> sheetMap3 = new HashMap<>();
+        sheetMap3.put("data3", list3);
+        Map<String, Object> sheetMap4 = new HashMap<>();
+        sheetMap4.put("data4", list4);
+
+        list.add(sheetMap1);
+        list.add(sheetMap2);
+        list.add(sheetMap3);
+        list.add(sheetMap4);
+        ExcelUtil.exportTemplateMultiSheet(list, "多sheet列表", "excel/多sheet列表.xlsx", response);
+    }
+
     /**
      * 导入表格
      */
diff --git a/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx b/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多sheet列表.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5277f2eaf95a0e36e1d04faeaa0217eec5f061a6
GIT binary patch
literal 13359
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
Qp#!+Ua?q8Z6KlYK0p&Bw+W-In

literal 0
HcmV?d00001


From 78c91d0733ed359957a18db05930977eca75b5e5 Mon Sep 17 00:00:00 2001
From: MichelleChung <1242874891@qq.com>
Date: Mon, 27 Nov 2023 02:56:59 +0000
Subject: [PATCH 4/9] =?UTF-8?q?!451=20=E5=93=8D=E5=BA=94=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20*=20update=20=E4=BC=98=E5=8C=96=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=8A=A0=E8=A7=A3=E5=AF=86=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91,=20=E9=81=BF=E5=85=8D=20NPE=20;=20*=20rollback=20?=
 =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E9=94=99=E8=AF=AF=E6=8F=90=E4=BA=A4,=20?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E5=8A=A0=E5=AF=86=E7=BB=84=E4=BB=B6=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=20;=20*=20add=20=E6=96=B0=E5=A2=9E=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=20@ApiEncrypt=20=E7=94=A8=E4=BA=8E=E6=A0=A1=E9=AA=8C=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8A=A0=E8=A7=A3=E5=AF=86=20;=20*=20add=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20EncryptResponseBodyWrapper=20=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=8F=82=E6=95=B0=E5=8C=85=E8=A3=85=E7=B1=BB?=
 =?UTF-8?q?=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/AuthController.java        |   2 +
 .../src/main/resources/application.yml        |   7 +-
 ruoyi-common/ruoyi-common-encrypt/pom.xml     |  12 ++
 .../common/encrypt/annotation/ApiEncrypt.java |  20 +++
 .../common/encrypt/filter/CryptoFilter.java   |  75 ++++++++++-
 .../filter/DecryptRequestBodyWrapper.java     |   2 +-
 .../filter/EncryptResponseBodyWrapper.java    | 121 ++++++++++++++++++
 .../properties/ApiDecryptProperties.java      |   6 +-
 8 files changed, 235 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
 create mode 100644 ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index 79cd57460..cf391be9c 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -16,6 +16,7 @@ import org.dromara.common.core.domain.model.LoginBody;
 import org.dromara.common.core.domain.model.RegisterBody;
 import org.dromara.common.core.domain.model.SocialLoginBody;
 import org.dromara.common.core.utils.*;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.social.config.properties.SocialLoginConfigProperties;
@@ -73,6 +74,7 @@ public class AuthController {
      * @param body 登录信息
      * @return 结果
      */
+    @ApiEncrypt(response = false)
     @PostMapping("/login")
     public R<LoginVo> login(@Validated @RequestBody String body) {
         LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ae20371ca..0ed7ccb67 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -171,8 +171,11 @@ api-decrypt:
   enabled: true
   # AES 加密头标识
   headerFlag: encrypt-key
-  # 公私钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
-  publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
+  # 响应加密公钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
+  # 对应前端解密私钥 MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAmc3CuPiGL/LcIIm7zryCEIbl1SPzBkr75E2VMtxegyZ1lYRD+7TZGAPkvIsBcaMs6Nsy0L78n2qh+lIZMpLH8wIDAQABAkEAk82Mhz0tlv6IVCyIcw/s3f0E+WLmtPFyR9/WtV3Y5aaejUkU60JpX4m5xNR2VaqOLTZAYjW8Wy0aXr3zYIhhQQIhAMfqR9oFdYw1J9SsNc+CrhugAvKTi0+BF6VoL6psWhvbAiEAxPPNTmrkmrXwdm/pQQu3UOQmc2vCZ5tiKpW10CgJi8kCIFGkL6utxw93Ncj4exE/gPLvKcT+1Emnoox+O9kRXss5AiAMtYLJDaLEzPrAWcZeeSgSIzbL+ecokmFKSDDcRske6QIgSMkHedwND1olF8vlKsJUGK3BcdtM8w4Xq7BpSBwsloE=
+  publicKey: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJnNwrj4hi/y3CCJu868ghCG5dUj8wZK++RNlTLcXoMmdZWEQ/u02RgD5LyLAXGjLOjbMtC+/J9qofpSGTKSx/MCAwEAAQ==
+  # 请求解密私钥 非对称算法的公私钥 如：SM2，RSA 使用者请自行更换
+  # 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
   privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=
 
 springdoc:
diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/ruoyi-common/ruoyi-common-encrypt/pom.xml
index 7f580637d..a1b0c5bb8 100644
--- a/ruoyi-common/ruoyi-common-encrypt/pom.xml
+++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml
@@ -37,6 +37,18 @@
             <artifactId>hutool-crypto</artifactId>
         </dependency>
 
+        <!-- SpringBoot Web容器 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-boot-starter-tomcat</artifactId>
+                    <groupId>org.springframework.boot</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
new file mode 100644
index 000000000..441cad7bf
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
@@ -0,0 +1,20 @@
+package org.dromara.common.encrypt.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 强制加密注解
+ *
+ * @author Michelle.Chung
+ */
+@Documented
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ApiEncrypt {
+
+    /**
+     * 响应加密忽略，默认加密，为 false 时不加密
+     */
+    boolean response() default true;
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
index c31e025ac..76ce37e5d 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
@@ -3,10 +3,19 @@ package org.dromara.common.encrypt.filter;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.core.constant.HttpStatus;
+import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.core.utils.SpringUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.encrypt.properties.ApiDecryptProperties;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerExceptionResolver;
+import org.springframework.web.servlet.HandlerExecutionChain;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
 
 import java.io.IOException;
 
@@ -25,8 +34,14 @@ public class CryptoFilter implements Filter {
 
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-        ServletRequest requestWrapper = null;
         HttpServletRequest servletRequest = (HttpServletRequest) request;
+        HttpServletResponse servletResponse = (HttpServletResponse) response;
+
+        boolean encryptFlag = false;
+        ServletRequest requestWrapper = null;
+        ServletResponse responseWrapper = null;
+        EncryptResponseBodyWrapper responseBodyWrapper = null;
+
         // 是否为 json 请求
         if (StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) {
             // 是否为 put 或者 post 请求
@@ -34,16 +49,68 @@ public class CryptoFilter implements Filter {
                 // 是否存在加密标头
                 String headerValue = servletRequest.getHeader(properties.getHeaderFlag());
                 if (StringUtils.isNotBlank(headerValue)) {
-                    requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPublicKey(), properties.getPrivateKey(), properties.getHeaderFlag());
+                    // 请求解密
+                    requestWrapper = new DecryptRequestBodyWrapper(servletRequest, properties.getPrivateKey(), properties.getHeaderFlag());
+                    // 获取加密注解
+                    ApiEncrypt apiEncrypt = this.getApiEncryptAnnotation(servletRequest);
+                    if (ObjectUtil.isNotNull(apiEncrypt)) {
+                        // 响应加密标志
+                        encryptFlag = apiEncrypt.response();
+                    } else {
+                        // 是否有注解，有就报错，没有放行
+                        HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver");
+                        exceptionResolver.resolveException(
+                            servletRequest, servletResponse, null,
+                            new ServiceException("没有访问权限，请联系管理员授权", HttpStatus.FORBIDDEN));
+                    }
+                }
+                // 判断是否响应加密
+                if (encryptFlag) {
+                    responseBodyWrapper = new EncryptResponseBodyWrapper(servletResponse);
+                    responseWrapper = responseBodyWrapper;
                 }
             }
         }
 
-        chain.doFilter(ObjectUtil.defaultIfNull(requestWrapper, request), response);
+        chain.doFilter(
+            ObjectUtil.defaultIfNull(requestWrapper, request),
+            ObjectUtil.defaultIfNull(responseWrapper, response));
+
+        if (encryptFlag) {
+            servletResponse.reset();
+            // 对原始内容加密
+            String encryptContent = responseBodyWrapper.getEncryptContent(
+                servletResponse, properties.getPublicKey(), properties.getHeaderFlag());
+            // 对加密后的内容写出
+            servletResponse.getWriter().write(encryptContent);
+        }
+    }
+
+    /**
+     * 获取 ApiEncrypt 注解
+     */
+    private ApiEncrypt getApiEncryptAnnotation(HttpServletRequest servletRequest) {
+        RequestMappingHandlerMapping handlerMapping = SpringUtils.getBean("requestMappingHandlerMapping", RequestMappingHandlerMapping.class);
+        // 获取注解
+        try {
+            HandlerExecutionChain mappingHandler = handlerMapping.getHandler(servletRequest);
+            System.out.println(mappingHandler);
+            if (ObjectUtil.isNotNull(mappingHandler)) {
+                Object handler = mappingHandler.getHandler();
+                if (ObjectUtil.isNotNull(handler)) {
+                    // 从handler获取注解
+                    if (handler instanceof HandlerMethod handlerMethod) {
+                        return handlerMethod.getMethodAnnotation(ApiEncrypt.class);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        return null;
     }
 
     @Override
     public void destroy() {
-
     }
 }
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java
index fa9a31071..98f4bc7c8 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/DecryptRequestBodyWrapper.java
@@ -24,7 +24,7 @@ public class DecryptRequestBodyWrapper extends HttpServletRequestWrapper {
 
     private final byte[] body;
 
-    public DecryptRequestBodyWrapper(HttpServletRequest request, String publicKey, String privateKey, String headerFlag) throws IOException {
+    public DecryptRequestBodyWrapper(HttpServletRequest request, String privateKey, String headerFlag) throws IOException {
         super(request);
         // 获取 AES 密码 采用 RSA 加密
         String headerRsa = request.getHeader(headerFlag);
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
new file mode 100644
index 000000000..f5482de24
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
@@ -0,0 +1,121 @@
+package org.dromara.common.encrypt.filter;
+
+import cn.hutool.core.util.RandomUtil;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.WriteListener;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import org.dromara.common.encrypt.utils.EncryptUtils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 加密响应参数包装类
+ *
+ * @author Michelle.Chung
+ */
+public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper {
+
+    private final ByteArrayOutputStream byteArrayOutputStream;
+    private final ServletOutputStream servletOutputStream;
+    private final PrintWriter printWriter;
+
+    public EncryptResponseBodyWrapper(HttpServletResponse response) throws IOException {
+        super(response);
+        this.byteArrayOutputStream = new ByteArrayOutputStream();
+        this.servletOutputStream = this.getOutputStream();
+        this.printWriter = new PrintWriter(new OutputStreamWriter(byteArrayOutputStream));
+    }
+
+    @Override
+    public PrintWriter getWriter() {
+        return printWriter;
+    }
+
+    @Override
+    public void flushBuffer() throws IOException {
+        if (servletOutputStream != null) {
+            servletOutputStream.flush();
+        }
+        if (printWriter != null) {
+            printWriter.flush();
+        }
+    }
+
+    @Override
+    public void reset() {
+        byteArrayOutputStream.reset();
+    }
+
+    public byte[] getResponseData() throws IOException {
+        flushBuffer();
+        return byteArrayOutputStream.toByteArray();
+    }
+
+    public String getContent() throws IOException {
+        flushBuffer();
+        return byteArrayOutputStream.toString();
+    }
+
+    /**
+     * 获取加密内容
+     *
+     * @param servletResponse response
+     * @param publicKey       RSA公钥 (用于加密 AES 秘钥)
+     * @param headerFlag      请求头标志
+     * @return 加密内容
+     * @throws IOException
+     */
+    public String getEncryptContent(HttpServletResponse servletResponse, String publicKey, String headerFlag) throws IOException {
+        // 生成秘钥
+        String aesPassword = RandomUtil.randomString(32);
+        System.out.println("aesPassword = " + aesPassword);
+        // 秘钥使用 Base64 编码
+        String encryptAes = EncryptUtils.encryptByBase64(aesPassword);
+        // Rsa 公钥加密 Base64 编码
+        String encryptPassword = EncryptUtils.encryptByRsa(encryptAes, publicKey);
+
+        // 设置响应头
+        servletResponse.setHeader(headerFlag, encryptPassword);
+        servletResponse.setHeader("Access-Control-Allow-Origin", "*");
+        servletResponse.setHeader("Access-Control-Allow-Methods", "*");
+        servletResponse.setCharacterEncoding(StandardCharsets.UTF_8.toString());
+
+        // 获取原始内容
+        String originalBody = this.getContent();
+        // 对内容进行加密
+        return EncryptUtils.encryptByAes(originalBody, aesPassword);
+    }
+
+    @Override
+    public ServletOutputStream getOutputStream() throws IOException {
+        return new ServletOutputStream() {
+            @Override
+            public boolean isReady() {
+                return false;
+            }
+
+            @Override
+            public void setWriteListener(WriteListener writeListener) {
+
+            }
+
+            @Override
+            public void write(int b) throws IOException {
+                byteArrayOutputStream.write(b);
+            }
+
+            @Override
+            public void write(byte[] b) throws IOException {
+                byteArrayOutputStream.write(b);
+            }
+
+            @Override
+            public void write(byte[] b, int off, int len) throws IOException {
+                byteArrayOutputStream.write(b, off, len);
+            }
+        };
+    }
+
+}
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
index 9e25b7b9a..6aadb3e03 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/properties/ApiDecryptProperties.java
@@ -21,14 +21,14 @@ public class ApiDecryptProperties {
      */
     private String headerFlag;
 
-
     /**
-     * 公钥
+     * 响应加密公钥
      */
     private String publicKey;
 
     /**
-     * 私钥
+     * 请求解密私钥
      */
     private String privateKey;
+
 }

From c45ffaec0f72f92240da97573cb12799f022472d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Nov 2023 11:13:01 +0800
Subject: [PATCH 5/9] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20WebSocketUtil?=
 =?UTF-8?q?s=20=E8=BF=9E=E6=8E=A5=E5=85=B3=E9=97=AD=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/common/websocket/utils/WebSocketUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
index 99c16c62a..086599c40 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/utils/WebSocketUtils.java
@@ -98,7 +98,7 @@ public class WebSocketUtils {
 
     private static void sendMessage(WebSocketSession session, WebSocketMessage<?> message) {
         if (session == null || !session.isOpen()) {
-            log.error("[send] session会话已经关闭");
+            log.warn("[send] session会话已经关闭");
         } else {
             try {
                 session.sendMessage(message);

From b0faebc5e64d16281d3c723539c8952a16a2692d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Nov 2023 11:14:16 +0800
Subject: [PATCH 6/9] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20!pr451=20?=
 =?UTF-8?q?=E6=94=B9=E8=BF=9B=E4=BB=A3=E7=A0=81=E9=80=BB=E8=BE=91=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=B3=A8=E8=A7=A3=E5=BC=BA=E5=88=B6=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=86=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/web/controller/AuthController.java   |  3 ++-
 ruoyi-common/ruoyi-common-encrypt/pom.xml            | 11 ++---------
 .../common/encrypt/annotation/ApiEncrypt.java        |  4 ++--
 .../dromara/common/encrypt/filter/CryptoFilter.java  |  2 +-
 .../encrypt/filter/EncryptResponseBodyWrapper.java   |  1 -
 .../controller/system/SysProfileController.java      |  2 ++
 .../controller/system/SysTenantController.java       | 12 +++---------
 .../system/controller/system/SysUserController.java  |  2 ++
 8 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
index cf391be9c..728e1b274 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java
@@ -74,7 +74,7 @@ public class AuthController {
      * @param body 登录信息
      * @return 结果
      */
-    @ApiEncrypt(response = false)
+    @ApiEncrypt
     @PostMapping("/login")
     public R<LoginVo> login(@Validated @RequestBody String body) {
         LoginBody loginBody = JsonUtils.parseObject(body, LoginBody.class);
@@ -165,6 +165,7 @@ public class AuthController {
     /**
      * 用户注册
      */
+    @ApiEncrypt
     @PostMapping("/register")
     public R<Void> register(@Validated @RequestBody RegisterBody user) {
         if (!configService.selectRegisterEnabled(user.getTenantId())) {
diff --git a/ruoyi-common/ruoyi-common-encrypt/pom.xml b/ruoyi-common/ruoyi-common-encrypt/pom.xml
index a1b0c5bb8..df3222bee 100644
--- a/ruoyi-common/ruoyi-common-encrypt/pom.xml
+++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml
@@ -37,16 +37,9 @@
             <artifactId>hutool-crypto</artifactId>
         </dependency>
 
-        <!-- SpringBoot Web容器 -->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>spring-boot-starter-tomcat</artifactId>
-                    <groupId>org.springframework.boot</groupId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
         </dependency>
 
     </dependencies>
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
index 441cad7bf..7f52de80b 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/annotation/ApiEncrypt.java
@@ -13,8 +13,8 @@ import java.lang.annotation.*;
 public @interface ApiEncrypt {
 
     /**
-     * 响应加密忽略，默认加密，为 false 时不加密
+     * 响应加密忽略，默认不加密，为 true 时加密
      */
-    boolean response() default true;
+    boolean response() default false;
 
 }
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
index 76ce37e5d..22c554341 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
@@ -58,7 +58,7 @@ public class CryptoFilter implements Filter {
                         encryptFlag = apiEncrypt.response();
                     } else {
                         // 是否有注解，有就报错，没有放行
-                        HandlerExceptionResolver exceptionResolver = SpringUtils.getBean("handlerExceptionResolver");
+                        HandlerExceptionResolver exceptionResolver = SpringUtils.getBean(HandlerExceptionResolver.class);
                         exceptionResolver.resolveException(
                             servletRequest, servletResponse, null,
                             new ServiceException("没有访问权限，请联系管理员授权", HttpStatus.FORBIDDEN));
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
index f5482de24..05cf44470 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/EncryptResponseBodyWrapper.java
@@ -70,7 +70,6 @@ public class EncryptResponseBodyWrapper extends HttpServletResponseWrapper {
     public String getEncryptContent(HttpServletResponse servletResponse, String publicKey, String headerFlag) throws IOException {
         // 生成秘钥
         String aesPassword = RandomUtil.randomString(32);
-        System.out.println("aesPassword = " + aesPassword);
         // 秘钥使用 Base64 编码
         String encryptAes = EncryptUtils.encryptByBase64(aesPassword);
         // Rsa 公钥加密 Base64 编码
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
index c9be0da02..0d776d30e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java
@@ -6,6 +6,7 @@ import cn.hutool.core.io.FileUtil;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.core.utils.file.MimeTypeUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -79,6 +80,7 @@ public class SysProfileController extends BaseController {
      *
      * @param bo 新旧密码
      */
+    @ApiEncrypt
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public R<Void> updatePwd(@Validated @RequestBody SysUserPasswordBo bo) {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java
index 865b57a9f..053ff1712 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java
@@ -4,7 +4,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.dev33.satoken.annotation.SaCheckRole;
 import com.baomidou.lock.annotation.Lock4j;
 import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.Min;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -13,6 +12,7 @@ import org.dromara.common.core.constant.TenantConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
@@ -25,14 +25,7 @@ import org.dromara.system.domain.bo.SysTenantBo;
 import org.dromara.system.domain.vo.SysTenantVo;
 import org.dromara.system.service.ISysTenantService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
@@ -87,6 +80,7 @@ public class SysTenantController extends BaseController {
     /**
      * 新增租户
      */
+    @ApiEncrypt
     @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY)
     @SaCheckPermission("system:tenant:add")
     @Log(title = "租户", businessType = BusinessType.INSERT)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
index 628060ae1..beefe4a81 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -14,6 +14,7 @@ import org.dromara.common.core.domain.model.LoginUser;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StreamUtils;
 import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.encrypt.annotation.ApiEncrypt;
 import org.dromara.common.excel.core.ExcelResult;
 import org.dromara.common.excel.utils.ExcelUtil;
 import org.dromara.common.log.annotation.Log;
@@ -209,6 +210,7 @@ public class SysUserController extends BaseController {
     /**
      * 重置密码
      */
+    @ApiEncrypt
     @SaCheckPermission("system:user:resetPwd")
     @Log(title = "用户管理", businessType = BusinessType.UPDATE)
     @PutMapping("/resetPwd")

From b0cc1a913e08818d9e3a16f3cfd398cd3cf3b9f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Nov 2023 11:19:17 +0800
Subject: [PATCH 7/9] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/common/encrypt/filter/CryptoFilter.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
index 22c554341..84b85d385 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/filter/CryptoFilter.java
@@ -94,7 +94,6 @@ public class CryptoFilter implements Filter {
         // 获取注解
         try {
             HandlerExecutionChain mappingHandler = handlerMapping.getHandler(servletRequest);
-            System.out.println(mappingHandler);
             if (ObjectUtil.isNotNull(mappingHandler)) {
                 Object handler = mappingHandler.getHandler();
                 if (ObjectUtil.isNotNull(handler)) {

From d3ad832ded4428f14241f7f7d3ecab8a1d415b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Nov 2023 16:19:12 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20powerjob?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E6=96=B9=E6=A1=88=20=E9=AB=98=E7=89=88?=
 =?UTF-8?q?=E6=9C=ACnginx=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 script/docker/nginx/conf/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/docker/nginx/conf/nginx.conf b/script/docker/nginx/conf/nginx.conf
index 641ae67cb..2aa6587da 100644
--- a/script/docker/nginx/conf/nginx.conf
+++ b/script/docker/nginx/conf/nginx.conf
@@ -108,7 +108,7 @@ http {
         }
 
         # 解决 powerjob 代理之后静态文件无法访问的问题 请勿修改乱动
-        location .*\.(js|css|jpg|png|svg|woff|ttf|ico)?$ {
+        location ~ ^/(js|css|jpg|png|svg|woff|ttf|ico|img)/ {
             proxy_pass http://powerjob-server;
         }
 

From d811cb8e041e5f84f02b5b707d6104f2e3145ab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Mon, 27 Nov 2023 17:56:36 +0800
Subject: [PATCH 9/9] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20Dockerfile=20?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8shell=E6=A8=A1=E5=BC=8F=20=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F=E4=BC=A0=E5=85=A5jvm?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/Dockerfile                        | 17 ++++++++---------
 ruoyi-extend/ruoyi-monitor-admin/Dockerfile   |  6 +++---
 ruoyi-extend/ruoyi-powerjob-server/Dockerfile |  6 +++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile
index cd9fb6387..4237ef94c 100644
--- a/ruoyi-admin/Dockerfile
+++ b/ruoyi-admin/Dockerfile
@@ -9,17 +9,16 @@ RUN mkdir -p /ruoyi/server/logs \
 
 WORKDIR /ruoyi/server
 
-ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8
+ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
 
 EXPOSE ${SERVER_PORT}
 
 ADD ./target/ruoyi-admin.jar ./app.jar
 
-ENTRYPOINT ["java", \
-            "-Djava.security.egd=file:/dev/./urandom", \
-            "-Dserver.port=${SERVER_PORT}", \
-            # 应用名称 如果想区分集群节点监控 改成不同的名称即可
-#            "-Dskywalking.agent.service_name=ruoyi-server", \
-#            "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \
-            "-jar", "app.jar",
-            "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"]
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
+           # 应用名称 如果想区分集群节点监控 改成不同的名称即可
+           #-Dskywalking.agent.service_name=ruoyi-server \
+           #-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar \
+           -jar app.jar \
+           -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}
+
diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
index 1535d0559..7ae068200 100644
--- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
+++ b/ruoyi-extend/ruoyi-monitor-admin/Dockerfile
@@ -7,11 +7,11 @@ RUN mkdir -p /ruoyi/monitor/logs
 
 WORKDIR /ruoyi/monitor
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
 
 EXPOSE 9090
 
 ADD ./target/ruoyi-monitor-admin.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar",
-            "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"]
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \
+           -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}
diff --git a/ruoyi-extend/ruoyi-powerjob-server/Dockerfile b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
index 9a4c03df0..729bb2223 100644
--- a/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
+++ b/ruoyi-extend/ruoyi-powerjob-server/Dockerfile
@@ -7,11 +7,11 @@ RUN mkdir -p /ruoyi/powerjob/logs
 
 WORKDIR /ruoyi/powerjob
 
-ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
+ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 7700
 
 ADD ./target/ruoyi-powerjob-server.jar ./app.jar
 
-ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar",
-            "-XX:+HeapDumpOnOutOfMemoryError", "-Xlog:gc*,:time,tags,level", "-XX:+UseZGC"]
+ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -jar app.jar \
+           -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC ${JAVA_OPTS}