JavaProject/lookbroad-serve
JavaProject
/
lookbroad-serve
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改登录返回不一致

This commit is contained in:
开源oschina 2022-05-21 15:32:34 +08:00
parent 21fd1ab172
commit 5920ec4f56
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/fc/v2/controller/admin/goview/GoViewController.java
View File

@ -12,13 +12,10 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; 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.ResponseBody;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.fc.v2.common.conf.oss.OssTemplate; import com.fc.v2.common.conf.oss.OssTemplate;
import com.fc.v2.common.domain.AjaxResult; 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.mapper.custom.TsysUserDao;
import com.fc.v2.model.auto.TsysUser; import com.fc.v2.model.auto.TsysUser;
import com.fc.v2.model.auto.TsysUserExample; 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.service.SysUserService;
import com.fc.v2.util.ServletUtils; import com.fc.v2.util.ServletUtils;
import com.fc.v2.util.StringUtils; import com.fc.v2.util.StringUtils;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.secure.SaSecureUtil; import cn.dev33.satoken.secure.SaSecureUtil;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -37,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
@RequestMapping("/api/goview/sys") @RequestMapping("/api/goview/sys")
public class GoViewController { public class GoViewController {
private static Logger logger = LoggerFactory.getLogger(AdminController.class); private static Logger logger = LoggerFactory.getLogger(GoViewController.class);
@Autowired @Autowired
private TsysUserDao tsysUserDao; private TsysUserDao tsysUserDao;
@Autowired @Autowired
@ -96,7 +91,11 @@ public class GoViewController {
} else { } else {
if (StringUtils.isNotNull(SaTokenUtil.getUser())) { if (StringUtils.isNotNull(SaTokenUtil.getUser())) {
// 跳转到 get请求的登陆方法 // 跳转到 get请求的登陆方法
return AjaxResult.successData(200, StpUtil.getTokenInfo()).put("msg","登录成功");
Map<String, Object> map=new HashMap<String, Object>();
map.put("token",StpUtil.getTokenInfo());
map.put("userinfo", SaTokenUtil.getUser());
return AjaxResult.success().put("data",map);
} else { } else {
return AjaxResult.error(500, "未知账户"); return AjaxResult.error(500, "未知账户");
} }