mirrors/youlai-mall
1
0
Fork 0
mirror of https://gitee.com/youlaitech/youlai-mall.git synced 2024-12-23 13:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix:MemberDTO引用错误问题修复

Browse Source
This commit is contained in:
haoxr 2020-10-12 09:13:40 +08:00
parent cac7b840f2
commit 8ddcbd7e7a
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/dto/MemberDTO.java
View File

@ -2,7 +2,6 @@ package com.youlai.mall.ums.api.dto;
import lombok.Data; import lombok.Data;
@Data @Data
public class MemberDTO { public class MemberDTO {
@ -14,4 +13,5 @@ public class MemberDTO {
private String avatar; private String avatar;
private String nickname; private String nickname;
} }

5
youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java
View File

@ -3,7 +3,6 @@ package com.youlai.auth.controller;
import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.api.WxMaService;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil; import cn.hutool.json.JSONUtil;
@ -100,8 +99,8 @@ public class AuthController {
long currentTimeSeconds = System.currentTimeMillis() / 1000; long currentTimeSeconds = System.currentTimeMillis() / 1000;
if (exp < currentTimeSeconds) { // token已过期 if (exp < currentTimeSeconds) { // token已过期，无需加入黑名单
return Result.custom(ResultCode.TOKEN_INVALID_OR_EXPIRED); return Result.success();
} }
redisTemplate.opsForValue().set(AuthConstants.TOKEN_BLACKLIST_PREFIX + jti, null, (exp - currentTimeSeconds), TimeUnit.SECONDS); redisTemplate.opsForValue().set(AuthConstants.TOKEN_BLACKLIST_PREFIX + jti, null, (exp - currentTimeSeconds), TimeUnit.SECONDS);
return Result.success(); return Result.success();

1
youlai-auth/src/main/java/com/youlai/auth/domain/User.java
View File

@ -2,7 +2,6 @@ package com.youlai.auth.domain;
import com.youlai.admin.api.dto.UserDTO; import com.youlai.admin.api.dto.UserDTO;
import com.youlai.common.core.constant.AuthConstants; import com.youlai.common.core.constant.AuthConstants;
import com.youlai.mall.ums.api.dto.MemberDTO;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;

3
youlai-auth/src/main/java/com/youlai/auth/service/UserDetailsServiceImpl.java
View File

@ -4,11 +4,8 @@ import com.youlai.admin.api.dto.UserDTO;
import com.youlai.admin.api.feign.RemoteAdminService; import com.youlai.admin.api.feign.RemoteAdminService;
import com.youlai.auth.domain.User; import com.youlai.auth.domain.User;
import com.youlai.common.core.constant.AuthConstants; import com.youlai.common.core.constant.AuthConstants;
import com.youlai.mall.ums.api.dto.MemberDTO;
import com.youlai.mall.ums.api.entity.UmsMember;
import com.youlai.mall.ums.api.feign.RemoteUmsMemberService; import com.youlai.mall.ums.api.feign.RemoteUmsMemberService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.AccountExpiredException; import org.springframework.security.authentication.AccountExpiredException;
import org.springframework.security.authentication.CredentialsExpiredException; import org.springframework.security.authentication.CredentialsExpiredException;
import org.springframework.security.authentication.DisabledException; import org.springframework.security.authentication.DisabledException;