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); 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); /** * 绑定 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); } } } 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()); 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()); 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 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")); } }
