From 5920ec4f56319fe06e409498e0ca20a8ee4ee3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=80=E6=BA=90oschina?= <115889198@qq.com> Date: Sat, 21 May 2022 15:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/admin/goview/GoViewController.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/fc/v2/controller/admin/goview/GoViewController.java b/src/main/java/com/fc/v2/controller/admin/goview/GoViewController.java index e4492e3..3ec9e23 100644 --- a/src/main/java/com/fc/v2/controller/admin/goview/GoViewController.java +++ b/src/main/java/com/fc/v2/controller/admin/goview/GoViewController.java @@ -12,13 +12,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import com.fc.v2.common.conf.oss.OssTemplate; import com.fc.v2.common.domain.AjaxResult; -import com.fc.v2.common.log.Log; -import com.fc.v2.controller.AdminController; import com.fc.v2.mapper.custom.TsysUserDao; import com.fc.v2.model.auto.TsysUser; import com.fc.v2.model.auto.TsysUserExample; @@ -26,8 +23,6 @@ import com.fc.v2.satoken.SaTokenUtil; import com.fc.v2.service.SysUserService; import com.fc.v2.util.ServletUtils; import com.fc.v2.util.StringUtils; - -import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.secure.SaSecureUtil; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.StrUtil; @@ -37,7 +32,7 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("/api/goview/sys") public class GoViewController { - private static Logger logger = LoggerFactory.getLogger(AdminController.class); + private static Logger logger = LoggerFactory.getLogger(GoViewController.class); @Autowired private TsysUserDao tsysUserDao; @Autowired @@ -96,7 +91,11 @@ public class GoViewController { } else { if (StringUtils.isNotNull(SaTokenUtil.getUser())) { // 跳转到 get请求的登陆方法 - return AjaxResult.successData(200, StpUtil.getTokenInfo()).put("msg","登录成功"); + + Map map=new HashMap(); + map.put("token",StpUtil.getTokenInfo()); + map.put("userinfo", SaTokenUtil.getUser()); + return AjaxResult.success().put("data",map); } else { return AjaxResult.error(500, "未知账户"); }