lsm/sa-token
1
0
Fork 0
mirror of https://gitee.com/dromara/sa-token.git synced 2025-09-19 01:58:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

重构API

Browse Source
This commit is contained in:
click33
2021-06-16 16:24:39 +08:00
parent 316bb063d9
commit f6f4d337c9
55 changed files with 319 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/jwt/SaTokenJwtUtil.java
View File

@@ -90,10 +90,10 @@ public class SaTokenJwtUtil {
}
return String.valueOf(loginId);
} catch (ExpiredJwtException e) {
// throw NotLoginException.newInstance(StpUtil.stpLogic.loginKey, NotLoginException.TOKEN_TIMEOUT);
// throw NotLoginException.newInstance(StpUtil.TYPE, NotLoginException.TOKEN_TIMEOUT);
return NotLoginException.TOKEN_TIMEOUT;
} catch (MalformedJwtException e) {
throw NotLoginException.newInstance(StpUtil.stpLogic.loginKey, NotLoginException.INVALID_TOKEN);
throw NotLoginException.newInstance(StpUtil.stpLogic.loginType, NotLoginException.INVALID_TOKEN);
} catch (Exception e) {
throw new SaTokenException(e);
}
@@ -122,7 +122,7 @@ public class SaTokenJwtUtil {
// 重写 (在当前会话上登录id )
@Override
public void setLoginId(Object loginId, SaLoginModel loginModel) {
public void login(Object loginId, SaLoginModel loginModel) {
// ------ 1、获取相应对象
SaStorage storage = SaManager.getSaTokenContext().getStorage();
SaTokenConfig config = getConfig();
@@ -203,7 +203,7 @@ public class SaTokenJwtUtil {
info.tokenValue = getTokenValue();
info.isLogin = isLogin();
info.loginId = getLoginIdDefaultNull();
info.loginKey = getLoginKey();
info.loginType = getLoginType();
info.tokenTimeout = getTokenTimeout();
// info.sessionTimeout = getSessionTimeout();
// info.tokenSessionTimeout = getTokenSessionTimeout();

4
sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
View File

@@ -32,7 +32,7 @@ public class TestJwtController {
System.out.println("当前是否登录：" + StpUtil.isLogin());
System.out.println("当前登录账号：" + StpUtil.getLoginIdDefaultNull());
StpUtil.setLoginId(id); // 在当前会话登录此账号
StpUtil.login(id); // 在当前会话登录此账号
System.out.println("登录成功");
System.out.println("当前是否登录：" + StpUtil.isLogin());
System.out.println("当前登录账号：" + StpUtil.getLoginId());
@@ -73,7 +73,7 @@ public class TestJwtController {
public AjaxJson test() {
System.out.println();
System.out.println("--------------进入请求--------------");
StpUtil.setLoginId(10001);
StpUtil.login(10001);
System.out.println(StpUtil.getTokenInfo().getTokenValue());
return AjaxJson.getSuccess();
}

4
sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/StpInterfaceImpl.java
View File

@@ -17,7 +17,7 @@ public class StpInterfaceImpl implements StpInterface {
* 返回一个账号所拥有的权限码集合
*/
@Override
public List<String> getPermissionList(Object loginId, String loginKey) {
public List<String> getPermissionList(Object loginId, String loginType) {
// 本list仅做模拟，实际项目中要根据具体业务逻辑来查询权限
List<String> list = new ArrayList<String>();
list.add("101");
@@ -33,7 +33,7 @@ public class StpInterfaceImpl implements StpInterface {
* 返回一个账号所拥有的角色标识集合
*/
@Override
public List<String> getRoleList(Object loginId, String loginKey) {
public List<String> getRoleList(Object loginId, String loginType) {
// 本list仅做模拟，实际项目中要根据具体业务逻辑来查询角色
List<String> list = new ArrayList<String>();
list.add("admin");

2
sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/SSOController.java
View File

@@ -21,7 +21,7 @@ public class SSOController {
@Mapping("doLogin")
public AjaxJson doLogin(@Param(defaultValue = "10001") String id) {
System.out.println("---------------- 进行登录 ");
StpUtil.setLoginId(id);
StpUtil.login(id);
return AjaxJson.getSuccess("登录成功: " + id);
}

2
sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/StressTestController.java
View File

@@ -38,7 +38,7 @@ public class StressTestController {
Ttime t = new Ttime().start();
// 每次登录的次数
for (int j = 1; j <= loginCount; j++) {
StpUtil.setLoginId("1000" + j, "PC-" + j);
StpUtil.login("1000" + j, "PC-" + j);
if(j % 1000 == 0) {
System.out.println("已登录：" + j);
}

8
sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
View File

@@ -36,7 +36,7 @@ public class TestController {
System.out.println("当前是否登录：" + StpUtil.isLogin());
System.out.println("当前登录账号：" + StpUtil.getLoginIdDefaultNull());
StpUtil.setLoginId(id); // 在当前会话登录此账号
StpUtil.login(id); // 在当前会话登录此账号
System.out.println("登录成功");
System.out.println("当前是否登录：" + StpUtil.isLogin());
System.out.println("当前登录账号：" + StpUtil.getLoginId());
@@ -183,7 +183,7 @@ public class TestController {
@Mapping("kickOut")
public AjaxJson kickOut() {
// 先登录上
StpUtil.setLoginId(10001);
StpUtil.login(10001);
// 踢下线
StpUtil.logoutByLoginId(10001);
// 再尝试获取
@@ -195,7 +195,7 @@ public class TestController {
// 测试登录接口, 按照设备登录， 浏览器访问： http://localhost:8081/test/login2
@Mapping("login2")
public AjaxJson login2(@Param(defaultValue="10001") String id, @Param(defaultValue="PC") String device) {
StpUtil.setLoginId(id, device);
StpUtil.login(id, device);
return AjaxJson.getSuccess();
}
@@ -230,7 +230,7 @@ public class TestController {
@Mapping("loginByDevice")
public AjaxJson loginByDevice() {
System.out.println("--------------");
StpUtil.setLoginId(10001, "PC");
StpUtil.login(10001, "PC");
return AjaxJson.getSuccessData("登录成功");
}

2
sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/UserController.java
View File

@@ -18,7 +18,7 @@ public class UserController {
public String doLogin(String username, String password) {
// 此处仅作模拟示例，真实项目需要从数据库中查询数据进行比对
if("zhang".equals(username) && "123456".equals(password)) {
StpUtil.setLoginId(10001);
StpUtil.login(10001);
return "登录成功";
}
return "登录失败";

4
sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/StpInterfaceImpl.java
View File

@@ -17,7 +17,7 @@ public class StpInterfaceImpl implements StpInterface {
* 返回一个账号所拥有的权限码集合
*/
@Override
public List<String> getPermissionList(Object loginId, String loginKey) {
public List<String> getPermissionList(Object loginId, String loginType) {
// 本list仅做模拟，实际项目中要根据具体业务逻辑来查询权限
List<String> list = new ArrayList<String>();
list.add("101");
@@ -33,7 +33,7 @@ public class StpInterfaceImpl implements StpInterface {
* 返回一个账号所拥有的角色标识集合
*/
@Override
public List<String> getRoleList(Object loginId, String loginKey) {
public List<String> getRoleList(Object loginId, String loginType) {
// 本list仅做模拟，实际项目中要根据具体业务逻辑来查询角色
List<String> list = new ArrayList<String>();
list.add("admin");

2
sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/SSOController.java
View File

@@ -20,7 +20,7 @@ public class SSOController {
@RequestMapping("doLogin")
public AjaxJson doLogin(@RequestParam(defaultValue = "10001") String id) {
System.out.println("---------------- 进行登录 ");
StpUtil.setLoginId(id);
StpUtil.login(id);
return AjaxJson.getSuccess("登录成功: " + id);
}

2
sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/StressTestController.java
View File

@@ -38,7 +38,7 @@ public class StressTestController {
Ttime t = new Ttime().start();
// 每次登录的次数
for (int j = 1; j <= loginCount; j++) {
StpUtil.setLoginId("1000" + j, "PC-" + j);
StpUtil.login("1000" + j, "PC-" + j);
if(j % 1000 == 0) {
System.out.println("已登录：" + j);
}

8
sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
View File

@@ -38,7 +38,7 @@ public class TestController {
System.out.println("当前是否登录：" + StpUtil.isLogin());
System.out.println("当前登录账号：" + StpUtil.getLoginIdDefaultNull());
StpUtil.setLoginId(id); // 在当前会话登录此账号
StpUtil.login(id); // 在当前会话登录此账号
System.out.println("登录成功");
System.out.println("当前是否登录：" + StpUtil.isLogin());
System.out.println("当前登录账号：" + StpUtil.getLoginId());
@@ -185,7 +185,7 @@ public class TestController {
@RequestMapping("kickOut")
public AjaxJson kickOut() {
// 先登录上
StpUtil.setLoginId(10001);
StpUtil.login(10001);
// 踢下线
StpUtil.logoutByLoginId(10001);
// 再尝试获取
@@ -197,7 +197,7 @@ public class TestController {
// 测试登录接口, 按照设备登录， 浏览器访问： http://localhost:8081/test/login2
@RequestMapping("login2")
public AjaxJson login2(@RequestParam(defaultValue="10001") String id, @RequestParam(defaultValue="PC") String device) {
StpUtil.setLoginId(id, device);
StpUtil.login(id, device);
return AjaxJson.getSuccess();
}
@@ -232,7 +232,7 @@ public class TestController {
@RequestMapping("loginByDevice")
public AjaxJson loginByDevice() {
System.out.println("--------------");
StpUtil.setLoginId(10001, "PC");
StpUtil.login(10001, "PC");
return AjaxJson.getSuccessData("登录成功");
}

2
sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/UserController.java
View File

@@ -19,7 +19,7 @@ public class UserController {
public String doLogin(String username, String password) {
// 此处仅作模拟示例，真实项目需要从数据库中查询数据进行比对
if("zhang".equals(username) && "123456".equals(password)) {
StpUtil.setLoginId(10001);
StpUtil.login(10001);
return "登录成功";
}
return "登录失败";

4
sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/satoken/StpInterfaceImpl.java
View File

@@ -17,7 +17,7 @@ public class StpInterfaceImpl implements StpInterface {
* 返回一个账号所拥有的权限码集合
*/
@Override
public List<String> getPermissionList(Object loginId, String loginKey) {
public List<String> getPermissionList(Object loginId, String loginType) {
// 本list仅做模拟，实际项目中要根据具体业务逻辑来查询权限
List<String> list = new ArrayList<String>();
list.add("101");
@@ -33,7 +33,7 @@ public class StpInterfaceImpl implements StpInterface {
* 返回一个账号所拥有的角色标识集合
*/
@Override
public List<String> getRoleList(Object loginId, String loginKey) {
public List<String> getRoleList(Object loginId, String loginType) {
// 本list仅做模拟，实际项目中要根据具体业务逻辑来查询角色
List<String> list = new ArrayList<String>();
list.add("admin");

2
sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/TestController.java
View File

@@ -24,7 +24,7 @@ public class TestController {
// 测试登录接口 [同步模式]， 浏览器访问： http://localhost:8081/test/login
@RequestMapping("login")
public AjaxJson login(@RequestParam(defaultValue="10001") String id) {
StpUtil.setLoginId(id);
StpUtil.login(id);
return AjaxJson.getSuccess("登录成功");
}