From b7c564d348bad52673c0c60dd316c63103593e9a Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 16 Oct 2025 21:43:53 +0800
Subject: [PATCH] 1
---
ruoyi-admin/src/main/java/com/ruoyi/im/util/SymmetricCryptoUtil.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/im/util/SymmetricCryptoUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/im/util/SymmetricCryptoUtil.java
index 14b1a6b..8188fd8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/im/util/SymmetricCryptoUtil.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/im/util/SymmetricCryptoUtil.java
@@ -27,11 +27,11 @@
private static final String IV_KEY = "0000000000000000"; // 改为16个0
public static void main(String[] args) {
- String originalText = "zdm321123.";
+ String originalText = "123456";
String encryptData = encryptFromString(originalText, Mode.CBC, Padding.ZeroPadding);
System.out.println("加密：" + encryptData);
- String decryptData = decryptFromString("mVqZjWfuBDrJCb2V36J7ow==", Mode.CBC, Padding.ZeroPadding);
+ String decryptData = decryptFromString("LbPnKi4WWPQ2NllKmCkAwg==", Mode.CBC, Padding.ZeroPadding);
System.out.println("解密：" + decryptData);
// 验证加解密是否一致
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
index e89a724..739d358 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/user/UserController.java
@@ -406,10 +406,10 @@
return AjaxResult.error("手机号格式不正确！");
}
}
- if(StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
+ if(null == vo.getStatus() && StringUtils.isNotEmpty(vo.getPassword()) && StringUtils.isEmpty(vo.getOldPassword())){
return AjaxResult.error("旧密码不能为空！");
}
- if(StringUtils.isNotEmpty(vo.getPassword())){
+ if(null == vo.getStatus() && StringUtils.isNotEmpty(vo.getPassword())){
String s = SymmetricCryptoUtil.decryptPassword(userAccount.getPassword());
if(!vo.getOldPassword().equals(s)){
return AjaxResult.error("旧密码不正确！");
--
Gitblit v1.9.3