From 4337640b7ab86136baed2fd6aa959e4828a75cea Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 十二月 2023 17:33:51 +0800
Subject: [PATCH] 计算加工工件个数算法和密码安全策略
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 058a528..87c3052 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -179,6 +179,8 @@
try {
SysUser user = JSON.parseObject(jsonObject.toJSONString(), SysUser.class);
user.setCreateTime(new Date());//璁剧疆鍒涘缓鏃堕棿
+ user.setPasswordTime(new Date());//璁剧疆瀵嗙爜鏃堕棿
+ user.setPasswordFlag(CommonConstant.DEL_FLAG_1);//璁剧疆瀵嗙爜棣栨鏍囪瘑
String salt = oConvertUtils.randomGen(8);
user.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), salt);
@@ -638,17 +640,17 @@
String oldpassword = json.getString("oldpassword");
String password = json.getString("password");
String confirmpassword = json.getString("confirmpassword");
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (!sysUser.getUsername().equals(username)) {
- return Result.error("鍙厑璁镐慨鏀硅嚜宸辩殑瀵嗙爜锛�");
- }
+ //LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ //if (!sysUser.getUsername().equals(username)) {
+ // return Result.error("鍙厑璁镐慨鏀硅嚜宸辩殑瀵嗙爜锛�");
+ //}
SysUser user = this.sysUserService.getOne(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUsername, username));
if (user == null) {
return Result.error("鐢ㄦ埛涓嶅瓨鍦紒");
}
//update-begin---author:wangshuai ---date:20220316 for锛歔VUEN-234]淇敼瀵嗙爜娣诲姞鏁忔劅鏃ュ織------------
- LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- baseCommonService.addLog("淇敼瀵嗙爜锛寀sername锛� " + loginUser.getUsername(), CommonConstant.LOG_TYPE_2, 2);
+ //LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ baseCommonService.addLog("淇敼瀵嗙爜锛寀sername锛� " + username, CommonConstant.LOG_TYPE_2, 2);
//update-end---author:wangshuai ---date:20220316 for锛歔VUEN-234]淇敼瀵嗙爜娣诲姞鏁忔劅鏃ュ織------------
return sysUserService.resetPassword(username, oldpassword, password, confirmpassword);
}
--
Gitblit v1.9.3