From 88bd75d93f86d3cf4f12e652d459da8bae71e545 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 15:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 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 2fa2972..489d7ea 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,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.text.CharSequenceUtil;
+import cn.lili.base.Result;
import cn.lili.cache.Cache;
import cn.lili.cache.CachePrefix;
import cn.lili.common.aop.annotation.DemoSite;
@@ -49,7 +50,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.RequiredArgsConstructor;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -70,33 +70,47 @@
* @since 2021-03-29 14:10:16
*/
@Service
-@RequiredArgsConstructor
public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> implements MemberService {
/**
* 浼氬憳token
*/
- private final MemberTokenGenerate memberTokenGenerate;
+ @Autowired
+ private MemberTokenGenerate memberTokenGenerate;
/**
* 鍟嗗token
*/
- private final StoreTokenGenerate storeTokenGenerate;
+ @Autowired
+ private StoreTokenGenerate storeTokenGenerate;
/**
* 鑱斿悎鐧诲綍
*/
- private final ConnectService connectService;
+ @Autowired
+ private ConnectService connectService;
/**
* 搴楅摵
*/
- private final StoreService storeService;
+ @Autowired
+ private StoreService storeService;
/**
* RocketMQ 閰嶇疆
*/
- private final RocketmqCustomProperties rocketmqCustomProperties;
- private final RocketMQTemplate rocketMQTemplate;
- private final ApplicationEventPublisher applicationEventPublisher;
- private final Cache cache;
- private final VideoAccountService videoAccountService;
+ @Autowired
+ private RocketmqCustomProperties rocketmqCustomProperties;
+
+ @Autowired
+ private RocketMQTemplate rocketMQTemplate;
+
+ @Autowired
+ private ApplicationEventPublisher applicationEventPublisher;
+ /**
+ * 缂撳瓨
+ */
+ @Autowired
+ private Cache cache;
+
+ @Autowired
+ private VideoAccountService videoAccountService;
@Override
public Member findByUsername(String userName) {
@@ -243,6 +257,7 @@
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);
+ member.setUuId(authUser.getUuid());
// 鍙戦�佷細鍛樻敞鍐屼俊鎭�
registerHandler(member);
@@ -298,6 +313,7 @@
* @param member
*/
@Transactional
+ @Override
public void registerHandler(Member member) {
member.setId(SnowFlake.getIdStr());
//淇濆瓨浼氬憳
@@ -484,6 +500,26 @@
Member member = this.getById(managerMemberEditDTO.getId());
//浼犻�掍慨鏀逛細鍛樹俊鎭�
BeanUtil.copyProperties(managerMemberEditDTO, member);
+ this.updateById(member);
+ return member;
+ }
+
+ @Override
+ public Result resetPassword(String id) {
+ String password = "123456";
+ Member member = this.getById(id);
+ member.setPassword(new BCryptPasswordEncoder().encode(password));
+ this.updateById(member);
+ return Result.ok("閲嶇疆鎴愬姛");
+ }
+
+
+ @Override
+ public Member updateMemberPartProperties(String id, String password, String mobile) {
+ //鏌ヨ浼氬憳淇℃伅
+ Member member = this.getById(id);
+ member.setMobile(mobile);
+ member.setUsername(mobile);
this.updateById(member);
return member;
}
@@ -828,6 +864,13 @@
return result;
}
+ @Override
+ public Member findByUUID(String uuid) {
+ QueryWrapper<Member> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("uu_id", uuid);
+ return this.baseMapper.selectOne(queryWrapper);
+ }
+
/**
* 妫�娴嬩細鍛�
*
--
Gitblit v1.8.0