sa token

in-cloud/src/main/java/com/jiayue/insu/incloud/controller/UserController.java

@@ -1,9 +1,11 @@
 package com.jiayue.insu.incloud.controller;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.jiayue.insu.incloud.entity.User;
 import com.jiayue.insu.incloud.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -13,10 +15,10 @@ public class UserController {
     @Autowired
     private UserService userService;
 
-    @GetMapping("/info")
-    public String  info(){
-        User byId = userService.getById(1);
-        System.out.println(byId);
-        return  "ok";
+    @PostMapping("/info")
+    public User  info(){
+        User byId = userService.findByName( (String) StpUtil.getLoginId());
+
+        return  byId;
     }
 }

in-cloud/src/main/java/com/jiayue/insu/incloud/entity/User.java

@@ -16,9 +16,9 @@ public class User implements Serializable {
     @TableId(type = IdType.AUTO)
     Long id;
 
-    String name;
+    String username;
 
-    String pwd;
+    String password;
 
     Integer age;
 
@@ -28,8 +28,8 @@ public class User implements Serializable {
     public String toString() {
         return "User{" +
                 "id=" + id +
-                ", name='" + name + '\'' +
-                ", pwd='" + pwd + '\'' +
+                ", name='" + username + '\'' +
+                ", pwd='" + password + '\'' +
                 ", age=" + age +
                 ", email='" + email + '\'' +
                 '}';

in-cloud/src/main/java/com/jiayue/insu/incloud/exception/GlobalException.java

@@ -3,6 +3,7 @@ package com.jiayue.insu.incloud.exception;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.jiayue.insu.common.core.util.R;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -32,9 +33,11 @@ public class GlobalException {
 
         // 不同异常返回不同状态码
         AjaxJson aj = null;
+        R r = null;
         if (e instanceof NotLoginException) {	// 如果是未登录异常
             NotLoginException ee = (NotLoginException) e;
             aj = AjaxJson.getNotLogin().setMsg(ee.getMessage());
+
         }
         else if(e instanceof NotRoleException) {		// 如果是角色异常
             NotRoleException ee = (NotRoleException) e;

in-cloud/src/main/java/com/jiayue/insu/incloud/permisson/Login.java

@@ -5,9 +5,7 @@ import com.jiayue.insu.common.core.util.R;
 import com.jiayue.insu.incloud.entity.User;
 import com.jiayue.insu.incloud.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("/login")
@@ -16,17 +14,27 @@ public class Login {
     @Autowired
     private UserService userService;
 
-    @GetMapping("/doLogin")
-    public R doLogin(String name,String pwd){
-        User user = userService.findByNameAndPwd(name, pwd);
-        if(user!=null){
-            StpUtil.login(user.getName());
-            return R.ok();
+    @PostMapping("/doLogin")
+    public R doLogin(@RequestBody User user ){
+        User userTar = userService.findByNameAndPwd(user.getUsername(), user.getPassword());
+        if(userTar!=null){
+            StpUtil.login(userTar.getUsername());
+            return R.ok(StpUtil.getTokenInfo());
         }else{
-            return R.failed();
+            return R.ok(null);
         }
     }
 
+    @PostMapping("/logout")
+    public R logout() {
+        try {
+            StpUtil.logout();
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return R.ok();
+    }
     // 查询登录状态，浏览器访问： http://localhost:8081/user/isLogin
     @GetMapping("/isLogin")
     public R isLogin() {
@@ -42,4 +50,5 @@ public class Login {
     }
 
 
+
 }

in-cloud/src/main/java/com/jiayue/insu/incloud/service/UserService.java

@@ -6,4 +6,6 @@ import com.jiayue.insu.incloud.entity.User;
 public interface UserService extends IService<User> {
 
     User findByNameAndPwd(String name,String pwd);
+
+    User findByName(String name);
 }

in-cloud/src/main/java/com/jiayue/insu/incloud/service/impl/UserServiceImpl.java

@@ -15,8 +15,16 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public User findByNameAndPwd(String name, String pwd) {
         LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(User::getName,name);
-        lambdaQueryWrapper.eq(User::getPwd,pwd);
+        lambdaQueryWrapper.eq(User::getUsername,name);
+        lambdaQueryWrapper.eq(User::getPassword,pwd);
+        User user = this.getOne(lambdaQueryWrapper);
+        return user;
+    }
+
+    @Override
+    public User findByName(String name) {
+        LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(User::getUsername,name);
         User user = this.getOne(lambdaQueryWrapper);
         return user;
     }