From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java
index 8e34843..2a096ee 100644
--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/org/dromara/common/encrypt/utils/EncryptUtils.java
@@ -19,10 +19,12 @@
* @author 鑰侀┈
*/
public class EncryptUtils {
+
/**
* 鍏挜
*/
public static final String PUBLIC_KEY = "publicKey";
+
/**
* 绉侀挜
*/
@@ -51,7 +53,7 @@
/**
* AES鍔犲瘑
*
- * @param data 寰呰В瀵嗘暟鎹�
+ * @param data 寰呭姞瀵嗘暟鎹�
* @param password 绉橀挜瀛楃涓�
* @return 鍔犲瘑鍚庡瓧绗︿覆, 閲囩敤Base64缂栫爜
*/
@@ -70,7 +72,7 @@
/**
* AES鍔犲瘑
*
- * @param data 寰呰В瀵嗘暟鎹�
+ * @param data 寰呭姞瀵嗘暟鎹�
* @param password 绉橀挜瀛楃涓�
* @return 鍔犲瘑鍚庡瓧绗︿覆, 閲囩敤Hex缂栫爜
*/
@@ -208,7 +210,7 @@
/**
* sm2绉侀挜瑙ｅ瘑
*
- * @param data 寰呭姞瀵嗘暟鎹�
+ * @param data 寰呰В瀵嗘暟鎹�
* @param privateKey 绉侀挜
* @return 瑙ｅ瘑鍚庡瓧绗︿覆
*/
@@ -266,7 +268,7 @@
/**
* rsa绉侀挜瑙ｅ瘑
*
- * @param data 寰呭姞瀵嗘暟鎹�
+ * @param data 寰呰В瀵嗘暟鎹�
* @param privateKey 绉侀挜
* @return 瑙ｅ瘑鍚庡瓧绗︿覆
*/
--
Gitblit v1.9.3