From f7e2789a576b2db4217d20d5cfdeb20249c83a5b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 24 七月 2025 17:47:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
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