From eaae0b1aa7ba0fc12231fdbd65e29dafbc332696 Mon Sep 17 00:00:00 2001
From: hxrui <1490493387@qq.com>
Date: Mon, 1 Feb 2021 20:22:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=8F=9C=E5=8D=95=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/youlai/admin/pojo/entity/SysMenu.java | 10 ++++++----
 .../main/java/com/youlai/admin/pojo/vo/MenuVO.java | 14 +++++++-------
 .../com/youlai/auth/controller/AuthController.java | 11 ++---------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java
index 90c10a5e..1be2ea84 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/entity/SysMenu.java
@@ -22,20 +22,22 @@ public class SysMenu extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    private Long parentId;
+
     private String name;
 
-    private Long parentId;
+    private String icon;
 
     private String path;
 
-    private String redirect;
-
-    private String icon;
+    private String component;
 
     private Integer sort;
 
     private Integer status;
 
+    private String redirect;
+
     @TableField(exist = false)
     private List<Integer> roles;
 
diff --git a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java
index 270400fc..7b9683b7 100644
--- a/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java
+++ b/youlai-admin/admin-api/src/main/java/com/youlai/admin/pojo/vo/MenuVO.java
@@ -10,24 +10,24 @@ import java.util.List;
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class MenuVO extends BaseEntity {
 
-    private Integer id;
+    private Long id;
 
-    private String name;
+    private Long parentId;
 
-    private Integer parentId;
+    private String name;
 
-    private Integer type;
+    private String icon;
 
     private String path;
 
-    private String icon;
+    private String component;
 
     private Integer sort;
 
-    private Integer visible;
-
     private Integer status;
 
+    private String redirect;
+
     @JsonInclude(value = JsonInclude.Include.NON_NULL)
     private List<MenuVO> children;
 
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 2a8199ac..411c94c0 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
@@ -78,8 +78,6 @@ public class AuthController {
     }
 
 
-
-
     private WxMaService wxService;
     private MemberFeignService memberFeignService;
     private PasswordEncoder passwordEncoder;
@@ -103,7 +101,6 @@ public class AuthController {
 
         Result<AuthMemberDTO> result = memberFeignService.getUserByOpenid(openid);
 
-        String username;
         if (ResultCode.USER_NOT_EXIST.getCode().equals(result.getCode())) { // 微信授权登录 会员信息不存在时 注册会员
             String encryptedData = parameters.get("encryptedData");
             String iv = parameters.get("iv");
@@ -125,15 +122,11 @@ public class AuthController {
             if (!ResultCode.SUCCESS.getCode().equals(res.getCode())) {
                 throw new BizException("注册会员失败");
             }
-            username = openid;
-        } else {
-            AuthMemberDTO authMemberDTO = result.getData();
-            username = authMemberDTO.getUsername();
         }
 
         // oauth2认证参数对应授权登录时注册会员的username、password信息，模拟通过oauth2的密码模式认证
-        parameters.put("username", username);
-        parameters.put("password", username);
+        parameters.put("username", openid);
+        parameters.put("password", openid);
 
         OAuth2AccessToken oAuth2AccessToken = tokenEndpoint.postAccessToken(principal, parameters).getBody();
         Oauth2Token oauth2Token = Oauth2Token.builder()
-- 
GitLab