From b2dfffe3b575466f4422011589e159a0220dd2fb Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 08 八月 2025 17:37:09 +0800
Subject: [PATCH] 排序调整
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 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 564de14..2f145e8 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;
@@ -24,6 +26,7 @@
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
import cn.lili.modules.connect.service.ConnectService;
import cn.lili.modules.lmk.domain.entity.VideoAccount;
+import cn.lili.modules.lmk.domain.form.MemberNickNameForm;
import cn.lili.modules.lmk.domain.form.MemberTagForm;
import cn.lili.modules.lmk.service.MemberTagService;
import cn.lili.modules.lmk.service.VideoAccountService;
@@ -51,8 +54,10 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+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;
@@ -208,6 +213,7 @@
throw new ServiceException(ResultCode.USER_NOT_EXIST);
}
//鍒ゆ柇瀵嗙爜鏄惁杈撳叆姝ｇ‘
+
if (!new BCryptPasswordEncoder().matches(password, member.getPassword())) {
throw new ServiceException(ResultCode.USER_PASSWORD_ERROR);
}
@@ -253,7 +259,7 @@
@Override
@Transactional
- public Member autoRegister(ConnectAuthUser authUser) {
+ public Member autoRegister(ConnectAuthUser authUser,Boolean encryptTwice) {
if (CharSequenceUtil.isEmpty(authUser.getNickname())) {
authUser.setNickname(CommonUtil.getSpecialStr("鐢ㄦ埛"));
@@ -265,7 +271,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);
@@ -511,7 +521,7 @@
//浼犻�掍慨鏀逛細鍛樹俊鎭�
BeanUtil.copyProperties(managerMemberEditDTO, member);
this.updateById(member);
- if (managerMemberEditDTO.getTags() != null) {
+ if (managerMemberEditDTO.getTags() != null && !CollectionUtils.isEmpty(managerMemberEditDTO.getTags())) {
MemberTagForm memberTagForm = new MemberTagForm();
memberTagForm.setMemberId(member.getId());
memberTagForm.setTagIds(managerMemberEditDTO.getTags());
@@ -522,8 +532,22 @@
}
@Override
+ public Result updateMemberNickName(MemberNickNameForm form) {
+ Member member = baseMapper.selectById(form.getMemberId());
+ boolean update = false;
+ if ("寰俊鐢ㄦ埛".equals(member.getNickName()) || StringUtils.isBlank(member.getNickName())) {
+ member.setNickName(form.getNickName());
+ update = true;
+ }
+ if (update){
+ baseMapper.updateById(member);
+ }
+ return Result.ok().data(member.getNickName());
+ }
+
+ @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);
@@ -905,4 +929,8 @@
}
}
+ public static void main(String[] args) {
+ System.err.println(SecureUtil.md5("111111"));
+ }
+
}
--
Gitblit v1.8.0