add Authentication and Authorization

Author: litongjava

docs/.vuepress/config/sidebar-zh.json

@@ -71,7 +71,7 @@
     "children": ["07_aop/01.md", "07_aop/02.md", "07_aop/03.md", "07_aop/03.md", "07_aop/04.md", "07_aop/05.md"]
   },
   {
-    "title": "08_token",
+    "title": "08_认证和授权",
     "collapsable": false,
     "children": ["08_token/01.md", "08_token/02.md"]
   },

docs/zh/08_token/01.md docs/zh/08_认证/01.md

@@ -138,7 +138,7 @@ public class AuthController {
 
   public boolean validateToken() {
     try {
-      StpUtil.checkActiveTimeout();
+      StpUtil.checkLogin();
       return true;
     } catch (Exception e) {
       return false;
@@ -203,6 +203,30 @@ Cookie: token=c5edff10712b4c49b64da5b910ecdb53; PHPSESSID=e11a6f19b3504fec816a3d
 
 也支持请求头参数 token
 
+### 生成 JWT token
+
+添加依赖
+
+```
+<!-- Sa-Token 整合 jwt -->
+<dependency>
+  <groupId>cn.dev33</groupId>
+  <artifactId>sa-token-jwt</artifactId>
+  <version>1.37.0</version>
+</dependency>
+```
+
+修改 SaTokenConfiguration 添加 jwt 相关配置
+
+```java
+saTokenConfig.setJwtSecretKey("asdasdasifhueuiwyurfewbfjsdafjk");
+saTokenConfig.setTokenPrefix("Bearer");
+StpLogicJwtForSimple stpLogicJwtForSimple = new StpLogicJwtForSimple();
+StpUtil.setStpLogic(stpLogicJwtForSimple);
+```
+
+其他不变,正常登录即可
+
 ### 将 Token 存入 Redis
 
 #### 为什么要将访问 token 存入 Redis

docs/zh/08_token/02.md docs/zh/08_认证/02.md

@@ -6,7 +6,7 @@
 使用 sa-token 将用户信息保存到 reids
 1.1.创建表
 
-```
+```sql
 CREATE TABLE IF NOT EXISTS `sys_user_info` (
   `id` BIGINT NOT NULL AUTO_INCREMENT COMMENT '主键',
   `app_id` INT NOT NULL COMMENT '应用id',
@@ -50,7 +50,7 @@ CREATE TABLE IF NOT EXISTS `sys_user_info` (
 fst
 junit
 
-```
+```xml
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <java.version>1.8</java.version>
@@ -136,7 +136,7 @@ CREATE TABLE IF NOT EXISTS `sys_user_info` (
 1.3.配置文件
 app.properties
 
-```
+```properties
 server.port=9204
 server.context-path=/pen-api
 # 或 prod
@@ -192,7 +192,7 @@ The_username_exists=用户名已经存在
 
 1.4.启动类
 
-```
+```java
 import com.litongjava.hotswap.wrapper.tio.boot.TioApplicationWrapper;
 import com.litongjava.jfinal.aop.annotation.AComponentScan;
 
@@ -211,7 +211,7 @@ public class MaLiangPenAiServerApp {
 
 1.5.连接 mysql
 
-```
+```java
 package com.enoleap.manglang.pen.api.server.config;
 
 import javax.sql.DataSource;
@@ -285,7 +285,7 @@ public class TableToJsonConfig {
 
 1.6.连接 reids
 
-```
+```java
 import com.litongjava.jfinal.aop.annotation.AConfiguration;
 import com.litongjava.jfinal.aop.annotation.AInitialization;
 import com.litongjava.jfinal.plugin.redis.Cache;
@@ -351,7 +351,7 @@ public class UserRegisterVO {
 
 1.7.2.UserRegisterController
 
-```
+```java
 import com.litongjava.jfinal.aop.annotation.AAutowired;
 import com.litongjava.tio.http.server.annotation.RequestPath;
 import com.litongjava.tio.utils.resp.RespVo;
@@ -379,7 +379,7 @@ public class UserRegisterController {
 
 1.7.3.UserRegisteValidator
 
-```
+```java
 package com.enoleap.manglang.pen.api.server.validator;
 
 import com.enoleap.manglang.pen.api.server.model.UserRegisterVO;
@@ -468,7 +468,7 @@ public class UserRegisteValidator {
 
 1.7.4.SysUserInfoService
 
-```
+```java
 import com.litongjava.jfinal.plugin.activerecord.Db;
 
 public class SysUserInfoService {
@@ -492,7 +492,7 @@ public class SysUserInfoService {
 
 1.7.5.UserRegisterService
 
-```
+```java
 import com.litongjava.jfinal.plugin.activerecord.Db;
 import com.litongjava.tio.utils.resp.RespVo;
 
@@ -544,7 +544,7 @@ public class UserRegisterService {
 1.8.单元测试注册
 1.8.1.TioBootTest
 
-```
+```java
 import java.util.List;
 
 import com.litongjava.jfinal.aop.Aop;
@@ -572,7 +572,7 @@ public class TioBootTest {
 
 1.8.2.SysUserInfoServiceTest
 
-```
+```java
 import org.junit.Before;
 import org.junit.Test;
 import com.litongjava.jfinal.aop.Aop;
@@ -596,7 +596,7 @@ public class SysUserInfoServiceTest {
 
 1.8.3.UserRegisterServiceTest
 
-```
+```java
 import org.junit.Before;
 import org.junit.Test;
 import com.litongjava.tio.utils.resp.RespVo;
@@ -625,7 +625,7 @@ public class UserRegisterServiceTest {
 
 1.8.4.UserRegisteValidatorTest
 
-```
+```java
 import org.junit.Test;
 
 import com.jfinal.kit.StrKit;
@@ -660,7 +660,7 @@ public class UserRegisteValidatorTest {
 1.9.整合 sa-token
 1.9.1.SaTokenConfiguration
 
-```
+```java
 // 导入必要的类和注解
 import com.litongjava.jfinal.aop.annotation.AConfiguration;
 import com.litongjava.jfinal.aop.annotation.AInitialization;
@@ -708,7 +708,7 @@ public class SaTokenConfiguration {
 
 1.9.2.InterceptorConfiguration
 
-```
+```java
 // 导入必要的类和注解
 import com.litongjava.jfinal.aop.annotation.AConfiguration;
 import com.litongjava.jfinal.aop.annotation.AInitialization;
@@ -737,7 +737,7 @@ public class InterceptorConfiguration {
 1.10.登录
 1.10.1.AuthController
 
-```
+```java
 import java.util.HashMap;
 import java.util.Map;
 
@@ -799,7 +799,7 @@ public class AuthController {
 
 1.10.2.AuthValidator
 
-```
+```java
 import com.jfinal.kit.StrKit;
 import com.litongjava.tio.boot.i18n.I18n;
 import com.litongjava.tio.boot.i18n.I18nLocale;
@@ -831,7 +831,7 @@ public class AuthValidator {
 
 1.10.3.AuthService
 
-```
+```java
 import com.litongjava.jfinal.plugin.activerecord.Db;
 import com.litongjava.tio.utils.resp.RespVo;
 
@@ -856,7 +856,7 @@ public class AuthService {
 1.11.发送请求测试
 1.11.1.注册
 
-```
+```shell
 curl --location --request POST 'http://localhost:9204/pen-api/user/register' \
 --header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \
 --header 'Accept: */*' \
@@ -874,7 +874,7 @@ curl --location --request POST 'http://localhost:9204/pen-api/user/register' \
 
 1.11.2.登录
 
-```
+```shell
 curl --location --request POST 'http://localhost:9204/pen-api/auth/doLogin' \
 --header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \
 --header 'Accept: */*' \
@@ -889,15 +889,15 @@ curl --location --request POST 'http://localhost:9204/pen-api/auth/doLogin' \
 响应头中保护 token
 响应体如下
 
-```
+```json
 {
-    "ok": true
+  "ok": true
 }
 ```
 
 1.11.3.验证 token 是否有效
 
-```
+```shell
 curl --location --request GET 'http://localhost:9204/pen-api/auth/validateToken' \
 --header 'token: 4eb6ac726a7d4f42bb10fe365823f9f7' \
 --header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \
@@ -908,7 +908,7 @@ curl --location --request GET 'http://localhost:9204/pen-api/auth/validateToken'
 
 1.11.4.获取用户 id
 
-```
+```shell
 curl --location --request GET 'http://localhost:9204/pen-api/auth/getUserId' \
 --header 'token: 4eb6ac726a7d4f42bb10fe365823f9f7' \
 --header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \
@@ -917,20 +917,20 @@ curl --location --request GET 'http://localhost:9204/pen-api/auth/getUserId' \
 --header 'Connection: keep-alive'
 ```
 
-```
+```json
 {
-    "data": {
-        "tokenTimeout": 2591819,
-        "userId": "35",
-        "token": "4eb6ac726a7d4f42bb10fe365823f9f7"
-    },
-    "ok": true
+  "data": {
+    "tokenTimeout": 2591819,
+    "userId": "35",
+    "token": "4eb6ac726a7d4f42bb10fe365823f9f7"
+  },
+  "ok": true
 }
 ```
 
 1.11.5.登出
 
-```
+```shell
 curl --location --request GET 'http://localhost:9204/pen-api/auth/logout' \
 --header 'token: 4eb6ac726a7d4f42bb10fe365823f9f7' \
 --header 'User-Agent: Apifox/1.0.0 (https://apifox.com)' \