From 5476f0366c2042d8b3858369fc0c149d57b2fb9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 24 七月 2025 17:47:27 +0800
Subject: [PATCH] 会员密码问题
---
framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java | 2 +-
framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java | 12 ++++++------
framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java | 3 ++-
buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java | 2 +-
framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java | 2 +-
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 18 +++++++++++++++---
framework/src/main/java/cn/lili/modules/member/service/MemberService.java | 2 +-
7 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
index 90bf661..89d030b 100644
--- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java
@@ -79,7 +79,7 @@
@PostMapping("/app/login")
public ResultMessage<Token> unionLogin(@RequestBody ConnectAuthUser authUser, @RequestHeader("uuid") String uuid) {
try {
- return ResultUtil.data(connectService.unionLoginCallback(authUser, uuid));
+ return ResultUtil.data(connectService.unionLoginCallback(authUser, uuid,true));
} catch (Exception e) {
e.printStackTrace();
log.error("unionID鐧诲綍閿欒", e);
diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
index a9356e8..ee7821f 100644
--- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
+++ b/framework/src/main/java/cn/lili/modules/connect/service/ConnectService.java
@@ -36,7 +36,7 @@
* @param uuid 鐢ㄦ埛uuid
* @return token
*/
- Token unionLoginCallback(ConnectAuthUser authUser, String uuid);
+ Token unionLoginCallback(ConnectAuthUser authUser, String uuid,boolean encryptTwice);
/**
* 缁戝畾
diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
index f0c599a..42dfb1d 100644
--- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java
@@ -87,8 +87,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Token unionLoginCallback(ConnectAuthUser authUser, String uuid) {
- return this.unionLoginCallback(authUser, false);
+ public Token unionLoginCallback(ConnectAuthUser authUser, String uuid,boolean encryptTwice) {
+ return this.unionLoginCallback(authUser, false,encryptTwice);
}
@Override
@@ -196,7 +196,7 @@
AuthToken authToken = new AuthToken();
authToken.setUnionId(unionId);
connectAuthUser.setToken(authToken);
- return this.unionLoginCallback(connectAuthUser, true);
+ return this.unionLoginCallback(connectAuthUser, true,true);
} catch (Exception e) {
e.printStackTrace();
}
@@ -305,7 +305,7 @@
* @return token
* @throws NoPermissionException 涓嶅厑璁告搷浣�
*/
- private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm) {
+ private Token unionLoginCallback(ConnectAuthUser authUser, boolean longTerm,boolean encryptTwice) {
try {
Member member = null;
@@ -336,14 +336,14 @@
Connect connect = this.getOne(queryWrapper);
if (connect == null) {
- member = memberService.autoRegister(authUser);
+ member = memberService.autoRegister(authUser,encryptTwice);
} else {
//鏌ヨ浼氬憳
member = memberService.getById(connect.getUserId());
//濡傛灉鏈粦瀹氫細鍛橈紝鍒欐妸鍒氭墠鏌ヨ鍒扮殑鑱斿悎鐧诲綍琛ㄦ暟鎹垹闄�
if (member == null) {
this.remove(queryWrapper);
- member = memberService.autoRegister(authUser);
+ member = memberService.autoRegister(authUser,encryptTwice);
}
}
}
diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
index b24f367..225e833 100644
--- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
+++ b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java
@@ -94,7 +94,7 @@
if (response.ok()) {
ConnectAuthUser authUser = response.getData();
try {
- Token token = connectService.unionLoginCallback(authUser, callback.getState());
+ Token token = connectService.unionLoginCallback(authUser, callback.getState(),true);
resultMessage = ResultUtil.data(token);
} catch (ServiceException e) {
throw new ServiceException(ResultCode.ERROR, e.getMessage());
diff --git a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java
index 2555f5d..08bde48 100644
--- a/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/lmk/service/impl/StoreMemberServiceImpl.java
@@ -1,5 +1,6 @@
package cn.lili.modules.lmk.service.impl;
+import cn.hutool.crypto.SecureUtil;
import cn.lili.base.Result;
import cn.lili.common.security.AuthUser;
@@ -63,7 +64,7 @@
return null;
}
ClerkAddDTO clerkAddDTO = new ClerkAddDTO();
- clerkAddDTO.setPassword(form.getPassword());
+ clerkAddDTO.setPassword(SecureUtil.md5(form.getPassword()));
clerkAddDTO.setRoles(form.getRole());
clerkAddDTO.setUsername(form.getMobile());
clerkAddDTO.setMobile(form.getMobile());
diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
index a3ba9b1..b53b5e9 100644
--- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
+++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java
@@ -220,7 +220,7 @@
* @param authUser 鑱斿悎鐧诲綍鐢ㄦ埛
* @return Token
*/
- Member autoRegister(ConnectAuthUser authUser);
+ Member autoRegister(ConnectAuthUser authUser,Boolean encryptTwice);
/**
* 鍒锋柊token
diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
index 474951a..bb1d11d 100644
--- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
@@ -3,6 +3,8 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.digest.MD5;
import cn.lili.base.Result;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
@@ -54,6 +56,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.catalina.security.SecurityUtil;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -209,6 +212,7 @@
throw new ServiceException(ResultCode.USER_NOT_EXIST);
}
//鍒ゆ柇瀵嗙爜鏄惁杈撳叆姝ｇ‘
+
if (!new BCryptPasswordEncoder().matches(password, member.getPassword())) {
throw new ServiceException(ResultCode.USER_PASSWORD_ERROR);
}
@@ -254,7 +258,7 @@
@Override
@Transactional
- public Member autoRegister(ConnectAuthUser authUser) {
+ public Member autoRegister(ConnectAuthUser authUser,Boolean encryptTwice) {
if (CharSequenceUtil.isEmpty(authUser.getNickname())) {
authUser.setNickname(CommonUtil.getSpecialStr("鐢ㄦ埛"));
@@ -266,7 +270,11 @@
// String username = UuidUtils.getUUID();
Member member = new Member(authUser.getUsername(), UuidUtils.getUUID(), authUser.getAvatar(), authUser.getNickname(),
authUser.getGender() != null ? Convert.toInt(authUser.getGender().getCode()) : 0, authUser.getPhone());
- member.setPassword(DEFAULT_PASSWORD);
+ if(encryptTwice){
+ member.setPassword( new BCryptPasswordEncoder().encode(SecureUtil.md5(DEFAULT_PASSWORD)));
+ }else {
+ member.setPassword( new BCryptPasswordEncoder().encode(DEFAULT_PASSWORD));
+ }
member.setUuId(authUser.getUuid());
// 鍙戦�佷細鍛樻敞鍐屼俊鎭�
registerHandler(member);
@@ -524,7 +532,7 @@
@Override
public Result resetPassword(String id) {
- String password = "123456";
+ String password = "111111";
Member member = this.getById(id);
member.setPassword(new BCryptPasswordEncoder().encode(password));
this.updateById(member);
@@ -906,4 +914,8 @@
}
}
+ public static void main(String[] args) {
+ System.err.println(SecureUtil.md5("111111"));
+ }
+
}
--
Gitblit v1.8.0