From 19464eb021cfa547dfbfba45a9c896837f7d0d98 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 18 七月 2024 15:35:15 +0800
Subject: [PATCH] 修改密码，登录接口增加密码解密逻辑（前端传递的密码加密传输）；枚举和枚举项：查询、增加、修改、删除接口上传。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index c38f4cc..e56db37 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,5 +1,6 @@
package com.vci.frameworkcore.compatibility.impl;
+import com.vci.dto.SmUserDTO;
import com.vci.common.util.ThreeDES;
import com.vci.corba.common.PLException;
import com.vci.corba.common.data.UserEntityInfo;
@@ -9,13 +10,12 @@
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.model.SmUserDO;
-import com.vci.frameworkcore.model.po.SmUserPO;
-import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
-import com.vci.frameworkcore.pagemodel.SmRoleVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.model.SmUserDO;
+import com.vci.pagemodel.SmUserVO;
+import com.vci.po.SmUserPO;
+import com.vci.pagemodel.OrgDepartmentVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
+import com.vci.pagemodel.SmRoleVO;
import com.vci.frameworkcore.properties.ConfigReader;
import com.vci.omd.utils.ObjectTool;
import com.vci.starter.poi.bo.ReadExcelOption;
@@ -183,7 +183,7 @@
* @return 鐢ㄦ埛鐨勪俊鎭�
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- private SmUserVO getUserByField(String queryField,String queryValue) throws VciBaseException{
+ private SmUserVO getUserByField(String queryField, String queryValue) throws VciBaseException{
VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(null, SmUserDO.class,null,true);
queryWrapper.eq(queryWrapper.getTableNick() + "." +queryField,queryValue);
queryWrapper.setDistinct(true);
@@ -1021,16 +1021,25 @@
/**
* 淇敼瀵嗙爜
* @param userOid 鐢ㄦ埛涓婚敭
+ * @param oldPassword 鏃х殑瀵嗙爜
* @param password 鏂扮殑瀵嗙爜
* @param confirmPassword 纭瀵嗙爜
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public void changePassword(String userOid, String password,
- String confirmPassword) throws PLException {
- WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
+ public boolean changePassword(String userOid,String oldPassword, String password,
+ String confirmPassword) throws Exception {
+ WebUtil.alertNotNull(userOid,"鐢ㄦ埛涓婚敭",oldPassword,"鐧诲綍瀵嗙爜",password,"瀵嗙爜",confirmPassword,"纭瀵嗙爜");
if(!password.equals(confirmPassword)){
throw new VciBaseException("瀵嗙爜鍜岀‘璁ゅ瘑鐮佷笉鐩哥瓑");
+ }
+ //瀵规棫瀵嗙爜鍜屽瘑鐮佽繘琛岃В瀵嗭紝渚夸簬姣斿瀵嗙爜鐢�
+ oldPassword = Func.decryptAes(oldPassword,"daliantan0v0vcip");
+ password = Func.decryptAes(password,"daliantan0v0vcip");
+ //瀵规瘮鏃у瘑鐮�
+ boolean b = this.checkPasswordEqual(oldPassword, userOid);
+ if(!b){
+ throw new PLException("500", new String[] { "鎮ㄨ緭鍏ョ殑瀵嗙爜涓庣櫥褰曞瘑鐮佷笉涓�鑷�,璇烽噸鏂拌緭鍏�!"});
}
SmUserVO smUserVO = getUserByUserOid(userOid);
if(Func.isEmpty(smUserVO)){
@@ -1039,16 +1048,25 @@
//TODO:鏍￠獙瀵嗙爜鏄惁绗﹀悎绛栫暐
String error = platformClientUtil.getFrameworkService().checkPasswordStrategyByUserId(smUserVO.getId(), password,null);
if (!StringUtils.isBlank(error)) {
- throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃");
+ throw new VciBaseException("褰撳墠璁剧疆鐨勫瘑鐮侊紝瀵嗙爜绛栫暐鏍￠獙鏈�氳繃!");
}
+
+ //TODO:鑰冭檻鏄惁闇�瑕佸皢淇敼鏂瑰紡鏀规垚鐩存帴璋冪敤骞冲彴鐨勬帴鍙ｏ紝鍥犱负鐜板湪鐨勪慨鏀规柟寮忔病鑳芥纭殑鏇存柊缂撳瓨
+ /*UserInfo userInfo = new UserInfo();
+ userInfo.id = userOid.trim();
+ userInfo.pwd = password;
+ userInfo.pwdUpdateTime = System.currentTimeMillis();
+ boolean updateBoolean = platformClientUtil.getFrameworkService().updateUser(userInfo, new UserEntityInfo(WebThreadLocalUtil.getCurrentUserSessionInfoInThread().getUserId(), null));
+ return updateBoolean;*/
+
ThreeDES des = new ThreeDES();// 瀹炰緥鍖栦竴涓锟�?
des.getKey("daliantan0v0");// 鐢熸垚瀵嗗寵
String encPassword = des.getEncString(password);
-
//淇敼瀵嗙爜鐨勫悓鏃堕渶瑕佸皢瀵嗙爜淇敼鏃堕棿涔熸洿鏂�
- String sql = "update pluser set plpassword = '" + encPassword + "' plpwdupdatetime = '"+ System.currentTimeMillis() +"' where pluid = '" + userOid.trim() + "'";
+ String sql = "update pluser set plpassword = '" + encPassword + "', plpwdupdatetime = TO_DATE('"
+ + Func.format(new Date(),"yyyy-MM-dd HH:mm:ss") +"','yyyy-MM-dd hh24:mi:ss') where pluid = '" + userOid.trim() + "'";
try {
- platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
+ return platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
} catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
--
Gitblit v1.9.3