From e14c003f6ff4e78740359828c39674507f134c45 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 11 五月 2022 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
index 01e3aa1..dc4e402 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/ClientService.java
@@ -6,10 +6,9 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.param.AddClientPrarm;
-import com.sandu.ximon.admin.param.ResetClientPasswordPrarm;
-import com.sandu.ximon.admin.param.UpdateClientPrarm;
+import com.sandu.ximon.admin.param.*;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.dao.domain.Admin;
import com.sandu.ximon.dao.domain.Client;
import com.sandu.ximon.dao.domain.ClientRoleRelation;
import com.sandu.ximon.dao.domain.Role;
@@ -114,18 +113,24 @@
return updateById(client);
}
- public boolean resetPassword(ResetClientPasswordPrarm resetClientPasswordPrarm) {
- Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, resetClientPasswordPrarm.getId()));
+ /**
+ * 淇敼褰撳墠鐧诲綍鐢ㄦ埛瀵嗙爜
+ *
+ * @param param
+ * @return
+ */
+ public boolean resetPassword(PwdParam param) {
+
+ Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, SecurityUtils.getUserDetails().getUserId()));
if (client == null) {
throw new BusinessException("璇ョ敤鎴蜂笉瀛樺湪锛�");
}
- PasswordEncoder pw = new BCryptPasswordEncoder();
//鍒ゆ柇鏃у瘑鐮佷笌鏁版嵁搴撴槸鍚︿竴鑷�
- if (pw.matches(resetClientPasswordPrarm.getOldPassword(), client.getPassword())) {
+ if (passwordEncoder.matches(param.getOldPass(), client.getPassword())) {
//鍔犲瘑鏂板瘑鐮�
- String encode = pw.encode(resetClientPasswordPrarm.getNewPassword());
+ String encode = passwordEncoder.encode(param.getNewPass());
client.setPassword(encode);
return updateById(client);
} else {
@@ -133,6 +138,23 @@
}
}
+ /**
+ * 淇敼绠＄悊鍛樼殑瀵嗙爜
+ *
+ * @param param
+ * @return
+ */
+ public boolean updateAdminPassword(UserPwsParm param) {
+ Client client = getOne(Wrappers.lambdaQuery(Client.class).eq(Client::getId, param.getUserid()));
+ if (client == null) {
+ throw new BusinessException("鐢ㄦ埛涓嶅瓨鍦�");
+ }
+
+ //鍔犲瘑鏂板瘑鐮�
+ client.setPassword(passwordEncoder.encode(param.getNewPass()));
+ return updateById(client);
+ }
+
public boolean deleteClient(Long id) {
//鍒ゆ柇鍒犻櫎鐢ㄦ埛鏄惁瀛樺湪
Client one = getById(id);
--
Gitblit v1.9.3