feat:微信认证退出接口完成

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;

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;

mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/vo/MemberVO.java

+package com.youlai.mall.ums.api.vo;
+
+import lombok.Data;
+
+@Data
+public class MemberVO {
+
+    private String nickname;
+
+
+    private String avatar;
+
+
+}

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;

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;

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;
 

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();
     }

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<String, String> parameters) throws WxErrorException, HttpRequestMethodNotSupportedException {
 
         String code = parameters.get("code");

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;