简单登录问题

src/main/java/thyyxxk/webserver/controller/LoginController.java

@@ -34,7 +34,7 @@ public class LoginController {
 
     @PassToken
     @GetMapping("/simpleLogin")
-    public ResultVo<JSONObject> simpleLogin(@RequestParam("code") String code, HttpServletRequest request) {
+    public ResultVo<UserInfo> simpleLogin(@RequestParam("code") String code, HttpServletRequest request) {
         return service.simpleLogin(code, request);
     }
 

src/main/java/thyyxxk/webserver/service/LoginService.java

@@ -125,25 +125,12 @@ public class LoginService {
         return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "验证码过期或者验证码错误。");
     }
 
-    public ResultVo<JSONObject> simpleLogin(String code, HttpServletRequest request) {
+    public ResultVo<UserInfo> simpleLogin(String code, HttpServletRequest request) {
         UserInfo us = dao.getUserInfoByCode(code);
         if (us == null) {
             return ResultVoUtil.fail(ExceptionEnum.NOT_EL_MESSAGE, "用户不存在");
         }
-        JSONObject js = new JSONObject();
-        ResultVo<UserInfo> userInfoResultVo = login(us, request, false);
-        if (userInfoResultVo.getCode() == 200) {
-            js.put("userInfo", userInfoResultVo.getData());
-        } else {
-            return ResultVoUtil.fail(ExceptionEnum.NOT_EL_MESSAGE, userInfoResultVo.getMessage());
-        }
-        ResultVo<Map<String, Object>> f = fetchVueMenus(us.getCode());
-        if (f.getCode() == 200) {
-            js.put("fetchVueMenus", f.getData());
-        } else {
-            return ResultVoUtil.fail(ExceptionEnum.NOT_EL_MESSAGE, f.getMessage());
-        }
-        return ResultVoUtil.success(js);
+        return login(us, request, false);
     }
 
     @DS("his")