diff --git a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/dto/MemberDTO.java b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/dto/MemberDTO.java index e429ebc31..b783c77fa 100644 --- a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/dto/MemberDTO.java +++ b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/dto/MemberDTO.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class MemberDTO { - private Integer id; + private Long id; private String username; private String password; private Integer status; diff --git a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/entity/UmsMember.java b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/entity/UmsMember.java index 9a6d90cc1..baef0e646 100644 --- a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/entity/UmsMember.java +++ b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/entity/UmsMember.java @@ -11,8 +11,6 @@ import java.time.LocalDate; @Accessors(chain = true) public class UmsMember { - - private Long id; private String username; diff --git a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/vo/MemberVO.java b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/vo/MemberVO.java new file mode 100644 index 000000000..be3e5f5bb --- /dev/null +++ b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/vo/MemberVO.java @@ -0,0 +1,14 @@ +package com.youlai.mall.ums.api.vo; + +import lombok.Data; + +@Data +public class MemberVO { + + private String nickname; + + + private String avatar; + + +} diff --git a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/dto/UserDTO.java b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/dto/UserDTO.java index 19a7cdefc..e898b90a3 100644 --- a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/dto/UserDTO.java +++ b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/dto/UserDTO.java @@ -9,7 +9,7 @@ import java.util.List; @NoArgsConstructor public class UserDTO { - private Integer id; + private Long id; private String username; private String password; private Integer status; diff --git a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUser.java b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUser.java index 63f8881bf..54352328e 100644 --- a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUser.java +++ b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUser.java @@ -10,7 +10,7 @@ import lombok.Data; public class SysUser extends BaseEntity { @TableId - private Integer id; + private Long id; private String username; @@ -24,8 +24,6 @@ public class SysUser extends BaseEntity { private String password; - private String salt; - private Integer status; private Integer deptId; diff --git a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUserRole.java b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUserRole.java index 04af63d20..3acef53ad 100644 --- a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUserRole.java +++ b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/entity/SysUserRole.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class SysUserRole { - private Integer userId; + private Long userId; private Integer roleId; diff --git a/youlai-auth/src/main/java/com/youlai/auth/config/WebSecurityConfig.java b/youlai-auth/src/main/java/com/youlai/auth/config/WebSecurityConfig.java index b894b3b9a..3a49d8eb6 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/config/WebSecurityConfig.java +++ b/youlai-auth/src/main/java/com/youlai/auth/config/WebSecurityConfig.java @@ -19,7 +19,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { http .authorizeRequests().requestMatchers(EndpointRequest.toAnyEndpoint()).permitAll() .and() - .authorizeRequests().antMatchers("/rsa/publicKey").permitAll().anyRequest().authenticated() + .authorizeRequests().antMatchers("/rsa/publicKey","/oauth/logout").permitAll().anyRequest().authenticated() .and() .csrf().disable(); } diff --git a/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java b/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java index d824bcd13..7dc2a9bbe 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java +++ b/youlai-auth/src/main/java/com/youlai/auth/controller/AuthController.java @@ -88,8 +88,6 @@ public class AuthController { return Result.success(oauth2Token); } - - @DeleteMapping("/logout") public Result logout(HttpServletRequest request) { String payload = request.getHeader(AuthConstants.JWT_PAYLOAD_KEY); @@ -107,7 +105,6 @@ public class AuthController { return Result.success(); } - private Result handleForWxAppAuth(Principal principal, Map parameters) throws WxErrorException, HttpRequestMethodNotSupportedException { String code = parameters.get("code"); diff --git a/youlai-auth/src/main/java/com/youlai/auth/domain/User.java b/youlai-auth/src/main/java/com/youlai/auth/domain/User.java index e0d5874fa..d6a9ae240 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/domain/User.java +++ b/youlai-auth/src/main/java/com/youlai/auth/domain/User.java @@ -20,7 +20,7 @@ import java.util.Collection; @NoArgsConstructor public class User implements UserDetails { - private Integer id; + private Long id; private String username;