From 4db920e98d170c98701731eed8c2d43b0a7fe42f Mon Sep 17 00:00:00 2001 From: liliang Date: Thu, 13 Mar 2025 11:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=8E=E5=95=86=E5=9F=8E?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9F=A5=E8=AF=A2=E7=9F=AD=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E4=BF=A1=E6=81=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imooc/controller/PassportController.java | 17 ++++++-- .../com/imooc/mapper/UserMemberMapper.java | 2 + .../resources/mapper/UserMemberMapper.xml | 40 +++++++++++++++++++ .../java/com/imooc/service/UserService.java | 7 ++++ .../imooc/service/impl/UserServiceImpl.java | 26 ++++++++++++ 5 files changed, 88 insertions(+), 4 deletions(-) diff --git a/book-api/src/main/java/com/imooc/controller/PassportController.java b/book-api/src/main/java/com/imooc/controller/PassportController.java index b11e09d..c7d0ebb 100644 --- a/book-api/src/main/java/com/imooc/controller/PassportController.java +++ b/book-api/src/main/java/com/imooc/controller/PassportController.java @@ -107,13 +107,11 @@ public class PassportController extends BaseInfoProperties { @PostMapping("loginFromShop") public String loginFromShop(String mobile, String memberId) { // 创建短视频系统账号 - return Optional.ofNullable(userService.createUserFromShop(mobile,memberId))// + return Optional.ofNullable(userService.createUserFromShop(mobile, memberId))// .map(user -> { String uToken = UUID.randomUUID().toString(); log.info(uToken); redis.set(REDIS_USER_TOKEN + ":" + user.getId(), uToken); - // 清除验证码 - redis.del(MOBILE_SMSCODE + ":" + user.getMobile()); // 返回给前端 UsersVO usersVO = new UsersVO(); BeanUtils.copyProperties(user, usersVO); @@ -121,7 +119,18 @@ public class PassportController extends BaseInfoProperties { return GsonUtil.beanToJson(usersVO); })// - .orElseGet(()->StringUtils.EMPTY); + .orElseGet(() -> StringUtils.EMPTY); + } + + /** + * 从商城登录获取短视频账户信息 + * + * @param memberId + * @return + */ + @PostMapping("getUserFromShop") + public String getUserFromShop(String memberId) { + return userService.getUserInfoFromShop(memberId); } /*@PostMapping("login") diff --git a/book-mapper/src/main/java/com/imooc/mapper/UserMemberMapper.java b/book-mapper/src/main/java/com/imooc/mapper/UserMemberMapper.java index b9cbb91..e18d59f 100644 --- a/book-mapper/src/main/java/com/imooc/mapper/UserMemberMapper.java +++ b/book-mapper/src/main/java/com/imooc/mapper/UserMemberMapper.java @@ -3,6 +3,7 @@ package com.imooc.mapper; import org.apache.ibatis.annotations.Mapper; import com.imooc.my.mapper.MyMapper; import com.imooc.pojo.UserMember; +import com.imooc.pojo.Users; /** * 短视频用户与商城会员数据处理层 @@ -10,4 +11,5 @@ import com.imooc.pojo.UserMember; @Mapper public interface UserMemberMapper extends MyMapper { + Users getUserByMemberId(String memberId); } \ No newline at end of file diff --git a/book-mapper/src/main/resources/mapper/UserMemberMapper.xml b/book-mapper/src/main/resources/mapper/UserMemberMapper.xml index 42ad949..0e9f652 100644 --- a/book-mapper/src/main/resources/mapper/UserMemberMapper.xml +++ b/book-mapper/src/main/resources/mapper/UserMemberMapper.xml @@ -1,4 +1,44 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/book-service/src/main/java/com/imooc/service/UserService.java b/book-service/src/main/java/com/imooc/service/UserService.java index 0fb3c2c..2b71101 100644 --- a/book-service/src/main/java/com/imooc/service/UserService.java +++ b/book-service/src/main/java/com/imooc/service/UserService.java @@ -59,4 +59,11 @@ public interface UserService { * @return */ Users createUserFromShop(String mobile, String memberId); + + /** + * 从商城系统获取短视频账户信息 + * @param memberId + * @return + */ + String getUserInfoFromShop(String memberId); } diff --git a/book-service/src/main/java/com/imooc/service/impl/UserServiceImpl.java b/book-service/src/main/java/com/imooc/service/impl/UserServiceImpl.java index 8444a49..0780692 100644 --- a/book-service/src/main/java/com/imooc/service/impl/UserServiceImpl.java +++ b/book-service/src/main/java/com/imooc/service/impl/UserServiceImpl.java @@ -16,7 +16,10 @@ import com.imooc.service.UserService; import com.imooc.utils.DateUtil; import com.imooc.utils.DesensitizationUtil; import com.imooc.utils.GsonUtil; +import com.imooc.utils.RedisOperator; import com.imooc.utils.RestTemplateUtil; +import com.imooc.vo.UsersVO; + import org.apache.commons.lang3.StringUtils; import org.n3r.idworker.Sid; import org.springframework.beans.BeanUtils; @@ -31,6 +34,10 @@ import tk.mybatis.mapper.entity.Example; import javax.annotation.Resource; import java.util.Date; import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import static com.imooc.base.BaseInfoProperties.REDIS_USER_TOKEN; +import static com.imooc.base.BaseInfoProperties.MOBILE_SMSCODE; /** * @author vercen @@ -48,6 +55,9 @@ public class UserServiceImpl implements UserService { @Autowired private UserMemberMapper userMemberMapper; + @Autowired + public RedisOperator redis; + @Autowired private Sid sid; private static final String USER_FACE1 = "http://122.152.205.72:88/group1/M00/00/05/CpoxxF6ZUySASMbOAABBAXhjY0Y649.png"; @@ -252,4 +262,20 @@ public class UserServiceImpl implements UserService { } return null; } + + @Override + public String getUserInfoFromShop(String memberId) { + return Optional.ofNullable(userMemberMapper.getUserByMemberId(memberId))// + .map(user -> { + String uToken = UUID.randomUUID().toString(); + redis.set(REDIS_USER_TOKEN + ":" + user.getId(), uToken); + // 返回给前端 + UsersVO usersVO = new UsersVO(); + BeanUtils.copyProperties(user, usersVO); + usersVO.setUserToken(uToken); + + return GsonUtil.beanToJson(usersVO); + })// + .orElseGet(() -> StringUtils.EMPTY); + } }