From a7ad52353293223b66d041b5baca8661340ac9a9 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 20 七月 2023 11:33:03 +0800
Subject: [PATCH] zhyly登录
---
src/main/java/com/qxueyou/scc/user/service/impl/UserService.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
index 7820d96..ad29f25 100644
--- a/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
+++ b/src/main/java/com/qxueyou/scc/user/service/impl/UserService.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.util.UUID;
+import com.qxueyou.scc.base.dao.CommonDAO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +39,9 @@
@Autowired
IOrganizationService organizationService;
+
+ @Autowired
+ private CommonDAO commonDAO;
/**
* 鍒濆鍖栫敤鎴穡rapper
@@ -131,14 +135,20 @@
@Override
public Result updatePassword(String userId, String usedPass, String pass) {
+ String hql = null;
+
+ List<Object> params = null;
+
User user = read(User.class, userId);
//闅忔満瀛楃涓�
String salt= UUID.randomUUID().toString();
+
+ String salts = user.getSalt();
//鐩愬��
user.setSalt(salt);
//瀵瑰瘑鐮佽繘琛屽姞瀵嗗鐞�
String newPassword= DigestUtils.md5DigestAsHex((salt+pass).getBytes());
- String newPasswords= DigestUtils.md5DigestAsHex((salt+usedPass).getBytes());
+ String newPasswords= DigestUtils.md5DigestAsHex((salts+usedPass).getBytes());
if (StringUtils.isNotBlank(usedPass) && StringUtils.isNotBlank(pass)) {
if (!user.getPassword().equals(newPasswords)) {
return new Result(false, "杈撳叆鐨勬棫瀵嗙爜閿欒");
@@ -237,9 +247,13 @@
@Override
public Result updateUser(String userId, String name, String account, String mobilePhone, String password,
Boolean sex) {
-
User dbUser = read(User.class, userId);
- String salt = dbUser.getSalt();
+ String salt = dbUser.getSalt();
+ if(salt == null){
+ salt= UUID.randomUUID().toString();
+ dbUser.setSalt(salt);
+ salt = dbUser.getSalt();
+ }
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
if (dbUser.getAccount().equals(account)) {
dbUser.setName(name);
@@ -268,4 +282,14 @@
return findCount("from User where account = ?", CollectionUtils.newList(account)) > 0;
}
+ @Override
+ public Result countUser() {
+ String hql = "from count User where sex=? and deleteFlag is false";
+ return new Result(true,findCount(hql,CollectionUtils.newList(1)));
+ }
+ @Override
+ public Result countUsersex() {
+ String hql = "from count User where sex=? and deleteFlag is false";
+ return new Result(true,findCount(hql,CollectionUtils.newList(0)));
+ }
}
--
Gitblit v1.8.0