From cc8dd0a83274fddedc10312b61eedc6f99302fb4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Mar 2023 17:28:14 +0000
Subject: [PATCH 001/129] Bump dubbo from 2.7.18 to 2.7.21 in
 /sa-token-dependencies

Bumps [dubbo](https://github.com/apache/dubbo) from 2.7.18 to 2.7.21.
- [Release notes](https://github.com/apache/dubbo/releases)
- [Changelog](https://github.com/apache/dubbo/blob/3.2/CHANGES.md)
- [Commits](https://github.com/apache/dubbo/compare/dubbo-2.7.18...dubbo-2.7.21)

---
updated-dependencies:
- dependency-name: org.apache.dubbo:dubbo
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 sa-token-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 63c7f8f2..68ee338c 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -29,7 +29,7 @@
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
 		<commons-pool2.version>2.5.0</commons-pool2.version>
-		<dubbo.version>2.7.18</dubbo.version>
+		<dubbo.version>2.7.21</dubbo.version>
 		<grpc-spring-boot-starter.version>2.10.1.RELEASE</grpc-spring-boot-starter.version>
 		<hutool-jwt.version>5.8.9</hutool-jwt.version>
 		<jjwt.version>0.9.1</jjwt.version>

From 653598276147f80c0a26f84b1a5da2239109efe3 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 26 Apr 2023 02:09:41 +0800
Subject: [PATCH 002/129] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=8F=8B=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pj/SaTokenSpringBoot3Application.java |  3 +--
 sa-token-doc/index.html                       | 24 ++++++++++++-------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java
index 6562ba2d..5b6809d5 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java
@@ -1,10 +1,9 @@
 package com.pj;
 
+import cn.dev33.satoken.SaManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import cn.dev33.satoken.SaManager;
-
 /**
  * Sa-Token 整合 SpringBoot3 示例，整合redis  
  * @author kong
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index 1acb755b..ec8de3e0 100644
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -180,6 +180,15 @@
 					<div class="s-fenge"></div>
 					<h2 class="s-title">优秀开源集成案例</h2>
 					<div class="feature-box s-case-box">
+						<!-- Snowy  5.5k -->
+						<div class="s-case">
+							<a href="https://gitee.com/xiaonuobase/snowy" target="_blank" class="s-case-link">
+								<img src="https://oss.dev33.cn/sa-token/case/case--snowy.png">
+							</a>
+							<h3 class="s-case-title">Snowy</h3>
+							<span class="s-author"> 小诺开源技术 </span>
+							<p class="s-case-intro">国内首个国密前后分离快速开发平台，基于Vue3、Antdv、SaToken</p>
+						</div>
 						<!-- SpringBoot_v2  5.3k -->
 						<div class="s-case">
 							<a href="https://gitee.com/bdj/SpringBoot_v2" target="_blank" class="s-case-link">
@@ -189,15 +198,6 @@
 							<span class="s-author">开源oschina</span>
 							<p class="s-case-intro">努力打造 springboot 框架的极致细腻的脚手架，原生纯净。</p>
 						</div>
-						<!-- Snowy  5.1k -->
-						<div class="s-case">
-							<a href="https://gitee.com/xiaonuobase/snowy" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--snowy.png">
-							</a>
-							<h3 class="s-case-title">Snowy</h3>
-							<span class="s-author"> 小诺开源技术 </span>
-							<p class="s-case-intro">国内首个国密前后分离快速开发平台，基于Vue3、Antdv、SaToken</p>
-						</div>
 						<!-- RuoYi-Vue-Plus  4.1k -->
 						<div class="s-case">
 							<a href="https://gitee.com/dromara/RuoYi-Vue-Plus" target="_blank" class="s-case-link">
@@ -352,6 +352,9 @@
 						<a href="http://www.chually.cn/" target="_blank" title="湖北楚商联盟金融信息服务有限公司">
 							<img src="https://oss.dev33.cn/sa-token/com/chushangjinfu.png">
 						</a>
+						<a href="https://www.zhongyuankeji.cn/" target="_blank" title="山东众远信息科技有限公司">
+							<img src="https://oss.dev33.cn/sa-token/com/zhongyuankeji.png">
+						</a>
 					</div>
 					<div style="height: 10px; clear: both;"></div>
 					<p>
@@ -546,6 +549,9 @@
 						<a href="http://solon.noear.org/" target="_blank">
 							<img src="https://oss.dev33.cn/sa-token/link/solon.png" msg="一个更现代感的应用开发框架：更快、更小、更自由。">
 						</a>
+						<a href="https://gitee.com/gz-yami/mall4j" target="_blank">
+							<img src="https://oss.dev33.cn/sa-token/link/mall4j.png" msg="一个基于Spring Boot 3 JDK17的商城系统。">
+						</a>
 					</div>
 					<div style="height: 10px; clear: both;"></div>
 				</div>

From fe52b05d8888e6592fa1ecd0b48410d1fb6ee55d Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 26 Apr 2023 12:52:56 +0800
Subject: [PATCH 003/129] =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=9E=E5=8A=A0=E6=87=92=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/index.html                      | 223 +++++++++--------
 sa-token-doc/plugin/jwt-extend.md            |   4 +-
 sa-token-doc/static/index.css                |   4 +-
 sa-token-doc/static/jquery.lazyload-1.9.3.js | 242 +++++++++++++++++++
 4 files changed, 368 insertions(+), 105 deletions(-)
 create mode 100644 sa-token-doc/static/jquery.lazyload-1.9.3.js

diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index ec8de3e0..512a9913 100644
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -113,14 +113,13 @@
 						<!-- <a href="https://gitee.com/dromara/sa-token" target="_blank">集成案例</a> -->
 					</div>
 					<h4 align="center" class="badge-box">
-						<a href="https://gitee.com/dromara/sa-token/stargazers"><img src="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>
-						<a href="https://gitee.com/dromara/sa-token/members"><img src="https://gitee.com/dromara/sa-token/badge/fork.svg?theme=gvp"></a>
-						<!-- <br><br> -->
-						<a href="https://github.com/dromara/sa-token/stargazers"><img src="https://img.shields.io/github/stars/dromara/sa-token?style=flat-square&logo=GitHub"></a>
-						<a href="https://github.com/dromara/sa-token/network/members"><img src="https://img.shields.io/github/forks/dromara/sa-token?style=flat-square&logo=GitHub"></a>
-						<a href="https://github.com/dromara/sa-token/watchers"><img src="https://img.shields.io/github/watchers/dromara/sa-token?style=flat-square&logo=GitHub"></a>
-						<a href="https://github.com/dromara/sa-token/issues"><img src="https://img.shields.io/github/issues/dromara/sa-token.svg?style=flat-square&logo=GitHub"></a>
-						<a href="https://github.com/dromara/sa-token/blob/master/LICENSE"><img src="https://img.shields.io/github/license/dromara/sa-token.svg?style=flat-square"></a>
+						<a href="https://gitee.com/dromara/sa-token/stargazers"><img class="lazy" data-original="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>
+						<a href="https://gitee.com/dromara/sa-token/members"><img class="lazy" data-original="https://gitee.com/dromara/sa-token/badge/fork.svg?theme=gvp"></a>
+						<a href="https://github.com/dromara/sa-token/stargazers"><img class="lazy" data-original="https://img.shields.io/github/stars/dromara/sa-token?style=flat-square&logo=GitHub"></a>
+						<a href="https://github.com/dromara/sa-token/network/members"><img class="lazy" data-original="https://img.shields.io/github/forks/dromara/sa-token?style=flat-square&logo=GitHub"></a>
+						<a href="https://github.com/dromara/sa-token/watchers"><img class="lazy" data-original="https://img.shields.io/github/watchers/dromara/sa-token?style=flat-square&logo=GitHub"></a>
+						<a href="https://github.com/dromara/sa-token/issues"><img class="lazy" data-original="https://img.shields.io/github/issues/dromara/sa-token.svg?style=flat-square&logo=GitHub"></a>
+						<a href="https://github.com/dromara/sa-token/blob/master/LICENSE"><img class="lazy" data-original="https://img.shields.io/github/license/dromara/sa-token.svg?style=flat-square"></a>
 					</h4>
 				</div>
 			</div>
@@ -183,7 +182,7 @@
 						<!-- Snowy  5.5k -->
 						<div class="s-case">
 							<a href="https://gitee.com/xiaonuobase/snowy" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--snowy.png">
+								<img class="lazy" data-original="https://oss.dev33.cn/sa-token/case/case--snowy.png">
 							</a>
 							<h3 class="s-case-title">Snowy</h3>
 							<span class="s-author"> 小诺开源技术 </span>
@@ -192,7 +191,7 @@
 						<!-- SpringBoot_v2  5.3k -->
 						<div class="s-case">
 							<a href="https://gitee.com/bdj/SpringBoot_v2" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--springboot_v2.png">
+								<img class="lazy" data-original="https://oss.dev33.cn/sa-token/case/case--springboot_v2.png">
 							</a>
 							<h3 class="s-case-title">SpringBoot_v2</h3>
 							<span class="s-author">开源oschina</span>
@@ -201,7 +200,7 @@
 						<!-- RuoYi-Vue-Plus  4.1k -->
 						<div class="s-case">
 							<a href="https://gitee.com/dromara/RuoYi-Vue-Plus" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--ruoyi-vue-plus.png">
+								<img class="lazy" data-original="https://oss.dev33.cn/sa-token/case/case--ruoyi-vue-plus.png">
 							</a>
 							<h3 class="s-case-title">RuoYi-Vue-Plus</h3>
 							<span class="s-author"> 疯狂的狮子Li </span>
@@ -210,7 +209,7 @@
 						<!-- RuoYi-Cloud-Plus  1.5K -->
 						<div class="s-case">
 							<a href="https://gitee.com/dromara/RuoYi-Cloud-Plus" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--ruoyi-cloud-plus.png">
+								<img class="lazy" data-original="https://oss.dev33.cn/sa-token/case/case--ruoyi-cloud-plus.png">
 							</a>
 							<h3 class="s-case-title">RuoYi-Cloud-Plus</h3>
 							<span class="s-author"> 疯狂的狮子Li </span>
@@ -219,7 +218,7 @@
 						<!-- Sa-Plus  1K -->
 						<div class="s-case">
 							<a href="https://gitee.com/click33/sa-plus" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--sa-plus.png">
+								<img class="lazy" data-original="https://oss.dev33.cn/sa-token/case/case--sa-plus.png">
 							</a>
 							<h3 class="s-case-title">Sa-Plus</h3>
 							<span class="s-author"> 孔明 </span>
@@ -228,7 +227,7 @@
 						<!-- EasyAdmin  878 -->
 						<div class="s-case">
 							<a href="https://gitee.com/lakernote/easy-admin" target="_blank" class="s-case-link">
-								<img src="https://oss.dev33.cn/sa-token/case/case--easy-admin.png">
+								<img class="lazy" data-original="https://oss.dev33.cn/sa-token/case/case--easy-admin.png">
 							</a>
 							<h3 class="s-case-title">EasyAdmin</h3>
 							<span class="s-author"> laker </span>
@@ -254,106 +253,106 @@
 					<h2 class="s-title">正在使用 Sa-Token 的企业 / 机构</h2>
 					<div class="com-box">
 						<a href="http://yun94.cn/" target="_blank" title="济南凉云网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/liangyunwangluo.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/liangyunwangluo.png">
 						</a>
 						<!-- <a href="http://www.jmwl51.com/" target="_blank" title="济南极梦网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/jimengwangluo.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/jimengwangluo.png">
 						</a> -->
 						<!-- <a href="https://www.suancheng.co/" target="_blank" title="山东酸橙网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/suanchengdudu.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/suanchengdudu.png">
 						</a> -->
 						<a href="https://chykj.com/" target="_blank" title="山东察远信息科技有限公司">
-							<img src="https://chykj.com/upload/1/cms/content/cylogoc.jpg">
+							<img class="lazy" data-original="https://chykj.com/upload/1/cms/content/cylogoc.jpg">
 						</a>
 						<a href="https://ms.airsr.com/" target="_blank" title="北京天衢航空服务有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/tianquhangkong.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/tianquhangkong.png">
 						</a>
 						<a href="###" title="货好多科技">
-							<img src="https://oss.dev33.cn/sa-token/com/huohaoduo.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/huohaoduo.png">
 						</a>
 						<a href="http://www.jmwl51.com/" target="_blank" title="济南极梦网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/jimeng.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/jimeng.png">
 						</a>
 						<a href="https://uniadmin.jiangruyi.com/" target="_blank" title="南京星意信息科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/uniadmin.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/uniadmin.png">
 						</a>
 						<a href="http://www.tuodan.tech/" target="_blank" title="深圳加速脱单科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/tuodan.jpeg">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/tuodan.jpeg">
 						</a>
 						<a href="https://www.yangxuwang.com/" target="_blank" title="上海阳旭网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/shouxin.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/shouxin.png">
 						</a>
 						<a href="https://www.ec-sudo.com/" target="_blank" title="深圳数独科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/shudukeji.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/shudukeji.png">
 						</a>
 						<a href="https://budwk.com/" target="_blank" title="BudWk 开发框架 V7.x">
-							<img src="https://oss.dev33.cn/sa-token/com/budwk.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/budwk.png">
 						</a>
 						<a href="https://www.quandashi.com/" target="_blank" title="北京梦知网科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/quandashi.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/quandashi.png">
 						</a>
 						<a href="http://www.gree.com.cn/" target="_blank" title="珠海格力电器股份有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/geli.jpeg">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/geli.jpeg">
 						</a>
 						<a href="http://www.dchealth.com/" target="_blank" title="神州医疗">
-							<img src="https://oss.dev33.cn/sa-token/com/shenzhouyiliao.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/shenzhouyiliao.png">
 						</a>
 						<a href="javascript:;" title="暖通管家">
-							<img src="https://oss.dev33.cn/sa-token/com/nuantong.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/nuantong.png">
 						</a>
 						<a href="https://www.quoting.cn/" target="_blank" title="引止">
-							<img src="https://oss.dev33.cn/sa-token/com/yinzhi.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/yinzhi.png">
 						</a>
 						<a href="http://www.dzlanke.cn/" target="_blank" title="德州蓝客网络科技">
-							<img src="https://oss.dev33.cn/sa-token/com/dezhoulanke.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/dezhoulanke.png">
 						</a>
 						<a href="http://www.turingoal.com" target="_blank" title="图灵谷（北京）科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/tulinggu.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/tulinggu.png">
 						</a>
 						<a href="javascript:;" title="辽宁薪达网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/taipingyangcanyin.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/taipingyangcanyin.png">
 						</a>
 						<a href="https://www.pactera.com/?renqun_youhua=2483561&bd_vid=9062916023494825120" target="_blank" title="中电文思海辉">
-							<img src="https://oss.dev33.cn/sa-token/com/zhongdianwensi-logo.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/zhongdianwensi-logo.png">
 						</a>
 						<a href="https://tisiqikeji.com/" target="_blank" title="吉林省体思奇健康科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/tisiqi.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/tisiqi.png">
 						</a>
 						<a href="http://www.qaqavr.com/" target="_blank" title="合肥中锐智能科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/hefeizhongrui2.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/hefeizhongrui2.png">
 						</a>
 						<a href="https://www.hstong.com/" target="_blank" title="价值网络">
-							<img src="https://oss.dev33.cn/sa-token/com/huashengtong.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/huashengtong.png">
 						</a>
 						<a href="https://www.shylsoft.com/" target="_blank" title="上海营联信息技术有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/yinglian.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/yinglian.png">
 						</a>
 						<a href="http://www.sxpartner.com/" target="_blank" title="陕西小伙伴网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/cptc.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/cptc.png">
 						</a>
 						<!-- <a href="https://gitee.com/fhs-opensource/fhs-framework" target="_blank" title="FHS 快速开发平台">
-							<img src="https://oss.dev33.cn/sa-token/com/fhs.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/fhs.png">
 						</a> -->
 						<a href="http://www.hmnst.com/index.html" target="_blank" title="微纳感知（合肥）技术有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/weinaganzhi.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/weinaganzhi.png">
 						</a>
 						<a href="https://www.aegis-info.com/" target="_blank" title="北京擎盾信息科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/beijingqingdun.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/beijingqingdun.png">
 						</a>
 						<a href="https://www.geostar.com.cn/" target="_blank" title="吉奥时空">
-							<img src="https://oss.dev33.cn/sa-token/com/jieaoshikong.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/jieaoshikong.png">
 						</a>
 						<a href="http://www.stbella.cn/" target="_blank" title="贝康国际">
-							<img src="https://oss.dev33.cn/sa-token/com/beikangguoji.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/beikangguoji.png">
 						</a>
 						<a href="https://mimirii.com/" target="_blank" title="西安米默网络科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/mimokeji.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/mimokeji.png">
 						</a>
 						<a href="http://www.chually.cn/" target="_blank" title="湖北楚商联盟金融信息服务有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/chushangjinfu.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/chushangjinfu.png">
 						</a>
 						<a href="https://www.zhongyuankeji.cn/" target="_blank" title="山东众远信息科技有限公司">
-							<img src="https://oss.dev33.cn/sa-token/com/zhongyuankeji.png">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/zhongyuankeji.png">
 						</a>
 					</div>
 					<div style="height: 10px; clear: both;"></div>
@@ -377,130 +376,130 @@
 					</h2>
 					<div class="com-box com-box-you">
 						<a href="https://gitee.com/dromara/TLog" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/tlog.png" msg="一个轻量级的分布式日志标记追踪神器，10分钟即可接入，自动对日志打标签完成微服务的链路追踪">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/tlog.png" msg="一个轻量级的分布式日志标记追踪神器，10分钟即可接入，自动对日志打标签完成微服务的链路追踪">
 						</a>
 						<a href="https://gitee.com/dromara/liteFlow" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/liteflow.png" msg="轻量，快速，稳定，可编排的组件式流程引擎">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/liteflow.png" msg="轻量，快速，稳定，可编排的组件式流程引擎">
 						</a>
 						<a href="https://hutool.cn/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/hutool.jpg" msg="🍬小而全的Java工具类库，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/hutool.jpg" msg="🍬小而全的Java工具类库，使Java拥有函数式语言般的优雅，让Java语言也可以“甜甜的”。">
 						</a>
 						<a href="https://sa-token.cc/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/sa-token.png" msg="一个轻量级 java 权限认证框架，让鉴权变得简单、优雅！">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/sa-token.png" msg="一个轻量级 java 权限认证框架，让鉴权变得简单、优雅！">
 						</a>
 						<a href="https://gitee.com/dromara/hmily" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/hmily.png" msg="高性能一站式分布式事务解决方案。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/hmily.png" msg="高性能一站式分布式事务解决方案。">
 						</a>
 						<a href="https://gitee.com/dromara/Raincat" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/raincat.png" msg="强一致性分布式事务解决方案。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/raincat.png" msg="强一致性分布式事务解决方案。">
 						</a>
 						<a href="https://gitee.com/dromara/myth" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/myth.png" msg="可靠消息分布式事务解决方案。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/myth.png" msg="可靠消息分布式事务解决方案。">
 						</a>
 						<a href="https://cubic.jiagoujishu.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/cubic.png" msg="一站式问题定位平台，以agent的方式无侵入接入应用，完整集成arthas功能模块，致力于应用级监控，帮助开发人员快速定位问题">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/cubic.png" msg="一站式问题定位平台，以agent的方式无侵入接入应用，完整集成arthas功能模块，致力于应用级监控，帮助开发人员快速定位问题">
 						</a>
 						<a href="https://maxkey.top/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/maxkey.png" msg="业界领先的身份管理和认证产品">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/maxkey.png" msg="业界领先的身份管理和认证产品">
 						</a>
 						<a href="http://forest.dtflyx.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/forest-logo.png" msg="Forest能够帮助您使用更简单的方式编写Java的HTTP客户端" nf>
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/forest-logo.png" msg="Forest能够帮助您使用更简单的方式编写Java的HTTP客户端" nf>
 						</a>
 						<a href="https://jpom.top/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/jpom.png" msg="一款简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/jpom.png" msg="一款简而轻的低侵入式在线构建、自动部署、日常运维、项目监控软件">
 						</a>
 						<a href="https://su.usthe.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/sureness.png" msg="面向 REST API 的高性能认证鉴权框架">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/sureness.png" msg="面向 REST API 的高性能认证鉴权框架">
 						</a>
 						<a href="https://easy-es.cn/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/easy-es2.png" msg="🚀傻瓜级ElasticSearch搜索引擎ORM框架">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/easy-es2.png" msg="🚀傻瓜级ElasticSearch搜索引擎ORM框架">
 						</a>
 						<a href="https://gitee.com/dromara/northstar" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/northstar_logo.png" msg="Northstar盈富量化交易平台">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/northstar_logo.png" msg="Northstar盈富量化交易平台">
 						</a>
 						<a href="https://hertzbeat.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/hertzbeat-brand.svg" msg="易用友好的云监控系统">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/hertzbeat-brand.svg" msg="易用友好的云监控系统">
 						</a>
 						<a href="https://dromara.gitee.io/fast-request/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/fast-request.gif" msg="Idea 版 Postman，为简化调试API而生">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/fast-request.gif" msg="Idea 版 Postman，为简化调试API而生">
 						</a>
 						<a href="https://www.jeesuite.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/mendmix.png" msg="开源分布式云原生架构一站式解决方案">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/mendmix.png" msg="开源分布式云原生架构一站式解决方案">
 						</a>
 						<a href="https://gitee.com/dromara/koalas-rpc" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/koalas-rpc2.png" msg="企业生产级百亿日PV高可用可拓展的RPC框架。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/koalas-rpc2.png" msg="企业生产级百亿日PV高可用可拓展的RPC框架。">
 						</a>
 						<a href="https://async.sizegang.cn/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/gobrs-async.png" msg="🔥 配置极简功能强大的异步任务动态编排框架">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/gobrs-async.png" msg="🔥 配置极简功能强大的异步任务动态编排框架">
 						</a>
 						<a href="https://dynamictp.cn/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/dynamic-tp.png" msg="🔥🔥🔥 基于配置中心的轻量级动态可监控线程池">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/dynamic-tp.png" msg="🔥🔥🔥 基于配置中心的轻量级动态可监控线程池">
 						</a>
 						<a href="https://www.x-easypdf.cn" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/x-easypdf.png" msg="一个用搭积木的方式构建pdf的框架（基于pdfbox）">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/x-easypdf.png" msg="一个用搭积木的方式构建pdf的框架（基于pdfbox）">
 						</a>
 						<a href="http://dromara.gitee.io/image-combiner" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/image-combiner.png" msg="一个专门用于图片合成的工具，没有很复杂的功能，简单实用，却不失强大">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/image-combiner.png" msg="一个专门用于图片合成的工具，没有很复杂的功能，简单实用，却不失强大">
 						</a>
 						<a href="https://www.herodotus.cn/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/dante-cloud2.png" msg="Dante-Cloud 是一款企业级微服务架构和服务能力开发平台。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/dante-cloud2.png" msg="Dante-Cloud 是一款企业级微服务架构和服务能力开发平台。">
 						</a>
 						<a href="http://www.mtruning.club" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/go-view.png" msg="低代码数据可视化开发平台">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/go-view.png" msg="低代码数据可视化开发平台">
 						</a>
 						<a href="https://tangyh.top/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/lamp-cloud.png" msg="微服务中后台快速开发平台，支持租户(SaaS)模式、非租户模式">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/lamp-cloud.png" msg="微服务中后台快速开发平台，支持租户(SaaS)模式、非租户模式">
 						</a>
 						<a href="https://www.redisfront.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/redis-front.png" msg="RedisFront 是一款开源免费的跨平台 Redis 桌面客户端工具, 支持单机模式, 集群模式, 哨兵模式以及 SSH 隧道连接, 可轻松管理Redis缓存数据.">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/redis-front.png" msg="RedisFront 是一款开源免费的跨平台 Redis 桌面客户端工具, 支持单机模式, 集群模式, 哨兵模式以及 SSH 隧道连接, 可轻松管理Redis缓存数据.">
 						</a>
 						<a href="https://www.yuque.com/u34495/mivcfg" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/electron-egg.png" msg="一个入门简单、跨平台、企业级桌面软件开发框架">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/electron-egg.png" msg="一个入门简单、跨平台、企业级桌面软件开发框架">
 						</a>
 						<a href="https://gitee.com/dromara/open-capacity-platform" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/open-capacity-platform.jpg" msg="简称ocp是基于Spring Cloud的企业级微服务框架(用户权限管理，配置中心管理，应用管理，....)">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/open-capacity-platform.jpg" msg="简称ocp是基于Spring Cloud的企业级微服务框架(用户权限管理，配置中心管理，应用管理，....)">
 						</a>
 						<a href="http://easy-trans.fhs-opensource.top/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/easy_trans.png" msg="Easy-Trans 一个注解搞定数据翻译,减少30%SQL代码量">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/easy_trans.png" msg="Easy-Trans 一个注解搞定数据翻译,减少30%SQL代码量">
 						</a>
 						<a href="https://gitee.com/dromara/neutrino-proxy" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/neutrino-proxy.svg" msg="一款基于 Netty 的、开源的内网穿透神器。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/neutrino-proxy.svg" msg="一款基于 Netty 的、开源的内网穿透神器。">
 						</a>
 						<a href="https://chatgpt.cn.obiscr.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/chatgpt.png" msg="一个支持在 JetBrains 系列 IDE 上运行的 ChatGPT 的插件。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/chatgpt.png" msg="一个支持在 JetBrains 系列 IDE 上运行的 ChatGPT 的插件。">
 						</a>
 						<a href="https://gitee.com/dromara/zyplayer-doc" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/zyplayer-doc.png" msg="zyplayer-doc是一款适合团队和个人使用的WIKI文档管理工具，同时还包含数据库文档、Api接口文档。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/zyplayer-doc.png" msg="zyplayer-doc是一款适合团队和个人使用的WIKI文档管理工具，同时还包含数据库文档、Api接口文档。">
 						</a>
 						<a href="https://gitee.com/dromara/payment-spring-boot" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/payment-spring-boot.png" msg="最全最好用的微信支付V3 Spring Boot 组件。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/payment-spring-boot.png" msg="最全最好用的微信支付V3 Spring Boot 组件。">
 						</a>
 						<a href="https://www.j2eefast.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/j2eefast.png" msg="J2eeFAST 是一个致力于中小企业 Java EE 企业级快速开发平台,我们永久开源!">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/j2eefast.png" msg="J2eeFAST 是一个致力于中小企业 Java EE 企业级快速开发平台,我们永久开源!">
 						</a>
 						<a href="https://gitee.com/dromara/data-compare" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/dataCompare.png" msg="数据库比对工具：hive 表数据比对，mysql、Doris 数据比对，实现自动化配置进行数据比对，避免频繁写sql 进行处理，低代码(Low-Code) 平台">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/dataCompare.png" msg="数据库比对工具：hive 表数据比对，mysql、Doris 数据比对，实现自动化配置进行数据比对，避免频繁写sql 进行处理，低代码(Low-Code) 平台">
 						</a>
 						<a href="https://gitee.com/dromara/open-giteye-api" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/open-giteye-api.svg" msg="giteye.net 是专为开源作者设计的数据图表服务工具类站点，提供了包括 Star 趋势图、贡献者列表、Gitee指数等数据图表服务。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/open-giteye-api.svg" msg="giteye.net 是专为开源作者设计的数据图表服务工具类站点，提供了包括 Star 趋势图、贡献者列表、Gitee指数等数据图表服务。">
 						</a>
 						<a href="https://gitee.com/dromara/RuoYi-Vue-Plus" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/RuoYi-Vue-Plus.png" msg="后台管理系统 重写 RuoYi-Vue 所有功能 集成 Sa-Token + Mybatis-Plus + Jackson + Xxl-Job + SpringDoc + Hutool + OSS 定期同步">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/RuoYi-Vue-Plus.png" msg="后台管理系统 重写 RuoYi-Vue 所有功能 集成 Sa-Token + Mybatis-Plus + Jackson + Xxl-Job + SpringDoc + Hutool + OSS 定期同步">
 						</a>
 						<a href="https://gitee.com/dromara/RuoYi-Cloud-Plus" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/RuoYi-Cloud-Plus.png" msg="微服务管理系统 重写RuoYi-Cloud所有功能 整合 SpringCloudAlibaba Dubbo3.0 Sa-Token Mybatis-Plus MQ OSS ES Xxl-Job Docker 全方位升级 定期同步">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/RuoYi-Cloud-Plus.png" msg="微服务管理系统 重写RuoYi-Cloud所有功能 整合 SpringCloudAlibaba Dubbo3.0 Sa-Token Mybatis-Plus MQ OSS ES Xxl-Job Docker 全方位升级 定期同步">
 						</a>
 						<a href="https://gitee.com/dromara/stream-query" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/stream-query.png" msg="允许完全摆脱 Mapper 的 mybatis-plus 体验！封装 stream 和 lambda 操作进行数据返回处理。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/stream-query.png" msg="允许完全摆脱 Mapper 的 mybatis-plus 体验！封装 stream 和 lambda 操作进行数据返回处理。">
 						</a>
 						<a href="https://wind.kim/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/sms4j.png" msg="短信聚合工具，让发送短信变的更简单。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/sms4j.png" msg="短信聚合工具，让发送短信变的更简单。">
 						</a> 
 						<a href="https://cloudeon.top/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/cloudeon.png" msg="简化kubernetes上大数据集群的运维管理">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/cloudeon.png" msg="简化kubernetes上大数据集群的运维管理">
 						</a> 
 						<a href="https://dromara.org/zh/projects/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/dromara.png" msg="让每一位开源爱好者，体会到开源的快乐。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/dromara.png" msg="让每一位开源爱好者，体会到开源的快乐。">
 						</a> 
 					</div>
 					<div style="height: 10px; clear: both;"></div>
@@ -509,7 +508,7 @@
 					</p>
 					<div style=" margin: 40px 14px 0; padding: 20px 0 10px; background-color: #f4f5f7;">
 						<h3 style="padding: 0px 0 10px; ">Dromara 知识星球</h3>
-						<img src="https://oss.dev33.cn/sa-token/dromara-xingqiu--sa-token.jpg" style="width: 300px;">
+						<img class="lazy" data-original="https://oss.dev33.cn/sa-token/dromara-xingqiu--sa-token.jpg" style="width: 300px;">
 					</div>
 				</div>
 				<div style="height: 30px;"></div>
@@ -523,34 +522,34 @@
 					<h2 class="s-title">友情链接</h2>
 					<div class="com-box com-box-you">
 						<a href="https://okhttps.ejlchina.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/okhttps.png" msg="如艺术一般优雅，像 1、2、3 一样简单，前后端通用，轻量却强大的 HTTP 客户端（同时支持 WebSocket 以及 Stomp 协议）">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/okhttps.png" msg="如艺术一般优雅，像 1、2、3 一样简单，前后端通用，轻量却强大的 HTTP 客户端（同时支持 WebSocket 以及 Stomp 协议）">
 						</a>
 						<a href="https://searcher.ejlchina.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/bean-searcher.png" msg="轻量级关系数据库条件检索引擎，使一行代码实现复杂列表检索成为可能！">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/bean-searcher.png" msg="轻量级关系数据库条件检索引擎，使一行代码实现复杂列表检索成为可能！">
 						</a>
 						<a href="https://xiaonuo.vip/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/xiaonuo2.png" msg="通用型后台权限管理框架，紧随潮流、开箱即用, 同时拥有Vue、Layui、SpringCloud三个版本">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/xiaonuo2.png" msg="通用型后台权限管理框架，紧随潮流、开箱即用, 同时拥有Vue、Layui、SpringCloud三个版本">
 						</a>
 						<a href="http://www.pearadmin.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/pear-admin.png" msg="致 力 于 让 Web 开 发 变 得 简 单 优 雅">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/pear-admin.png" msg="致 力 于 让 Web 开 发 变 得 简 单 优 雅">
 						</a>
 						<a href="http://www.layui-vue.com/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/layui-vue.png" msg="layui - vue（谐音：类 UI) 是 一 套 Vue 3.0 的 桌 面 端 组 件 库.">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/layui-vue.png" msg="layui - vue（谐音：类 UI) 是 一 套 Vue 3.0 的 桌 面 端 组 件 库.">
 						</a>
 						<a href="https://shenyu.apache.org/zh/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/shenyu.svg" msg="一个异步的，高性能的，跨语言的，响应式的 API 网关。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/shenyu.svg" msg="一个异步的，高性能的，跨语言的，响应式的 API 网关。">
 						</a>
 						<a href="https://dwz.cn/L9hCwepg" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/com/yungouos.png" msg="官方直连支付系统解决方案，支持个人、个体户、企业全渠道签约。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/com/yungouos.png" msg="官方直连支付系统解决方案，支持个人、个体户、企业全渠道签约。">
 						</a>
 						<a href="https://hippo4j.cn/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/hippo4j.jpg" msg="强大的动态线程池框架，附带监控报警功能，支持 Tomcat、Jetty、Undertow、RocketMQ、Dubbo、RabbitMQ、Hystrix 消费线程池">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/hippo4j.jpg" msg="强大的动态线程池框架，附带监控报警功能，支持 Tomcat、Jetty、Undertow、RocketMQ、Dubbo、RabbitMQ、Hystrix 消费线程池">
 						</a>
 						<a href="http://solon.noear.org/" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/solon.png" msg="一个更现代感的应用开发框架：更快、更小、更自由。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/solon.png" msg="一个更现代感的应用开发框架：更快、更小、更自由。">
 						</a>
 						<a href="https://gitee.com/gz-yami/mall4j" target="_blank">
-							<img src="https://oss.dev33.cn/sa-token/link/mall4j.png" msg="一个基于Spring Boot 3 JDK17的商城系统。">
+							<img class="lazy" data-original="https://oss.dev33.cn/sa-token/link/mall4j.png" msg="一个基于Spring Boot 3 JDK17的商城系统。">
 						</a>
 					</div>
 					<div style="height: 10px; clear: both;"></div>
@@ -752,6 +751,28 @@
 			}
 			
 		</script>
+		
+		<!-- 图片懒加载 -->
+		<script src="static/jquery.lazyload-1.9.3.js"></script>
+		<script>
+			$(function() {
+				$("img.lazy").lazyload({
+					effect: "fadeIn",  // 动画，show=显示，fadeIn=淡入，slideDown=下拉
+					effectspeed: 1200,  // 动画持续时间
+					skip_invisible: true, // 不加载隐藏的图像
+					// threshold: -180,  // 提前加载：距离屏幕多少px时就显示出来
+					// event: 'click',  // 事件触发时才加载，scroll=滑动，click=点击，mouseover=鼠标划过，sporty=运动的
+					// 未加载时的占位图，此为3x3透明小图片
+					placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAADCAYAAABWKLW/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMTowMToyMiAyMjoxNDoxM63SwyUAAAANSURBVBhXYyAGMDAAAAAnAAF2ypRxAAAAAElFTkSuQmCC",
+					load: function(){
+						console.log('lazy img: ' + this.src);
+					}
+				});
+			})
+			// $(window).bind("load", function() {   
+			//   // var timeout = setTimeout(function() {$("img.lazy").trigger("sporty")}, 5000);   
+			// });  
+		</script>
 
 		<script type="text/javascript">
 			// 预览版提示 
diff --git a/sa-token-doc/plugin/jwt-extend.md b/sa-token-doc/plugin/jwt-extend.md
index 4897b337..d5b17e50 100644
--- a/sa-token-doc/plugin/jwt-extend.md
+++ b/sa-token-doc/plugin/jwt-extend.md
@@ -25,9 +25,9 @@ implementation 'cn.dev33:sa-token-jwt:${sa.top.version}'
 <!---------------------------- tabs:end ---------------------------->
 
 
-> 注意: sa-token-jwt 显式依赖 hutool-jwt 5.7.14 版本，意味着：你的项目中要么不引入 Hutool，要么引入版本 >= 5.7.14 的 Hutool 版本
+> 1. 注意: sa-token-jwt 显式依赖 hutool-jwt 5.7.14 版本，保险起见：你的项目中要么不引入 hutool，要么引入版本 >= 5.7.14 的 hutool 版本。
+> 2. hutool 5.8.13 和 5.8.14 版本下会出现类型转换问题，[关联issue](https://gitee.com/dromara/sa-token/issues/I6L429)。
 
-> hutool 5.8.13 和 5.8.14 禁止使用, [关联issue](https://gitee.com/dromara/sa-token/issues/I6L429)
 
 ### 2、配置秘钥
 在 `application.yml` 配置文件中配置 jwt 生成秘钥：
diff --git a/sa-token-doc/static/index.css b/sa-token-doc/static/index.css
index aef3b57d..0508ceb8 100644
--- a/sa-token-doc/static/index.css
+++ b/sa-token-doc/static/index.css
@@ -109,7 +109,6 @@ body{font-size: 16px; color: #34495E; font-family: "Source Sans Pro","Helvetica
 .s-case{position: relative; transition: all 0.2s; background-color: #FFF;}
 .s-case-link{display: block; width: 100%; height: 0px; padding-bottom: 50%; position: relative; overflow: hidden;}
 .s-case-link img{width: 100%; height: 100%; object-fit: cover; object-position: center; position: absolute;}
-.s-case-link img{transition: all 0.3s;}
 .s-case-title,.s-case-intro{padding: 0 16px;}
 .s-case-title{margin-top: 20px; font-size: 18px; font-weight: 400; color: #333; font-family: "microsoft yahei";}
 .s-case-intro{margin-top: 15px; font-size: 14px; line-height: 20px; color: #777; word-break:break-all;}
@@ -120,6 +119,7 @@ body{font-size: 16px; color: #34495E; font-family: "Source Sans Pro","Helvetica
 /* 悬浮动画 */
 .s-case:hover{box-shadow: 0 0 20px #ccc;}
 .s-case:hover img{transform: scale(1.3, 1.3); }
+.s-case-link img{transition: transform 0.3s;}
 .s-case img:hover{cursor: pointer;}
 .s-case:hover .s-case-link:after {background-color: rgba(0, 0, 0, .35); color: #FFF;}
 .s-case .s-case-link:after {
@@ -144,7 +144,7 @@ body{font-size: 16px; color: #34495E; font-family: "Source Sans Pro","Helvetica
 .com-box{display: flex; flex-wrap: wrap; width: 100%; margin-bottom: 50px; justify-content: flex-start;}
 .com-box a{display: block; flex: 0 0 13%; margin: 5px; cursor: pointer; border: 0px #ddd solid;}
 .com-box a{line-height: 75px;}
-.com-box a img{transition: all 0.2s; vertical-align: middle; min-width: 60%; max-width: 100%; max-height: 100%;}
+.com-box a img{transition: transform 0.2s; vertical-align: middle; min-width: 60%; max-width: 100%; max-height: 100%;}
 .com-box a img:hover{transform: scale(1.05, 1.05);}
 .com-box-you a img:hover{transform: none;}
 
diff --git a/sa-token-doc/static/jquery.lazyload-1.9.3.js b/sa-token-doc/static/jquery.lazyload-1.9.3.js
new file mode 100644
index 00000000..3019fe5f
--- /dev/null
+++ b/sa-token-doc/static/jquery.lazyload-1.9.3.js
@@ -0,0 +1,242 @@
+/*
+ * Lazy Load - jQuery plugin for lazy loading images
+ *
+ * Copyright (c) 2007-2013 Mika Tuupola
+ *
+ * Licensed under the MIT license:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Project home:
+ *   http://www.appelsiini.net/projects/lazyload
+ *
+ * Version:  1.9.3
+ *
+ */
+
+(function($, window, document, undefined) {
+    var $window = $(window);
+
+    $.fn.lazyload = function(options) {
+        var elements = this;
+        var $container;
+        var settings = {
+            threshold       : 0,
+            failure_limit   : 0,
+            event           : "scroll",
+            effect          : "show",
+            container       : window,
+            data_attribute  : "original",
+            skip_invisible  : true,
+            appear          : null,
+            load            : null,
+            placeholder     : "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAANSURBVBhXYzh8+PB/AAffA0nNPuCLAAAAAElFTkSuQmCC"
+        };
+
+        function update() {
+            var counter = 0;
+
+            elements.each(function() {
+                var $this = $(this);
+                if (settings.skip_invisible && !$this.is(":visible")) {
+                    return;
+                }
+                if ($.abovethetop(this, settings) ||
+                    $.leftofbegin(this, settings)) {
+                        /* Nothing. */
+                } else if (!$.belowthefold(this, settings) &&
+                    !$.rightoffold(this, settings)) {
+                        $this.trigger("appear");
+                        /* if we found an image we'll load, reset the counter */
+                        counter = 0;
+                } else {
+                    if (++counter > settings.failure_limit) {
+                        return false;
+                    }
+                }
+            });
+
+        }
+
+        if(options) {
+            /* Maintain BC for a couple of versions. */
+            if (undefined !== options.failurelimit) {
+                options.failure_limit = options.failurelimit;
+                delete options.failurelimit;
+            }
+            if (undefined !== options.effectspeed) {
+                options.effect_speed = options.effectspeed;
+                delete options.effectspeed;
+            }
+
+            $.extend(settings, options);
+        }
+
+        /* Cache container as jQuery as object. */
+        $container = (settings.container === undefined ||
+                      settings.container === window) ? $window : $(settings.container);
+
+        /* Fire one scroll event per scroll. Not one scroll event per image. */
+        if (0 === settings.event.indexOf("scroll")) {
+            $container.bind(settings.event, function() {
+                return update();
+            });
+        }
+
+        this.each(function() {
+            var self = this;
+            var $self = $(self);
+
+            self.loaded = false;
+
+            /* If no src attribute given use data:uri. */
+            if ($self.attr("src") === undefined || $self.attr("src") === false) {
+                if ($self.is("img")) {
+                    $self.attr("src", settings.placeholder);
+                }
+            }
+
+            /* When appear is triggered load original image. */
+            $self.one("appear", function() {
+                if (!this.loaded) {
+                    if (settings.appear) {
+                        var elements_left = elements.length;
+                        settings.appear.call(self, elements_left, settings);
+                    }
+                    $("<img />")
+                        .bind("load", function() {
+
+                            var original = $self.attr("data-" + settings.data_attribute);
+                            $self.hide();
+                            if ($self.is("img")) {
+                                $self.attr("src", original);
+                            } else {
+                                $self.css("background-image", "url('" + original + "')");
+                            }
+                            $self[settings.effect](settings.effect_speed);
+
+                            self.loaded = true;
+
+                            /* Remove image from array so it is not looped next time. */
+                            var temp = $.grep(elements, function(element) {
+                                return !element.loaded;
+                            });
+                            elements = $(temp);
+
+                            if (settings.load) {
+                                var elements_left = elements.length;
+                                settings.load.call(self, elements_left, settings);
+                            }
+                        })
+                        .attr("src", $self.attr("data-" + settings.data_attribute));
+                }
+            });
+
+            /* When wanted event is triggered load original image */
+            /* by triggering appear.                              */
+            if (0 !== settings.event.indexOf("scroll")) {
+                $self.bind(settings.event, function() {
+                    if (!self.loaded) {
+                        $self.trigger("appear");
+                    }
+                });
+            }
+        });
+
+        /* Check if something appears when window is resized. */
+        $window.bind("resize", function() {
+            update();
+        });
+
+        /* With IOS5 force loading images when navigating with back button. */
+        /* Non optimal workaround. */
+        if ((/(?:iphone|ipod|ipad).*os 5/gi).test(navigator.appVersion)) {
+            $window.bind("pageshow", function(event) {
+                if (event.originalEvent && event.originalEvent.persisted) {
+                    elements.each(function() {
+                        $(this).trigger("appear");
+                    });
+                }
+            });
+        }
+
+        /* Force initial check if images should appear. */
+        $(document).ready(function() {
+            update();
+        });
+
+        return this;
+    };
+
+    /* Convenience methods in jQuery namespace.           */
+    /* Use as  $.belowthefold(element, {threshold : 100, container : window}) */
+
+    $.belowthefold = function(element, settings) {
+        var fold;
+
+        if (settings.container === undefined || settings.container === window) {
+            fold = (window.innerHeight ? window.innerHeight : $window.height()) + $window.scrollTop();
+        } else {
+            fold = $(settings.container).offset().top + $(settings.container).height();
+        }
+
+        return fold <= $(element).offset().top - settings.threshold;
+    };
+
+    $.rightoffold = function(element, settings) {
+        var fold;
+
+        if (settings.container === undefined || settings.container === window) {
+            fold = $window.width() + $window.scrollLeft();
+        } else {
+            fold = $(settings.container).offset().left + $(settings.container).width();
+        }
+
+        return fold <= $(element).offset().left - settings.threshold;
+    };
+
+    $.abovethetop = function(element, settings) {
+        var fold;
+
+        if (settings.container === undefined || settings.container === window) {
+            fold = $window.scrollTop();
+        } else {
+            fold = $(settings.container).offset().top;
+        }
+
+        return fold >= $(element).offset().top + settings.threshold  + $(element).height();
+    };
+
+    $.leftofbegin = function(element, settings) {
+        var fold;
+
+        if (settings.container === undefined || settings.container === window) {
+            fold = $window.scrollLeft();
+        } else {
+            fold = $(settings.container).offset().left;
+        }
+
+        return fold >= $(element).offset().left + settings.threshold + $(element).width();
+    };
+
+    $.inviewport = function(element, settings) {
+         return !$.rightoffold(element, settings) && !$.leftofbegin(element, settings) &&
+                !$.belowthefold(element, settings) && !$.abovethetop(element, settings);
+     };
+
+    /* Custom selectors for your convenience.   */
+    /* Use as $("img:below-the-fold").something() or */
+    /* $("img").filter(":below-the-fold").something() which is faster */
+
+    $.extend($.expr[":"], {
+        "below-the-fold" : function(a) { return $.belowthefold(a, {threshold : 0}); },
+        "above-the-top"  : function(a) { return !$.belowthefold(a, {threshold : 0}); },
+        "right-of-screen": function(a) { return $.rightoffold(a, {threshold : 0}); },
+        "left-of-screen" : function(a) { return !$.rightoffold(a, {threshold : 0}); },
+        "in-viewport"    : function(a) { return $.inviewport(a, {threshold : 0}); },
+        /* Maintain BC for couple of versions. */
+        "above-the-fold" : function(a) { return !$.belowthefold(a, {threshold : 0}); },
+        "right-of-fold"  : function(a) { return $.rightoffold(a, {threshold : 0}); },
+        "left-of-fold"   : function(a) { return !$.rightoffold(a, {threshold : 0}); }
+    });
+
+})(jQuery, window, document);
\ No newline at end of file

From 602c0220f990ec0fba1b0839a2ea29b59768fbdc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 27 Apr 2023 22:49:42 +0800
Subject: [PATCH 004/129] =?UTF-8?q?=E9=87=8D=E6=9E=84=20demo=20=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa-token-demo-sso-server-solon/.gitignore       |   0
 .../sa-token-demo-sso-server-solon/pom.xml          |   0
 .../src/main/java/com/pj/SaSsoServerApp.java        |   0
 .../src/main/java/com/pj/h5/CorsFilter.java         |   0
 .../src/main/java/com/pj/h5/H5Controller.java       |   0
 .../main/java/com/pj/sso/GlobalExceptionFilter.java |   0
 .../src/main/java/com/pj/sso/SsoConfig.java         |   0
 .../main/java/com/pj/sso/SsoServerController.java   |   0
 .../resources/WEB-INF/static/sa-res/jquery.min.js   |   0
 .../resources/WEB-INF/static/sa-res/layer/layer.js  |   0
 .../WEB-INF/static/sa-res/layer/mobile/layer.js     |   0
 .../static/sa-res/layer/mobile/need/layer.css       |   0
 .../static/sa-res/layer/theme/default/icon-ext.png  | Bin
 .../static/sa-res/layer/theme/default/icon.png      | Bin
 .../static/sa-res/layer/theme/default/layer.css     |   0
 .../static/sa-res/layer/theme/default/loading-0.gif | Bin
 .../static/sa-res/layer/theme/default/loading-1.gif | Bin
 .../static/sa-res/layer/theme/default/loading-2.gif | Bin
 .../main/resources/WEB-INF/static/sa-res/login.css  |   0
 .../main/resources/WEB-INF/static/sa-res/login.js   |   0
 .../src/main/resources/WEB-INF/view/sa-login.html   |   0
 .../src/main/resources/app.yml                      |   0
 .../sa-token-demo-sso1-client-solon/pom.xml         |   0
 .../src/main/java/com/pj/SaConfig.java              |   0
 .../src/main/java/com/pj/SaSso1ClientApp.java       |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/resources/app.yml                      |   0
 .../sa-token-demo-sso2-client-solon/pom.xml         |   0
 .../src/main/java/com/pj/SaConfig.java              |   0
 .../src/main/java/com/pj/SaSso2ClientApp.java       |   0
 .../src/main/java/com/pj/h5/CorsFilter.java         |   0
 .../src/main/java/com/pj/h5/H5Controller.java       |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/resources/app.yml                      |   0
 .../sa-token-demo-sso3-client-solon/pom.xml         |   0
 .../src/main/java/com/pj/SaConfig.java              |   0
 .../src/main/java/com/pj/SaSso3ClientApp.java       |   0
 .../main/java/com/pj/sso/SaSsoAutoConfigure.java    |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/java/com/pj/sso/SsoConfig.java         |   0
 .../src/main/resources/app.yml                      |   0
 .../sa-token-demo-sso-client-h5/index.html          |   0
 .../sa-token-demo-sso-client-h5/sso-login.html      |   0
 .../sa-token-demo-sso-client-vue2/.gitignore        |   0
 .../sa-token-demo-sso-client-vue2/README.md         |   0
 .../sa-token-demo-sso-client-vue2/babel.config.js   |   0
 .../sa-token-demo-sso-client-vue2/package-lock.json |   0
 .../sa-token-demo-sso-client-vue2/package.json      |   0
 .../public/favicon.ico                              | Bin
 .../sa-token-demo-sso-client-vue2/public/index.html |   0
 .../sa-token-demo-sso-client-vue2/src/App.vue       |   0
 .../src/assets/logo.png                             | Bin
 .../sa-token-demo-sso-client-vue2/src/main.js       |   0
 .../src/router/index.js                             |   0
 .../src/views/method-util.js                        |   0
 .../src/views/sso-index.vue                         |   0
 .../src/views/sso-login.vue                         |   0
 .../sa-token-demo-sso-client-vue3/.gitignore        |   0
 .../sa-token-demo-sso-client-vue3/README.md         |   0
 .../sa-token-demo-sso-client-vue3/index.html        |   0
 .../sa-token-demo-sso-client-vue3/package-lock.json |   0
 .../sa-token-demo-sso-client-vue3/package.json      |   0
 .../sa-token-demo-sso-client-vue3/public/vite.svg   |   0
 .../sa-token-demo-sso-client-vue3/src/App.vue       |   0
 .../src/assets/vue.svg                              |   0
 .../sa-token-demo-sso-client-vue3/src/main.js       |   0
 .../src/router/index.js                             |   0
 .../src/views/method-util.js                        |   0
 .../src/views/sso-index.vue                         |   0
 .../src/views/sso-login.vue                         |   0
 .../sa-token-demo-sso-client-vue3/vite.config.js    |   0
 .../sa-token-demo-sso-server-h5/login.css           |   0
 .../sa-token-demo-sso-server-h5/login.js            |   0
 .../sa-token-demo-sso-server-h5/sso-auth.html       |   0
 .../sa-token-demo-sso-server/.gitignore             |   0
 .../sa-token-demo-sso-server/pom.xml                |   0
 .../main/java/com/pj/SaSsoServerApplication.java    |   0
 .../src/main/java/com/pj/h5/CorsFilter.java         |   0
 .../src/main/java/com/pj/h5/H5Controller.java       |   0
 .../java/com/pj/sso/GlobalExceptionHandler.java     |   0
 .../main/java/com/pj/sso/SsoServerController.java   |   0
 .../src/main/resources/application.yml              |   0
 .../src/main/resources/static/sa-res/jquery.min.js  |   0
 .../src/main/resources/static/sa-res/layer/layer.js |   0
 .../resources/static/sa-res/layer/mobile/layer.js   |   0
 .../static/sa-res/layer/mobile/need/layer.css       |   0
 .../static/sa-res/layer/theme/default/icon-ext.png  | Bin
 .../static/sa-res/layer/theme/default/icon.png      | Bin
 .../static/sa-res/layer/theme/default/layer.css     |   0
 .../static/sa-res/layer/theme/default/loading-0.gif | Bin
 .../static/sa-res/layer/theme/default/loading-1.gif | Bin
 .../static/sa-res/layer/theme/default/loading-2.gif | Bin
 .../src/main/resources/static/sa-res/login.css      |   0
 .../src/main/resources/static/sa-res/login.js       |   0
 .../src/main/resources/templates/sa-login.html      |   0
 .../sa-token-demo-sso1-client/.gitignore            |   0
 .../sa-token-demo-sso1-client/pom.xml               |   0
 .../main/java/com/pj/SaSso1ClientApplication.java   |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/resources/application.yml              |   0
 .../sa-token-demo-sso2-client/.gitignore            |   0
 .../sa-token-demo-sso2-client/pom.xml               |   0
 .../main/java/com/pj/SaSso2ClientApplication.java   |   0
 .../src/main/java/com/pj/h5/CorsFilter.java         |   0
 .../src/main/java/com/pj/h5/H5Controller.java       |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/resources/application.yml              |   0
 .../sa-token-demo-sso3-client-nosdk/.gitignore      |   0
 .../sa-token-demo-sso3-client-nosdk/pom.xml         |   0
 .../main/java/com/pj/SaSsoClientApplication.java    |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/java/com/pj/sso/SsoRequestUtil.java    |   0
 .../src/main/java/com/pj/sso/util/AjaxJson.java     |   0
 .../java/com/pj/sso/util/MyHttpSessionHolder.java   |   0
 .../src/main/resources/application.yml              |   0
 .../sa-token-demo-sso3-client/.gitignore            |   0
 .../sa-token-demo-sso3-client/pom.xml               |   0
 .../main/java/com/pj/SaSso3ClientApplication.java   |   0
 .../main/java/com/pj/sso/SsoClientController.java   |   0
 .../src/main/resources/application.yml              |   0
 120 files changed, 0 insertions(+), 0 deletions(-)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/jquery.min.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/layer.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/layer.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/need/layer.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon-ext.png (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon.png (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/layer.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-0.gif (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-1.gif (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-2.gif (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/view/sa-login.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso-server-solon/src/main/resources/app.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso1-client-solon/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso1-client-solon/src/main/resources/app.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaSso2ClientApp.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso2-client-solon/src/main/resources/app.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoConfig.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso-for-solon}/sa-token-demo-sso3-client-solon/src/main/resources/app.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-h5/index.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-h5/sso-login.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/README.md (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/babel.config.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/package-lock.json (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/package.json (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/public/favicon.ico (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/public/index.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/App.vue (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/assets/logo.png (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/main.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/router/index.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/views/method-util.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/views/sso-index.vue (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue2/src/views/sso-login.vue (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/README.md (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/index.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/package-lock.json (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/package.json (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/public/vite.svg (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/App.vue (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/assets/vue.svg (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/main.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/router/index.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/views/method-util.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/views/sso-index.vue (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/src/views/sso-login.vue (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-client-vue3/vite.config.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server-h5/login.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server-h5/login.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server-h5/sso-auth.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/java/com/pj/SaSsoServerApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/jquery.min.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/layer.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/layer.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/need/layer.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon-ext.png (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon.png (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/layer.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-0.gif (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-1.gif (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-2.gif (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.css (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.js (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso-server/src/main/resources/templates/sa-login.html (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso1-client/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso1-client/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso1-client/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/src/main/java/com/pj/SaSso2ClientApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso2-client/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/SaSsoClientApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/AjaxJson.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client-nosdk/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client/src/main/java/com/pj/SaSso3ClientApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-sso}/sa-token-demo-sso3-client/src/main/resources/application.yml (100%)

diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/.gitignore b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/.gitignore
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/pom.xml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/SaSsoServerApp.java
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/jquery.min.js b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/jquery.min.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/jquery.min.js
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/jquery.min.js
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/layer.js b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/layer.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/layer.js
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/layer.js
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/layer.js b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/layer.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/layer.js
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/layer.js
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/need/layer.css b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/need/layer.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/need/layer.css
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/mobile/need/layer.css
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon-ext.png b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon-ext.png
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon-ext.png
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon-ext.png
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon.png b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon.png
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon.png
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/icon.png
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/layer.css b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/layer.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/layer.css
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/layer.css
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-0.gif b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-0.gif
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-0.gif
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-0.gif
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-1.gif b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-1.gif
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-1.gif
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-1.gif
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-2.gif b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-2.gif
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-2.gif
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/layer/theme/default/loading-2.gif
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.css b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.css
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.css
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.js b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.js
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/static/sa-res/login.js
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/view/sa-login.html b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/view/sa-login.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/view/sa-login.html
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/WEB-INF/view/sa-login.html
diff --git a/sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-solon/src/main/resources/app.yml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml
diff --git a/sa-token-demo/sa-token-demo-sso1-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client-solon/pom.xml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java
diff --git a/sa-token-demo/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java
diff --git a/sa-token-demo/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso1-client-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/resources/app.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client-solon/src/main/resources/app.yml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/resources/app.yml
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/pom.xml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaSso2ClientApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaSso2ClientApp.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaSso2ClientApp.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaSso2ClientApp.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/resources/app.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client-solon/src/main/resources/app.yml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/resources/app.yml
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/pom.xml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaSso3ClientApp.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SaSsoAutoConfigure.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoConfig.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoConfig.java
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoConfig.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/resources/app.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-solon/src/main/resources/app.yml
rename to sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/resources/app.yml
diff --git a/sa-token-demo/sa-token-demo-sso-client-h5/index.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-h5/index.html
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/index.html
diff --git a/sa-token-demo/sa-token-demo-sso-client-h5/sso-login.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-h5/sso-login.html
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/README.md b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/README.md
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/README.md
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/README.md
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/babel.config.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/babel.config.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/babel.config.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/babel.config.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/package-lock.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/package-lock.json
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/package.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package.json
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/package.json
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package.json
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/public/favicon.ico b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/favicon.ico
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/public/favicon.ico
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/favicon.ico
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/public/index.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/index.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/public/index.html
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/index.html
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/App.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/App.vue
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/App.vue
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/App.vue
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/assets/logo.png b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/assets/logo.png
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/assets/logo.png
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/assets/logo.png
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/main.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/main.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/main.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/main.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/router/index.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/router/index.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/router/index.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/router/index.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/views/method-util.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/method-util.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/views/method-util.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/method-util.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/views/sso-index.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-index.vue
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/views/sso-index.vue
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-index.vue
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue2/src/views/sso-login.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-login.vue
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue2/src/views/sso-login.vue
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/src/views/sso-login.vue
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/README.md b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/README.md
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/README.md
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/README.md
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/index.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/index.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/index.html
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/index.html
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/package-lock.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package-lock.json
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/package-lock.json
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package-lock.json
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/package.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package.json
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/package.json
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package.json
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/public/vite.svg b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/public/vite.svg
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/public/vite.svg
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/public/vite.svg
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/App.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/App.vue
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/App.vue
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/App.vue
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/assets/vue.svg b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/assets/vue.svg
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/assets/vue.svg
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/assets/vue.svg
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/main.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/main.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/main.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/main.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/router/index.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/router/index.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/router/index.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/router/index.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/views/method-util.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/method-util.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/views/method-util.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/method-util.js
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/views/sso-index.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-index.vue
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/views/sso-index.vue
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-index.vue
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/src/views/sso-login.vue b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-login.vue
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/src/views/sso-login.vue
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/src/views/sso-login.vue
diff --git a/sa-token-demo/sa-token-demo-sso-client-vue3/vite.config.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/vite.config.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-client-vue3/vite.config.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/vite.config.js
diff --git a/sa-token-demo/sa-token-demo-sso-server-h5/login.css b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-h5/login.css
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.css
diff --git a/sa-token-demo/sa-token-demo-sso-server-h5/login.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-h5/login.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/login.js
diff --git a/sa-token-demo/sa-token-demo-sso-server-h5/sso-auth.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/sso-auth.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server-h5/sso-auth.html
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5/sso-auth.html
diff --git a/sa-token-demo/sa-token-demo-sso-server/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/pom.xml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/SaSsoServerApplication.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/SaSsoServerApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/SaSsoServerApplication.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/SaSsoServerApplication.java
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/jquery.min.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/jquery.min.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/jquery.min.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/jquery.min.js
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/layer.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/layer.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/layer.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/layer.js
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/layer.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/layer.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/layer.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/layer.js
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/need/layer.css b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/need/layer.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/need/layer.css
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/mobile/need/layer.css
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon-ext.png b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon-ext.png
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon-ext.png
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon-ext.png
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon.png b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon.png
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon.png
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/icon.png
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/layer.css b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/layer.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/layer.css
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/layer.css
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-0.gif b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-0.gif
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-0.gif
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-0.gif
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-1.gif b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-1.gif
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-1.gif
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-1.gif
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-2.gif b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-2.gif
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-2.gif
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/layer/theme/default/loading-2.gif
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.css b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.css
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.css
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.css
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.js
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.js
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/static/sa-res/login.js
diff --git a/sa-token-demo/sa-token-demo-sso-server/src/main/resources/templates/sa-login.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/templates/sa-login.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso-server/src/main/resources/templates/sa-login.html
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/templates/sa-login.html
diff --git a/sa-token-demo/sa-token-demo-sso1-client/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client/pom.xml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java
diff --git a/sa-token-demo/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso1-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso1-client/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-sso2-client/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/pom.xml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/SaSso2ClientApplication.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/SaSso2ClientApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/SaSso2ClientApplication.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/SaSso2ClientApplication.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso2-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso2-client/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/pom.xml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/SaSsoClientApplication.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/SaSsoClientApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/SaSsoClientApplication.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/SaSsoClientApplication.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/AjaxJson.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/AjaxJson.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/AjaxJson.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/AjaxJson.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client-nosdk/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-sso3-client/.gitignore b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client/.gitignore
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/.gitignore
diff --git a/sa-token-demo/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client/pom.xml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
diff --git a/sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/SaSso3ClientApplication.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/SaSso3ClientApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/SaSso3ClientApplication.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/SaSso3ClientApplication.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
diff --git a/sa-token-demo/sa-token-demo-sso3-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-sso3-client/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml

From ade676139169c73126bb22d86b8ed92d131f835e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 14:50:23 +0000
Subject: [PATCH 005/129] Bump @sideway/formula

Bumps [@sideway/formula](https://github.com/sideway/formula) from 3.0.0 to 3.0.1.
- [Release notes](https://github.com/sideway/formula/releases)
- [Commits](https://github.com/sideway/formula/compare/v3.0.0...v3.0.1)

---
updated-dependencies:
- dependency-name: "@sideway/formula"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../sa-token-demo-sso-client-vue2/package-lock.json  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
index 71f4d4c9..a2bf28dd 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
@@ -1852,9 +1852,9 @@
       }
     },
     "node_modules/@sideway/formula": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
-      "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
       "dev": true
     },
     "node_modules/@sideway/pinpoint": {
@@ -12427,9 +12427,9 @@
       }
     },
     "@sideway/formula": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.0.tgz",
-      "integrity": "sha512-vHe7wZ4NOXVfkoRb8T5otiENVlT7a3IAiw7H5M2+GO+9CDgcVUUsX1zalAztCmwyOr2RUTGJdgB+ZvSVqmdHmg==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
       "dev": true
     },
     "@sideway/pinpoint": {

From de5a963ab613aab21cd68a0bffaf93e5e93a04dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 27 Apr 2023 14:50:38 +0000
Subject: [PATCH 006/129] Bump webpack

Bumps [webpack](https://github.com/webpack/webpack) from 5.74.0 to 5.81.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.74.0...v5.81.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                         | 448 +++++++++---------
 1 file changed, 224 insertions(+), 224 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
index 71f4d4c9..d11d0dcb 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
@@ -2019,9 +2019,9 @@
       }
     },
     "node_modules/@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
       "dev": true
     },
     "node_modules/@types/express": {
@@ -2922,148 +2922,148 @@
       "dev": true
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
+      "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+        "@webassemblyjs/helper-numbers": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
+      "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
+      "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
+      "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
+      "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.5",
+        "@webassemblyjs/helper-api-error": "1.11.5",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
+      "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
+      "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-buffer": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/wasm-gen": "1.11.5"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
+      "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
+      "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
+      "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
+      "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-buffer": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/helper-wasm-section": "1.11.5",
+        "@webassemblyjs/wasm-gen": "1.11.5",
+        "@webassemblyjs/wasm-opt": "1.11.5",
+        "@webassemblyjs/wasm-parser": "1.11.5",
+        "@webassemblyjs/wast-printer": "1.11.5"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
+      "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/ieee754": "1.11.5",
+        "@webassemblyjs/leb128": "1.11.5",
+        "@webassemblyjs/utf8": "1.11.5"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
+      "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-buffer": "1.11.5",
+        "@webassemblyjs/wasm-gen": "1.11.5",
+        "@webassemblyjs/wasm-parser": "1.11.5"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
+      "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-api-error": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/ieee754": "1.11.5",
+        "@webassemblyjs/leb128": "1.11.5",
+        "@webassemblyjs/utf8": "1.11.5"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
+      "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/ast": "1.11.5",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -5000,9 +5000,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
+      "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -5040,9 +5040,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
+      "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
       "dev": true
     },
     "node_modules/escalade": {
@@ -9206,9 +9206,9 @@
       "dev": true
     },
     "node_modules/serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -9776,9 +9776,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
-      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
+      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
       "dev": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.2",
@@ -9794,16 +9794,16 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
+      "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/trace-mapping": "^0.3.14",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.5"
       },
       "engines": {
         "node": ">= 10.13.0"
@@ -10399,22 +10399,22 @@
       "dev": true
     },
     "node_modules/webpack": {
-      "version": "5.74.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+      "version": "5.81.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz",
+      "integrity": "sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
+        "enhanced-resolve": "^5.13.0",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
@@ -10423,9 +10423,9 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
+        "schema-utils": "^3.1.2",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
+        "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
@@ -10827,9 +10827,9 @@
       }
     },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
+      "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -12572,9 +12572,9 @@
       }
     },
     "@types/estree": {
-      "version": "0.0.51",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz",
-      "integrity": "sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
       "dev": true
     },
     "@types/express": {
@@ -13286,148 +13286,148 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
-      "integrity": "sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
+      "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1"
+        "@webassemblyjs/helper-numbers": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz",
-      "integrity": "sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
+      "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz",
-      "integrity": "sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
+      "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz",
-      "integrity": "sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
+      "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==",
       "dev": true
     },
     "@webassemblyjs/helper-numbers": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz",
-      "integrity": "sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
+      "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.5",
+        "@webassemblyjs/helper-api-error": "1.11.5",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz",
-      "integrity": "sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
+      "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz",
-      "integrity": "sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
+      "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-buffer": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/wasm-gen": "1.11.5"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz",
-      "integrity": "sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
+      "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz",
-      "integrity": "sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
+      "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz",
-      "integrity": "sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
+      "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz",
-      "integrity": "sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
+      "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/helper-wasm-section": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-opt": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
-        "@webassemblyjs/wast-printer": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-buffer": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/helper-wasm-section": "1.11.5",
+        "@webassemblyjs/wasm-gen": "1.11.5",
+        "@webassemblyjs/wasm-opt": "1.11.5",
+        "@webassemblyjs/wasm-parser": "1.11.5",
+        "@webassemblyjs/wast-printer": "1.11.5"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz",
-      "integrity": "sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
+      "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/ieee754": "1.11.5",
+        "@webassemblyjs/leb128": "1.11.5",
+        "@webassemblyjs/utf8": "1.11.5"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz",
-      "integrity": "sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
+      "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-buffer": "1.11.1",
-        "@webassemblyjs/wasm-gen": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-buffer": "1.11.5",
+        "@webassemblyjs/wasm-gen": "1.11.5",
+        "@webassemblyjs/wasm-parser": "1.11.5"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz",
-      "integrity": "sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
+      "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/helper-api-error": "1.11.1",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.1",
-        "@webassemblyjs/ieee754": "1.11.1",
-        "@webassemblyjs/leb128": "1.11.1",
-        "@webassemblyjs/utf8": "1.11.1"
+        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/helper-api-error": "1.11.5",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
+        "@webassemblyjs/ieee754": "1.11.5",
+        "@webassemblyjs/leb128": "1.11.5",
+        "@webassemblyjs/utf8": "1.11.5"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz",
-      "integrity": "sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==",
+      "version": "1.11.5",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
+      "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.1",
+        "@webassemblyjs/ast": "1.11.5",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -14883,9 +14883,9 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz",
-      "integrity": "sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
+      "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
@@ -14917,9 +14917,9 @@
       }
     },
     "es-module-lexer": {
-      "version": "0.9.3",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz",
-      "integrity": "sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
+      "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
       "dev": true
     },
     "escalade": {
@@ -18045,9 +18045,9 @@
       }
     },
     "serialize-javascript": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz",
-      "integrity": "sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
       "requires": {
         "randombytes": "^2.1.0"
@@ -18511,9 +18511,9 @@
       "dev": true
     },
     "terser": {
-      "version": "5.15.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.15.1.tgz",
-      "integrity": "sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==",
+      "version": "5.17.1",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
+      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
       "dev": true,
       "requires": {
         "@jridgewell/source-map": "^0.3.2",
@@ -18537,16 +18537,16 @@
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz",
-      "integrity": "sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
+      "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
       "dev": true,
       "requires": {
-        "@jridgewell/trace-mapping": "^0.3.14",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
-        "serialize-javascript": "^6.0.0",
-        "terser": "^5.14.1"
+        "serialize-javascript": "^6.0.1",
+        "terser": "^5.16.5"
       },
       "dependencies": {
         "schema-utils": {
@@ -18988,22 +18988,22 @@
       "dev": true
     },
     "webpack": {
-      "version": "5.74.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
-      "integrity": "sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==",
+      "version": "5.81.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz",
+      "integrity": "sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
-        "@types/estree": "^0.0.51",
-        "@webassemblyjs/ast": "1.11.1",
-        "@webassemblyjs/wasm-edit": "1.11.1",
-        "@webassemblyjs/wasm-parser": "1.11.1",
+        "@types/estree": "^1.0.0",
+        "@webassemblyjs/ast": "^1.11.5",
+        "@webassemblyjs/wasm-edit": "^1.11.5",
+        "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
         "acorn-import-assertions": "^1.7.6",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.10.0",
-        "es-module-lexer": "^0.9.0",
+        "enhanced-resolve": "^5.13.0",
+        "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
         "glob-to-regexp": "^0.4.1",
@@ -19012,9 +19012,9 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.0",
+        "schema-utils": "^3.1.2",
         "tapable": "^2.1.1",
-        "terser-webpack-plugin": "^5.1.3",
+        "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
@@ -19033,9 +19033,9 @@
           "requires": {}
         },
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
+          "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",

From 62580e7c098a41bf1a37f22d89bb4fea7edad243 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 27 Apr 2023 22:51:13 +0800
Subject: [PATCH 007/129] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85?=
 =?UTF-8?q?=E8=A6=81=E7=9A=84=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index ad7711ab..b36e13de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,10 +22,6 @@
 		<module>sa-token-core</module>
 		<module>sa-token-starter</module>
 		<module>sa-token-plugin</module>
-		<module>sa-token-demo/sa-token-demo-sso-server-solon</module>
-		<module>sa-token-demo/sa-token-demo-sso1-client-solon</module>
-		<module>sa-token-demo/sa-token-demo-sso2-client-solon</module>
-		<module>sa-token-demo/sa-token-demo-sso3-client-solon</module>
 	</modules>
 
 <!-- 开源协议 apache 2.0 -->

From e7da43baa65709c0a20b4c30116fdb86913b429c Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 27 Apr 2023 23:12:50 +0800
Subject: [PATCH 008/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20SaResult=20?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/util/SaResult.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
index f6175c10..08576971 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
@@ -5,7 +5,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * 对Ajax请求返回Json格式数据的简易封装 <br>
+ * 对 Ajax 请求返回Json格式数据的简易封装 <br>
  * 所有预留字段：<br>
  * code=状态码 <br>
  * msg=描述信息 <br>
@@ -173,7 +173,14 @@ public class SaResult extends LinkedHashMap<String, Object> implements Serializa
 				+ ", \"data\": " + transValue(this.getData()) 
 				+ "}";
 	}
-	
+
+	/**
+	 * 转换 value 值：
+	 * 	如果 value 值属于 String 类型，则在前后补上引号
+	 * 	如果 value 值属于其它类型，则原样返回
+	 * @param value
+	 * @return
+	 */
 	private String transValue(Object value) {
 		if(value instanceof String) {
 			return "\"" + value + "\"";

From 9469b15fd64a8c4347df1eafe7b4793b555bfccc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 27 Apr 2023 23:14:22 +0800
Subject: [PATCH 009/129] =?UTF-8?q?fix:=20=E5=9C=A8=20SSO=20=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=89=E4=B8=AD=20ticket=20=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E9=94=99=E6=97=B6=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=20NPE=20=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index dfce1d98..bcb1d227 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -443,9 +443,9 @@ public class SaSsoProcessor {
 			// 发起请求 
 			String checkUrl = ssoTemplate.buildCheckTicketUrl(ticket, ssoLogoutCall);
 			SaResult result = ssoTemplate.request(checkUrl);
-			
+
 			// 校验 
-			if(result.getCode() == SaResult.CODE_SUCCESS) {
+			if(result.getCode() != null && result.getCode() == SaResult.CODE_SUCCESS) {
 				return result.getData();
 			} else {
 				// 将 sso-server 回应的消息作为异常抛出 

From 0bb434336dc444d2e721de4e34ee53464fcaa40e Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 28 Apr 2023 00:19:36 +0800
Subject: [PATCH 010/129] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?=E6=8E=92=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/more/common-questions.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/sa-token-doc/more/common-questions.md b/sa-token-doc/more/common-questions.md
index 100e05eb..d068ba6b 100644
--- a/sa-token-doc/more/common-questions.md
+++ b/sa-token-doc/more/common-questions.md
@@ -419,6 +419,16 @@ Caused by: java.lang.ClassNotFoundException: cn.dev33.satoken.same.SaSameTemplat
 请仔细排查你的 pom.xml 文件，是否有 Sa-Token 依赖没对齐，**请不要肉眼检查，用全局搜索 "sa-token" 关键词来找**，如果是多模块或者微服务项目，就整个项目搜索。
 
 
+### Q：在多账号模式的注解鉴权时，报错：未能获取对应StpLogic，type=xxx
+
+报这个错说明对应 type 的 StpLogic 尚未初始化到全局 StpLogicMap 中，一般会有两种原因造成这种情况：
+1. 注解里的 loginType 拼写错误，请改正 （建议使用常量）。
+2. 自定义 StpUtil 尚未初始化（静态类中的属性至少一次调用后才会初始化），解决方法两种：
+	- (1) 从main方法里调用一次
+	- (2) 在自定义StpUtil类加上类似 @Component 的注解让容器启动时扫描到自动初始化 
+
+
+
 
 
 

From 47e11f0c83706db782a9aecba249140113747b2f Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 28 Apr 2023 10:46:09 +0800
Subject: [PATCH 011/129] =?UTF-8?q?=E6=95=B4=E7=90=86=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/more/update-log.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sa-token-doc/more/update-log.md b/sa-token-doc/more/update-log.md
index 1d6a1fc5..c954ed93 100644
--- a/sa-token-doc/more/update-log.md
+++ b/sa-token-doc/more/update-log.md
@@ -2,20 +2,28 @@
 
 
 ### 2023-1-11 @v1.34.0
+
+新增插件：
 - 新增：新增 `SpringBoot3.x` 集成插件，感谢 `@jry` 提供的参考思路。   **[重要]**
 - 新增：新增 `sa-token-dao-redisson-jackson` 插件，感谢 `@疯狂的狮子Li` 提交的pr。   **[重要]**
-- 新增：Alone-Redis 新增集群配置能力，感谢 `@appleOfGray` 提交的pr。   **[重要]**
+
+sa-token-core 核心包：
 - 升级：升级 Sign 签名模块，增加部分重载方法。
 - 重构：`SaSignTemplate#joinParams` 更名为 `joinParamsDictSort`。  **[不向下兼容]**
 - 升级：升级临时 Token 认证模块，可指定 service 参数。
 - 删除：彻底删除过期类 `SaAnnotationInterceptor` 和 `SaRouteInterceptor`。
+- 修复：修复源码注释和文档的部分不合适之处。
+
+sa-token-sso 单点登录：
 - 删除：SSO 模块移除过期类 `SaSsoHandle` 类。
 - 新增：SSO 模块增加 ticket 的 client 锁定功能，解决部分场景下的 ticket 劫持问题。  **[重要]**
 - 修复：修复 SSO 模式2，在 client 端配置 `is-share=false` 时无法单点注销的问题。
 - 修复：修复 SSO 模式3 部分场景下注销时无法正常回退页面的问题。
-- 修复：修复 OAuth2 模块示例 getClientModel 方法 clientId 写错的问题。
-- 重构：使用 jwt-simple 模式后 is-share 恒等于 false，无论是否有设定 `setExtra` 数据。
-- 修复：修复源码注释和文档的部分不合适之处。
+
+其它模块：
+- sa-token-oauth2：修复 OAuth2 模块示例 getClientModel 方法 clientId 写错的问题。
+- sa-token-alone-redis：新增：Alone-Redis 新增集群配置能力，感谢 `@appleOfGray` 提交的pr。   **[重要]**
+- sa-token-jwt：重构：使用 jwt-simple 模式后 is-share 恒等于 false，无论是否有设定 `setExtra` 数据。
 
 
 

From 2629b791d22d66f50d25760de50f967a4c9afb29 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 28 Apr 2023 10:46:52 +0800
Subject: [PATCH 012/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E6=9C=AA=E6=8F=90=E4=BE=9B=20Token=20=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8CgetTokenSession()=20=E5=B0=86=E6=8A=9B=E5=87=BA?=
 =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E5=BC=82=E5=B8=B8=EF=BC=8C=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E8=BF=94=E5=9B=9E=20null=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/stp/StpLogic.java | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 314e6855..4853513b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -951,16 +951,20 @@ public class StpLogic {
 	 * @return Session对象  
 	 */
 	public SaSession getTokenSession(boolean isCreate) {
-		// Token 为空的情况下直接返回 null
+
+		// 如果配置了：tokenSessionCheckLogin == true，则需要先校验当前是否登录
+		if(getConfig().getTokenSessionCheckLogin()) {
+			checkLogin();
+		}
+
+		// 如果前端没有提供 Token ，则直接返回 null
 		String tokenValue = getTokenValue();
 		if(SaFoxUtil.isEmpty(tokenValue)) {
 			return null;
 		}
-		// 如果配置了需要校验登录状态，则验证一下
-		if(getConfig().getTokenSessionCheckLogin()) {
-			checkLogin();
-		}
-		// 获取 SaSession 数据
+
+		// 代码至此：tokenSessionCheckLogin 校验通过、且 Token 有值
+		// 现在根据前端提供的 Token 获取它对应的 Token-Session 对象（SaSession）
 		return getTokenSessionByToken(tokenValue, isCreate);
 	}
 

From 14fc74ec9d414139d584314817a94db7e1c5cd41 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 28 Apr 2023 23:10:59 +0800
Subject: [PATCH 013/129] =?UTF-8?q?SaSession=20=E6=96=B0=E5=A2=9E=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=9Atype=E3=80=81loginType=E3=80=81loginId?=
 =?UTF-8?q?=E3=80=81token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/session/SaSession.java   | 157 +++++++++++++++---
 .../java/cn/dev33/satoken/stp/StpLogic.java   |  35 +++-
 .../cn/dev33/satoken/util/SaTokenConsts.java  |  30 +++-
 .../main/java/com/pj/SaTokenApplication.java  |   3 +-
 .../main/java/com/pj/test/TestController.java |   9 +-
 .../src/main/resources/application.yml        |   2 +-
 6 files changed, 189 insertions(+), 47 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index 9f552f32..9f61271c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -29,29 +29,56 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
-	 * 在 Session 上存储用户对象时建议使用的key 
+	 * 在 SaSession 上存储用户对象时建议使用的 key
 	 */
 	public static final String USER = "USER";
 
 	/**
-	 * 在 Session 上存储角色时建议使用的key 
+	 * 在 SaSession 上存储角色列表时建议使用的 key
 	 */
 	public static final String ROLE_LIST = "ROLE_LIST";
 
 	/**
-	 * 在 Session 上存储权限时建议使用的key 
+	 * 在 SaSession 上存储权限列表时建议使用的 key
 	 */
 	public static final String PERMISSION_LIST = "PERMISSION_LIST";
-	
-	/** 此 Session 的 id */
+
+	/**
+	 * 此 SaSession 的 id
+	 */
 	private String id;
 
-	/** 此 Session 的创建时间（时间戳） */
+	/**
+	 * 此 SaSession 的 类型
+	 */
+	private String type;
+
+	/**
+	 * 所属 loginType
+	 */
+	private String loginType;
+
+	/**
+	 * 所属 loginId （当此 SaSession 属于 Account-Session 时，此值有效）
+	 */
+	private Object loginId;
+
+	/**
+	 * 所属 Token （当此 SaSession 属于 Token-Session 时，此值有效）
+	 */
+	private String token;
+
+	/**
+	 * 此 SaSession 的创建时间（13位时间戳）
+	 */
 	private long createTime;
 
-	/** 此 Session 的所有挂载数据 */
+	/**
+	 * 所有挂载数据
+	 */
 	private final Map<String, Object> dataMap = new ConcurrentHashMap<>();
 
+
 	// ----------------------- 构建相关
 
 	/**
@@ -77,16 +104,16 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	}
 
 	/**
-	 * 获取此 Session 的 id
-	 * @return 此 Session 的id
+	 * 获取：此 SaSession 的 id
+	 * @return /
 	 */
 	public String getId() {
-		return id;
+		return this.id;
 	}
 
 	/**
-	 * 写入此 Session 的 id
-	 * @param id SessionId
+	 * 写入：此 SaSession 的 id
+	 * @param id /
 	 * @return 对象自身
 	 */
 	public SaSession setId(String id) {
@@ -95,16 +122,90 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	}
 
 	/**
-	 * 返回当前会话创建时间（时间戳）
-	 * @return 时间戳
+	 * 获取：此 SaSession 的 类型
+	 *
+	 * @return /
 	 */
-	public long getCreateTime() {
-		return createTime;
+	public String getType() {
+		return this.type;
 	}
 
 	/**
-	 * 写入此 Session 的创建时间（时间戳）
-	 * @param createTime 时间戳
+	 * 设置：此 SaSession 的 类型
+	 *
+	 * @param type /
+	 * @return 对象自身
+	 */
+	public SaSession setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+	/**
+	 * 获取：所属 loginType
+	 * @return /
+	 */
+	public String getLoginType() {
+		return this.loginType;
+	}
+
+	/**
+	 * 设置：所属 loginType
+	 * @param loginType /
+	 * @return 对象自身
+	 */
+	public SaSession setLoginType(String loginType) {
+		this.loginType = loginType;
+		return this;
+	}
+
+	/**
+	 * 获取：所属 loginId （当此 SaSession 属于 Account-Session 时，此值有效）
+	 * @return /
+	 */
+	public Object getLoginId() {
+		return this.loginId;
+	}
+
+	/**
+	 * 设置：所属 loginId （当此 SaSession 属于 Account-Session 时，此值有效）
+	 * @param loginId /
+	 * @return 对象自身
+	 */
+	public SaSession setLoginId(Object loginId) {
+		this.loginId = loginId;
+		return this;
+	}
+
+	/**
+	 * 获取：所属 Token （当此 SaSession 属于 Token-Session 时，此值有效）
+	 * @return /
+	 */
+	public String getToken() {
+		return this.token;
+	}
+
+	/**
+	 * 设置：所属 Token （当此 SaSession 属于 Token-Session 时，此值有效）
+	 * @param token /
+	 * @return 对象自身
+	 */
+	public SaSession setToken(String token) {
+		this.token = token;
+		return this;
+	}
+
+	/**
+	 * 返回：当前 SaSession 的创建时间（13位时间戳）
+	 * @return /
+	 */
+	public long getCreateTime() {
+		return this.createTime;
+	}
+
+	/**
+	 * 写入：此 SaSession 的创建时间（13位时间戳）
+	 * @param createTime /
 	 * @return 对象自身
 	 */
 	public SaSession setCreateTime(long createTime) {
@@ -219,7 +320,7 @@ public class SaSession implements SaSetValueInterface, Serializable {
 		}
 	}
 
-	
+
 	// ----------------------- 一些操作
 
 	/**
@@ -291,8 +392,9 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	protected long trans(long value) {
 		return value == SaTokenDao.NEVER_EXPIRE ? Long.MAX_VALUE : value;
 	}
-	
-	// ----------------------- 存取值 (类型转换) 
+
+
+	// ----------------------- 存取值 (类型转换)
 
 	// ---- 重写接口方法 
 	
@@ -346,19 +448,20 @@ public class SaSession implements SaSetValueInterface, Serializable {
 		return this;
 	}
 
-	// ---- 其它方法 
+
+	// ----------------------- 其它方法
 
 	/**
-	 * 返回当前Session的所有key 
+	 * 返回当前 Session 挂载数据的所有 key
 	 *
-	 * @return 所有值的key列表
+	 * @return key 列表
 	 */
 	public Set<String> keys() {
 		return dataMap.keySet();
 	}
 	
 	/**
-	 * 清空所有值 
+	 * 清空所有挂载数据
 	 */
 	public void clear() {
 		dataMap.clear();
@@ -366,7 +469,7 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	}
 
 	/**
-	 * 获取数据挂载集合（如果更新map里的值，请调用session.update()方法避免产生脏数据 ）
+	 * 获取数据挂载集合（如果更新map里的值，请调用 session.update() 方法避免产生脏数据 ）
 	 *
 	 * @return 返回底层储存值的map对象
 	 */
@@ -375,7 +478,7 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	}
 
 	/**
-	 * 写入数据集合 (不改变底层对象，只将此dataMap所有数据进行替换) 
+	 * 写入数据集合 (不改变底层对象引用，只将此 dataMap 所有数据进行替换)
 	 * @param dataMap 数据集合 
 	 */
 	public void refreshDataMap(Map<String, Object> dataMap) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 4853513b..6197e7b5 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.SaCheckDisable;
@@ -867,12 +868,24 @@ public class StpLogic {
 	 * 获取指定key的Session, 如果Session尚未创建，isCreate=是否新建并返回
 	 * @param sessionId SessionId
 	 * @param isCreate 是否新建
+	 * @param appendOperation 如果这个 SaSession 是新建的，则要追加执行的动作
 	 * @return Session对象 
 	 */
-	public SaSession getSessionBySessionId(String sessionId, boolean isCreate) {
+	public SaSession getSessionBySessionId(String sessionId, boolean isCreate, Consumer<SaSession> appendOperation) {
+
+		// 先检查这个 SaSession 是否已经存在，如果不存在且 isCreate=true，则新建并返回
 		SaSession session = getSaTokenDao().getSession(sessionId);
+
 		if(session == null && isCreate) {
+			// 创建这个 SaSession
 			session = SaStrategy.me.createSession.apply(sessionId);
+
+			// 追加操作
+			if(appendOperation != null) {
+				appendOperation.accept(session);
+			}
+
+			// 将这个 SaSession 入库
 			getSaTokenDao().setSession(session, getConfig().getTimeout());
 		}
 		return session;
@@ -884,7 +897,7 @@ public class StpLogic {
 	 * @return Session对象 
 	 */
 	public SaSession getSessionBySessionId(String sessionId) {
-		return getSessionBySessionId(sessionId, false);
+		return getSessionBySessionId(sessionId, false, null);
 	}
 
 	/** 
@@ -894,7 +907,12 @@ public class StpLogic {
 	 * @return Session对象
 	 */
 	public SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
-		return getSessionBySessionId(splicingKeySession(loginId), isCreate);
+		return getSessionBySessionId(splicingKeySession(loginId), isCreate, session -> {
+			// 设定这个 SaSession 的各种基础信息：类型、账号体系、账号id
+			session.setType(SaTokenConsts.SESSION_TYPE__ACCOUNT);
+			session.setLoginType(getLoginType());
+			session.setLoginId(loginId);
+		});
 	}
 
 	/** 
@@ -903,7 +921,7 @@ public class StpLogic {
 	 * @return Session对象 
 	 */
 	public SaSession getSessionByLoginId(Object loginId) {
-		return getSessionBySessionId(splicingKeySession(loginId), true);
+		return getSessionByLoginId(loginId, true);
 	}
 
 	/** 
@@ -933,7 +951,12 @@ public class StpLogic {
 	 * @return session对象
 	 */
 	public SaSession getTokenSessionByToken(String tokenValue, boolean isCreate) {
-		return getSessionBySessionId(splicingKeyTokenSession(tokenValue), isCreate);
+		return getSessionBySessionId(splicingKeyTokenSession(tokenValue), isCreate, session -> {
+			// 设定这个 SaSession 的各种基础信息：类型、账号体系、Token 值
+			session.setType(SaTokenConsts.SESSION_TYPE__TOKEN);
+			session.setLoginType(getLoginType());
+			session.setToken(tokenValue);
+		});
 	}
 	
 	/** 
@@ -942,7 +965,7 @@ public class StpLogic {
 	 * @return Session对象  
 	 */
 	public SaSession getTokenSessionByToken(String tokenValue) {
-		return getSessionBySessionId(splicingKeyTokenSession(tokenValue), true);
+		return getTokenSessionByToken(tokenValue, true);
 	}
 
 	/** 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index 17b141c1..c3f6eae7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -10,7 +10,7 @@ public class SaTokenConsts {
 	private SaTokenConsts() {
 	}
 	
-	// =================== sa-token版本信息 ===================  
+	// ------------------ Sa-Token 版本信息
 	
 	/**
 	 * Sa-Token 当前版本号 
@@ -32,7 +32,7 @@ public class SaTokenConsts {
 	 */
 	public static final String DEV_DOC_URL = "https://sa-token.cc";
 	
-	// =================== 常量key标记 ===================  
+	// ------------------ 常量key标记
 	
 	/**
 	 * 常量key标记: 如果token为本次请求新创建的，则以此字符串为key存储在当前request中 
@@ -101,7 +101,7 @@ public class SaTokenConsts {
 	public static final String DEFAULT_TEMP_TOKEN_SERVICE = "record"; 
 
 
-	// =================== token-style 相关 ===================  
+	// ------------------ token-style 相关
 	
 	/**
 	 * Token风格: uuid 
@@ -131,10 +131,28 @@ public class SaTokenConsts {
 	/**
 	 * Token风格: tik风格 (2_14_16) 
 	 */
-	public static final String TOKEN_STYLE_TIK = "tik"; 
+	public static final String TOKEN_STYLE_TIK = "tik";
 
-	
-	// =================== 其它 ===================  
+
+	// ------------------ SaSession 的类型
+
+	/**
+	 * SaSession 的类型: Account-Session
+	 */
+	public static final String SESSION_TYPE__ACCOUNT = "Account-Session";
+
+	/**
+	 * SaSession 的类型: Token-Session
+	 */
+	public static final String SESSION_TYPE__TOKEN = "Token-Session";
+
+	/**
+	 * SaSession 的类型: Custom-Session
+	 */
+	public static final String SESSION_TYPE__CUSTOM = "Custom-Session";
+
+
+	// ------------------ 其它
 
 	/**
 	 * 连接Token前缀和Token值的字符 
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
index 228e0bc2..a183c0cc 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
@@ -1,10 +1,9 @@
 package com.pj;
 
+import cn.dev33.satoken.SaManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import cn.dev33.satoken.SaManager;
-
 /**
  * Sa-Token 测试  
  * @author kong
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index d6772e98..2d692f49 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -1,11 +1,10 @@
 package com.pj.test;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 测试专用Controller 
@@ -26,7 +25,7 @@ public class TestController {
 	// 测试   浏览器访问： http://localhost:8081/test/test
 	@RequestMapping("test")
 	public SaResult test() {
-		System.out.println("------------进来了"); 
+		System.out.println("------------进来了");
 		// 返回
 		return SaResult.data("");
 	}
diff --git a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
index b38fe0af..e6a2ffa7 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
@@ -18,7 +18,7 @@ sa-token:
     token-style: uuid
     # 是否输出操作日志 
     is-log: false
-    
+
 spring: 
     # redis配置 
     redis:

From bc855f2b1b5064f616f7c79cd5aad53e112f4eef Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 29 Apr 2023 07:12:11 +0800
Subject: [PATCH 014/129] =?UTF-8?q?=E6=8A=BD=E7=A6=BB=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E6=8E=A5=E5=8F=A3=20SaFilter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/filter/SaFilter.java     | 70 ++++++++++++++++
 sa-token-demo/sa-token-demo-solon/pom.xml     |  7 ++
 .../sa-token-demo-sso-server-solon/pom.xml    |  8 ++
 .../main/java/com/pj/SaTokenApplication.java  |  1 +
 .../sa-token-context-dubbo3/pom.xml           |  4 +-
 .../satoken/jboot/SaTokenPathFilter.java      | 66 +++------------
 .../satoken/jfinal/SaTokenPathFilter.java     | 66 +++------------
 .../reactor/filter/SaReactorFilter.java       | 72 ++++------------
 .../reactor/filter/SaReactorFilter.java       | 72 ++++------------
 .../solon/integration/SaTokenFilter.java      | 82 ++++---------------
 .../dev33/satoken/filter/SaServletFilter.java | 74 ++++-------------
 .../dev33/satoken/filter/SaServletFilter.java | 76 ++++-------------
 .../dev33/satoken/springboot/BasicsTest.java  |  4 +-
 13 files changed, 191 insertions(+), 411 deletions(-)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
new file mode 100644
index 00000000..65774195
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
@@ -0,0 +1,70 @@
+package cn.dev33.satoken.filter;
+
+import java.util.List;
+
+/**
+ * Sa-Token 过滤器接口，为不同版本的过滤器：
+ *  1、封装共同代码。
+ *  2、定义统一的行为接口。
+ *
+ * @author click33
+ * @since 2023/4/29
+ */
+public interface SaFilter {
+
+    // ------------------------ 设置此过滤器 拦截 & 放行 的路由
+
+    /**
+     * 添加 [ 拦截路由 ]
+     * @param paths 路由
+     * @return 对象自身
+     */
+    public SaFilter addInclude(String... paths);
+
+    /**
+     * 添加 [ 放行路由 ]
+     * @param paths 路由
+     * @return 对象自身
+     */
+    public SaFilter addExclude(String... paths);
+
+    /**
+     * 写入 [ 拦截路由 ] 集合
+     * @param pathList 路由集合
+     * @return 对象自身
+     */
+    public SaFilter setIncludeList(List<String> pathList);
+
+    /**
+     * 写入 [ 放行路由 ] 集合
+     * @param pathList 路由集合
+     * @return 对象自身
+     */
+    public SaFilter setExcludeList(List<String> pathList);
+
+
+    // ------------------------ 钩子函数
+
+    /**
+     * 写入[ 认证函数 ]: 每次请求执行
+     * @param auth see note
+     * @return 对象自身
+     */
+    public SaFilter setAuth(SaFilterAuthStrategy auth);
+
+    /**
+     * 写入[ 异常处理函数 ]：每次[ 认证函数 ]发生异常时执行此函数
+     * @param error see note
+     * @return 对象自身
+     */
+    public SaFilter setError(SaFilterErrorStrategy error);
+
+    /**
+     * 写入[ 前置函数 ]：在每次[ 认证函数 ]之前执行。
+     *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
+     * @param beforeAuth /
+     * @return 对象自身
+     */
+    public SaFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth);
+
+}
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index 836860f1..b2f65adf 100644
--- a/sa-token-demo/sa-token-demo-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-solon/pom.xml
@@ -6,6 +6,13 @@
 	<artifactId>sa-token-demo-solon</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 
+	<!-- Solon -->
+	<parent>
+		<groupId>org.noear</groupId>
+		<artifactId>solon-parent</artifactId>
+		<version>2.2.3</version>
+		<relativePath/>
+	</parent>
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
index 65b53f2d..6f66fe1e 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
@@ -6,6 +6,14 @@
 	<artifactId>sa-token-demo-sso-server-solon</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	
+	<!-- Solon -->
+	<parent>
+		<groupId>org.noear</groupId>
+		<artifactId>solon-parent</artifactId>
+		<version>2.2.3</version>
+		<relativePath/>
+	</parent>
+	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.34.0</sa-token.version>
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
index a183c0cc..ef69b80c 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
@@ -1,6 +1,7 @@
 package com.pj;
 
 import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.filter.SaServletFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
diff --git a/sa-token-plugin/sa-token-context-dubbo3/pom.xml b/sa-token-plugin/sa-token-context-dubbo3/pom.xml
index 76ebd5d4..2820c6c8 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/pom.xml
+++ b/sa-token-plugin/sa-token-context-dubbo3/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>cn.dev33</groupId>
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
index 7e24ffa6..c8de6c95 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
@@ -3,81 +3,50 @@ package cn.dev33.satoken.jboot;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.filter.SaFilterAuthStrategy;
 import cn.dev33.satoken.filter.SaFilterErrorStrategy;
+import cn.dev33.satoken.filter.SaFilter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class SaTokenPathFilter {
+public class SaTokenPathFilter implements SaFilter {
 
     // ------------------------ 设置此过滤器 拦截 & 放行 的路由
 
     /**
      * 拦截路由
      */
-    private List<String> includeList = new ArrayList<>();
+    public List<String> includeList = new ArrayList<>();
 
     /**
      * 放行路由
      */
-    private List<String> excludeList = new ArrayList<>();
+    public List<String> excludeList = new ArrayList<>();
 
-    /**
-     * 添加 [拦截路由]
-     * @param paths 路由
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter addInclude(String... paths) {
         includeList.addAll(Arrays.asList(paths));
         return this;
     }
 
-    /**
-     * 添加 [放行路由]
-     * @param paths 路由
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter addExclude(String... paths) {
         excludeList.addAll(Arrays.asList(paths));
         return this;
     }
 
-    /**
-     * 写入 [拦截路由] 集合
-     * @param pathList 路由集合
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setIncludeList(List<String> pathList) {
         includeList = pathList;
         return this;
     }
 
-    /**
-     * 写入 [放行路由] 集合
-     * @param pathList 路由集合
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setExcludeList(List<String> pathList) {
         excludeList = pathList;
         return this;
     }
 
-    /**
-     * 获取 [拦截路由] 集合
-     * @return see note
-     */
-    public List<String> getIncludeList() {
-        return includeList;
-    }
-
-    /**
-     * 获取 [放行路由] 集合
-     * @return see note
-     */
-    public List<String> getExcludeList() {
-        return excludeList;
-    }
-
 
     // ------------------------ 钩子函数
 
@@ -95,34 +64,23 @@ public class SaTokenPathFilter {
 
     /**
      * 前置函数：在每次[认证函数]之前执行
+     *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
      */
     public SaFilterAuthStrategy beforeAuth = r -> {};
 
-    /**
-     * 写入[认证函数]: 每次请求执行
-     * @param auth see note
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setAuth(SaFilterAuthStrategy auth) {
         this.auth = auth;
         return this;
     }
 
-    /**
-     * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数
-     * @param error see note
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setError(SaFilterErrorStrategy error) {
         this.error = error;
         return this;
     }
 
-    /**
-     * 写入[前置函数]：在每次[认证函数]之前执行
-     * @param beforeAuth see note
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
         this.beforeAuth = beforeAuth;
         return this;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
index 731ef14c..2444422e 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
@@ -3,81 +3,50 @@ package cn.dev33.satoken.jfinal;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.filter.SaFilterAuthStrategy;
 import cn.dev33.satoken.filter.SaFilterErrorStrategy;
+import cn.dev33.satoken.filter.SaFilter;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class SaTokenPathFilter {
+public class SaTokenPathFilter implements SaFilter {
 
     // ------------------------ 设置此过滤器 拦截 & 放行 的路由
 
     /**
      * 拦截路由
      */
-    private List<String> includeList = new ArrayList<>();
+    public List<String> includeList = new ArrayList<>();
 
     /**
      * 放行路由
      */
-    private List<String> excludeList = new ArrayList<>();
+    public List<String> excludeList = new ArrayList<>();
 
-    /**
-     * 添加 [拦截路由]
-     * @param paths 路由
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter addInclude(String... paths) {
         includeList.addAll(Arrays.asList(paths));
         return this;
     }
 
-    /**
-     * 添加 [放行路由]
-     * @param paths 路由
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter addExclude(String... paths) {
         excludeList.addAll(Arrays.asList(paths));
         return this;
     }
 
-    /**
-     * 写入 [拦截路由] 集合
-     * @param pathList 路由集合
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setIncludeList(List<String> pathList) {
         includeList = pathList;
         return this;
     }
 
-    /**
-     * 写入 [放行路由] 集合
-     * @param pathList 路由集合
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setExcludeList(List<String> pathList) {
         excludeList = pathList;
         return this;
     }
 
-    /**
-     * 获取 [拦截路由] 集合
-     * @return see note
-     */
-    public List<String> getIncludeList() {
-        return includeList;
-    }
-
-    /**
-     * 获取 [放行路由] 集合
-     * @return see note
-     */
-    public List<String> getExcludeList() {
-        return excludeList;
-    }
-
 
     // ------------------------ 钩子函数
 
@@ -95,34 +64,23 @@ public class SaTokenPathFilter {
 
     /**
      * 前置函数：在每次[认证函数]之前执行
+     *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
      */
     public SaFilterAuthStrategy beforeAuth = r -> {};
 
-    /**
-     * 写入[认证函数]: 每次请求执行
-     * @param auth see note
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setAuth(SaFilterAuthStrategy auth) {
         this.auth = auth;
         return this;
     }
 
-    /**
-     * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数
-     * @param error see note
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setError(SaFilterErrorStrategy error) {
         this.error = error;
         return this;
     }
 
-    /**
-     * 写入[前置函数]：在每次[认证函数]之前执行
-     * @param beforeAuth see note
-     * @return 对象自身
-     */
+    @Override
     public SaTokenPathFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
         this.beforeAuth = beforeAuth;
         return this;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index c0603192..f48d150d 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import cn.dev33.satoken.filter.SaFilter;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
@@ -27,75 +28,43 @@ import reactor.core.publisher.Mono;
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
-public class SaReactorFilter implements WebFilter {
+public class SaReactorFilter implements SaFilter, WebFilter {
 
 	// ------------------------ 设置此过滤器 拦截 & 放行 的路由 
 
 	/**
 	 * 拦截路由 
 	 */
-	private List<String> includeList = new ArrayList<>();
+	public List<String> includeList = new ArrayList<>();
 
 	/**
 	 * 放行路由 
 	 */
-	private List<String> excludeList = new ArrayList<>();
+	public List<String> excludeList = new ArrayList<>();
 
-	/**
-	 * 添加 [拦截路由] 
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter addInclude(String... paths) {
 		includeList.addAll(Arrays.asList(paths));
 		return this;
 	}
-	
-	/**
-	 * 添加 [放行路由]
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaReactorFilter addExclude(String... paths) {
 		excludeList.addAll(Arrays.asList(paths));
 		return this;
 	}
 
-	/**
-	 * 写入 [拦截路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setIncludeList(List<String> pathList) {
 		includeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 写入 [放行路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaReactorFilter setExcludeList(List<String> pathList) {
 		excludeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 获取 [拦截路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getIncludeList() {
-		return includeList;
-	}
-	
-	/**
-	 * 获取 [放行路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getExcludeList() {
-		return excludeList;
-	}
 
 
 	// ------------------------ 钩子函数
@@ -113,35 +82,24 @@ public class SaReactorFilter implements WebFilter {
 	};
 
 	/**
-	 * 前置函数：在每次[认证函数]之前执行 
+	 * 前置函数：在每次[认证函数]之前执行
+	 *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
 	 */
 	public SaFilterAuthStrategy beforeAuth = r -> {};
 
-	/**
-	 * 写入[认证函数]: 每次请求执行 
-	 * @param auth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setAuth(SaFilterAuthStrategy auth) {
 		this.auth = auth;
 		return this;
 	}
 
-	/**
-	 * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数 
-	 * @param error see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setError(SaFilterErrorStrategy error) {
 		this.error = error;
 		return this;
 	}
 
-	/**
-	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 * @param beforeAuth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
 		this.beforeAuth = beforeAuth;
 		return this;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index e03c8888..a3287b31 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import cn.dev33.satoken.filter.SaFilter;
 import org.springframework.core.annotation.Order;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebFilter;
@@ -27,75 +28,43 @@ import reactor.core.publisher.Mono;
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
-public class SaReactorFilter implements WebFilter {
+public class SaReactorFilter implements SaFilter, WebFilter {
 
 	// ------------------------ 设置此过滤器 拦截 & 放行 的路由 
 
 	/**
 	 * 拦截路由 
 	 */
-	private List<String> includeList = new ArrayList<>();
+	public List<String> includeList = new ArrayList<>();
 
 	/**
 	 * 放行路由 
 	 */
-	private List<String> excludeList = new ArrayList<>();
+	public List<String> excludeList = new ArrayList<>();
 
-	/**
-	 * 添加 [拦截路由] 
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter addInclude(String... paths) {
 		includeList.addAll(Arrays.asList(paths));
 		return this;
 	}
-	
-	/**
-	 * 添加 [放行路由]
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaReactorFilter addExclude(String... paths) {
 		excludeList.addAll(Arrays.asList(paths));
 		return this;
 	}
 
-	/**
-	 * 写入 [拦截路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setIncludeList(List<String> pathList) {
 		includeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 写入 [放行路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaReactorFilter setExcludeList(List<String> pathList) {
 		excludeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 获取 [拦截路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getIncludeList() {
-		return includeList;
-	}
-	
-	/**
-	 * 获取 [放行路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getExcludeList() {
-		return excludeList;
-	}
 
 
 	// ------------------------ 钩子函数
@@ -113,35 +82,24 @@ public class SaReactorFilter implements WebFilter {
 	};
 
 	/**
-	 * 前置函数：在每次[认证函数]之前执行 
+	 * 前置函数：在每次[认证函数]之前执行
+	 *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
 	 */
 	public SaFilterAuthStrategy beforeAuth = r -> {};
 
-	/**
-	 * 写入[认证函数]: 每次请求执行 
-	 * @param auth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setAuth(SaFilterAuthStrategy auth) {
 		this.auth = auth;
 		return this;
 	}
 
-	/**
-	 * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数 
-	 * @param error see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setError(SaFilterErrorStrategy error) {
 		this.error = error;
 		return this;
 	}
 
-	/**
-	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 * @param beforeAuth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaReactorFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
 		this.beforeAuth = beforeAuth;
 		return this;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
index 31866411..6a4698f6 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -6,6 +6,7 @@ import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.exception.StopMatchException;
 import cn.dev33.satoken.filter.SaFilterAuthStrategy;
 import cn.dev33.satoken.filter.SaFilterErrorStrategy;
+import cn.dev33.satoken.filter.SaFilter;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.strategy.SaStrategy;
 import org.noear.solon.Solon;
@@ -26,7 +27,8 @@ import java.util.List;
  * @author noear
  * @since 1.10
  */
-public class SaTokenFilter implements Filter { //之所以改名，为了跟 SaTokenInterceptor 形成一对
+public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为了跟 SaTokenInterceptor 形成一对
+
 	/**
 	 * 是否打开注解鉴权
 	 */
@@ -37,88 +39,50 @@ public class SaTokenFilter implements Filter { //之所以改名，为了跟 SaT
 	/**
 	 * 拦截路由
 	 */
-	protected List<String> includeList = new ArrayList<>();
+	public List<String> includeList = new ArrayList<>();
 
 	/**
 	 * 放行路由
 	 */
-	protected List<String> excludeList = new ArrayList<>();
+	public List<String> excludeList = new ArrayList<>();
 
-	/**
-	 * 添加 [拦截路由]
-	 *
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter addInclude(String... paths) {
 		includeList.addAll(Arrays.asList(paths));
 		return this;
 	}
 
-	/**
-	 * 添加 [放行路由]
-	 *
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter addExclude(String... paths) {
 		excludeList.addAll(Arrays.asList(paths));
 		return this;
 	}
 
-	/**
-	 * 写入 [拦截路由] 集合
-	 *
-	 * @param pathList 路由集合
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter setIncludeList(List<String> pathList) {
 		includeList = pathList;
 		return this;
 	}
 
-	/**
-	 * 写入 [放行路由] 集合
-	 *
-	 * @param pathList 路由集合
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter setExcludeList(List<String> pathList) {
 		excludeList = pathList;
 		return this;
 	}
 
-	/**
-	 * 获取 [拦截路由] 集合
-	 *
-	 * @return see note
-	 */
-	public List<String> getIncludeList() {
-		return includeList;
-	}
-
-	/**
-	 * 获取 [放行路由] 集合
-	 *
-	 * @return see note
-	 */
-	public List<String> getExcludeList() {
-		return excludeList;
-	}
-
 
 	// ------------------------ 钩子函数
 
 	/**
 	 * 认证函数：每次请求执行
 	 */
-	protected SaFilterAuthStrategy auth = r -> {
+	public SaFilterAuthStrategy auth = r -> {
 	};
 
 	/**
 	 * 异常处理函数：每次[认证函数]发生异常时执行此函数
 	 */
-	protected SaFilterErrorStrategy error = e -> {
+	public SaFilterErrorStrategy error = e -> {
 		if (e instanceof SaTokenException) {
 			throw (SaTokenException) e;
 		} else {
@@ -128,38 +92,24 @@ public class SaTokenFilter implements Filter { //之所以改名，为了跟 SaT
 
 	/**
 	 * 前置函数：在每次[认证函数]之前执行
+	 *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
 	 */
-	protected SaFilterAuthStrategy beforeAuth = r -> {
+	public SaFilterAuthStrategy beforeAuth = r -> {
 	};
 
-	/**
-	 * 写入[认证函数]: 每次请求执行
-	 *
-	 * @param auth see note
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter setAuth(SaFilterAuthStrategy auth) {
 		this.auth = auth;
 		return this;
 	}
 
-	/**
-	 * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数
-	 *
-	 * @param error see note
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter setError(SaFilterErrorStrategy error) {
 		this.error = error;
 		return this;
 	}
 
-	/**
-	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 *
-	 * @param beforeAuth see note
-	 * @return 对象自身
-	 */
+	@Override
 	public SaTokenFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
 		this.beforeAuth = beforeAuth;
 		return this;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index a647e206..ddd54d7d 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -27,75 +27,43 @@ import cn.dev33.satoken.util.SaTokenConsts;
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
-public class SaServletFilter implements Filter {
+public class SaServletFilter implements SaFilter, Filter {
 
 	// ------------------------ 设置此过滤器 拦截 & 放行 的路由 
 
 	/**
 	 * 拦截路由 
 	 */
-	private List<String> includeList = new ArrayList<>();
+	public List<String> includeList = new ArrayList<>();
 
 	/**
 	 * 放行路由 
 	 */
-	private List<String> excludeList = new ArrayList<>();
+	public List<String> excludeList = new ArrayList<>();
 
-	/**
-	 * 添加 [拦截路由] 
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter addInclude(String... paths) {
 		includeList.addAll(Arrays.asList(paths));
 		return this;
 	}
-	
-	/**
-	 * 添加 [放行路由]
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaServletFilter addExclude(String... paths) {
 		excludeList.addAll(Arrays.asList(paths));
 		return this;
 	}
 
-	/**
-	 * 写入 [拦截路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setIncludeList(List<String> pathList) {
 		includeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 写入 [放行路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaServletFilter setExcludeList(List<String> pathList) {
 		excludeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 获取 [拦截路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getIncludeList() {
-		return includeList;
-	}
-	
-	/**
-	 * 获取 [放行路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getExcludeList() {
-		return excludeList;
-	}
 
 
 	// ------------------------ 钩子函数
@@ -113,35 +81,24 @@ public class SaServletFilter implements Filter {
 	};
 
 	/**
-	 * 前置函数：在每次[认证函数]之前执行 
+	 * 前置函数：在每次[认证函数]之前执行
+	 *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
 	 */
 	public SaFilterAuthStrategy beforeAuth = r -> {};
 
-	/**
-	 * 写入[认证函数]: 每次请求执行 
-	 * @param auth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setAuth(SaFilterAuthStrategy auth) {
 		this.auth = auth;
 		return this;
 	}
 
-	/**
-	 * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数 
-	 * @param error see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setError(SaFilterErrorStrategy error) {
 		this.error = error;
 		return this;
 	}
 
-	/**
-	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 * @param beforeAuth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
 		this.beforeAuth = beforeAuth;
 		return this;
@@ -151,8 +108,7 @@ public class SaServletFilter implements Filter {
 	// ------------------------ doFilter
 
 	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		
 		try {
 			// 执行全局过滤器 
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 3c6b40e6..9255993c 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -26,75 +26,43 @@ import jakarta.servlet.ServletResponse;
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
-public class SaServletFilter implements Filter {
+public class SaServletFilter implements SaFilter, Filter {
 
 	// ------------------------ 设置此过滤器 拦截 & 放行 的路由 
 
 	/**
 	 * 拦截路由 
 	 */
-	private List<String> includeList = new ArrayList<>();
+	public List<String> includeList = new ArrayList<>();
 
 	/**
 	 * 放行路由 
 	 */
-	private List<String> excludeList = new ArrayList<>();
+	public List<String> excludeList = new ArrayList<>();
 
-	/**
-	 * 添加 [拦截路由] 
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter addInclude(String... paths) {
 		includeList.addAll(Arrays.asList(paths));
 		return this;
 	}
-	
-	/**
-	 * 添加 [放行路由]
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaServletFilter addExclude(String... paths) {
 		excludeList.addAll(Arrays.asList(paths));
 		return this;
 	}
 
-	/**
-	 * 写入 [拦截路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setIncludeList(List<String> pathList) {
 		includeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 写入 [放行路由] 集合
-	 * @param pathList 路由集合 
-	 * @return 对象自身
-	 */
+
+	@Override
 	public SaServletFilter setExcludeList(List<String> pathList) {
 		excludeList = pathList;
 		return this;
 	}
-	
-	/**
-	 * 获取 [拦截路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getIncludeList() {
-		return includeList;
-	}
-	
-	/**
-	 * 获取 [放行路由] 集合
-	 * @return see note 
-	 */
-	public List<String> getExcludeList() {
-		return excludeList;
-	}
 
 
 	// ------------------------ 钩子函数
@@ -112,35 +80,24 @@ public class SaServletFilter implements Filter {
 	};
 
 	/**
-	 * 前置函数：在每次[认证函数]之前执行 
+	 * 前置函数：在每次[认证函数]之前执行
+	 *      <b>注意点：前置认证函数将不受 includeList 与 excludeList 的限制，所有路由的请求都会进入 beforeAuth</b>
 	 */
 	public SaFilterAuthStrategy beforeAuth = r -> {};
 
-	/**
-	 * 写入[认证函数]: 每次请求执行 
-	 * @param auth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setAuth(SaFilterAuthStrategy auth) {
 		this.auth = auth;
 		return this;
 	}
 
-	/**
-	 * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数 
-	 * @param error see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setError(SaFilterErrorStrategy error) {
 		this.error = error;
 		return this;
 	}
 
-	/**
-	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 * @param beforeAuth see note 
-	 * @return 对象自身
-	 */
+	@Override
 	public SaServletFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
 		this.beforeAuth = beforeAuth;
 		return this;
@@ -150,8 +107,7 @@ public class SaServletFilter implements Filter {
 	// ------------------------ doFilter
 
 	@Override
-	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-			throws IOException, ServletException {
+	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		
 		try {
 			// 执行全局过滤器 
@@ -179,7 +135,7 @@ public class SaServletFilter implements Filter {
 	}
 
 	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
+	public void init(FilterConfig filterConfig) {
 	}
 	
 	@Override
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
index 64280506..9b5c90c2 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
@@ -762,8 +762,8 @@ public class BasicsTest {
     			.setAuth(obj -> {})
     			.setBeforeAuth(obj -> {})
     			;
-    	Assertions.assertEquals(filter.getIncludeList().get(0), "/**");
-    	Assertions.assertEquals(filter.getExcludeList().get(0), "/favicon.ico");
+    	Assertions.assertEquals(filter.includeList.get(0), "/**");
+    	Assertions.assertEquals(filter.excludeList.get(0), "/favicon.ico");
     	// 以下功能无法测试
     	filter.init(null);
     	filter.doFilter(SpringMVCUtil.getRequest(), SpringMVCUtil.getResponse(), new MockFilterChain());

From d54af3699961146c25622c4f919354c3f254927e Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 29 Apr 2023 22:10:14 +0800
Subject: [PATCH 015/129] =?UTF-8?q?=E5=B0=86=E5=85=A8=E5=B1=80=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E7=9A=84=20BeforeAuth=20=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E4=B8=8D=E5=8F=97=20includeList=20=E4=B8=8E?=
 =?UTF-8?q?=20excludeList=20=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=AF=B7=E6=B1=82=E9=83=BD=E4=BC=9A=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/pj/satoken/SaTokenConfigure.java  |  2 +-
 sa-token-demo/sa-token-demo-solon/pom.xml           |  2 +-
 .../main/java/com/pj/satoken/SaTokenConfigure.java  |  2 +-
 .../main/java/com/pj/satoken/SaTokenConfigure.java  | 13 ++++++-------
 .../main/java/com/pj/satoken/SaTokenConfigure.java  |  2 +-
 .../main/java/com/pj/satoken/SaTokenConfigure.java  |  4 ++--
 .../main/java/com/pj/satoken/SaTokenConfigure.java  |  2 +-
 sa-token-doc/up/global-filter.md                    |  2 +-
 .../cn/dev33/satoken/jboot/SaTokenPathFilter.java   |  2 +-
 .../cn/dev33/satoken/jfinal/SaTokenPathFilter.java  |  2 +-
 .../satoken/reactor/filter/SaReactorFilter.java     |  4 ++--
 .../satoken/reactor/filter/SaReactorFilter.java     |  4 ++--
 .../satoken/solon/integration/SaTokenFilter.java    |  8 ++++----
 .../cn/dev33/satoken/filter/SaServletFilter.java    |  4 ++--
 .../cn/dev33/satoken/filter/SaServletFilter.java    |  4 ++--
 15 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 9ef97a41..7f41b5fb 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -94,7 +94,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         			return SaResult.error(e.getMessage());
         		})
         		
-        		// 前置函数：在每次认证函数之前执行
+        		// 前置函数：在每次认证函数之前执行（BeforeAuth 不受 includeList 与 excludeList 的限制，所有请求都会进入）
         		.setBeforeAuth(r -> {
         			// ---------- 设置一些安全响应头 ----------
         			SaHolder.getResponse()
diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index b2f65adf..87289c56 100644
--- a/sa-token-demo/sa-token-demo-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-solon/pom.xml
@@ -13,7 +13,7 @@
 		<version>2.2.3</version>
 		<relativePath/>
 	</parent>
-	
+
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.34.0</sa-token.version>
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 72a3c559..567489d5 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -42,7 +42,7 @@ public class SaTokenConfigure {
 					return AjaxJson.getError(e.getMessage());
 				})
 
-				// 前置函数：在每次认证函数之前执行
+				// 前置函数：在每次认证函数之前执行（BeforeAuth 不受 includeList 与 excludeList 的限制，所有请求都会进入）
 				.setBeforeAuth(r -> {
 					// ---------- 设置一些安全响应头 ----------
 					SaHolder.getResponse()
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
index a4a4995e..71e7aca7 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -1,14 +1,13 @@
 package com.pj.satoken;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.filter.SaServletFilter;
 import cn.dev33.satoken.interceptor.SaInterceptor;
 import cn.dev33.satoken.util.SaResult;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 
 /**
@@ -40,7 +39,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         		
         		// 认证函数: 每次请求执行 
         		.setAuth(obj -> {
-        			// System.out.println("---------- sa全局认证 " + SaHolder.getRequest().getRequestPath()); 
+        			// SaManager.getLog().debug("----- 请求path={}  提交token={}", SaHolder.getRequest().getRequestPath(), StpUtil.getTokenValue());
         			
         		})
         		
@@ -50,7 +49,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         			return SaResult.error(e.getMessage());
         		})
         		
-        		// 前置函数：在每次认证函数之前执行
+        		// 前置函数：在每次认证函数之前执行 （BeforeAuth不受 includeList 与 excludeList 的限制，所有请求都会进入）
         		.setBeforeAuth(r -> {
         			// ---------- 设置一些安全响应头 ----------
         			SaHolder.getResponse()
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java
index a4a4995e..9de045f8 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -50,7 +50,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         			return SaResult.error(e.getMessage());
         		})
         		
-        		// 前置函数：在每次认证函数之前执行
+        		// 前置函数：在每次认证函数之前执行（BeforeAuth 不受 includeList 与 excludeList 的限制，所有请求都会进入）
         		.setBeforeAuth(r -> {
         			// ---------- 设置一些安全响应头 ----------
         			SaHolder.getResponse()
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 30149e15..9d628520 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -41,7 +41,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         		
         		// 认证函数: 每次请求执行 
         		.setAuth(obj -> {
-        			// System.out.println("---------- sa全局认证 " + SaHolder.getRequest().getRequestPath()); 
+        			// SaManager.getLog().debug("----- 请求path={}  提交token={}", SaHolder.getRequest().getRequestPath(), StpUtil.getTokenValue());
         			
         		})
         		
@@ -51,7 +51,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         			return AjaxJson.getError(e.getMessage());
         		})
         		
-        		// 前置函数：在每次认证函数之前执行
+        		// 前置函数：在每次认证函数之前执行（BeforeAuth 不受 includeList 与 excludeList 的限制，所有请求都会进入）
         		.setBeforeAuth(r -> {
         			// ---------- 设置一些安全响应头 ----------
         			SaHolder.getResponse()
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 07736e4e..c4cacc6e 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -51,7 +51,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
         			return SaResult.error(e.getMessage());
         		})
         		
-        		// 前置函数：在每次认证函数之前执行
+        		// 前置函数：在每次认证函数之前执行（BeforeAuth 不受 includeList 与 excludeList 的限制，所有请求都会进入）
         		.setBeforeAuth(r -> {
         			// ---------- 设置一些安全响应头 ----------
         			SaHolder.getResponse()
diff --git a/sa-token-doc/up/global-filter.md b/sa-token-doc/up/global-filter.md
index d305f2bf..fe2f5a32 100644
--- a/sa-token-doc/up/global-filter.md
+++ b/sa-token-doc/up/global-filter.md
@@ -53,7 +53,7 @@ public class SaTokenConfigure {
         			return SaResult.error(e.getMessage());
         		})
 				
-        		// 前置函数：在每次认证函数之前执行
+        		// 前置函数：在每次认证函数之前执行（BeforeAuth 不受 includeList 与 excludeList 的限制，所有请求都会进入）
         		.setBeforeAuth(r -> {
         			// ---------- 设置一些安全响应头 ----------
         			SaHolder.getResponse()
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
index c8de6c95..e20c03fd 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
@@ -91,8 +91,8 @@ public class SaTokenPathFilter implements SaFilter {
     public void doFilter(Controller ctx, FilterChain chain) throws Throwable {
         try {
             // 执行全局过滤器
+            beforeAuth.run(null);
             SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-                beforeAuth.run(null);
                 auth.run(null);
             });
 
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
index 2444422e..078164a4 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
@@ -91,8 +91,8 @@ public class SaTokenPathFilter implements SaFilter {
     public void doFilter(Controller ctx, FilterChain chain) throws Throwable {
         try {
             // 执行全局过滤器
+            beforeAuth.run(null);
             SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-                beforeAuth.run(null);
                 auth.run(null);
             });
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index f48d150d..b9ec70e5 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -119,9 +119,9 @@ public class SaReactorFilter implements SaFilter, WebFilter {
 			// 写入全局上下文 (同步) 
 			SaReactorSyncHolder.setContext(exchange);
 			
-			// 执行全局过滤器 
+			// 执行全局过滤器
+			beforeAuth.run(null);
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				beforeAuth.run(null);
 				auth.run(null);
 			});
 			
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index a3287b31..07207108 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -119,9 +119,9 @@ public class SaReactorFilter implements SaFilter, WebFilter {
 			// 写入全局上下文 (同步) 
 			SaReactorSyncHolder.setContext(exchange);
 			
-			// 执行全局过滤器 
+			// 执行全局过滤器
+			beforeAuth.run(null);
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				beforeAuth.run(null);
 				auth.run(null);
 			});
 			
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
index 6a4698f6..7179865d 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -124,11 +124,11 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为
 			Action action = (mainHandler instanceof Action ? (Action) mainHandler : null);
 
 			//先路径过滤下（包括了静态文件）
+			//1.执行前置处理（主要是一些跨域之类的）
+			if(beforeAuth != null) {
+				beforeAuth.run(mainHandler);
+			}
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				//1.执行前置处理（主要是一些跨域之类的）
-				if(beforeAuth != null) {
-					beforeAuth.run(mainHandler);
-				}
 				//2.执行注解处理
 				if(authAnno(action)) {
 					//3.执行规则处理（如果没有被 @SaIgnore 忽略）
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index ddd54d7d..15875222 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -111,9 +111,9 @@ public class SaServletFilter implements SaFilter, Filter {
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		
 		try {
-			// 执行全局过滤器 
+			// 执行全局过滤器
+			beforeAuth.run(null);
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				beforeAuth.run(null);
 				auth.run(null);
 			});
 			
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 9255993c..98aa8f0c 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -110,9 +110,9 @@ public class SaServletFilter implements SaFilter, Filter {
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		
 		try {
-			// 执行全局过滤器 
+			// 执行全局过滤器
+			beforeAuth.run(null);
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				beforeAuth.run(null);
 				auth.run(null);
 			});
 			

From 2c27611473c043fef3b44962cb27881e1f72c386 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 30 Apr 2023 01:18:15 +0800
Subject: [PATCH 016/129] =?UTF-8?q?=E6=9C=AA=E6=8C=87=E5=AE=9A=E5=85=B7?=
 =?UTF-8?q?=E4=BD=93=E8=A6=81=E6=A0=A1=E9=AA=8C=E7=9A=84=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=A0=81=E6=97=B6=EF=BC=8C=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BF=87?=
 =?UTF-8?q?=20close=20#I6ZE9Z?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 38 +++++++++++++++----
 1 file changed, 31 insertions(+), 7 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 6197e7b5..42ae2efa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1382,7 +1382,13 @@ public class StpLogic {
  	 * @param roleArray 角色标识数组
  	 */
  	public void checkRoleAnd(String... roleArray){
- 		Object loginId = getLoginId();
+		// 如果没有指定权限，那么直接跳过
+		if(roleArray == null || roleArray.length == 0) {
+			return;
+		}
+
+		// 开始校验
+		Object loginId = getLoginId();
  		List<String> roleList = getRoleList(loginId);
  		for (String role : roleArray) {
  			if(!hasElement(roleList, role)) {
@@ -1396,6 +1402,12 @@ public class StpLogic {
  	 * @param roleArray 角色标识数组
  	 */
  	public void checkRoleOr(String... roleArray){
+		// 如果没有指定权限，那么直接跳过
+		if(roleArray == null || roleArray.length == 0) {
+			return;
+		}
+
+		// 开始校验
  		Object loginId = getLoginId();
  		List<String> roleList = getRoleList(loginId);
  		for (String role : roleArray) {
@@ -1404,9 +1416,9 @@ public class StpLogic {
  				return;		
  			}
  		}
-		if(roleArray.length > 0) {
-	 		throw new NotRoleException(roleArray[0], this.loginType).setCode(SaErrorCode.CODE_11041);
-		}
+
+		// 代码至此，说明一个都没通过，需要抛出无角色异常
+		throw new NotRoleException(roleArray[0], this.loginType).setCode(SaErrorCode.CODE_11041);
  	}
 
  	
@@ -1495,6 +1507,12 @@ public class StpLogic {
  	 * @param permissionArray 权限码数组
  	 */
  	public void checkPermissionAnd(String... permissionArray){
+		// 如果没有指定权限，那么直接跳过
+		if(permissionArray == null || permissionArray.length == 0) {
+			return;
+		}
+
+		// 开始校验
  		Object loginId = getLoginId();
  		List<String> permissionList = getPermissionList(loginId);
  		for (String permission : permissionArray) {
@@ -1509,6 +1527,12 @@ public class StpLogic {
  	 * @param permissionArray 权限码数组
  	 */
  	public void checkPermissionOr(String... permissionArray){
+		// 如果没有指定权限，那么直接跳过
+		if(permissionArray == null || permissionArray.length == 0) {
+			return;
+		}
+
+		// 开始校验
  		Object loginId = getLoginId();
  		List<String> permissionList = getPermissionList(loginId);
  		for (String permission : permissionArray) {
@@ -1517,9 +1541,9 @@ public class StpLogic {
  				return;		
  			}
  		}
-		if(permissionArray.length > 0) {
-	 		throw new NotPermissionException(permissionArray[0], this.loginType).setCode(SaErrorCode.CODE_11051);
-		}
+
+		// 代码至此，说明一个都没通过，需要抛出无权限异常
+		throw new NotPermissionException(permissionArray[0], this.loginType).setCode(SaErrorCode.CODE_11051);
  	}
 
  	

From a4320f3e7e6711a9628912778e8fb123dd54a8db Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 30 Apr 2023 01:28:46 +0800
Subject: [PATCH 017/129] =?UTF-8?q?=E5=B0=86=20getLoginId()=20=E7=9A=84?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E6=8F=90=E5=89=8D=EF=BC=8C=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E2=80=9C=E6=A0=A1=E9=AA=8C=E6=9D=83=E9=99=90=E5=89=8D=E5=85=88?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=98=AF=E5=90=A6=E7=99=BB=E5=BD=95=E2=80=9D?=
 =?UTF-8?q?=E7=9A=84=E6=97=A7=E5=85=B1=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/stp/StpLogic.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 42ae2efa..60f6d355 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1382,13 +1382,15 @@ public class StpLogic {
  	 * @param roleArray 角色标识数组
  	 */
  	public void checkRoleAnd(String... roleArray){
+		// 先获取当前是哪个账号id
+		Object loginId = getLoginId();
+
 		// 如果没有指定权限，那么直接跳过
 		if(roleArray == null || roleArray.length == 0) {
 			return;
 		}
 
 		// 开始校验
-		Object loginId = getLoginId();
  		List<String> roleList = getRoleList(loginId);
  		for (String role : roleArray) {
  			if(!hasElement(roleList, role)) {
@@ -1402,13 +1404,15 @@ public class StpLogic {
  	 * @param roleArray 角色标识数组
  	 */
  	public void checkRoleOr(String... roleArray){
+		// 先获取当前是哪个账号id
+		Object loginId = getLoginId();
+
 		// 如果没有指定权限，那么直接跳过
 		if(roleArray == null || roleArray.length == 0) {
 			return;
 		}
 
 		// 开始校验
- 		Object loginId = getLoginId();
  		List<String> roleList = getRoleList(loginId);
  		for (String role : roleArray) {
  			if(hasElement(roleList, role)) {
@@ -1507,13 +1511,15 @@ public class StpLogic {
  	 * @param permissionArray 权限码数组
  	 */
  	public void checkPermissionAnd(String... permissionArray){
+		// 先获取当前是哪个账号id
+		Object loginId = getLoginId();
+
 		// 如果没有指定权限，那么直接跳过
 		if(permissionArray == null || permissionArray.length == 0) {
 			return;
 		}
 
 		// 开始校验
- 		Object loginId = getLoginId();
  		List<String> permissionList = getPermissionList(loginId);
  		for (String permission : permissionArray) {
  			if(!hasElement(permissionList, permission)) {
@@ -1527,13 +1533,15 @@ public class StpLogic {
  	 * @param permissionArray 权限码数组
  	 */
  	public void checkPermissionOr(String... permissionArray){
+		// 先获取当前是哪个账号id
+		Object loginId = getLoginId();
+
 		// 如果没有指定权限，那么直接跳过
 		if(permissionArray == null || permissionArray.length == 0) {
 			return;
 		}
 
 		// 开始校验
- 		Object loginId = getLoginId();
  		List<String> permissionList = getPermissionList(loginId);
  		for (String permission : permissionArray) {
  			if(hasElement(permissionList, permission)) {

From ca29da17eefec9ccd1a210664a4784ab0494c868 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 30 Apr 2023 01:40:48 +0800
Subject: [PATCH 018/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20SaInterceptor=20?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E9=89=B4=E6=9D=83=E5=92=8C=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E9=89=B4=E6=9D=83=E4=BA=A4=E6=8D=A2=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E7=9A=84=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pj/satoken/SaTokenConfigure.java |  2 +-
 sa-token-doc/more/common-questions.md         | 24 +++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 71e7aca7..74e61a58 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -23,7 +23,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 	 */
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
-		// 注册 Sa-Token 拦截器打开注解鉴权功能 
+		// 注册 Sa-Token 拦截器打开注解鉴权功能
 		registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**");
 	}
 	
diff --git a/sa-token-doc/more/common-questions.md b/sa-token-doc/more/common-questions.md
index d068ba6b..368dc982 100644
--- a/sa-token-doc/more/common-questions.md
+++ b/sa-token-doc/more/common-questions.md
@@ -470,6 +470,30 @@ public class GlobalExceptionHandler {
 }
 ```
 
+### Q：在 SaInterceptor 中，注解鉴权总是先于路由拦截鉴权执行，能调整一下顺序吗？
+框架没有提供直接的 API，但你有以下两种方式可以做到这一点：
+- 方式1：将 SaInterceptor 里的代码复制出来一份，按照你的需求改一下，然后使用你这个自定义的拦截器，不再使用官方的。
+- 方式2：注册两次 SaInterceptor 拦截器，例如：
+
+``` java
+@Configuration
+public class SaTokenConfigure implements WebMvcConfigurer {
+	
+	@Override
+	public void addInterceptors(InterceptorRegistry registry) {
+		// 路由拦截鉴权
+		registry.addInterceptor(new SaInterceptor(r -> {
+			// 路由拦截鉴权的代码 ...
+		}).isAnnotation(false)).addPathPatterns("/**");
+
+		// 打开注解鉴权
+		registry.addInterceptor(new SaInterceptor()).addPathPatterns("/**");
+	}
+}
+```
+如上，第一个完成路由拦截鉴权功能，第二个完成注解鉴权功能。
+
+
 ### Q：我的项目权限模型不是RBAC模型，很复杂，可以集成吗？
 无论什么模型，只要能把一个用户具有的所有权限塞到一个List里返回给框架，就能集成
 

From 49b0ec9943594fc83033542e07dad34b4b0731f4 Mon Sep 17 00:00:00 2001
From: weloe <1345895607@qq.com>
Date: Sun, 30 Apr 2023 04:16:02 +0800
Subject: [PATCH 019/129] =?UTF-8?q?update:=20=E5=A2=9E=E5=8A=A0Override?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java | 1 +
 .../cn/dev33/satoken/servlet/model/SaResponseForServlet.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 77d2e102..0bf4c04d 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -84,6 +84,7 @@ public class SaRequestForServlet implements SaRequest {
 	 * 返回当前请求的url，例：http://xxx.com/test
 	 * @return see note
 	 */
+	@Override
 	public String getUrl() {
 		String currDomain = SaManager.getConfig().getCurrDomain();
 		if(SaFoxUtil.isEmpty(currDomain) == false) {
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index 47c3def0..4c29eaa3 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -57,6 +57,7 @@ public class SaResponseForServlet implements SaResponse {
 	 * @param value 值 
 	 * @return 对象自身 
 	 */
+	@Override
 	public SaResponse addHeader(String name, String value) {
 		response.addHeader(name, value);
 		return this;

From a72ba8379b4a49a8a3219a4759f91f9d41babb28 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 30 Apr 2023 17:54:22 +0800
Subject: [PATCH 020/129] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BE=AA=E7=8E=AF?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=20token=20=E7=9A=84=E7=AE=97=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=A1=AE=E4=BF=9D=20Token=20?=
 =?UTF-8?q?=E7=9A=84=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev33/satoken/config/SaTokenConfig.java   | 86 +++++--------------
 .../fun/SaGenerateUniqueTokenFunction.java    | 31 +++++++
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 33 ++++++-
 .../cn/dev33/satoken/strategy/SaStrategy.java | 75 +++++++++++-----
 .../java/cn/dev33/satoken/util/SaFoxUtil.java | 14 +--
 .../java/com/pj/SaTokenDemoApplication.java   |  3 +-
 .../main/java/com/pj/test/TestController.java |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 8 files changed, 146 insertions(+), 100 deletions(-)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index be77d923..e0ff46f9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -39,9 +39,13 @@ public class SaTokenConfig implements Serializable {
 	 */
 	private int maxLoginCount = 12;
 
+	/** 在每次创建 token 时的最高循环次数，用于保证 token 唯一性（-1=不循环尝试，直接使用） */
+	private int maxTryTimes = 12;
+
 	/** 是否尝试从请求体里读取token */
 	private Boolean isReadBody = true;
 
+
 	/** 是否尝试从header里读取token */
 	private Boolean isReadHeader = true;
 
@@ -205,6 +209,22 @@ public class SaTokenConfig implements Serializable {
 		return this;
 	}
 
+	/**
+	 * @return 在每次创建 token 时的最高循环次数，用于保证 token 唯一性（-1=不循环尝试，直接使用）
+	 */
+	public int getMaxTryTimes() {
+		return maxTryTimes;
+	}
+
+	/**
+	 * @param maxTryTimes 在每次创建 token 时的最高循环次数，用于保证 token 唯一性（-1=不循环尝试，直接使用）
+	 * @return 对象自身
+	 */
+	public SaTokenConfig setMaxTryTimes(int maxTryTimes) {
+		this.maxTryTimes = maxTryTimes;
+		return this;
+	}
+
 	/**
 	 * @return 是否尝试从请求体里读取token
 	 */
@@ -411,7 +431,7 @@ public class SaTokenConfig implements Serializable {
 	 * @param logLevelInt 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal）
 	 * @return 对象自身
 	 */
-	public SaTokenConfig setLogLeveInt(int logLevelInt) {
+	public SaTokenConfig setLogLevelInt(int logLevelInt) {
 		this.logLevelInt = logLevelInt;
 		this.logLevel = SaFoxUtil.translateLogLevelToString(logLevelInt);
 		return this;
@@ -521,7 +541,8 @@ public class SaTokenConfig implements Serializable {
 				+ ", activityTimeout=" + activityTimeout
 				+ ", isConcurrent=" + isConcurrent 
 				+ ", isShare=" + isShare 
-				+ ", maxLoginCount=" + maxLoginCount 
+				+ ", maxLoginCount=" + maxLoginCount
+				+ ", maxTryTimes=" + maxTryTimes
 				+ ", isReadBody=" + isReadBody
 				+ ", isReadHeader=" + isReadHeader 
 				+ ", isReadCookie=" + isReadCookie
@@ -544,65 +565,4 @@ public class SaTokenConfig implements Serializable {
 				+ "]";
 	}
 
-	
-	/**
-	 * <h1> 本函数设计已过时，未来版本可能移除此函数，请及时更换为 getIsReadHeader() ，使用方式保持不变 </h1>
-	 * @return 是否尝试从header里读取token
-	 */
-	@Deprecated
-	public Boolean getIsReadHead() {
-		return isReadHeader;
-	}
-
-	/**
-	 * <h1> 本函数设计已过时，未来版本可能移除此函数，请及时更换为 setIsReadHeader() ，使用方式保持不变 </h1>
-	 * @param isReadHead 是否尝试从header里读取token
-	 * @return 对象自身
-	 */
-	@Deprecated
-	public SaTokenConfig setIsReadHead(Boolean isReadHead) {
-		this.isReadHeader = isReadHead;
-		return this;
-	}
-
-	/**
-	 * <h1> 本函数设计已过时，未来版本可能移除此函数，请及时更换为 getSameTokenTimeout() ，使用方式保持不变 </h1>
-	 * @return Id-Token的有效期 (单位: 秒)
-	 */
-	@Deprecated
-	public long getIdTokenTimeout() {
-		return sameTokenTimeout;
-	}
-
-	/**
-	 * <h1> 本函数设计已过时，未来版本可能移除此函数，请及时更换为 setSameTokenTimeout() ，使用方式保持不变 </h1>
-	 * @param idTokenTimeout Id-Token的有效期 (单位: 秒)
-	 * @return 对象自身
-	 */
-	@Deprecated
-	public SaTokenConfig setIdTokenTimeout(long idTokenTimeout) {
-		this.sameTokenTimeout = idTokenTimeout;
-		return this;
-	}
-
-	/**
-	 * <h1> 本函数设计已过时，未来版本可能移除此函数，请及时更换为 getCheckSameToken() ，使用方式保持不变 </h1>
-	 * @return 是否校验Id-Token（部分rpc插件有效）
-	 */
-	@Deprecated
-	public Boolean getCheckIdToken() {
-		return checkSameToken;
-	}
-
-	/**
-	 * <h1> 本函数设计已过时，未来版本可能移除此函数，请及时更换为 setCheckSameToken() ，使用方式保持不变 </h1>
-	 * @param checkIdToken 是否校验Id-Token（部分rpc插件有效）
-	 * @return 对象自身 
-	 */
-	@Deprecated
-	public SaTokenConfig setCheckIdToken(Boolean checkIdToken) {
-		this.checkSameToken = checkIdToken;
-		return this;
-	}
-
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
new file mode 100644
index 00000000..76f4cc6d
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
@@ -0,0 +1,31 @@
+package cn.dev33.satoken.fun;
+
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * 生成唯一式 token 的方法签名
+ *
+ * @author click33
+ * @since 2023/4/30
+ */
+@FunctionalInterface
+public interface SaGenerateUniqueTokenFunction {
+
+    /**
+     * 封装 token 生成、校验的代码，生成唯一式 token
+     *
+     * @param elementName 要生成的元素名称，方便抛出异常时组织提示信息
+     * @param maxTryTimes 最大尝试次数
+     * @param createTokenFunction 创建 token 的函数
+     * @param checkTokenFunction 校验 token 是否唯一的函数（返回 true 表示唯一，可用）
+     * @return 最终生成的唯一式 token
+     */
+    public String execute(
+            String elementName,
+            int maxTryTimes,
+            Supplier<String> createTokenFunction,
+            Function<String, Boolean> checkTokenFunction
+    );
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 60f6d355..b31c8fce 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -421,8 +421,17 @@ public class StpLogic {
 			}
 		}
 		
-		// 如果代码走到此处，说明未能成功复用旧Token，需要新建Token 
-		return createTokenValue(id, loginModel.getDeviceOrDefault(), loginModel.getTimeout(), loginModel.getExtraData());
+		// 如果代码走到此处，说明未能成功复用旧Token，需要新建Token
+		return SaStrategy.me.generateUniqueToken.execute(
+				"token",
+				getConfigOfMaxTryTimes(),
+				() -> {
+					return createTokenValue(id, loginModel.getDeviceOrDefault(), loginModel.getTimeout(), loginModel.getExtraData());
+				},
+				tokenValue -> {
+					return getLoginIdNotHandle(tokenValue) == null;
+				}
+		);
 	}
 	
 	// --- 注销 
@@ -1036,7 +1045,17 @@ public class StpLogic {
 		 */
 		if(isCreate) {
 			// 随机创建一个 Token
-			tokenValue = createTokenValue(null, null, getConfig().getTimeout(), null);
+			tokenValue = SaStrategy.me.generateUniqueToken.execute(
+					"token",
+					getConfigOfMaxTryTimes(),
+					() -> {
+						return createTokenValue(null, null, getConfig().getTimeout(), null);
+					},
+					token -> {
+						return getTokenSessionByToken(token, false) == null;
+					}
+			);
+
 			// 写入 [最后操作时间]
 			setLastActivityToNow(tokenValue);
 			// 在当前上下文写入此 TokenValue
@@ -2305,6 +2324,14 @@ public class StpLogic {
 		return (int) timeout;
 	}
 
+	/**
+	 * 返回全局配置的 maxTryTimes 值，在每次创建 token 时，对其唯一性测试的最高次数（-1=不测试）
+	 * @return /
+	 */
+	public int getConfigOfMaxTryTimes() {
+		return getConfig().getMaxTryTimes();
+	}
+
 
 	/**
 	 * 返回持久化对象 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 56186e97..4b0095dd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -1,5 +1,14 @@
 package cn.dev33.satoken.strategy;
 
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.annotation.*;
+import cn.dev33.satoken.basic.SaBasicUtil;
+import cn.dev33.satoken.exception.SaTokenException;
+import cn.dev33.satoken.fun.SaGenerateUniqueTokenFunction;
+import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.util.SaFoxUtil;
+import cn.dev33.satoken.util.SaTokenConsts;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
@@ -8,18 +17,7 @@ import java.util.UUID;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-
-import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.annotation.SaCheckBasic;
-import cn.dev33.satoken.annotation.SaCheckDisable;
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaCheckRole;
-import cn.dev33.satoken.annotation.SaCheckSafe;
-import cn.dev33.satoken.basic.SaBasicUtil;
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.util.SaFoxUtil;
-import cn.dev33.satoken.util.SaTokenConsts;
+import java.util.function.Supplier;
 
 /**
  * Sa-Token 策略对象 
@@ -47,9 +45,7 @@ public final class SaStrategy {
 	 */
 	public static final SaStrategy me = new SaStrategy();
 
-	// 
-	// 所有策略  
-	// 
+	// ----------------------- 所有策略
 	
 	/**
 	 * 创建 Token 的策略 
@@ -194,11 +190,38 @@ public final class SaStrategy {
 				me.getAnnotation.apply(method.getDeclaringClass(), annotationClass) != null;
 	};
 
+	/**
+	 * 生成唯一式 token 的算法
+	 * <p> 参数 [元素名称, 最大尝试次数, 创建 token 函数, 检查 token 函数]
+	 */
+	public SaGenerateUniqueTokenFunction generateUniqueToken = (elementName, maxTryTimes, createTokenFunction, checkTokenFunction) -> {
 
-	// 
-	// 重写策略 set连缀风格 
-	// 
-	
+		// 为方便叙述，以下代码注释均假设在处理生成 token 的场景，但实际上本方法也可能被用于生成 code、ticket 等
+
+		// 循环生成
+		for (int i = 1; ; i++) {
+			// 生成 token
+			String token = createTokenFunction.get();
+
+			// 如果 maxTryTimes == -1，表示不做唯一性验证，直接返回
+			if (maxTryTimes == -1) {
+				return token;
+			}
+
+			// 如果 token 在DB库查询不到数据，说明是个可用的全新 token，直接返回
+			if (checkTokenFunction.apply(token)) {
+				return token;
+			}
+
+			// 如果已经循环了 maxTryTimes 次，仍然没有创建出可用的 token，那么抛出异常
+			if (i >= maxTryTimes) {
+				throw new SaTokenException(elementName + " 生成失败，已尝试" + i + "次，生成算法过于简单或资源池已耗尽");
+			}
+		}
+	};
+
+
+	// ----------------------- 重写策略 set连缀风格
 
 	/**
 	 * 重写创建 Token 的策略 
@@ -276,5 +299,17 @@ public final class SaStrategy {
 		this.isAnnotationPresent = isAnnotationPresent;
 		return this;
 	}
-	
+
+	/**
+	 * 生成唯一式 token 的算法
+	 * <p> 参数 [元素名称, 最大尝试次数, 创建 token 函数, 检查 token 函数]
+	 *
+	 * @param generateUniqueToken /
+	 * @return 对象自身
+	 */
+	public SaStrategy setGenerateUniqueToken(SaGenerateUniqueTokenFunction generateUniqueToken) {
+		this.generateUniqueToken = generateUniqueToken;
+		return this;
+	}
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index 40edc4d0..4dc0509f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -1,5 +1,8 @@
 package cn.dev33.satoken.util;
 
+import cn.dev33.satoken.error.SaErrorCode;
+import cn.dev33.satoken.exception.SaTokenException;
+
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -8,19 +11,10 @@ import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.regex.Pattern;
 
-import cn.dev33.satoken.error.SaErrorCode;
-import cn.dev33.satoken.exception.SaTokenException;
-
 /**
  * Sa-Token 内部工具类
  *
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java
index 4f5e4467..7c01ff54 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java
@@ -1,10 +1,9 @@
 package com.pj;
 
+import cn.dev33.satoken.SaManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import cn.dev33.satoken.SaManager;
-
 /**
  * Sa-Token整合SpringBoot 示例，整合redis  
  * @author kong
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java
index d0aa2580..308bcaa8 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java
@@ -17,7 +17,7 @@ public class TestController {
 	// 测试   浏览器访问： http://localhost:8081/test/test
 	@RequestMapping("test")
 	public SaResult test() {
-		System.out.println("------------进来了"); 
+		System.out.println("------------进来了");
 		return SaResult.ok();
 	}
 	
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
index 3a41ae12..fdb03d91 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
@@ -18,7 +18,7 @@ sa-token:
     token-style: uuid
     # 是否输出操作日志 
     is-log: true
-    
+
 spring: 
     # redis配置 
     redis:

From 453030058f476a7acabd051ee8142c32f920b5d7 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 30 Apr 2023 23:02:04 +0800
Subject: [PATCH 021/129] =?UTF-8?q?=E4=B8=BA=20jwt-mixin=20=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E9=80=82=E9=85=8D=20max-try-times=20=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/stp/StpLogic.java    |  4 ++--
 sa-token-demo/sa-token-demo-jwt/pom.xml             |  4 ++--
 sa-token-doc/plugin/jwt-extend.md                   |  6 ++++++
 sa-token-doc/use/config.md                          |  3 ++-
 .../cn/dev33/satoken/jwt/StpLogicJwtForMixin.java   | 13 +++++++++++--
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index b31c8fce..09ea2826 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -351,7 +351,7 @@ public class StpLogic {
 	 * @return 返回会话令牌 
 	 */
 	public String createLoginSession(Object id, SaLoginModel loginModel) {
-		
+
 		// ------ 前置检查
 		SaTokenException.throwByNull(id, "账号id不能为空", SaErrorCode.CODE_11002);
 		
@@ -395,7 +395,7 @@ public class StpLogic {
 	 * @return 返回 Token
 	 */
 	protected String distUsableToken(Object id, SaLoginModel loginModel) {
-		
+
 		// 获取全局配置
 		Boolean isConcurrent = getConfig().getIsConcurrent();
 		
diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml
index 8f184e81..9e200919 100644
--- a/sa-token-demo/sa-token-demo-jwt/pom.xml
+++ b/sa-token-demo/sa-token-demo-jwt/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         
 		<!-- Sa-Token 整合 Redis (使用jackson序列化方式) -->
-		<!-- <dependency>
+		 <dependency>
             <groupId>cn.dev33</groupId>
             <artifactId>sa-token-dao-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
@@ -50,7 +50,7 @@
 		<dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
-        </dependency> -->
+        </dependency>
         
 		<!-- @ConfigurationProperties -->
 		<dependency>
diff --git a/sa-token-doc/plugin/jwt-extend.md b/sa-token-doc/plugin/jwt-extend.md
index d5b17e50..7aed51f9 100644
--- a/sa-token-doc/plugin/jwt-extend.md
+++ b/sa-token-doc/plugin/jwt-extend.md
@@ -234,6 +234,12 @@ public void setSaJwtTemplate() {
 技术上来讲无法将其踢下线，所以此时顶人下线和踢人下线等 API 都属于不可用状态，所以此时 `is-concurrent` 配置项必须配置为 `true`。
 
 
+##### 3、使用 jwt-mixin 模式后，max-try-times 恒等于 -1。
+
+为防止框架错误判断 token 唯一性，当使用 jwt-mixin 模式后，`max-try-times` 恒等于 -1。
+
+
+
 
 
 
diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index aa5bd486..7544bd3e 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -110,7 +110,7 @@ public class SaTokenConfigure {
 --- 
 ### 所有可配置项
 
-你不必立刻掌握整个表格，只需要在用到某个功能时再详细查阅它即可
+**你不必立刻掌握整个表格，只需要在用到某个功能时再详细查阅它即可**
 
 | 参数名称				| 类型		| 默认值		| 说明																				|
 | :--------				| :--------	| :--------	| :--------																			|
@@ -120,6 +120,7 @@ public class SaTokenConfigure {
 | isConcurrent			| Boolean	| true		| 是否允许同一账号并发登录 （为 true 时允许一起登录，为 false 时新登录挤掉旧登录）															|
 | isShare				| Boolean	| true		| 在多人登录同一账号时，是否共用一个token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） 	|
 | maxLoginCount			| int		| 12		| 同一账号最大登录数量，-1代表不限 （只有在 `isConcurrent=true`, `isShare=false` 时此配置才有效），[详解](/use/config?id=配置项详解：maxlogincount)	|
+| maxTryTimes			| int		| 12		| 在每次创建 Token 时的最高循环次数，用于保证 Token 唯一性（-1=不循环重试，直接使用）			|
 | isReadBody			| Boolean	| true		| 是否尝试从 请求体 里读取 Token														|
 | isReadHeader			| Boolean	| true		| 是否尝试从 header 里读取 Token														|
 | isReadCookie			| Boolean	| true		| 是否尝试从 cookie 里读取 Token，此值为 false 后，`StpUtil.login(id)` 登录时也不会再往前端注入Cookie				|
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index 21e7fe3f..5b2612bb 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -212,12 +212,21 @@ public class StpLogicJwtForMixin extends StpLogic {
 	// ------------------- Bean对象代理 -------------------  
 	
 	/**
-	 * 返回全局配置对象的isShare属性 
+	 * 返回全局配置对象的 isShare 属性
 	 * @return / 
 	 */
 	@Override
 	public boolean getConfigOfIsShare() {
 		return false;
 	}
-	
+
+	/**
+	 * 返回全局配置对象的 maxTryTimes 属性
+	 * @return /
+	 */
+	@Override
+	public int getConfigOfMaxTryTimes() {
+		return -1;
+	}
+
 }

From 3a84c3d51e8481f8486feb33e0967581068701ba Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 1 May 2023 02:56:42 +0800
Subject: [PATCH 022/129] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?Cookie=20=E9=85=8D=E7=BD=AE=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/use/config.md | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index 7544bd3e..53cadbf7 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -149,6 +149,31 @@ Cookie相关配置：
 | httpOnly		| Boolean	| false		| 是否禁止 js 操作 Cookie 	|
 | sameSite		| String	| Lax		| 第三方限制级别（Strict=完全禁止，Lax=部分允许，None=不限制）		|
 
+Cookie 配置示例：
+
+<!---------------------------- tabs:start ---------------------------->
+<!------------- tab:yaml 风格  ------------->
+``` yaml
+# Sa-Token 配置
+sa-token: 
+    # Cookie 相关配置 
+    cookie: 
+        domain: stp.com
+        path: /
+        secure: false
+		httpOnly: true
+		sameSite: Lax
+```
+<!------------- tab:properties 风格  ------------->
+``` properties
+# Cookie 相关配置 
+sa-token.cookie.domain=stp.com
+sa-token.cookie.path=/
+sa-token.cookie.secure=false
+sa-token.cookie.httpOnly=true
+sa-token.cookie.sameSite=Lax
+```
+<!---------------------------- tabs:end ---------------------------->
 
 
 ### 单点登录相关配置 

From 68e99f232e7497125258af61aac670bbac7fcd9a Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 1 May 2023 09:37:50 +0800
Subject: [PATCH 023/129] =?UTF-8?q?=E5=B0=86=E5=85=A8=E5=B1=80=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8=E7=9A=84=20BeforeAuth=20=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E4=B8=8D=E5=8F=97=20includeList=20=E4=B8=8E?=
 =?UTF-8?q?=20excludeList=20=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=8C=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E8=AF=B7=E6=B1=82=E9=83=BD=E4=BC=9A=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/solon/integration/SaTokenFilter.java     |  3 ++-
 .../solon/integration/SaTokenInterceptor.java        | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
index 7179865d..5331ab03 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -123,11 +123,12 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为
 			Handler mainHandler = Solon.app().router().matchMain(ctx);
 			Action action = (mainHandler instanceof Action ? (Action) mainHandler : null);
 
-			//先路径过滤下（包括了静态文件）
 			//1.执行前置处理（主要是一些跨域之类的）
 			if(beforeAuth != null) {
 				beforeAuth.run(mainHandler);
 			}
+
+			//先路径过滤下（包括了静态文件）
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
 				//2.执行注解处理
 				if(authAnno(action)) {
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
index 0afb5a82..a9554c76 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
@@ -172,19 +172,19 @@ public class SaTokenInterceptor implements RouterInterceptor {
 		try {
 			Action action = (mainHandler instanceof Action ? (Action) mainHandler : null);
 
-			//先路径过滤下（包括了静态文件）
+			//1.执行前置处理（主要是一些跨域之类的）
+			if(beforeAuth != null) {
+				beforeAuth.run(mainHandler);
+			}
+
+			//先路径过滤下（不包括静态文件）
 			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				//1.执行前置处理（主要是一些跨域之类的）
-				if(beforeAuth != null) {
-					beforeAuth.run(mainHandler);
-				}
 				//2.执行注解处理
 				if(authAnno(action)) {
 					//3.执行规则处理（如果没有被 @SaIgnore 忽略）
 					auth.run(mainHandler);
 				}
 			});
-
 		} catch (StopMatchException e) {
 
 		} catch (SaTokenException e) {

From aa2663e3f570432054c7a943ad1235de14382565 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 2 May 2023 03:22:37 +0800
Subject: [PATCH 024/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20getData=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=9C=A8=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E4=B8=89=E6=8B=89=E5=8F=96=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=BC=A0=E9=80=92=E4=BB=BB=E6=84=8F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/context/model/SaRequest.java      |  18 +-
 .../satoken/listener/SaTokenEventCenter.java  |   8 +-
 .../satoken/listener/SaTokenListener.java     |   6 +-
 .../listener/SaTokenListenerForLog.java       |  10 +-
 .../cn/dev33/satoken/sign/SaSignTemplate.java |  71 ++++--
 .../java/com/pj/sso/SsoServerController.java  |  34 ++-
 .../java/com/pj/sso/SsoClientController.java  |  21 +-
 .../src/main/resources/application.yml        |   6 +-
 sa-token-doc/sso/sso-type3.md                 | 163 ++++++++-----
 .../dubbo/model/SaRequestForDubbo.java        |  21 ++
 .../dubbo3/model/SaRequestForDubbo3.java      |  21 ++
 .../context/grpc/model/SaRequestForGrpc.java  |  21 ++
 .../cn/dev33/satoken/config/SaSsoConfig.java  |  61 +++--
 .../cn/dev33/satoken/sso/SaSsoTemplate.java   | 217 ++++++++++--------
 .../java/cn/dev33/satoken/sso/SaSsoUtil.java  | 112 ++++++---
 .../satoken/sso/error/SaSsoErrorCode.java     |   5 +-
 .../servlet/model/SaRequestForServlet.java    |  35 ++-
 .../reactor/model/SaRequestForReactor.java    |  21 ++
 .../reactor/model/SaRequestForReactor.java    |  24 ++
 .../servlet/model/SaRequestForServlet.java    |  31 +++
 .../solon/model/SaRequestForSolon.java        |  20 ++
 21 files changed, 668 insertions(+), 258 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
index 12e92aa3..8dfb402e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
@@ -4,6 +4,9 @@ import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Request 包装类
  * @author kong
@@ -70,8 +73,19 @@ public interface SaRequest {
 		}
 		return paramValue;
 	}
-	
-	
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	public List<String> getParamNames();
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	public Map<String, String> getParamMap();
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 * @param name 键 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
index 1e9107df..4bb1890a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
@@ -262,12 +262,12 @@ public class SaTokenEventCenter {
 	
 	/**
 	 * 全局组件载入 
-	 * @param comtName 组件名称 
-	 * @param comtObj 组件对象 
+	 * @param compName 组件名称
+	 * @param compObj 组件对象
 	 */
-	public static void doRegisterComponent(String comtName, Object comtObj) {
+	public static void doRegisterComponent(String compName, Object compObj) {
 		for (SaTokenListener listener : listenerList) {
-			listener.doRegisterComponent(comtName, comtObj);
+			listener.doRegisterComponent(compName, compObj);
 		}
 	}
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
index e71b4700..6cb6ffe8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
@@ -103,10 +103,10 @@ public interface SaTokenListener {
 
 	/**
 	 * 全局组件载入 
-	 * @param comtName 组件名称 
-	 * @param comtObj 组件对象 
+	 * @param compName 组件名称
+	 * @param compObj 组件对象
 	 */
-	public default void doRegisterComponent(String comtName, Object comtObj) {}
+	public default void doRegisterComponent(String compName, Object compObj) {}
 
 	/**
 	 * StpLogic 对象替换 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
index 9ef0a2da..8b763056 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
@@ -106,13 +106,13 @@ public class SaTokenListenerForLog implements SaTokenListener {
 
 	/**
 	 * 全局组件载入 
-	 * @param comtName 组件名称 
-	 * @param comtObj 组件对象 
+	 * @param compName 组件名称
+	 * @param compObj 组件对象
 	 */
 	@Override
-	public void doRegisterComponent(String comtName, Object comtObj) {
-		String canonicalName = comtObj == null ? null : comtObj.getClass().getCanonicalName();
-		log.info("全局组件 {} 载入成功: {}", comtName, canonicalName);
+	public void doRegisterComponent(String compName, Object compObj) {
+		String canonicalName = compObj == null ? null : compObj.getClass().getCanonicalName();
+		log.info("全局组件 {} 载入成功: {}", compName, canonicalName);
 	}
 
 	/**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index 0635105c..346e8773 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -1,18 +1,18 @@
 package cn.dev33.satoken.sign;
 
-import java.util.Map;
-import java.util.TreeMap;
-
 import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.util.Map;
+import java.util.TreeMap;
+
 /**
- * 参数签名算法 
- * 
+ * 参数签名算法
+ *
  * @author kong
- * @since: 2022-4-27
+ * @since 2022-4-27
  */
 public interface SaSignTemplate {
 
@@ -21,13 +21,13 @@ public interface SaSignTemplate {
 	 * @param paramsMap 参数列表
 	 * @return 拼接出的参数字符串 
 	 */
-	public default String joinParams(Map<String, Object> paramsMap) {
+	public default String joinParams(Map<String, ?> paramsMap) {
 		
 		// 按照 k1=v1&k2=v2&k3=v3 排列 
         StringBuilder sb = new StringBuilder();
         for (String key : paramsMap.keySet()) {
         	Object value = paramsMap.get(key);
-        	if(SaFoxUtil.isEmpty(value) == false) {
+        	if( ! SaFoxUtil.isEmpty(value) ) {
         		sb.append(key).append("=").append(value).append("&");
         	}
         }
@@ -46,9 +46,9 @@ public interface SaSignTemplate {
 	 * @param paramsMap 参数列表
 	 * @return 拼接出的参数字符串 
 	 */
-	public default String joinParamsDictSort(Map<String, Object> paramsMap) {
+	public default String joinParamsDictSort(Map<String, ?> paramsMap) {
 		// 保证字段按照字典顺序排列 
-		if(paramsMap instanceof TreeMap == false) {
+		if( ! (paramsMap instanceof TreeMap) ) {
 			paramsMap = new TreeMap<>(paramsMap);
 		}
 		
@@ -62,9 +62,17 @@ public interface SaSignTemplate {
 	 * @param key 秘钥 
 	 * @return 签名 
 	 */
-	public default String createSign(Map<String, Object> paramsMap, String key) {
+	public default String createSign(Map<String, ?> paramsMap, String key) {
 		SaTokenException.throwByNull(key, "参与参数签名的秘钥不可为空", SaErrorCode.CODE_12201);
-		
+
+		// 如果调用者不小心传入了 sign 参数，则此处需要将 sign 参数排除在外
+		// 为了保证不影响原有的 paramsMap，此处需要再复制一份
+		if(paramsMap.containsKey("sign")) {
+			paramsMap = new TreeMap<>(paramsMap);
+			paramsMap.remove("sign");
+		}
+
+		// 计算签名
 		String paramsStr = joinParamsDictSort(paramsMap);
 		String fullStr = paramsStr + "&key=" + key;
 		return SaSecureUtil.md5(fullStr);
@@ -77,7 +85,7 @@ public interface SaSignTemplate {
 	 * @param sign 待验证的签名
 	 * @return 签名是否有效
 	 */
-	public default boolean isValidSign(Map<String, Object> paramsMap, String key, String sign) {
+	public default boolean isValidSign(Map<String, ?> paramsMap, String key, String sign) {
 		String theSign = createSign(paramsMap, key);
 		return theSign.equals(sign);
 	}
@@ -88,8 +96,8 @@ public interface SaSignTemplate {
 	 * @param key 秘钥
 	 * @param sign 待验证的签名
 	 */
-	public default void checkSign(Map<String, Object> paramsMap, String key, String sign) {
-		if(isValidSign(paramsMap, key, sign) == false) {
+	public default void checkSign(Map<String, ?> paramsMap, String key, String sign) {
+		if( ! isValidSign(paramsMap, key, sign) ) {
 			throw new SaTokenException("无效签名：" + sign).setCode(SaErrorCode.CODE_12202);
 		}
 	}
@@ -111,15 +119,15 @@ public interface SaSignTemplate {
 	 * 给 paramsMap 追加 timestamp、nonce、sign 三个参数，并转换为参数字符串，形如：
 	 * <code>data=xxx8nonce=xxx8timestamp=xxx8sign=xxx</code>
 	 * @param paramsMap 参数列表
-	 * @param key 秘钥 
-	 * @return 加工后的参数列表 转化为的参数字符串 
+	 * @param key 秘钥
+	 * @return 加工后的参数列表 转化为的参数字符串
 	 */
-	public default String addSignParamsToString(Map<String, Object> paramsMap, String key) {
-		// 追加参数 
+	public default String addSignParamsAndToString(Map<String, Object> paramsMap, String key) {
+		// 追加参数
 		paramsMap = addSignParams(paramsMap, key);
-		
-        // .
-        return joinParams(paramsMap);
+
+		// .
+		return joinParams(paramsMap);
 	}
 
 	/**
@@ -139,9 +147,26 @@ public interface SaSignTemplate {
 	 * @param allowDisparity 允许的最大时间差（单位：ms），-1 代表不限制
 	 */
 	public default void checkTimestamp(long timestamp, long allowDisparity) {
-		if(isValidTimestamp(timestamp, allowDisparity) == false) {
+		if( ! isValidTimestamp(timestamp, allowDisparity) ) {
 			throw new SaTokenException("timestamp 超出允许的范围：" + timestamp).setCode(SaErrorCode.CODE_12203);
 		}
 	}
 
+	// ------------------ 以下为兼容旧版本的方法 ------------------
+
+	/**
+	 * 请更换为 addSignParamsAndToString
+	 * @param paramsMap 参数列表
+	 * @param key 秘钥
+	 * @return 加工后的参数列表 转化为的参数字符串
+	 */
+	@Deprecated
+	public default String addSignParamsToString(Map<String, Object> paramsMap, String key) {
+		// 追加参数
+		paramsMap = addSignParams(paramsMap, key);
+
+		// .
+		return joinParams(paramsMap);
+	}
+
 }
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
index 9f6ecfce..8c72a99f 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
@@ -1,17 +1,17 @@
 package com.pj.sso;
 
+import cn.dev33.satoken.config.SaSsoConfig;
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.sso.SaSsoProcessor;
+import cn.dev33.satoken.sso.SaSsoUtil;
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import com.dtflys.forest.Forest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 
-import com.dtflys.forest.Forest;
-
-import cn.dev33.satoken.config.SaSsoConfig;
-import cn.dev33.satoken.sso.SaSsoProcessor;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.dev33.satoken.util.SaResult;
-
 /**
  * Sa-Token-SSO Server端 Controller 
  * @author kong
@@ -63,5 +63,23 @@ public class SsoServerController {
 			}
 		});
 	}
-	
+
+	// 示例：获取数据接口（用于在模式三下，为 client 端开放拉取数据的接口）
+	@RequestMapping("/sso/getData")
+	public Object userinfo(String apiType, String loginId) {
+		System.out.println("---------------- 获取数据 ----------------");
+		System.out.println("apiType=" + apiType);
+		System.out.println("loginId=" + loginId);
+
+		// 校验签名：只有拥有正确秘钥发起的请求才能通过校验
+		SaSsoUtil.checkSign(SaHolder.getRequest());
+
+		// 自定义返回结果（模拟）
+		return SaResult.ok()
+				.set("id", loginId)
+				.set("name", "LinXiaoYu")
+				.set("sex", "女")
+				.set("age", 18);
+	}
+
 }
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
index 111340fb..cf1d77a0 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
@@ -1,5 +1,6 @@
 package com.pj.sso;
 
+import cn.dev33.satoken.context.SaHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,6 +14,10 @@ import cn.dev33.satoken.sso.SaSsoUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Sa-Token-SSO Client端 Controller 
  * @author kong
@@ -52,11 +57,17 @@ public class SsoClientController {
 	}
 	
 	// 查询我的账号信息 
-	@RequestMapping("/sso/myinfo")
-	public Object myinfo() {
-		Object userinfo = SaSsoUtil.getUserinfo(StpUtil.getLoginId());
-		System.out.println("--------info：" + userinfo);
-		return userinfo;
+	@RequestMapping("/sso/myInfo")
+	public Object myInfo() {
+		// 组织请求参数
+		Map<String, Object> map = new HashMap<>();
+		map.put("apiType", "userinfo");
+		map.put("loginId", StpUtil.getLoginId());
+
+		// 发起请求
+		Object resData = SaSsoUtil.getData("/sso/getData", map);
+		System.out.println("sso-server 返回的信息：" + resData);
+		return resData;
 	}
 
 	// 全局异常拦截 
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
index 5c2433d4..67632540 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
@@ -18,9 +18,9 @@ sa-token:
         slo-url: http://sa-sso-server.com:9000/sso/signout
         # 接口调用秘钥 
         secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
-        # SSO-Server端 查询userinfo地址 
-        userinfo-url: http://sa-sso-server.com:9000/sso/userinfo
-        
+        # 查询数据地址
+        get-data-url: http://sa-sso-server.com:9000/sso/getData
+
 spring: 
     # 配置 Redis 连接 （此处与SSO-Server端连接不同的Redis）
     redis: 
diff --git a/sa-token-doc/sso/sso-type3.md b/sa-token-doc/sso/sso-type3.md
index 336f7265..ea504b69 100644
--- a/sa-token-doc/sso/sso-type3.md
+++ b/sa-token-doc/sso/sso-type3.md
@@ -98,109 +98,160 @@ forest.log-enabled: false
 > 注：如果已测试运行模式二，可先将Redis中的数据清空，以防旧数据对测试造成干扰
 
 
-### 3、获取 Userinfo 
-除了账号id，我们可能还需要将用户的昵称、头像等信息从 Server端 带到 Client端，即：用户资料的同步。
+### 3、获取 UserInfo 
+除了账号id，我们可能还需要将用户的昵称、头像等信息从 Server端 带到 Client端，即：用户资料的拉取。
 
-在模式二中我们只需要将需要同步的资料放到 SaSession 即可，但是在模式三中两端不再连接同一个Redis，这时候我们需要通过http接口来同步信息：
+在模式二中我们只需要将需要同步的资料放到 SaSession 即可，但是在模式三中两端不再连接同一个 Redis，这时候我们需要通过 http 接口来同步信息。
+
+在旧版本`（<= v1.34.0）` 框架提供的方案是配置 getUserinfo 接口地址，从 client 调用拉取数据，该方案有以下缺点：
+- 每次调用只能传递固定 loginId 一个参数，不方便。
+- 只能拉取 userinfo 数据，不通用。
+- 如果还需要拉取其它业务数据，需要再自定义一个接口，比较麻烦。
+
+为此，我们设计了更通用、灵活的 getData 接口，解决上述三个难题。
+
+#### 3.1、首先在 Server 端开放一个查询数据的接口
 
-#### 3.1、在 Server 端自定义接口，查询用户资料
 ``` java
-// 自定义接口：获取userinfo 
-@RequestMapping("/sso/userinfo")
-public Object userinfo(String loginId) {
-	System.out.println("---------------- 获取userinfo --------");
-	
-	// 校验签名，防止敏感信息外泄  
+// 示例：获取数据接口（用于在模式三下，为 client 端开放拉取数据的接口）
+@RequestMapping("/sso/getData")
+public Object userinfo(String apiType, String loginId) {
+	System.out.println("---------------- 获取数据 ----------------");
+	System.out.println("apiType=" + apiType);
+	System.out.println("loginId=" + loginId);
+
+	// 校验签名：只有拥有正确秘钥发起的请求才能通过校验
 	SaSsoUtil.checkSign(SaHolder.getRequest());
 
 	// 自定义返回结果（模拟）
 	return SaResult.ok()
 			.set("id", loginId)
-			.set("name", "linxiaoyu")
+			.set("name", "LinXiaoYu")
 			.set("sex", "女")
 			.set("age", 18);
 }
 ```
 
-#### 3.2、在 Client 端调用此接口查询 userinfo
+#### 3.2、在 Client 端调用此接口查询数据
+
 首先在 application.yml 中配置接口地址：
 <!---------------------------- tabs:start ---------------------------->
 <!------------- tab:yaml 风格  ------------->
 ``` yaml
 sa-token: 
     sso: 
-        # SSO-Server端 查询userinfo地址 
-        userinfo-url: http://sa-sso-server.com:9000/sso/userinfo
+        # sso-server 端拉取数据地址 
+        get-data-url: http://sa-sso-server.com:9000/sso/getData
 ```
 <!------------- tab:properties 风格  ------------->
 ``` properties
-# SSO-Server端 查询userinfo地址 
-sa-token.sso.userinfo-url=http://sa-sso-server.com:9000/sso/userinfo
+# sso-server 端拉取数据地址 
+sa-token.sso.get-data-url=http://sa-sso-server.com:9000/sso/getData
 ```
 <!---------------------------- tabs:end ---------------------------->
 
-
-
-然后在`SsoClientController`中新增接口 
+然后在 `SsoClientController` 中新增接口 
 ``` java
 // 查询我的账号信息 
-@RequestMapping("/sso/myinfo")
-public Object myinfo() {
-	Object userinfo = SaSsoUtil.getUserinfo(StpUtil.getLoginId());
-	System.out.println("--------info：" + userinfo);
-	return userinfo;
+@RequestMapping("/sso/myInfo")
+public Object myInfo() {
+	// 组织请求参数
+	Map<String, Object> map = new HashMap<>();
+	map.put("apiType", "userinfo");
+	map.put("loginId", StpUtil.getLoginId());
+
+	// 发起请求
+	Object resData = SaSsoUtil.getData(map);
+	System.out.println("sso-server 返回的信息：" + resData);
+	return resData;
 }
 ```
 
 #### 3.3、访问测试
-访问测试：[http://sa-sso-client1.com:9001/sso/myinfo](http://sa-sso-client1.com:9001/sso/myinfo)
+访问测试：[http://sa-sso-client1.com:9001/sso/myInfo](http://sa-sso-client1.com:9001/sso/myInfo)
 
 
 ### 4、自定义接口通信
 
-群里有小伙伴提问：`SaSsoUtil.getUserinfo` 提供的参数太少，只有一个 loginId，无法满足业务需求怎么办？
+上述示例展示在 client 端向 server 拉取 userinfo 数据的步骤，如果你还需要拉取其它业务的数据，稍加改造示例便可以实现。
 
-答：SaSsoUtil.getUserinfo只是为了避免你在项目中硬编码认证中心 url 而提供的简易封装，如果这个API无法满足你的业务需求，
-你完全可以在 Server 端自定义一些接口然后从 Client 端使用 http 工具调用即可。
+#### 4.1、方式一，使用 apiType 参数来区分业务
 
-以下是一个简单的示例：
+我们可以约定好，使用 apiType 来区分不同的业务，例如：
+- 当 `apiType=userinfo` 时：代表拉取用户资料。
+- 当 `apiType=followList` 时：代表拉取用户的关注列表。
+- 当 `apiType=fansList` 时：代表拉取用户的粉丝列表。
 
-#### 4.1、先在 sso-server 端自定义一个接口
-``` java
-// 获取指定用户的关注列表 
-@RequestMapping("/sso/getFollowList")
-public Object ssoRequest(Long loginId) {
+此时，我们便可以通过在 client 端传入不同的 apiType 参数，来区分不同的业务。
 
-	// 校验签名，签名不通过直接抛出异常 
-	SaSsoUtil.checkSign(SaHolder.getRequest());
-
-	// 查询数据 (此处仅做模拟)
-	List<Integer> list = Arrays.asList(10041, 10042, 10043, 10044);
-	
-	// 返回 
-	return list;
-}
-```
-
-
-#### 4.2、然后在 sso-client 端调用这个接口 
 ``` java
 // 查询我的账号信息 
 @RequestMapping("/sso/myFollowList")
 public Object myFollowList() {
-	// 组织url，加上签名参数 
-	String url = SaSsoUtil.addSignParams("http://sa-sso-server.com:9000/sso/getFollowList", StpUtil.getLoginId());
-	
-	// 调用，并返回 SaResult 结果 
-	SaResult res = SaSsoUtil.request(url);
-	
-	// 返回给前端 
-	return res;
+	// 组织请求参数
+	Map<String, Object> map = new HashMap<>();
+	map.put("apiType", "followList");  // 关键代码，代表本次我要拉取关注列表
+	map.put("loginId", StpUtil.getLoginId());
+
+	// 发起请求
+	Object resData = SaSsoUtil.getData(map);
+	System.out.println("sso-server 返回的信息：" + resData);
+	return resData;
 }
 ```
 
+然后在 server 端我们通过不同的 apiType 值，返回不同的信息即可。
+
+
+#### 4.2、方式二：直接在调用接口时传入一个自定义 path 
+
+我们可以 client 端，调用 `SaSsoUtil.getData` 方法时，传入一个自定义 path，例如：
+
+``` java
+// 查询我的账号信息 
+@RequestMapping("/sso/myFansList")
+public Object myFansList() {
+	// 组织请求参数
+	Map<String, Object> map = new HashMap<>();
+	// map.put("apiType", "userinfo");   // 此时已经不需要 apiType 参数了 
+	map.put("loginId", StpUtil.getLoginId());
+
+	// 发起请求 （传入自定义的 path 地址）
+	Object resData = SaSsoUtil.getData("/sso/getFansList", map);
+	System.out.println("sso-server 返回的信息：" + resData);
+	return resData;
+}
+```
+
+同时，我们需要在 server 端开放这个自定义的 `/sso/getFansList` 接口：
+
+``` java
+// 获取指定用户的粉丝列表
+@RequestMapping("/sso/getFansList")
+public Object getFansList(Long loginId) {
+	System.out.println("---------------- 获取 loginId=" + loginId + " 的粉丝列表 ----------------");
+
+	// 校验签名：只有拥有正确秘钥发起的请求才能通过校验
+	SaSsoUtil.checkSign(SaHolder.getRequest());
+
+	// 查询数据 (此处仅做模拟)
+	List<Integer> list = Arrays.asList(10041, 10042, 10043, 10044);
+
+	// 返回
+	return list;
+}
+```
+
+**注意：使用此方案时，需要在 client 端配置 `sa-token.sso.server-url` 地址，例如：**
+``` yaml
+sa-token: 
+    sso: 
+		# sso-server 端主机地址
+        server-url: http://sa-sso-server.com:9000
+```
+
 #### 4.3、访问测试
-访问测试：[http://sa-sso-client1.com:9001/sso/myFollowList](http://sa-sso-client1.com:9001/sso/myFollowList)
+访问测试：[http://sa-sso-client1.com:9001/sso/myFansList](http://sa-sso-client1.com:9001/sso/myFansList)
 
 
 
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
index 3e506528..9ee00aea 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
@@ -4,6 +4,9 @@ import org.apache.dubbo.rpc.RpcContext;
 
 import cn.dev33.satoken.context.model.SaRequest;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Request for Dubbo 
  * 
@@ -42,6 +45,24 @@ public class SaRequestForDubbo implements SaRequest {
 		return null;
 	}
 
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	@Override
+	public List<String> getParamNames(){
+		return null;
+	}
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	@Override
+	public Map<String, String> getParamMap(){
+		return null;
+	}
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 */
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
index 655cdd95..b2efb9fd 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
@@ -3,6 +3,9 @@ package cn.dev33.satoken.context.dubbo3.model;
 import cn.dev33.satoken.context.model.SaRequest;
 import org.apache.dubbo.rpc.RpcContext;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Request for Dubbo3
  * 
@@ -41,6 +44,24 @@ public class SaRequestForDubbo3 implements SaRequest {
 		return null;
 	}
 
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	@Override
+	public List<String> getParamNames(){
+		return null;
+	}
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	@Override
+	public Map<String, String> getParamMap(){
+		return null;
+	}
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 */
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
index 269878bd..cbff558f 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
@@ -3,6 +3,9 @@ package cn.dev33.satoken.context.grpc.model;
 import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext;
 import cn.dev33.satoken.context.model.SaRequest;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * Request for grpc
  *
@@ -27,6 +30,24 @@ public class SaRequestForGrpc implements SaRequest {
         return null;
     }
 
+    /**
+     * 获取 [请求体] 里提交的所有参数名称
+     * @return 参数名称列表
+     */
+    @Override
+    public List<String> getParamNames(){
+        return null;
+    }
+
+    /**
+     * 获取 [请求体] 里提交的所有参数
+     * @return 参数列表
+     */
+    @Override
+    public Map<String, String> getParamMap(){
+        return null;
+    }
+
     /**
      * 在 [请求头] 里获取一个值
      */
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index 6ed799ad..40e536d7 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -61,31 +61,36 @@ public class SaSsoConfig implements Serializable {
 	 */
 	public String authUrl = "/sso/auth";
 
-	/**
-	 * 是否打开单点注销功能 
-	 */
-	// public Boolean isSlo = true;  // 同Server端 
+	// /**
+	// * 是否打开单点注销功能
+	// */
+	// public Boolean isSlo = true;  // 同Server端，不再重复声明
 
-	/**
-	 * 是否打开模式三（此值为 true 时将使用 http 请求：校验ticket值、单点注销、获取userinfo） 
-	 */
-	// public Boolean isHttp = false;  // 同Server端
+	// /**
+	//  * 是否打开模式三（此值为 true 时将使用 http 请求：校验ticket值、单点注销、获取userinfo）
+	//  */
+	// public Boolean isHttp = false;  // 同Server端，不再重复声明
 
-	/**
-	 * 接口调用秘钥 (用于SSO模式三单点注销的接口通信身份校验) 
-	 */
-	// public String secretkey;  // 同Server端
+	// /**
+	//  * 接口调用秘钥 (用于SSO模式三单点注销的接口通信身份校验)
+	// */
+	// public String secretkey;  // 同Server端，不再重复声明
 
 	/**
 	 * 配置 Server 端的 ticket 校验地址 
 	 */
 	public String checkTicketUrl = "/sso/checkTicket";
 
+	/**
+	 * 配置 Server 端查询数据 getData 地址
+	 */
+	public String getDataUrl = "/sso/getData";
+
 	/**
 	 * 配置 Server 端查询 userinfo 地址 
 	 */
 	public String userinfoUrl = "/sso/userinfo";
-	
+
 	/**
 	 * 配置 Server 端单点注销地址 
 	 */
@@ -97,7 +102,7 @@ public class SaSsoConfig implements Serializable {
 	public String ssoLogoutCall;
 
 	/**
-	 * 配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、userinfoUrl、sloUrl 属性前面，用以简化各种 url 配置 
+	 * 配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、getDataUrl、sloUrl 属性前面，用以简化各种 url 配置
 	 */
 	public String serverUrl;
 
@@ -240,6 +245,22 @@ public class SaSsoConfig implements Serializable {
 		return this;
 	}
 
+	/**
+	 * @return Server 端查询数据 getData 地址
+	 */
+	public String getGetDataUrl() {
+		return getDataUrl;
+	}
+
+	/**
+	 * @param getDataUrl 配置 Server 端查询数据 getData 地址
+	 * @return 对象自身
+	 */
+	public SaSsoConfig setGetDataUrl(String getDataUrl) {
+		this.getDataUrl = getDataUrl;
+		return this;
+	}
+
 	/**
 	 * @return 配置的 Server 端查询 userinfo 地址 
 	 */
@@ -289,14 +310,14 @@ public class SaSsoConfig implements Serializable {
 	}
 
 	/**
-	 * @return 配置的 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、userinfoUrl、sloUrl 属性前面，用以简化各种 url 配置 
+	 * @return 配置的 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、getDataUrl、sloUrl 属性前面，用以简化各种 url 配置
 	 */
 	public String getServerUrl() {
 		return serverUrl;
 	}
 
 	/**
-	 * @param serverUrl 配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、userinfoUrl、sloUrl 属性前面，用以简化各种 url 配置 
+	 * @param serverUrl 配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、getDataUrl、sloUrl 属性前面，用以简化各种 url 配置
 	 * @return 对象自身
 	 */
 	public SaSsoConfig setServerUrl(String serverUrl) {
@@ -331,6 +352,7 @@ public class SaSsoConfig implements Serializable {
 				+ ", client=" + client 
 				+ ", authUrl=" + authUrl 
 				+ ", checkTicketUrl=" + checkTicketUrl
+				+ ", getDataUrl=" + getDataUrl
 				+ ", userinfoUrl=" + userinfoUrl 
 				+ ", sloUrl=" + sloUrl 
 				+ ", ssoLogoutCall=" + ssoLogoutCall 
@@ -356,6 +378,13 @@ public class SaSsoConfig implements Serializable {
 		return SaFoxUtil.spliceTwoUrl(getServerUrl(), getCheckTicketUrl());
 	}
 
+	/**
+	 * @return 获取拼接url：Server 端查询数据 getData 地址
+	 */
+	public String splicingGetDataUrl() {
+		return SaFoxUtil.spliceTwoUrl(getServerUrl(), getGetDataUrl());
+	}
+
 	/**
 	 * @return 获取拼接url：Server 端查询 userinfo 地址 
 	 */
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index d287e5c4..128427f6 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -1,12 +1,5 @@
 package cn.dev33.satoken.sso;
 
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.config.SaSsoConfig;
 import cn.dev33.satoken.context.model.SaRequest;
@@ -21,6 +14,8 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
 
+import java.util.*;
+
 /**
  * Sa-Token-SSO 单点登录模块 
  * @author kong
@@ -153,7 +148,7 @@ public class SaSsoTemplate {
 		}
 		String loginId = SaManager.getSaTokenDao().get(splicingTicketSaveKey(ticket));
 		// 如果是 "a,b" 的格式，则只取最前面的一项 
-		if(loginId != null && loginId.indexOf(",") > -1) {
+		if(loginId != null && loginId.contains(",")) {
 			String[] arr = loginId.split(",");
 			loginId = arr[0];
 		}
@@ -206,7 +201,7 @@ public class SaSsoTemplate {
 
 			// 如果是 "a,b" 的格式，则解析出对应的 Client
 			String ticketClient = null;
-			if(loginId.indexOf(",") > -1) {
+			if(loginId.contains(",")) {
 				String[] arr = loginId.split(",");
 				loginId = arr[0];
 				ticketClient = arr[1];
@@ -252,7 +247,7 @@ public class SaSsoTemplate {
 	public void checkRedirectUrl(String url) {
 		
 		// 1、是否是一个有效的url 
-		if(SaFoxUtil.isUrl(url) == false) {
+		if( ! SaFoxUtil.isUrl(url) ) {
 			throw new SaSsoException("无效redirect：" + url).setCode(SaSsoErrorCode.CODE_30001);
 		}
 		
@@ -264,12 +259,11 @@ public class SaSsoTemplate {
 		
 		// 3、是否在[允许地址列表]之中 
 		List<String> authUrlList = Arrays.asList(getAllowUrl().replaceAll(" ", "").split(",")); 
-		if(SaStrategy.me.hasElement.apply(authUrlList, url) == false) {
+		if( ! SaStrategy.me.hasElement.apply(authUrlList, url) ) {
 			throw new SaSsoException("非法redirect：" + url).setCode(SaSsoErrorCode.CODE_30002);
 		}
 		
-		// 校验通过 √ 
-		return;
+		// 校验通过 √
 	}
 	
 
@@ -285,7 +279,7 @@ public class SaSsoTemplate {
 			return;
 		}
 		SaSession session = getStpLogic().getSessionByLoginId(loginId);
-		Set<String> urlSet = session.get(SaSsoConsts.SLO_CALLBACK_SET_KEY, ()-> new HashSet<String>());
+		Set<String> urlSet = session.get(SaSsoConsts.SLO_CALLBACK_SET_KEY, HashSet::new);
 		urlSet.add(sloCallbackUrl);
 		session.set(SaSsoConsts.SLO_CALLBACK_SET_KEY, urlSet);
 	}
@@ -304,7 +298,7 @@ public class SaSsoTemplate {
 		
 		// step.1 遍历通知 Client 端注销会话 
 		SaSsoConfig cfg = SaSsoManager.getConfig();
-		Set<String> urlSet = session.get(SaSsoConsts.SLO_CALLBACK_SET_KEY, () -> new HashSet<String>());
+		Set<String> urlSet = session.get(SaSsoConsts.SLO_CALLBACK_SET_KEY, HashSet::new);
 		for (String url : urlSet) {
 			url = addSignParams(url, loginId);
 			cfg.getSendHttp().apply(url);
@@ -315,12 +309,23 @@ public class SaSsoTemplate {
 	}
 
 	/**
-	 * 获取：账号资料 
-	 * @param loginId 账号id
-	 * @return 账号资料  
+	 * 根据配置的 getData 地址，查询数据
+	 * @param paramMap 查询参数
+	 * @return 查询结果
 	 */
-	public Object getUserinfo(Object loginId) {
-		String url = buildUserinfoUrl(loginId);
+	public Object getData(Map<String, Object> paramMap) {
+		String getDataUrl = SaSsoManager.getConfig().splicingGetDataUrl();
+		return getData(getDataUrl, paramMap);
+	}
+
+	/**
+	 * 根据自定义 path 地址，查询数据 （此方法需要配置 sa-token.sso.server-url 地址）
+	 * @param path 自定义 path
+	 * @param paramMap 查询参数
+	 * @return 查询结果
+	 */
+	public Object getData(String path, Map<String, Object> paramMap) {
+		String url = buildCustomPathUrl(path, paramMap);
 		return SaSsoManager.getConfig().getSendHttp().apply(url);
 	}
 
@@ -355,17 +360,16 @@ public class SaSsoTemplate {
 		 * 部分 Servlet 版本 request.getRequestURL() 返回的 url 带有 query 参数，形如：http://domain.com?id=1，
 		 * 如果不加判断会造成最终生成的 serverAuthUrl 带有双 back 参数 ，这个 if 判断正是为了解决此问题 
 		 */
-		if(clientLoginUrl.indexOf(paramName.back + "=" + back) == -1) {
+		if( ! clientLoginUrl.contains(paramName.back + "=" + back) ) {
 			clientLoginUrl = SaFoxUtil.joinParam(clientLoginUrl, paramName.back, back); 
 		}
-		String serverAuthUrl = SaFoxUtil.joinParam(serverUrl, paramName.redirect, clientLoginUrl);
-		
+
 		// 返回 
-		return serverAuthUrl;
+		return SaFoxUtil.joinParam(serverUrl, paramName.redirect, clientLoginUrl);
 	}
 	
 	/**
-	 * 构建URL：Server端向Client下放ticke的地址 
+	 * 构建URL：Server端向Client下放ticket的地址
 	 * @param loginId 账号id 
 	 * @param client 客户端标识 
 	 * @param redirect Client端提供的重定向地址 
@@ -412,16 +416,6 @@ public class SaSsoTemplate {
 		return url;
 	}
 
-	/**
-	 * 构建URL：Server端 账号资料查询地址 
-	 * @param loginId 账号id
-	 * @return Server端 账号资料查询地址 
-	 */
-	public String buildUserinfoUrl(Object loginId) {
-		String userinfoUrl = SaSsoManager.getConfig().splicingUserinfoUrl();
-		return addSignParams(userinfoUrl, loginId);
-	}
-
 	/**
 	 * 构建URL：校验ticket的URL 
 	 * <p> 在模式三下，Client端拿到Ticket后根据此地址向Server端发送请求，获取账号id 
@@ -461,6 +455,34 @@ public class SaSsoTemplate {
 		return addSignParams(url, loginId);
 	}
 
+	/**
+	 * 构建URL：Server端 getData 地址，带签名等参数
+	 * @param paramMap 查询参数
+	 * @return /
+	 */
+	public String buildGetDataUrl(Map<String, Object> paramMap) {
+		String getDataUrl = SaSsoManager.getConfig().getGetDataUrl();
+		return buildCustomPathUrl(getDataUrl, paramMap);
+	}
+
+	/**
+	 * 构建URL：Server 端自定义 path 地址，带签名等参数 （此方法需要配置 sa-token.sso.server-url 地址）
+	 * @param paramMap 请求参数
+	 * @return /
+	 */
+	public String buildCustomPathUrl(String path, Map<String, Object> paramMap) {
+		// 如果path不是以 http 开头，那么就拼接上 serverUrl
+		String url = path;
+		if( ! url.startsWith("http") ) {
+			String serverUrl = SaSsoManager.getConfig().getServerUrl();
+			SaSsoException.throwByNull(serverUrl, "请先配置 sa-token.sso.server-url 地址", SaSsoErrorCode.CODE_30012);
+			url = SaFoxUtil.spliceTwoUrl(serverUrl, path);
+		}
+
+		// 添加签名等参数，并序列化
+		return addSignParams(url, paramMap);
+	}
+
 	
 	// ------------------- 返回相应key ------------------- 
 
@@ -510,24 +532,65 @@ public class SaSsoTemplate {
 	}
 
 	/**
-	 * 校验secretkey秘钥是否有效 （API已过期，请更改为更安全的 sign 式校验）
-	 * @param secretkey 秘钥 
+	 * 给 paramMap 追加 sign 等参数，并序列化为kv字符串，拼接到url后面
+	 * @param url 请求地址
+	 * @param paramMap 请求原始参数列表
+	 * @return 加工后的url
 	 */
-	@Deprecated
-	public void checkSecretkey(String secretkey) {
-		 if(SaFoxUtil.isEmpty(secretkey) || secretkey.equals(getSecretkey()) == false) {
-			 throw new SaSsoException("无效秘钥：" + secretkey).setCode(SaSsoErrorCode.CODE_30003);
-		 }
+	public String addSignParams(String url, Map<String, Object> paramMap) {
+		// 追加：时间戳、随机字符串、参数签名
+		SaManager.getSaSignTemplate().addSignParams(paramMap, getSecretkey());
+
+		// 序列化为kv字符串
+		String signParams = SaManager.getSaSignTemplate().joinParams(paramMap);
+
+		// 拼接到一起
+		return SaFoxUtil.joinParam(url, signParams);
 	}
-	
+
 	/**
-	 * 根据参数计算签名 
+	 * 给 url 拼接 loginId 参数，并拼接 sign 等参数
+	 * @param url 链接
+	 * @param loginId 账号id
+	 * @return 加工后的url
+	 */
+	public String addSignParams(String url, Object loginId) {
+		Map<String, Object> paramMap = new LinkedHashMap<>();
+		paramMap.put(paramName.loginId, loginId);
+		return addSignParams(url, paramMap);
+	}
+
+	/**
+	 * 校验签名
+	 * @param req request 
+	 */
+	public void checkSign(SaRequest req) {
+		// 获取签名、时间戳、随机字符串
+		String sign = req.getParamNotNull(paramName.sign);
+		String timestamp = req.getParamNotNull(paramName.timestamp);
+		String nonce = req.getParamNotNull(paramName.nonce);
+
+		// 1、校验时间戳
+		SaManager.getSaSignTemplate().checkTimestamp(Long.parseLong(timestamp), SaSsoManager.getConfig().getTimestampDisparity());
+
+		// 2、校验随机字符串
+
+		// 3、校验签名
+		SaManager.getSaSignTemplate().checkSign(req.getParamMap(), getSecretkey(), sign);
+	}
+
+
+	// -------- 以下方法已废弃，仅为兼容旧版本而保留 --------
+
+	/**
+	 * 根据参数计算签名
 	 * @param loginId 账号id
 	 * @param timestamp 当前时间戳，13位
-	 * @param nonce 随机字符串 
+	 * @param nonce 随机字符串
 	 * @param secretkey 账号id
-	 * @return 签名 
+	 * @return 签名
 	 */
+	@Deprecated
 	public String getSign(Object loginId, String timestamp, String nonce, String secretkey) {
 		Map<String, Object> map = new TreeMap<>();
 		map.put(paramName.loginId, loginId);
@@ -537,58 +600,26 @@ public class SaSsoTemplate {
 	}
 
 	/**
-	 * 给 url 追加 sign 等参数 
-	 * @param url 连接
-	 * @param loginId 账号id 
-	 * @return 加工后的url 
+	 * 构建URL：Server端 账号资料查询地址
+	 * @param loginId 账号id
+	 * @return Server端 账号资料查询地址
 	 */
-	public String addSignParams(String url, Object loginId) {
-		
-		// 时间戳、随机字符串、参数签名
-		String timestamp = String.valueOf(System.currentTimeMillis());
-		String nonce = SaFoxUtil.getRandomString(20);
-		String sign = getSign(loginId, timestamp, nonce, getSecretkey());
-		
-		// 追加到url 
-		url = SaFoxUtil.joinParam(url, paramName.loginId, loginId);
-		url = SaFoxUtil.joinParam(url, paramName.timestamp, timestamp);
-		url = SaFoxUtil.joinParam(url, paramName.nonce, nonce);
-		url = SaFoxUtil.joinParam(url, paramName.sign, sign);
-		return url;
+	@Deprecated
+	public String buildUserinfoUrl(Object loginId) {
+		String userinfoUrl = SaSsoManager.getConfig().splicingUserinfoUrl();
+		return addSignParams(userinfoUrl, loginId);
 	}
 
 	/**
-	 * 校验签名
-	 * @param req request 
+	 * 获取：账号资料
+	 * @param loginId 账号id
+	 * @return 账号资料
 	 */
-	public void checkSign(SaRequest req) {
-
-		// 参数签名、账号id、时间戳、随机字符串
-		String sign = req.getParamNotNull(paramName.sign);
-		String loginId = req.getParamNotNull(paramName.loginId);
-		String timestamp = req.getParamNotNull(paramName.timestamp);
-		String nonce = req.getParamNotNull(paramName.nonce);
-		
-		// 校验时间戳 
-		checkTimestamp(Long.valueOf(timestamp));
-		
-		// 校验签名 
-		String calcSign = getSign(loginId, timestamp, nonce, getSecretkey());
-		if(calcSign.equals(sign) == false) {
-			throw new SaSsoException("签名无效：" + calcSign).setCode(SaSsoErrorCode.CODE_30008);
-		}
+	@Deprecated
+	public Object getUserinfo(Object loginId) {
+		String url = buildUserinfoUrl(loginId);
+		return SaSsoManager.getConfig().getSendHttp().apply(url);
 	}
 
-	/**
-	 * 校验时间戳与当前时间的差距是否超出限制 
-	 * @param timestamp 时间戳 
-	 */
-	public void checkTimestamp(long timestamp) {
-		long disparity = Math.abs(System.currentTimeMillis() - timestamp);
-		long allowDisparity = SaSsoManager.getConfig().getTimestampDisparity();
-		if(allowDisparity != -1 && disparity > allowDisparity) {
-			throw new SaSsoException("timestamp 超出允许的范围").setCode(SaSsoErrorCode.CODE_30007);
-		}
-	}
-	
+
 }
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index 60f875b9..4388c043 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -3,6 +3,8 @@ package cn.dev33.satoken.sso;
 import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.util.SaResult;
 
+import java.util.Map;
+
 /**
  * Sa-Token-SSO 单点登录模块 工具类 
  * @author kong
@@ -139,12 +141,22 @@ public class SaSsoUtil {
 	}
 
 	/**
-	 * 获取：账号资料 
-	 * @param loginId 账号id
-	 * @return 账号资料 
+	 * 获取：查询数据
+	 * @param paramMap 查询参数
+	 * @return 查询结果
 	 */
-	public static Object getUserinfo(Object loginId) {
-		return ssoTemplate.getUserinfo(loginId);
+	public static Object getData(Map<String, Object> paramMap) {
+		return ssoTemplate.getData(paramMap);
+	}
+
+	/**
+	 * 根据自定义 path 查询数据 （此方法需要配置 sa-token.sso.server-url 地址）
+	 * @param path 自定义 path
+	 * @param paramMap 查询参数
+	 * @return 查询结果
+	 */
+	public static Object getData(String path, Map<String, Object> paramMap) {
+		return ssoTemplate.getData(path, paramMap);
 	}
 
 
@@ -161,7 +173,7 @@ public class SaSsoUtil {
 	}
 
 	/**
-	 * 构建URL：Server端向Client下放ticke的地址 
+	 * 构建URL：Server端向Client下放ticket的地址
 	 * @param loginId 账号id 
 	 * @param client 客户端标识 
 	 * @param redirect Client端提供的重定向地址 
@@ -172,14 +184,23 @@ public class SaSsoUtil {
 	}
 
 	/**
-	 * 构建URL：Server端 账号资料查询地址 
-	 * @param loginId 账号id
-	 * @return Server端 账号资料查询地址 
+	 * 构建URL：Server端 getData 地址，带签名等参数
+	 * @param paramMap 查询参数
+	 * @return /
 	 */
-	public static String buildUserinfoUrl(Object loginId) {
-		return ssoTemplate.buildUserinfoUrl(loginId);
+	public static String buildGetDataUrl(Map<String, Object> paramMap) {
+		return ssoTemplate.buildGetDataUrl(paramMap);
 	}
-	
+
+	/**
+	 * 构建URL：Server 端自定义 path 地址，带签名等参数 （此方法需要配置 sa-token.sso.server-url 地址）
+	 * @param paramMap 请求参数
+	 * @return /
+	 */
+	public static String buildCustomPathUrl(String path, Map<String, Object> paramMap) {
+		return ssoTemplate.buildCustomPathUrl(path, paramMap);
+	}
+
 	
 	// ------------------- 请求相关 ------------------- 
 
@@ -193,31 +214,20 @@ public class SaSsoUtil {
 	}
 
 	/**
-	 * 校验secretkey秘钥是否有效 （API已过期，请更改为更安全的 sign 式校验）
-	 * @param secretkey 秘钥 
+	 * 给 paramMap 追加 sign 等参数，并序列化为kv字符串，拼接到url后面
+	 * @param url 请求地址
+	 * @param paramMap 请求原始参数列表
+	 * @return 加工后的url
 	 */
-	@Deprecated
-	public static void checkSecretkey(String secretkey) {
-		ssoTemplate.checkSecretkey(secretkey);
+	public static String addSignParams(String url, Map<String, Object> paramMap) {
+		return ssoTemplate.addSignParams(url, paramMap);
 	}
 
 	/**
-	 * 根据参数计算签名 
+	 * 给 url 拼接 loginId 参数，并拼接 sign 等参数
+	 * @param url 链接
 	 * @param loginId 账号id
-	 * @param timestamp 当前时间戳，13位
-	 * @param nonce 随机字符串 
-	 * @param secretkey 账号id
-	 * @return 签名 
-	 */
-	public static String getSign(Object loginId, String timestamp, String nonce, String secretkey) {
-		return ssoTemplate.getSign(loginId, timestamp, nonce, secretkey);
-	}
-
-	/**
-	 * 给 url 追加 sign 等参数 
-	 * @param url 连接
-	 * @param loginId 账号id 
-	 * @return 加工后的url 
+	 * @return 加工后的url
 	 */
 	public static String addSignParams(String url, Object loginId) {
 		return ssoTemplate.addSignParams(url, loginId);
@@ -231,12 +241,40 @@ public class SaSsoUtil {
 		ssoTemplate.checkSign(req);
 	}
 
+
+	// -------- 以下方法已废弃，仅为兼容旧版本而保留 --------
+
 	/**
-	 * 校验时间戳与当前时间的差距是否超出限制 
-	 * @param timestamp 时间戳 
+	 * 根据参数计算签名
+	 * @param loginId 账号id
+	 * @param timestamp 当前时间戳，13位
+	 * @param nonce 随机字符串
+	 * @param secretkey 账号id
+	 * @return 签名
 	 */
-	public static void checkTimestamp(long timestamp) {
-		ssoTemplate.checkTimestamp(timestamp);
+	@Deprecated
+	public static String getSign(Object loginId, String timestamp, String nonce, String secretkey) {
+		return ssoTemplate.getSign(loginId, timestamp, nonce, secretkey);
 	}
-	
+
+	/**
+	 * 获取：账号资料
+	 * @param loginId 账号id
+	 * @return 账号资料
+	 */
+	@Deprecated
+	public static Object getUserinfo(Object loginId) {
+		return ssoTemplate.getUserinfo(loginId);
+	}
+
+	/**
+	 * 构建URL：Server端 账号资料查询地址
+	 * @param loginId 账号id
+	 * @return Server端 账号资料查询地址
+	 */
+	@Deprecated
+	public static String buildUserinfoUrl(Object loginId) {
+		return ssoTemplate.buildUserinfoUrl(loginId);
+	}
+
 }
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
index ce2eedb7..0763086f 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
@@ -40,5 +40,8 @@ public interface SaSsoErrorCode {
 
 	/** 该 ticket 不属于当前 client */
 	public static final int CODE_30011 = 30011;
-	
+
+	/** 当前缺少配置 server-url 地址 */
+	public static final int CODE_30012 = 30012;
+
 }
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 77d2e102..434ac1ee 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -1,7 +1,5 @@
 package cn.dev33.satoken.servlet.model;
 
-import java.io.IOException;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.exception.SaTokenException;
@@ -12,6 +10,9 @@ import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
+import java.io.IOException;
+import java.util.*;
+
 /**
  * Request for Jakarta Servlet 
  * @author kong
@@ -48,6 +49,36 @@ public class SaRequestForServlet implements SaRequest {
 		return request.getParameter(name);
 	}
 
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	@Override
+	public List<String> getParamNames(){
+		Enumeration<String> parameterNames = request.getParameterNames();
+		List<String> list = new ArrayList<>();
+		while (parameterNames.hasMoreElements()) {
+			list.add(parameterNames.nextElement());
+		}
+		return list;
+	}
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	@Override
+	public Map<String, String> getParamMap(){
+		// 获取所有参数
+		Map<String, String[]> parameterMap = request.getParameterMap();
+		Map<String, String> map = new LinkedHashMap<>(parameterMap.size());
+		for (String key : parameterMap.keySet()) {
+			String[] values = parameterMap.get(key);
+			map.put(key, values[0]);
+		}
+		return map;
+	}
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 */
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index da98532e..35e58005 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -12,6 +12,8 @@ import cn.dev33.satoken.reactor.context.SaReactorHolder;
 import cn.dev33.satoken.reactor.context.SaReactorSyncHolder;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.util.*;
+
 /**
  * Request for Reactor 
  * @author kong
@@ -48,6 +50,25 @@ public class SaRequestForReactor implements SaRequest {
 		return request.getQueryParams().getFirst(name);
 	}
 
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	@Override
+	public List<String> getParamNames(){
+		Set<String> names = request.getQueryParams().keySet();
+		return new ArrayList<>(names);
+	}
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	@Override
+	public Map<String, String> getParamMap(){
+		return request.getQueryParams().toSingleValueMap();
+	}
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 */
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index da98532e..da8819c0 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -12,6 +12,11 @@ import cn.dev33.satoken.reactor.context.SaReactorHolder;
 import cn.dev33.satoken.reactor.context.SaReactorSyncHolder;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * Request for Reactor 
  * @author kong
@@ -48,6 +53,25 @@ public class SaRequestForReactor implements SaRequest {
 		return request.getQueryParams().getFirst(name);
 	}
 
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	@Override
+	public List<String> getParamNames(){
+		Set<String> names = request.getQueryParams().keySet();
+		return new ArrayList<>(names);
+	}
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	@Override
+	public Map<String, String> getParamMap(){
+		return request.getQueryParams().toSingleValueMap();
+	}
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 */
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 374bd25a..46b457c8 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -1,6 +1,7 @@
 package cn.dev33.satoken.servlet.model;
 
 import java.io.IOException;
+import java.util.*;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.Cookie;
@@ -49,6 +50,36 @@ public class SaRequestForServlet implements SaRequest {
 		return request.getParameter(name);
 	}
 
+	/**
+	 * 获取 [请求体] 里提交的所有参数名称
+	 * @return 参数名称列表
+	 */
+	@Override
+	public List<String> getParamNames(){
+		Enumeration<String> parameterNames = request.getParameterNames();
+		List<String> list = new ArrayList<>();
+		while (parameterNames.hasMoreElements()) {
+			list.add(parameterNames.nextElement());
+		}
+		return list;
+	}
+
+	/**
+	 * 获取 [请求体] 里提交的所有参数
+	 * @return 参数列表
+	 */
+	@Override
+	public Map<String, String> getParamMap(){
+		// 获取所有参数
+		Map<String, String[]> parameterMap = request.getParameterMap();
+		Map<String, String> map = new LinkedHashMap<>(parameterMap.size());
+		for (String key : parameterMap.keySet()) {
+			String[] values = parameterMap.get(key);
+			map.put(key, values[0]);
+		}
+		return map;
+	}
+
 	/**
 	 * 在 [请求头] 里获取一个值 
 	 */
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
index ae66fd12..7cf25fb1 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
@@ -5,6 +5,11 @@ import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.util.SaFoxUtil;
 import org.noear.solon.core.handle.Context;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * @author noear
  * @since 1.4
@@ -27,6 +32,21 @@ public class SaRequestForSolon implements SaRequest {
         return ctx.param(s);
     }
 
+    @Override
+    public List<String> getParamNames(){
+        Set<String> names = ctx.paramMap().keySet();
+        return new ArrayList<>(names);
+    }
+
+    /**
+     * 获取 [请求体] 里提交的所有参数
+     * @return 参数列表
+     */
+    @Override
+    public Map<String, String> getParamMap(){
+        return ctx.paramMap();
+    }
+
     @Override
     public String getHeader(String s) {
         return ctx.header(s);

From ac09cced2b46349d75af41e0bcc02be9b26ee74a Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 3 May 2023 04:23:48 +0800
Subject: [PATCH 025/129] =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=9AAPI=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=AD=BE=E5=90=8D=E6=89=80=E6=9C=89=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=9D=87=E8=BF=81=E7=A7=BB=E8=87=B3=20core=20?=
 =?UTF-8?q?=E6=A0=B8=E5=BF=83=E6=A8=A1=E5=9D=97=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/SaManager.java |   9 +-
 .../cn/dev33/satoken/config/SaSignConfig.java | 111 +++++++
 .../dev33/satoken/config/SaTokenConfig.java   |  32 +-
 .../satoken/exception/SaSignException.java    |  48 +++
 .../cn/dev33/satoken/sign/SaSignTemplate.java | 279 ++++++++++++++----
 .../sign/SaSignTemplateDefaultImpl.java       |  11 -
 .../cn/dev33/satoken/sign/SaSignUtil.java     | 159 ++++++++++
 .../java/com/pj/sso/SsoServerController.java  |   6 +-
 .../src/main/resources/application.yml        |  14 +-
 .../java/com/pj/sso/SsoClientController.java  |  16 +-
 .../src/main/resources/application.yml        |   9 +-
 sa-token-doc/sso/sso-questions.md             |   7 +
 sa-token-doc/sso/sso-server.md                |  21 +-
 sa-token-doc/sso/sso-type2.md                 |   4 -
 sa-token-doc/sso/sso-type3.md                 |  15 +-
 .../cn/dev33/satoken/config/SaSsoConfig.java  |  54 +---
 .../cn/dev33/satoken/sso/SaSsoProcessor.java  |   4 +-
 .../cn/dev33/satoken/sso/SaSsoTemplate.java   | 123 +++-----
 .../java/cn/dev33/satoken/sso/SaSsoUtil.java  |  40 +--
 19 files changed, 661 insertions(+), 301 deletions(-)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
 delete mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplateDefaultImpl.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index ce6f24fd..8e0d108b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -1,8 +1,5 @@
 package cn.dev33.satoken;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.config.SaTokenConfigFactory;
 import cn.dev33.satoken.context.SaTokenContext;
@@ -19,7 +16,6 @@ import cn.dev33.satoken.log.SaLog;
 import cn.dev33.satoken.log.SaLogForConsole;
 import cn.dev33.satoken.same.SaSameTemplate;
 import cn.dev33.satoken.sign.SaSignTemplate;
-import cn.dev33.satoken.sign.SaSignTemplateDefaultImpl;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpInterfaceDefaultImpl;
 import cn.dev33.satoken.stp.StpLogic;
@@ -28,6 +24,9 @@ import cn.dev33.satoken.temp.SaTempDefaultImpl;
 import cn.dev33.satoken.temp.SaTempInterface;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.util.LinkedHashMap;
+import java.util.Map;
+
 /**
  * 管理 Sa-Token 所有全局组件  
  * @author kong
@@ -209,7 +208,7 @@ public class SaManager {
 		if (saSignTemplate == null) {
 			synchronized (SaManager.class) {
 				if (saSignTemplate == null) {
-					SaManager.saSignTemplate = new SaSignTemplateDefaultImpl();
+					SaManager.saSignTemplate = new SaSignTemplate();
 				}
 			}
 		}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
new file mode 100644
index 00000000..90ca38d2
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
@@ -0,0 +1,111 @@
+package cn.dev33.satoken.config;
+
+/**
+ * Sa-Token API 接口签名/验签 相关配置类
+ *
+ * @author click33
+ * @since 2023/5/2
+ */
+public class SaSignConfig {
+
+    /**
+     * API 调用签名秘钥
+     */
+    private String secretKey;
+
+    /**
+     * 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     */
+    private long timestampDisparity = 1000  * 60 * 15;
+
+    /**
+     * 是否校验 nonce 随机字符串
+     */
+    private Boolean isCheckNonce = true;
+
+
+    /**
+     * 获取 API 调用签名秘钥
+     *
+     * @return /
+     */
+    public String getSecretKey() {
+        return this.secretKey;
+    }
+
+    /**
+     * 设置 API 调用签名秘钥
+     *
+     * @param secretKey /
+     * @return 对象自身
+     */
+    public SaSignConfig setSecretKey(String secretKey) {
+        this.secretKey = secretKey;
+        return this;
+    }
+
+    /**
+     * 获取 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     *
+     * @return /
+     */
+    public long getTimestampDisparity() {
+        return this.timestampDisparity;
+    }
+
+    /**
+     * 设置 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     *
+     * @param timestampDisparity /
+     * @return 对象自身
+     */
+    public SaSignConfig setTimestampDisparity(long timestampDisparity) {
+        this.timestampDisparity = timestampDisparity;
+        return this;
+    }
+
+    /**
+     * 获取 是否校验 nonce 随机字符串
+     *
+     * @return /
+     */
+    public Boolean getIsCheckNonce() {
+        return this.isCheckNonce;
+    }
+
+    /**
+     * 设置 是否校验 nonce 随机字符串
+     *
+     * @param isCheckNonce /
+     * @return 对象自身
+     */
+    public SaSignConfig setIsCheckNonce(Boolean isCheckNonce) {
+        this.isCheckNonce = isCheckNonce;
+        return this;
+    }
+
+    /**
+     * 计算保存 nonce 时应该使用的 ttl，单位：秒
+     * @return /
+     */
+    public long getSaveNonceExpire() {
+        // 如果 timestampDisparity >= 0，则 nonceTtl 的值等于 timestampDisparity 的值，单位转秒
+        if(timestampDisparity >= 0) {
+            return timestampDisparity / 1000;
+        }
+        // 否则，nonceTtl 的值为 24 小时
+        else {
+            return 60 * 60 * 24;
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "SaSignConfig ["
+                + "secretKey=" + secretKey
+                + ", timestampDisparity=" + timestampDisparity
+                + ", isCheckNonce=" + isCheckNonce
+                + "]";
+    }
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index e0ff46f9..5e82d7c4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -1,9 +1,9 @@
 package cn.dev33.satoken.config;
 
-import java.io.Serializable;
-
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.io.Serializable;
+
 /**
  * Sa-Token 配置类 Model 
  * <p>
@@ -109,7 +109,12 @@ public class SaTokenConfig implements Serializable {
 	 * Cookie配置对象 
 	 */
 	public SaCookieConfig cookie = new SaCookieConfig();
-	
+
+	/**
+	 * API 签名配置对象
+	 */
+	public SaSignConfig sign = new SaSignConfig();
+
 
 	/**
 	 * @return token名称 (同时也是cookie名称)
@@ -532,7 +537,23 @@ public class SaTokenConfig implements Serializable {
 		this.cookie = cookie;
 		return this;
 	}
-	
+
+	/**
+	 * @return API 签名全局配置对象
+	 */
+	public SaSignConfig getSign() {
+		return sign;
+	}
+
+	/**
+	 * @param sign API 签名全局配置对象
+	 * @return 对象自身
+	 */
+	public SaTokenConfig setSign(SaSignConfig sign) {
+		this.sign = sign;
+		return this;
+	}
+
 	@Override
 	public String toString() {
 		return "SaTokenConfig ["
@@ -561,7 +582,8 @@ public class SaTokenConfig implements Serializable {
 				+ ", currDomain=" + currDomain 
 				+ ", sameTokenTimeout=" + sameTokenTimeout
 				+ ", checkSameToken=" + checkSameToken 
-				+ ", cookie=" + cookie 
+				+ ", cookie=" + cookie
+				+ ", sign=" + sign
 				+ "]";
 	}
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
new file mode 100644
index 00000000..491bed46
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
@@ -0,0 +1,48 @@
+package cn.dev33.satoken.exception;
+
+import cn.dev33.satoken.util.SaFoxUtil;
+
+/**
+ * 一个异常：代表 API 参数签名校验失败
+ * 
+ * @author kong
+ * @since 2023-5-3
+ */
+public class SaSignException extends SaTokenException {
+
+	/**
+	 * 序列化版本号
+	 */
+	private static final long serialVersionUID = 6806129545290130144L;
+
+	/**
+	 * 一个异常：代表 API 参数签名校验失败
+	 * @param message 异常描述
+	 */
+	public SaSignException(String message) {
+		super(message);
+	}
+
+	/**
+	 * 如果flag==true，则抛出message异常
+	 * @param flag 标记
+	 * @param message 异常信息
+	 */
+	public static void throwBy(boolean flag, String message) {
+		if(flag) {
+			throw new SaSignException(message);
+		}
+	}
+
+	/**
+	 * 如果 value isEmpty，则抛出 message 异常
+	 * @param value 值
+	 * @param message 异常信息
+	 */
+	public static void throwByNull(Object value, String message) {
+		if(SaFoxUtil.isEmpty(value)) {
+			throw new SaSignException(message);
+		}
+	}
+
+}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index 346e8773..c9057058 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -1,7 +1,10 @@
 package cn.dev33.satoken.sign;
 
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.config.SaSignConfig;
+import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.error.SaErrorCode;
-import cn.dev33.satoken.exception.SaTokenException;
+import cn.dev33.satoken.exception.SaSignException;
 import cn.dev33.satoken.secure.SaSecureUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 
@@ -9,19 +12,74 @@ import java.util.Map;
 import java.util.TreeMap;
 
 /**
- * 参数签名算法
+ * API 参数签名算法
  *
  * @author kong
  * @since 2022-4-27
  */
-public interface SaSignTemplate {
+public class SaSignTemplate {
+
+	// ----------- 签名配置
+
+	SaSignConfig signConfig;
+
+	/**
+	 * 获取：API 签名配置
+	 * @return /
+	 */
+	public SaSignConfig getSignConfig() {
+		return signConfig;
+	}
+
+	/**
+	 * 获取：API 签名配置：
+	 * 	1. 如果用户自定义了 signConfig ，则使用用户自定义的。
+	 * 	2. 否则使用全局默认配置。
+	 * @return /
+	 */
+	public SaSignConfig getSignConfigOrGlobal() {
+		// 如果用户自定义了 signConfig ，则使用用户自定义的
+		if(signConfig != null) {
+			return signConfig;
+		}
+		// 否则使用全局默认配置
+		return SaManager.getConfig().getSign();
+	}
+
+	/**
+	 * 获取：API 签名配置的秘钥
+	 * @return /
+	 */
+	public String getSecretKey() {
+		return getSignConfigOrGlobal().getSecretKey();
+	}
+
+	/**
+	 * 设置：API 签名配置
+	 * @param signConfig /
+	 */
+	public SaSignTemplate setSignConfig(SaSignConfig signConfig) {
+		this.signConfig = signConfig;
+		return this;
+	}
+
+
+	// ----------- 自定义使用的参数名称 (不声明final，允许开发者自定义修改)
+
+	public static String key = "key";
+	public static String timestamp = "timestamp";
+	public static String nonce = "nonce";
+	public static String sign = "sign";
+
+
+	// ----------- 拼接参数
 
 	/**
 	 * 将所有参数连接成一个字符串(不排序)，形如：b=28a=18c=3
 	 * @param paramsMap 参数列表
 	 * @return 拼接出的参数字符串 
 	 */
-	public default String joinParams(Map<String, ?> paramsMap) {
+	public String joinParams(Map<String, ?> paramsMap) {
 		
 		// 按照 k1=v1&k2=v2&k3=v3 排列 
         StringBuilder sb = new StringBuilder();
@@ -46,7 +104,7 @@ public interface SaSignTemplate {
 	 * @param paramsMap 参数列表
 	 * @return 拼接出的参数字符串 
 	 */
-	public default String joinParamsDictSort(Map<String, ?> paramsMap) {
+	public String joinParamsDictSort(Map<String, ?> paramsMap) {
 		// 保证字段按照字典顺序排列 
 		if( ! (paramsMap instanceof TreeMap) ) {
 			paramsMap = new TreeMap<>(paramsMap);
@@ -56,62 +114,40 @@ public interface SaSignTemplate {
         return joinParams(paramsMap);
 	}
 
+
+	// ----------- 创建签名
+
 	/**
 	 * 创建签名：md5(paramsStr + keyStr)
-	 * @param paramsMap 参数列表 
-	 * @param key 秘钥 
+	 * @param paramsMap 参数列表
 	 * @return 签名 
 	 */
-	public default String createSign(Map<String, ?> paramsMap, String key) {
-		SaTokenException.throwByNull(key, "参与参数签名的秘钥不可为空", SaErrorCode.CODE_12201);
+	public String createSign(Map<String, ?> paramsMap) {
+		String secretKey = getSecretKey();
+		SaSignException.throwByNull(secretKey, "参与参数签名的秘钥不可为空", SaErrorCode.CODE_12201);
 
 		// 如果调用者不小心传入了 sign 参数，则此处需要将 sign 参数排除在外
-		// 为了保证不影响原有的 paramsMap，此处需要再复制一份
-		if(paramsMap.containsKey("sign")) {
+		if(paramsMap.containsKey(sign)) {
+			// 为了保证不影响原有的 paramsMap，此处需要再复制一份
 			paramsMap = new TreeMap<>(paramsMap);
-			paramsMap.remove("sign");
+			paramsMap.remove(sign);
 		}
 
 		// 计算签名
 		String paramsStr = joinParamsDictSort(paramsMap);
-		String fullStr = paramsStr + "&key=" + key;
+		String fullStr = paramsStr + "&" + key + "=" + secretKey;
 		return SaSecureUtil.md5(fullStr);
 	}
 
-	/**
-	 * 判断：给定的参数 + 秘钥 生成的签名是否为有效签名
-	 * @param paramsMap 参数列表
-	 * @param key 秘钥
-	 * @param sign 待验证的签名
-	 * @return 签名是否有效
-	 */
-	public default boolean isValidSign(Map<String, ?> paramsMap, String key, String sign) {
-		String theSign = createSign(paramsMap, key);
-		return theSign.equals(sign);
-	}
-
-	/**
-	 * 校验：给定的参数 + 秘钥 生成的签名是否为有效签名，如果签名无效则抛出异常
-	 * @param paramsMap 参数列表
-	 * @param key 秘钥
-	 * @param sign 待验证的签名
-	 */
-	public default void checkSign(Map<String, ?> paramsMap, String key, String sign) {
-		if( ! isValidSign(paramsMap, key, sign) ) {
-			throw new SaTokenException("无效签名：" + sign).setCode(SaErrorCode.CODE_12202);
-		}
-	}
-
 	/**
 	 * 给 paramsMap 追加 timestamp、nonce、sign 三个参数 
-	 * @param paramsMap 参数列表 
-	 * @param key 秘钥 
+	 * @param paramsMap 参数列表
 	 * @return 加工后的参数列表 
 	 */
-	public default Map<String, Object> addSignParams(Map<String, Object> paramsMap, String key) {
-		paramsMap.put("timestamp", String.valueOf(System.currentTimeMillis()));
-		paramsMap.put("nonce", SaFoxUtil.getRandomString(32));
-		paramsMap.put("sign", createSign(paramsMap, key));
+	public Map<String, Object> addSignParams(Map<String, Object> paramsMap) {
+		paramsMap.put(timestamp, String.valueOf(System.currentTimeMillis()));
+		paramsMap.put(nonce, SaFoxUtil.getRandomString(32));
+		paramsMap.put(sign, createSign(paramsMap));
 		return paramsMap;
 	}
 
@@ -119,24 +155,26 @@ public interface SaSignTemplate {
 	 * 给 paramsMap 追加 timestamp、nonce、sign 三个参数，并转换为参数字符串，形如：
 	 * <code>data=xxx8nonce=xxx8timestamp=xxx8sign=xxx</code>
 	 * @param paramsMap 参数列表
-	 * @param key 秘钥
 	 * @return 加工后的参数列表 转化为的参数字符串
 	 */
-	public default String addSignParamsAndToString(Map<String, Object> paramsMap, String key) {
+	public String addSignParamsAndJoin(Map<String, Object> paramsMap) {
 		// 追加参数
-		paramsMap = addSignParams(paramsMap, key);
+		paramsMap = addSignParams(paramsMap);
 
-		// .
+		// 拼接参数
 		return joinParams(paramsMap);
 	}
 
+
+	// ----------- 校验签名
+
 	/**
 	 * 判断：指定时间戳与当前时间戳的差距是否在允许的范围内
 	 * @param timestamp 待校验的时间戳
-	 * @param allowDisparity 允许的最大时间差（单位：ms），-1 代表不限制
 	 * @return 是否在允许的范围内
 	 */
-	public default boolean isValidTimestamp(long timestamp, long allowDisparity) {
+	public boolean isValidTimestamp(long timestamp) {
+		long allowDisparity = getSignConfigOrGlobal().getTimestampDisparity();
 		long disparity = Math.abs(System.currentTimeMillis() - timestamp);
 		return allowDisparity == -1 || disparity <= allowDisparity;
 	}
@@ -144,29 +182,142 @@ public interface SaSignTemplate {
 	/**
 	 * 校验：指定时间戳与当前时间戳的差距是否在允许的范围内，如果超出则抛出异常
 	 * @param timestamp 待校验的时间戳
-	 * @param allowDisparity 允许的最大时间差（单位：ms），-1 代表不限制
 	 */
-	public default void checkTimestamp(long timestamp, long allowDisparity) {
-		if( ! isValidTimestamp(timestamp, allowDisparity) ) {
-			throw new SaTokenException("timestamp 超出允许的范围：" + timestamp).setCode(SaErrorCode.CODE_12203);
+	public void checkTimestamp(long timestamp) {
+		if( ! isValidTimestamp(timestamp) ) {
+			throw new SaSignException("timestamp 超出允许的范围：" + timestamp).setCode(SaErrorCode.CODE_12203);
 		}
 	}
 
-	// ------------------ 以下为兼容旧版本的方法 ------------------
+	/**
+	 * 判断：随机字符串 nonce 是否有效。
+	 * 		注意：同一 nonce 可以被多次判断有效，不会被缓存
+	 * @param nonce 待判断的随机字符串
+	 * @return 是否有效
+	 */
+	public boolean isValidNonce(String nonce) {
+		// 为空代表无效
+		if(SaFoxUtil.isEmpty(nonce)) {
+			return false;
+		}
+
+		// 校验此 nonce 是否已被使用过
+		String key = splicingNonceSaveKey(nonce);
+		return SaManager.getSaTokenDao().get(key) == null;
+	}
 
 	/**
-	 * 请更换为 addSignParamsAndToString
-	 * @param paramsMap 参数列表
-	 * @param key 秘钥
-	 * @return 加工后的参数列表 转化为的参数字符串
+	 * 校验：随机字符串 nonce 是否有效，如果无效则抛出异常。
+	 * 		注意：同一 nonce 只可以被校验通过一次，校验后将保存在缓存中，再次校验将无法通过
+	 * @param nonce 待校验的随机字符串
 	 */
-	@Deprecated
-	public default String addSignParamsToString(Map<String, Object> paramsMap, String key) {
-		// 追加参数
-		paramsMap = addSignParams(paramsMap, key);
+	public void checkNonce(String nonce) {
+		// 为空代表无效
+		if(SaFoxUtil.isEmpty(nonce)) {
+			throw new SaSignException("nonce 为空，无效");
+		}
 
-		// .
-		return joinParams(paramsMap);
+		// 校验此 nonce 是否已被使用过
+		String key = splicingNonceSaveKey(nonce);
+		if(SaManager.getSaTokenDao().get(key) != null) {
+			throw new SaSignException("此 nonce 已被使用过，不可重复使用：" + nonce);
+		}
+
+		// 校验通过后，将此 nonce 保存在缓存中，保证下次校验无法通过
+		SaManager.getSaTokenDao().set(key, nonce, getSignConfigOrGlobal().getSaveNonceExpire());
+	}
+
+	/**
+	 * 判断：给定的参数 + 秘钥 生成的签名是否为有效签名
+	 * @param paramsMap 参数列表
+	 * @param sign 待验证的签名
+	 * @return 签名是否有效
+	 */
+	public boolean isValidSign(Map<String, ?> paramsMap, String sign) {
+		String theSign = createSign(paramsMap);
+		return theSign.equals(sign);
+	}
+
+	/**
+	 * 校验：给定的参数 + 秘钥 生成的签名是否为有效签名，如果签名无效则抛出异常
+	 * @param paramsMap 参数列表
+	 * @param sign 待验证的签名
+	 */
+	public void checkSign(Map<String, ?> paramsMap, String sign) {
+		if( ! isValidSign(paramsMap, sign) )  {
+			throw new SaSignException("无效签名：" + sign).setCode(SaErrorCode.CODE_12202);
+		}
+	}
+
+	/**
+	 * 判断：参数列表中的 nonce、timestamp、sign 是否均为合法的
+	 * @param paramMap 待校验的请求参数集合
+	 * @return 是否合法
+	 */
+	public boolean isValidParamMap(Map<String, String> paramMap) {
+		// 获取必须的三个参数
+		String timestampValue = paramMap.get(timestamp);
+		String nonceValue = paramMap.get(nonce);
+		String signValue = paramMap.get(sign);
+
+		// 三个参数必须全部非空
+		SaSignException.throwByNull(timestampValue, "缺少 timestamp 字段");
+		SaSignException.throwByNull(nonceValue, "缺少 nonce 字段");
+		SaSignException.throwByNull(signValue, "缺少 sign 字段");
+
+		// 三个值的校验必须全部通过
+		return isValidTimestamp(Long.parseLong(timestampValue))
+				&& (getSignConfigOrGlobal().getIsCheckNonce() ? isValidNonce(nonceValue) : true)
+				&& isValidSign(paramMap, signValue);
+	}
+
+	/**
+	 * 校验：参数列表中的 nonce、timestamp、sign 是否均为合法的，如果不合法，则抛出对应的异常
+	 * @param paramMap 待校验的请求参数集合
+	 */
+	public void checkParamMap(Map<String, String> paramMap) {
+		// 获取必须的三个参数
+		String timestampValue = paramMap.get(timestamp);
+		String nonceValue = paramMap.get(nonce);
+		String signValue = paramMap.get(sign);
+
+		// 依次校验三个参数
+		checkTimestamp(Long.parseLong(timestampValue));
+		if(getSignConfigOrGlobal().getIsCheckNonce()) {
+			checkNonce(nonceValue);
+		}
+		checkSign(paramMap, signValue);
+
+		// 通过 √
+	}
+
+	/**
+	 * 判断：一个请求中的 nonce、timestamp、sign 是否均为合法的
+	 * @param request 待校验的请求对象
+	 * @return 是否合法
+	 */
+	public boolean isValidRequest(SaRequest request) {
+		return isValidParamMap(request.getParamMap());
+	}
+
+	/**
+	 * 校验：一个请求的 nonce、timestamp、sign 是否均为合法的，如果不合法，则抛出对应的异常
+	 * @param request 待校验的请求对象
+	 */
+	public void checkRequest(SaRequest request) {
+		checkParamMap(request.getParamMap());
+	}
+
+
+	// ------------------- 返回相应key -------------------
+
+	/**
+	 * 拼接key：存储 nonce 时使用的 key
+	 * @param nonce nonce 值
+	 * @return key
+	 */
+	public String splicingNonceSaveKey(String nonce) {
+		return SaManager.getConfig().getTokenName() + ":sign:nonce:" + nonce;
 	}
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplateDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplateDefaultImpl.java
deleted file mode 100644
index f8137033..00000000
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplateDefaultImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package cn.dev33.satoken.sign;
-
-/**
- * 参数签名算法 [默认实现类]
- * 
- * @author kong
- * @since: 2022-4-27
- */
-public class SaSignTemplateDefaultImpl implements SaSignTemplate {
-
-}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
new file mode 100644
index 00000000..649b9b2c
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
@@ -0,0 +1,159 @@
+package cn.dev33.satoken.sign;
+
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.context.model.SaRequest;
+
+import java.util.Map;
+
+/**
+ * API 参数签名算法 - 工具类
+ *
+ * @author kong
+ * @since 2022-4-27
+ */
+public class SaSignUtil {
+
+	// ----------- 拼接参数
+
+	/**
+	 * 将所有参数连接成一个字符串(不排序)，形如：b=28a=18c=3
+	 * @param paramsMap 参数列表
+	 * @return 拼接出的参数字符串 
+	 */
+	public static String joinParams(Map<String, ?> paramsMap) {
+		return SaManager.getSaSignTemplate().joinParams(paramsMap);
+	}
+
+	/**
+	 * 将所有参数按照字典顺序连接成一个字符串，形如：a=18b=28c=3
+	 * @param paramsMap 参数列表
+	 * @return 拼接出的参数字符串 
+	 */
+	public static String joinParamsDictSort(Map<String, ?> paramsMap) {
+		return SaManager.getSaSignTemplate().joinParamsDictSort(paramsMap);
+	}
+
+
+	// ----------- 创建签名
+
+	/**
+	 * 创建签名：md5(paramsStr + keyStr)
+	 * @param paramsMap 参数列表
+	 * @return 签名 
+	 */
+	public static String createSign(Map<String, ?> paramsMap) {
+		return SaManager.getSaSignTemplate().createSign(paramsMap);
+	}
+
+	/**
+	 * 给 paramsMap 追加 timestamp、nonce、sign 三个参数 
+	 * @param paramsMap 参数列表
+	 * @return 加工后的参数列表 
+	 */
+	public static Map<String, Object> addSignParams(Map<String, Object> paramsMap) {
+		return SaManager.getSaSignTemplate().addSignParams(paramsMap);
+	}
+
+	/**
+	 * 给 paramsMap 追加 timestamp、nonce、sign 三个参数，并转换为参数字符串，形如：
+	 * <code>data=xxx8nonce=xxx8timestamp=xxx8sign=xxx</code>
+	 * @param paramsMap 参数列表
+	 * @return 加工后的参数列表 转化为的参数字符串
+	 */
+	public static String addSignParamsAndJoin(Map<String, Object> paramsMap) {
+		return SaManager.getSaSignTemplate().addSignParamsAndJoin(paramsMap);
+	}
+
+
+	// ----------- 校验签名
+
+	/**
+	 * 判断：指定时间戳与当前时间戳的差距是否在允许的范围内
+	 * @param timestamp 待校验的时间戳
+	 * @return 是否在允许的范围内
+	 */
+	public static boolean isValidTimestamp(long timestamp) {
+		return SaManager.getSaSignTemplate().isValidTimestamp(timestamp);
+	}
+
+	/**
+	 * 校验：指定时间戳与当前时间戳的差距是否在允许的范围内，如果超出则抛出异常
+	 * @param timestamp 待校验的时间戳
+	 */
+	public static void checkTimestamp(long timestamp) {
+		SaManager.getSaSignTemplate().checkTimestamp(timestamp);
+	}
+
+	/**
+	 * 判断：随机字符串 nonce 是否有效。
+	 * 		注意：同一 nonce 可以被多次判断有效，不会被缓存
+	 * @param nonce 待判断的随机字符串
+	 * @return 是否有效
+	 */
+	public static boolean isValidNonce(String nonce) {
+		return SaManager.getSaSignTemplate().isValidNonce(nonce);
+	}
+
+	/**
+	 * 校验：随机字符串 nonce 是否有效，如果无效则抛出异常。
+	 * 		注意：同一 nonce 只可以被校验通过一次，校验后将保存在缓存中，再次校验将无法通过
+	 * @param nonce 待校验的随机字符串
+	 */
+	public static void checkNonce(String nonce) {
+		SaManager.getSaSignTemplate().checkNonce(nonce);
+	}
+
+	/**
+	 * 判断：给定的参数 + 秘钥 生成的签名是否为有效签名
+	 * @param paramsMap 参数列表
+	 * @param sign 待验证的签名
+	 * @return 签名是否有效
+	 */
+	public static boolean isValidSign(Map<String, ?> paramsMap, String sign) {
+		return SaManager.getSaSignTemplate().isValidSign(paramsMap, sign);
+	}
+
+	/**
+	 * 校验：给定的参数 + 秘钥 生成的签名是否为有效签名，如果签名无效则抛出异常
+	 * @param paramsMap 参数列表
+	 * @param sign 待验证的签名
+	 */
+	public static void checkSign(Map<String, ?> paramsMap, String sign) {
+		SaManager.getSaSignTemplate().checkSign(paramsMap, sign);
+	}
+
+	/**
+	 * 判断：参数列表中的 nonce、timestamp、sign 是否均为合法的
+	 * @param paramMap 待校验的请求参数集合
+	 * @return 是否合法
+	 */
+	public static boolean isValidParamMap(Map<String, String> paramMap) {
+		return SaManager.getSaSignTemplate().isValidParamMap(paramMap);
+	}
+
+	/**
+	 * 校验：参数列表中的 nonce、timestamp、sign 是否均为合法的，如果不合法，则抛出对应的异常
+	 * @param paramMap 待校验的请求参数集合
+	 */
+	public static void checkParamMap(Map<String, String> paramMap) {
+		SaManager.getSaSignTemplate().checkParamMap(paramMap);
+	}
+
+	/**
+	 * 判断：一个请求中的 nonce、timestamp、sign 是否均为合法的
+	 * @param request 待校验的请求对象
+	 * @return 是否合法
+	 */
+	public static boolean isValidRequest(SaRequest request) {
+		return SaManager.getSaSignTemplate().isValidRequest(request);
+	}
+
+	/**
+	 * 校验：一个请求的 nonce、timestamp、sign 是否均为合法的，如果不合法，则抛出对应的异常
+	 * @param request 待校验的请求对象
+	 */
+	public static void checkRequest(SaRequest request) {
+		SaManager.getSaSignTemplate().checkRequest(request);
+	}
+
+}
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
index 8c72a99f..d399e905 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
@@ -2,8 +2,8 @@ package com.pj.sso;
 
 import cn.dev33.satoken.config.SaSsoConfig;
 import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.sign.SaSignUtil;
 import cn.dev33.satoken.sso.SaSsoProcessor;
-import cn.dev33.satoken.sso.SaSsoUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
 import com.dtflys.forest.Forest;
@@ -66,13 +66,13 @@ public class SsoServerController {
 
 	// 示例：获取数据接口（用于在模式三下，为 client 端开放拉取数据的接口）
 	@RequestMapping("/sso/getData")
-	public Object userinfo(String apiType, String loginId) {
+	public Object getData(String apiType, String loginId) {
 		System.out.println("---------------- 获取数据 ----------------");
 		System.out.println("apiType=" + apiType);
 		System.out.println("loginId=" + loginId);
 
 		// 校验签名：只有拥有正确秘钥发起的请求才能通过校验
-		SaSsoUtil.checkSign(SaHolder.getRequest());
+		SaSignUtil.checkRequest(SaHolder.getRequest());
 
 		// 自定义返回结果（模拟）
 		return SaResult.ok()
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml
index be264665..c7937759 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/resources/application.yml
@@ -15,14 +15,14 @@ sa-token:
         ticket-timeout: 300
         # 所有允许的授权回调地址
         allow-url: "*"
-        # 是否打开单点注销功能
-        is-slo: true
-        
-        # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开） 
+
+        # ------- SSO-模式三相关配置 （下面的配置在使用SSO模式三时打开）
         # 是否打开模式三 
-        isHttp: true
-        # 接口调用秘钥（用于SSO模式三的单点注销功能）
-        secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+        is-http: true
+    sign:
+        # API 接口调用秘钥
+        secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+
         # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） 
         
 spring: 
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
index cf1d77a0..adbcbeef 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
@@ -1,21 +1,17 @@
 package com.pj.sso;
 
-import cn.dev33.satoken.context.SaHolder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.dtflys.forest.Forest;
-
 import cn.dev33.satoken.config.SaSsoConfig;
 import cn.dev33.satoken.sso.SaSsoProcessor;
 import cn.dev33.satoken.sso.SaSsoUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
+import com.dtflys.forest.Forest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -65,7 +61,7 @@ public class SsoClientController {
 		map.put("loginId", StpUtil.getLoginId());
 
 		// 发起请求
-		Object resData = SaSsoUtil.getData("/sso/getData", map);
+		Object resData = SaSsoUtil.getData(map);
 		System.out.println("sso-server 返回的信息：" + resData);
 		return resData;
 	}
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
index 67632540..a61bc655 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
@@ -8,18 +8,17 @@ sa-token:
     sso: 
         # SSO-Server端 统一认证地址 
         auth-url: http://sa-sso-server.com:9000/sso/auth
-        # 使用Http请求校验ticket 
+        # 使用 Http 请求校验ticket (模式三)
         is-http: true
         # SSO-Server端 ticket校验地址 
         check-ticket-url: http://sa-sso-server.com:9000/sso/checkTicket
-        # 打开单点注销功能 
-        is-slo: true
         # 单点注销地址 
         slo-url: http://sa-sso-server.com:9000/sso/signout
-        # 接口调用秘钥 
-        secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
         # 查询数据地址
         get-data-url: http://sa-sso-server.com:9000/sso/getData
+    sign:
+        # API 接口调用秘钥
+        secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
 
 spring: 
     # 配置 Redis 连接 （此处与SSO-Server端连接不同的Redis）
diff --git a/sa-token-doc/sso/sso-questions.md b/sa-token-doc/sso/sso-questions.md
index 1d0b8843..2be82544 100644
--- a/sa-token-doc/sso/sso-questions.md
+++ b/sa-token-doc/sso/sso-questions.md
@@ -184,6 +184,13 @@ public class SsoUserServerController {
 			public StpLogic getStpLogic() {
 				return StpUserUtil.stpLogic;
 			}
+            // 使用自定义的签名秘钥
+            SaSignConfig signConfig =  new SaSignConfig().setSecretKey("xxxx-新的秘钥-xxxx");
+            SaSignTemplate userSignTemplate = new SaSignTemplate().setSignConfig(signConfig);
+            @Override
+            public SaSignTemplate getSignTemplate() {
+                return userSignTemplate;
+            }
 		};
 		// 让这个SSO请求处理器，使用的路由前缀是 /sso-user，而不是原先的 /sso 
 		ssoUserTemplate.apiName.replacePrefix("/sso-user");
diff --git a/sa-token-doc/sso/sso-server.md b/sa-token-doc/sso/sso-server.md
index 6b1288d1..06fd6a87 100644
--- a/sa-token-doc/sso/sso-server.md
+++ b/sa-token-doc/sso/sso-server.md
@@ -178,14 +178,13 @@ sa-token:
         ticket-timeout: 300
         # 所有允许的授权回调地址
         allow-url: "*"
-        # 是否打开单点注销功能
-        is-slo: true
         
-        # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
+        # ------- SSO-模式三相关配置 （下面的配置在使用SSO模式三时打开）
         # 是否打开模式三 
-        isHttp: true
-        # 接口调用秘钥（用于SSO模式三的单点注销功能）
-        secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+        is-http: true
+    sign:
+        # API 接口调用秘钥
+        secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
         # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） 
         
 spring: 
@@ -219,14 +218,12 @@ server.port=9000
 sa-token.sso.ticket-timeout=300
 # 所有允许的授权回调地址
 sa-token.sso.allow-url=*
-# 是否打开单点注销功能
-sa-token.sso.is-slo=true
 
-# ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
+# ------- SSO-模式三相关配置 （下面的配置在使用SSO模式三时打开）
 # 是否打开模式三 
-sa-token.sso.isHttp=true
-# 接口调用秘钥（用于SSO模式三的单点注销功能）
-sa-token.sso.secretkey=kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+sa-token.sso.is-http=true
+# API 接口调用秘钥
+sa-token.sign.secret-key=kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
 
 # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） 
     
diff --git a/sa-token-doc/sso/sso-type2.md b/sa-token-doc/sso/sso-type2.md
index a38f3153..901cc9e1 100644
--- a/sa-token-doc/sso/sso-type2.md
+++ b/sa-token-doc/sso/sso-type2.md
@@ -173,8 +173,6 @@ sa-token:
     sso: 
         # SSO-Server端 统一认证地址 
         auth-url: http://sa-sso-server.com:9000/sso/auth
-        # 是否打开单点注销接口
-        is-slo: true
 
     # 配置Sa-Token单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
     alone-redis: 
@@ -197,8 +195,6 @@ server.port=9001
 ######### Sa-Token 配置 #########
 # SSO-Server端 统一认证地址 
 sa-token.sso.auth-url=http://sa-sso-server.com:9000/sso/auth
-# 是否打开单点注销接口
-sa-token.sso.is-slo=true
 
 # 配置 Sa-Token 单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
 # Redis数据库索引
diff --git a/sa-token-doc/sso/sso-type3.md b/sa-token-doc/sso/sso-type3.md
index ea504b69..194d6a4d 100644
--- a/sa-token-doc/sso/sso-type3.md
+++ b/sa-token-doc/sso/sso-type3.md
@@ -115,13 +115,13 @@ forest.log-enabled: false
 ``` java
 // 示例：获取数据接口（用于在模式三下，为 client 端开放拉取数据的接口）
 @RequestMapping("/sso/getData")
-public Object userinfo(String apiType, String loginId) {
+public Object getData(String apiType, String loginId) {
 	System.out.println("---------------- 获取数据 ----------------");
 	System.out.println("apiType=" + apiType);
 	System.out.println("loginId=" + loginId);
 
 	// 校验签名：只有拥有正确秘钥发起的请求才能通过校验
-	SaSsoUtil.checkSign(SaHolder.getRequest());
+	SaSignUtil.checkRequest(SaHolder.getRequest());
 
 	// 自定义返回结果（模拟）
 	return SaResult.ok()
@@ -232,7 +232,7 @@ public Object getFansList(Long loginId) {
 	System.out.println("---------------- 获取 loginId=" + loginId + " 的粉丝列表 ----------------");
 
 	// 校验签名：只有拥有正确秘钥发起的请求才能通过校验
-	SaSsoUtil.checkSign(SaHolder.getRequest());
+	SaSignUtil.checkRequest(SaHolder.getRequest());
 
 	// 查询数据 (此处仅做模拟)
 	List<Integer> list = Arrays.asList(10041, 10042, 10043, 10044);
@@ -284,12 +284,11 @@ sa-token:
 ``` yaml
 sa-token: 
 	sso: 
-        # 打开单点注销功能 
-        is-slo: true
 		# 单点注销地址 
 		slo-url: http://sa-sso-server.com:9000/sso/signout
-		# 接口调用秘钥 
-		secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+    sign:
+        # API 接口调用秘钥
+        secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
 ```
 <!------------- tab:properties 风格  ------------->
 ``` properties
@@ -298,7 +297,7 @@ sa-token.sso.is-slo=true
 # 单点注销地址 
 sa-token.sso.slo-url=http://sa-sso-server.com:9000/sso/signout
 # 接口调用秘钥 
-sa-token.sso.secretkey=kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+sa-token.sign.secret-key=kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
 ```
 <!---------------------------- tabs:end ---------------------------->
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index 40e536d7..8909fcd8 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -43,11 +43,6 @@ public class SaSsoConfig implements Serializable {
 	 */
 	public Boolean isHttp = false; 
 
-	/**
-	 * 接口调用秘钥 (用于SSO模式三单点注销的接口通信身份校验) 
-	 */
-	public String secretkey;
-
 	
 	// ----------------- Client端相关配置 
 
@@ -106,17 +101,6 @@ public class SaSsoConfig implements Serializable {
 	 */
 	public String serverUrl;
 
-	// ----------------- 其它 
-
-
-
-	/**
-	 * 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距 
-	 */
-	public long timestampDisparity = 1000  * 60 * 10;
-
-
-
 
 	/**
 	 * @return Ticket有效期 (单位: 秒)  
@@ -182,22 +166,6 @@ public class SaSsoConfig implements Serializable {
 		return this;
 	}
 
-	/**
-	 * @return 接口调用秘钥 (用于SSO模式三单点注销的接口通信身份校验)  
-	 */
-	public String getSecretkey() {
-		return secretkey;
-	}
-
-	/**
-	 * @param secretkey 接口调用秘钥 (用于SSO模式三单点注销的接口通信身份校验)  
-	 * @return 对象自身
-	 */
-	public SaSsoConfig setSecretkey(String secretkey) {
-		this.secretkey = secretkey;
-		return this;
-	}
-
 	/**
 	 * @return 当前 Client 名称标识，用于和 ticket 码的互相锁定 
 	 */
@@ -325,30 +293,13 @@ public class SaSsoConfig implements Serializable {
 		return this;
 	}
 
-	/**
-	 * @return 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距 
-	 */
-	public long getTimestampDisparity() {
-		return timestampDisparity;
-	}
-
-	/**
-	 * @param timestampDisparity 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距 
-	 * @return 对象自身 
-	 */
-	public SaSsoConfig setTimestampDisparity(long timestampDisparity) {
-		this.timestampDisparity = timestampDisparity;
-		return this;
-	}
-
 	@Override
 	public String toString() {
 		return "SaSsoConfig ["
 				+ "ticketTimeout=" + ticketTimeout 
 				+ ", allowUrl=" + allowUrl 
 				+ ", isSlo=" + isSlo
-				+ ", isHttp=" + isHttp 
-				+ ", secretkey=" + secretkey 
+				+ ", isHttp=" + isHttp
 				+ ", client=" + client 
 				+ ", authUrl=" + authUrl 
 				+ ", checkTicketUrl=" + checkTicketUrl
@@ -356,8 +307,7 @@ public class SaSsoConfig implements Serializable {
 				+ ", userinfoUrl=" + userinfoUrl 
 				+ ", sloUrl=" + sloUrl 
 				+ ", ssoLogoutCall=" + ssoLogoutCall 
-				+ ", serverUrl=" + serverUrl 
-				+ ", timestampDisparity=" + timestampDisparity 
+				+ ", serverUrl=" + serverUrl
 				+ "]";
 	}
 	
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index bcb1d227..b75702bd 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -193,7 +193,7 @@ public class SaSsoProcessor {
 		String loginId = req.getParam(paramName.loginId);
 		
 		// step.1 校验签名 
-		ssoTemplate.checkSign(req);
+		ssoTemplate.getSignTemplate().checkRequest(req);
 		
 		// step.2 单点注销 
 		ssoTemplate.ssoLogout(loginId);
@@ -374,7 +374,7 @@ public class SaSsoProcessor {
 		String loginId = req.getParamNotNull(paramName.loginId);
 		
 		// 注销当前应用端会话
-		ssoTemplate.checkSign(req);
+		ssoTemplate.getSignTemplate().checkRequest(req);
 		stpLogic.logout(loginId);
 		
 		// 响应 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index 128427f6..4386090a 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -2,8 +2,8 @@ package cn.dev33.satoken.sso;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.config.SaSsoConfig;
-import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.sign.SaSignTemplate;
 import cn.dev33.satoken.sso.error.SaSsoErrorCode;
 import cn.dev33.satoken.sso.exception.SaSsoException;
 import cn.dev33.satoken.sso.name.ApiName;
@@ -68,8 +68,16 @@ public class SaSsoTemplate {
 	public SaSsoConfig getSsoConfig() {
 		return SaSsoManager.getConfig();
 	}
-	
-	
+
+	/**
+	 * 获取底层使用的 API 签名对象
+	 * @return /
+	 */
+	public SaSignTemplate getSignTemplate() {
+		return SaManager.getSaSignTemplate();
+	}
+
+
 	// ---------------------- Ticket 操作 ---------------------- 
 	
 	/**
@@ -300,7 +308,7 @@ public class SaSsoTemplate {
 		SaSsoConfig cfg = SaSsoManager.getConfig();
 		Set<String> urlSet = session.get(SaSsoConsts.SLO_CALLBACK_SET_KEY, HashSet::new);
 		for (String url : urlSet) {
-			url = addSignParams(url, loginId);
+			url = joinLoginIdAndSign(url, loginId);
 			cfg.getSendHttp().apply(url);
 		}
 		
@@ -452,7 +460,7 @@ public class SaSsoTemplate {
 	 */
 	public String buildSloUrl(Object loginId) {
 		String url = SaSsoManager.getConfig().splicingSloUrl();
-		return addSignParams(url, loginId);
+		return joinLoginIdAndSign(url, loginId);
 	}
 
 	/**
@@ -480,32 +488,11 @@ public class SaSsoTemplate {
 		}
 
 		// 添加签名等参数，并序列化
-		return addSignParams(url, paramMap);
-	}
-
-	
-	// ------------------- 返回相应key ------------------- 
-
-	/** 
-	 * 拼接key：Ticket 查 账号Id 
-	 * @param ticket ticket值 
-	 * @return key
-	 */
-	public String splicingTicketSaveKey(String ticket) {
-		return SaManager.getConfig().getTokenName() + ":ticket:" + ticket;
-	}
-
-	/** 
-	 * 拼接key：账号Id 反查 Ticket 
-	 * @param id 账号id
-	 * @return key
-	 */
-	public String splicingTicketIndexKey(Object id) {
-		return SaManager.getConfig().getTokenName() + ":id-ticket:" + id;
+		return joinParamMapAndSign(url, paramMap);
 	}
 
 
-	// ------------------- 请求相关 ------------------- 
+	// ------------------- 发起请求 -------------------
 
 	/**
 	 * 发出请求，并返回 SaResult 结果 
@@ -518,33 +505,20 @@ public class SaSsoTemplate {
 		return new SaResult(map);
 	}
 
-	/**
-	 * 获取：接口调用秘钥 
-	 * @return see note 
-	 */
-	public String getSecretkey() {
-		// 默认从配置文件中返回 
-		String secretkey = SaSsoManager.getConfig().getSecretkey();
-		if(SaFoxUtil.isEmpty(secretkey)) {
-			throw new SaSsoException("请配置 secretkey 参数").setCode(SaSsoErrorCode.CODE_30009);
-		}
-		return secretkey;
-	}
-
 	/**
 	 * 给 paramMap 追加 sign 等参数，并序列化为kv字符串，拼接到url后面
 	 * @param url 请求地址
 	 * @param paramMap 请求原始参数列表
 	 * @return 加工后的url
 	 */
-	public String addSignParams(String url, Map<String, Object> paramMap) {
-		// 追加：时间戳、随机字符串、参数签名
-		SaManager.getSaSignTemplate().addSignParams(paramMap, getSecretkey());
+	public String joinParamMapAndSign(String url, Map<String, Object> paramMap) {
+		// 在参数列表中追加：时间戳、随机字符串、参数签名
+		SaManager.getSaSignTemplate().addSignParams(paramMap);
 
-		// 序列化为kv字符串
+		// 将参数列表序列化为kv字符串
 		String signParams = SaManager.getSaSignTemplate().joinParams(paramMap);
 
-		// 拼接到一起
+		// 将kv字符串拼接到url后面
 		return SaFoxUtil.joinParam(url, signParams);
 	}
 
@@ -554,51 +528,36 @@ public class SaSsoTemplate {
 	 * @param loginId 账号id
 	 * @return 加工后的url
 	 */
-	public String addSignParams(String url, Object loginId) {
+	public String joinLoginIdAndSign(String url, Object loginId) {
 		Map<String, Object> paramMap = new LinkedHashMap<>();
 		paramMap.put(paramName.loginId, loginId);
-		return addSignParams(url, paramMap);
+		return joinParamMapAndSign(url, paramMap);
+	}
+
+
+	// ------------------- 返回相应key -------------------
+
+	/**
+	 * 拼接key：Ticket 查 账号Id
+	 * @param ticket ticket值
+	 * @return key
+	 */
+	public String splicingTicketSaveKey(String ticket) {
+		return SaManager.getConfig().getTokenName() + ":ticket:" + ticket;
 	}
 
 	/**
-	 * 校验签名
-	 * @param req request 
+	 * 拼接key：账号Id 反查 Ticket
+	 * @param id 账号id
+	 * @return key
 	 */
-	public void checkSign(SaRequest req) {
-		// 获取签名、时间戳、随机字符串
-		String sign = req.getParamNotNull(paramName.sign);
-		String timestamp = req.getParamNotNull(paramName.timestamp);
-		String nonce = req.getParamNotNull(paramName.nonce);
-
-		// 1、校验时间戳
-		SaManager.getSaSignTemplate().checkTimestamp(Long.parseLong(timestamp), SaSsoManager.getConfig().getTimestampDisparity());
-
-		// 2、校验随机字符串
-
-		// 3、校验签名
-		SaManager.getSaSignTemplate().checkSign(req.getParamMap(), getSecretkey(), sign);
+	public String splicingTicketIndexKey(Object id) {
+		return SaManager.getConfig().getTokenName() + ":id-ticket:" + id;
 	}
 
 
 	// -------- 以下方法已废弃，仅为兼容旧版本而保留 --------
 
-	/**
-	 * 根据参数计算签名
-	 * @param loginId 账号id
-	 * @param timestamp 当前时间戳，13位
-	 * @param nonce 随机字符串
-	 * @param secretkey 账号id
-	 * @return 签名
-	 */
-	@Deprecated
-	public String getSign(Object loginId, String timestamp, String nonce, String secretkey) {
-		Map<String, Object> map = new TreeMap<>();
-		map.put(paramName.loginId, loginId);
-		map.put(paramName.timestamp, timestamp);
-		map.put(paramName.nonce, nonce);
-		return SaManager.getSaSignTemplate().createSign(map, secretkey);
-	}
-
 	/**
 	 * 构建URL：Server端 账号资料查询地址
 	 * @param loginId 账号id
@@ -607,7 +566,7 @@ public class SaSsoTemplate {
 	@Deprecated
 	public String buildUserinfoUrl(Object loginId) {
 		String userinfoUrl = SaSsoManager.getConfig().splicingUserinfoUrl();
-		return addSignParams(userinfoUrl, loginId);
+		return joinLoginIdAndSign(userinfoUrl, loginId);
 	}
 
 	/**
@@ -618,7 +577,7 @@ public class SaSsoTemplate {
 	@Deprecated
 	public Object getUserinfo(Object loginId) {
 		String url = buildUserinfoUrl(loginId);
-		return SaSsoManager.getConfig().getSendHttp().apply(url);
+		return request(url);
 	}
 
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index 4388c043..a4fc2880 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -1,6 +1,5 @@
 package cn.dev33.satoken.sso;
 
-import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.util.SaResult;
 
 import java.util.Map;
@@ -202,7 +201,7 @@ public class SaSsoUtil {
 	}
 
 	
-	// ------------------- 请求相关 ------------------- 
+	// ------------------- 发起请求 -------------------
 
 	/**
 	 * 发出请求，并返回 SaResult 结果 
@@ -219,8 +218,8 @@ public class SaSsoUtil {
 	 * @param paramMap 请求原始参数列表
 	 * @return 加工后的url
 	 */
-	public static String addSignParams(String url, Map<String, Object> paramMap) {
-		return ssoTemplate.addSignParams(url, paramMap);
+	public static String joinParamMapAndSign(String url, Map<String, Object> paramMap) {
+		return ssoTemplate.joinLoginIdAndSign(url, paramMap);
 	}
 
 	/**
@@ -229,32 +228,21 @@ public class SaSsoUtil {
 	 * @param loginId 账号id
 	 * @return 加工后的url
 	 */
-	public static String addSignParams(String url, Object loginId) {
-		return ssoTemplate.addSignParams(url, loginId);
-	}
-
-	/**
-	 * 校验签名
-	 * @param req request 
-	 */
-	public static void checkSign(SaRequest req) {
-		ssoTemplate.checkSign(req);
+	public static String joinLoginIdAndSign(String url, Object loginId) {
+		return ssoTemplate.joinLoginIdAndSign(url, loginId);
 	}
 
 
 	// -------- 以下方法已废弃，仅为兼容旧版本而保留 --------
 
 	/**
-	 * 根据参数计算签名
+	 * 构建URL：Server端 账号资料查询地址
 	 * @param loginId 账号id
-	 * @param timestamp 当前时间戳，13位
-	 * @param nonce 随机字符串
-	 * @param secretkey 账号id
-	 * @return 签名
+	 * @return Server端 账号资料查询地址
 	 */
 	@Deprecated
-	public static String getSign(Object loginId, String timestamp, String nonce, String secretkey) {
-		return ssoTemplate.getSign(loginId, timestamp, nonce, secretkey);
+	public static String buildUserinfoUrl(Object loginId) {
+		return ssoTemplate.buildUserinfoUrl(loginId);
 	}
 
 	/**
@@ -267,14 +255,4 @@ public class SaSsoUtil {
 		return ssoTemplate.getUserinfo(loginId);
 	}
 
-	/**
-	 * 构建URL：Server端 账号资料查询地址
-	 * @param loginId 账号id
-	 * @return Server端 账号资料查询地址
-	 */
-	@Deprecated
-	public static String buildUserinfoUrl(Object loginId) {
-		return ssoTemplate.buildUserinfoUrl(loginId);
-	}
-
 }

From ca65c2d9fd31917683cfb8b33fc50eaf4d13f79f Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 3 May 2023 04:53:35 +0800
Subject: [PATCH 026/129] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/sso/sso-questions.md | 3 +++
 sa-token-doc/use/config.md        | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sa-token-doc/sso/sso-questions.md b/sa-token-doc/sso/sso-questions.md
index 2be82544..30bd127c 100644
--- a/sa-token-doc/sso/sso-questions.md
+++ b/sa-token-doc/sso/sso-questions.md
@@ -57,6 +57,9 @@ public class SaSsoServerApplication {
 解决方案：在 sso-client 也新建上这个类，而且包名需要与 sso-server 端的一致（直接从 sso-server 把实体类复制过来就好了）
 
 
+### 模式三配置一堆 xxx-url ，有办法简化一下吗？
+可以使用 `sa-token.sso.server-url` 配置项来简化，参考：[配置项详解：serverurl](/use/config?id=配置项详解：serverurl)
+
 
 ### 问：SSO模式二或模式三，第一个 client 登录成功之后再访问其它两个 client 不会自动登录，需要点一下登录按钮才会登录上？
 答：这是正常现象，系统 1 登录成功之后，系统 2 与系统 3 需要点击登录按钮，才会登录成功。
diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index 53cadbf7..02308f84 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -345,7 +345,7 @@ sa-token.oauth2.is-client=true
 
 #### 配置项详解：serverUrl
 
-配置含义：配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、userinfoUrl、sloUrl 属性前面，用以简化各种 url 配置。
+配置含义：配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、getDataUrl、sloUrl 属性前面，用以简化各种 url 配置。
 
 在开发 SSO 模块时，我们需要在 sso-client 配置认证中心的各种地址，特别是在模式三下，一般代码会变成这样：
 
@@ -358,8 +358,8 @@ sa-token:
         check-ticket-url: http://sa-sso-server.com:9000/sso/checkTicket
         # 单点注销地址 
         slo-url: http://sa-sso-server.com:9000/sso/signout
-        # SSO-Server端 查询userinfo地址 
-        userinfo-url: http://sa-sso-server.com:9000/sso/userinfo
+        # SSO-Server端 查询数据地址 
+        get-data-url: http://sa-sso-server.com:9000/sso/getData
 ```
 
 一堆 xxx-url 配置比较繁琐，且含有大量重复字符，现在我们可以将其简化为：

From fc4d9a8f6202686a22e75af189da122585afec73 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 3 May 2023 05:09:15 +0800
Subject: [PATCH 027/129] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/pj/current/GlobalException.java       | 2 +-
 .../src/main/resources/application.yml                      | 2 +-
 sa-token-doc/more/common-questions.md                       | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/GlobalException.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/GlobalException.java
index 7ee67369..1d6ebb1c 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/GlobalException.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/GlobalException.java
@@ -26,7 +26,7 @@ public class GlobalException {
 
 		// 打印堆栈，以供调试
 		System.out.println("全局异常---------------");
-		e.printStackTrace(); 
+		e.printStackTrace();
 
 		// 不同异常返回不同状态码 
 		AjaxJson aj = null;
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
index fdb03d91..55685ecb 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
@@ -19,7 +19,7 @@ sa-token:
     # 是否输出操作日志 
     is-log: true
 
-spring: 
+spring:
     # redis配置 
     redis:
         # Redis数据库索引（默认为0）
diff --git a/sa-token-doc/more/common-questions.md b/sa-token-doc/more/common-questions.md
index 368dc982..6eb729fb 100644
--- a/sa-token-doc/more/common-questions.md
+++ b/sa-token-doc/more/common-questions.md
@@ -428,6 +428,12 @@ Caused by: java.lang.ClassNotFoundException: cn.dev33.satoken.same.SaSameTemplat
 	- (2) 在自定义StpUtil类加上类似 @Component 的注解让容器启动时扫描到自动初始化 
 
 
+### Q：使用拦截器鉴权，访问一个不存在的 path 时，springboot 会自动在控制台打印一下异常。
+可尝试添加以下配置解决：
+``` properties
+spring.resources.add-mappings=false
+spring.mvc.throw-exception-if-no-handler-found=true
+```
 
 
 

From fc4ec6a1f9d620e258745cc0fb61bd82fe5ae975 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 3 May 2023 06:48:28 +0800
Subject: [PATCH 028/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/sso/sso-questions.md | 44 ++++++++++++++++++++++++++++---
 sa-token-doc/use/config.md        | 42 +----------------------------
 2 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/sa-token-doc/sso/sso-questions.md b/sa-token-doc/sso/sso-questions.md
index 30bd127c..68bcf4be 100644
--- a/sa-token-doc/sso/sso-questions.md
+++ b/sa-token-doc/sso/sso-questions.md
@@ -50,15 +50,53 @@ public class SaSsoServerApplication {
 如果使用的是模式三，则排查是否有重复校验 ticket 的代码，一个 ticket 码只能使用一次，多次重复使用就会提示这个。
 
 
-### 模式一或者模式二报错：Could not write JSON: No serializer found for class com.pj.sso.SysUser and no properties discovered to create BeanSerializer 
+### 问：模式一或者模式二报错：Could not write JSON: No serializer found for class com.pj.sso.SysUser and no properties discovered to create BeanSerializer 
 
 一般是因为在 sso-server 端往 session 上写入了某个实体类（比如 User），而在 sso-client 端没有这个实体类，导致反序列化失败。
 
 解决方案：在 sso-client 也新建上这个类，而且包名需要与 sso-server 端的一致（直接从 sso-server 把实体类复制过来就好了）
 
 
-### 模式三配置一堆 xxx-url ，有办法简化一下吗？
-可以使用 `sa-token.sso.server-url` 配置项来简化，参考：[配置项详解：serverurl](/use/config?id=配置项详解：serverurl)
+### 问：模式三配置一堆 xxx-url ，有办法简化一下吗？
+可以使用 `sa-token.sso.server-url` 来简化：
+
+配置含义：配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、getDataUrl、sloUrl 属性前面，用以简化各种 url 配置。
+
+在开发 SSO 模块时，我们需要在 sso-client 配置认证中心的各种地址，特别是在模式三下，一般代码会变成这样：
+
+``` yaml
+sa-token: 
+    sso: 
+        # SSO-Server端 统一认证地址 
+        auth-url: http://sa-sso-server.com:9000/sso/auth
+        # SSO-Server端 ticket校验地址 
+        check-ticket-url: http://sa-sso-server.com:9000/sso/checkTicket
+        # 单点注销地址 
+        slo-url: http://sa-sso-server.com:9000/sso/signout
+        # SSO-Server端 查询数据地址 
+        get-data-url: http://sa-sso-server.com:9000/sso/getData
+```
+
+一堆 xxx-url 配置比较繁琐，且含有大量重复字符，现在我们可以将其简化为：
+``` yaml
+sa-token: 
+    sso: 
+        server-url: http://sa-sso-server.com:9000
+```
+
+只要你配置了 `server-url` 地址，Sa-Token 就可以自动拼接出其它四个地址：
+
+**例1，使用 server-url 简化：**
+- 你配置的 server-url 值是：`http://sa-sso-server.com:9000`。
+- 框架拼接出的 auth-url 值就是：`http://sa-sso-server.com:9000/sso/auth`，其它三个 url 配置项同理。
+
+**例2，使用 server-url + auth-url 简化：**
+- 你配置的 server-url 值是：`http://sa-sso-server.com:9000`，auth-url 是：`/sso/auth2`。
+- 框架拼接出的 auth-url 值就是：`http://sa-sso-server.com:9000/sso/auth2`，其它三个 url 配置项同理。
+
+**例3，auth-url 地址以 http 字符开头：**
+- 你配置的 server-url 值是：`http://sa-sso-server.com:9000`，auth-url 是：`http://my-site.com/sso/auth2`。
+- 此时框架只以 auth-url 值为准，得到的 auth-url 值是：`http://my-site.com/sso/auth2`，其它三个 url 配置项同理。
 
 
 ### 问：SSO模式二或模式三，第一个 client 登录成功之后再访问其它两个 client 不会自动登录，需要点一下登录按钮才会登录上？
diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index 02308f84..dd90b2ea 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -201,7 +201,7 @@ Client 端配置：
 | sloUrl		| String	| /sso/signout		| 配置 Server 端单点注销地址										|
 | ssoLogoutCall	| String	| null				| 配置当前 Client 端的单点注销回调URL （为空时自动获取）	|
 | secretkey		| String	| null				| 接口调用秘钥 （用于SSO模式三单点注销的接口通信身份校验）		|
-| serverUrl		| String	| null				| 配置 Server 端主机总地址，拼接在 `authUrl`、`checkTicketUrl`、`userinfoUrl`、`sloUrl` 属性前面，用以简化各种 url 配置，[详解](/use/config?id=配置项详解：serverUrl)		|
+| serverUrl		| String	| null				| 配置 Server 端主机总地址，拼接在 `authUrl`、`checkTicketUrl`、`userinfoUrl`、`sloUrl` 属性前面，用以简化各种 url 配置，参考：[详解](/sso/sso-questions?id=问：模式三配置一堆-xxx-url-，有办法简化一下吗？)	|
 | client		| String	| ""				| 当前 Client 名称标识，用于和 ticket 码的互相锁定			|
 
 
@@ -343,46 +343,6 @@ sa-token.oauth2.is-client=true
 - 此配置项为 true 时，代表使用SSO模式三：使用 Http 请求校验 ticket 值、使用 Http 请求做到单点注销、使用 Http 请求同步 Userinfo 数据。
 
 
-#### 配置项详解：serverUrl
-
-配置含义：配置 Server 端主机总地址，拼接在 authUrl、checkTicketUrl、getDataUrl、sloUrl 属性前面，用以简化各种 url 配置。
-
-在开发 SSO 模块时，我们需要在 sso-client 配置认证中心的各种地址，特别是在模式三下，一般代码会变成这样：
-
-``` yaml
-sa-token: 
-    sso: 
-        # SSO-Server端 统一认证地址 
-        auth-url: http://sa-sso-server.com:9000/sso/auth
-        # SSO-Server端 ticket校验地址 
-        check-ticket-url: http://sa-sso-server.com:9000/sso/checkTicket
-        # 单点注销地址 
-        slo-url: http://sa-sso-server.com:9000/sso/signout
-        # SSO-Server端 查询数据地址 
-        get-data-url: http://sa-sso-server.com:9000/sso/getData
-```
-
-一堆 xxx-url 配置比较繁琐，且含有大量重复字符，现在我们可以将其简化为：
-``` yaml
-sa-token: 
-    sso: 
-        server-url: http://sa-sso-server.com:9000
-```
-
-只要你配置了 `server-url` 地址，Sa-Token 就可以自动拼接出其它四个地址：
-
-**例1，使用 server-url 简化：**
-- 你配置的 server-url 值是：`http://sa-sso-server.com:9000`。
-- 框架拼接出的 auth-url 值就是：`http://sa-sso-server.com:9000/sso/auth`，其它三个 url 配置项同理。
-
-**例2，使用 server-url + auth-url 简化：**
-- 你配置的 server-url 值是：`http://sa-sso-server.com:9000`，auth-url 是：`/sso/auth2`。
-- 框架拼接出的 auth-url 值就是：`http://sa-sso-server.com:9000/sso/auth2`，其它三个 url 配置项同理。
-
-**例3，auth-url 地址以 http 字符开头：**
-- 你配置的 server-url 值是：`http://sa-sso-server.com:9000`，auth-url 是：`http://my-site.com/sso/auth2`。
-- 此时框架只以 auth-url 值为准，得到的 auth-url 值是：`http://my-site.com/sso/auth2`，其它三个 url 配置项同理。
-
 
 
 ---

From 0bed1ff7cfe39b01015c0f9329efcdf98b0bdcd6 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Wed, 3 May 2023 10:06:10 +0800
Subject: [PATCH 029/129] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=A4=E4=B8=AA?=
 =?UTF-8?q?=E5=BC=83=E7=94=A8=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../solon/integration/SaTokenPathFilter.java  |  16 --
 .../integration/SaTokenPathInterceptor.java   | 221 ------------------
 2 files changed, 237 deletions(-)
 delete mode 100644 sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java
 delete mode 100644 sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathInterceptor.java

diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java
deleted file mode 100644
index 6d2285bb..00000000
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathFilter.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.dev33.satoken.solon.integration;
-
-
-import org.noear.solon.annotation.Note;
-
-/**
- * sa-token 基于路由的过滤式鉴权（增加了注解的处理）；使用优先级要低些 //对静态文件有处理效果
- *
- * @author noear
- * @since 1.10
- */
-@Note("推荐：由 SaTokenFilter 替代")
-@Deprecated
-public class SaTokenPathFilter extends SaTokenFilter {
-
-}
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathInterceptor.java
deleted file mode 100644
index edc172e2..00000000
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenPathInterceptor.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package cn.dev33.satoken.solon.integration;
-
-import cn.dev33.satoken.annotation.SaIgnore;
-import cn.dev33.satoken.exception.BackResultException;
-import cn.dev33.satoken.exception.SaTokenException;
-import cn.dev33.satoken.exception.StopMatchException;
-import cn.dev33.satoken.filter.SaFilterAuthStrategy;
-import cn.dev33.satoken.filter.SaFilterErrorStrategy;
-import cn.dev33.satoken.router.SaRouter;
-import cn.dev33.satoken.strategy.SaStrategy;
-import org.noear.solon.annotation.Note;
-import org.noear.solon.core.handle.Action;
-import org.noear.solon.core.handle.Context;
-import org.noear.solon.core.handle.Handler;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * sa-token 基于路由的拦截式鉴权（增加了注解的处理）；使用优先级要高些
- *
- * @author noear
- * @since 1.10
- */
-@Note("推荐：由 SaTokenInterceptor 替代")
-@Deprecated
-public class SaTokenPathInterceptor implements Handler {
-	/**
-	 * 是否打开注解鉴权
-	 */
-	public boolean isAnnotation = true;
-
-	// ------------------------ 设置此过滤器 拦截 & 放行 的路由
-
-	/**
-	 * 拦截路由
-	 */
-	protected List<String> includeList = new ArrayList<>();
-
-	/**
-	 * 放行路由
-	 */
-	protected List<String> excludeList = new ArrayList<>();
-
-	/**
-	 * 添加 [拦截路由]
-	 *
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor addInclude(String... paths) {
-		includeList.addAll(Arrays.asList(paths));
-		return this;
-	}
-
-	/**
-	 * 添加 [放行路由]
-	 *
-	 * @param paths 路由
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor addExclude(String... paths) {
-		excludeList.addAll(Arrays.asList(paths));
-		return this;
-	}
-
-	/**
-	 * 写入 [拦截路由] 集合
-	 *
-	 * @param pathList 路由集合
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor setIncludeList(List<String> pathList) {
-		includeList = pathList;
-		return this;
-	}
-
-	/**
-	 * 写入 [放行路由] 集合
-	 *
-	 * @param pathList 路由集合
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor setExcludeList(List<String> pathList) {
-		excludeList = pathList;
-		return this;
-	}
-
-	/**
-	 * 获取 [拦截路由] 集合
-	 *
-	 * @return see note
-	 */
-	public List<String> getIncludeList() {
-		return includeList;
-	}
-
-	/**
-	 * 获取 [放行路由] 集合
-	 *
-	 * @return see note
-	 */
-	public List<String> getExcludeList() {
-		return excludeList;
-	}
-
-
-	// ------------------------ 钩子函数
-
-	/**
-	 * 认证函数：每次请求执行
-	 */
-	protected SaFilterAuthStrategy auth = r -> {
-	};
-
-	/**
-	 * 异常处理函数：每次[认证函数]发生异常时执行此函数
-	 */
-	protected SaFilterErrorStrategy error = e -> {
-		if (e instanceof SaTokenException) {
-			throw (SaTokenException) e;
-		} else {
-			throw new SaTokenException(e);
-		}
-	};
-
-	/**
-	 * 前置函数：在每次[认证函数]之前执行
-	 */
-	protected SaFilterAuthStrategy beforeAuth = r -> {
-	};
-
-	/**
-	 * 写入[认证函数]: 每次请求执行
-	 *
-	 * @param auth see note
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor setAuth(SaFilterAuthStrategy auth) {
-		this.auth = auth;
-		return this;
-	}
-
-	/**
-	 * 写入[异常处理函数]：每次[认证函数]发生异常时执行此函数
-	 *
-	 * @param error see note
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor setError(SaFilterErrorStrategy error) {
-		this.error = error;
-		return this;
-	}
-
-	/**
-	 * 写入[前置函数]：在每次[认证函数]之前执行
-	 *
-	 * @param beforeAuth see note
-	 * @return 对象自身
-	 */
-	public SaTokenPathInterceptor setBeforeAuth(SaFilterAuthStrategy beforeAuth) {
-		this.beforeAuth = beforeAuth;
-		return this;
-	}
-
-
-	@Override
-	public void handle(Context ctx) throws Throwable {
-		try {
-			Action action = ctx.action();
-
-			//1.路径规则处理
-			SaRouter.match(includeList).notMatch(excludeList).check(r -> {
-				//1.执行前置处理（主要是一些跨域之类的）
-				if(beforeAuth != null) {
-					beforeAuth.run(action);
-				}
-				//2.执行注解处理
-				authAnno(action);
-				//3.执行规则处理
-				auth.run(action);
-			});
-
-
-		} catch (StopMatchException e) {
-
-		} catch (SaTokenException e) {
-			// 1. 获取异常处理策略结果
-			Object result;
-			if (e instanceof BackResultException) {
-				result = e.getMessage();
-			} else {
-				result = error.run(e);
-			}
-
-			// 2. 写入输出流
-			if (result != null) {
-				ctx.render(result);
-			}
-			ctx.setHandled(true);
-		}
-	}
-
-	private void authAnno(Action action) {
-		//2.验证注解处理
-		if (isAnnotation && action != null) {
-			// 获取此请求对应的 Method 处理函数
-			Method method = action.method().getMethod();
-
-			// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
-			if (SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
-				return;
-			}
-
-			// 注解校验
-			SaStrategy.me.checkMethodAnnotation.accept(method);
-		}
-	}
-}

From 21edf2774326455d46cba95469ce8ade2cb9be9f Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 8 May 2023 13:47:59 +0800
Subject: [PATCH 030/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B8=E5=BF=83?=
 =?UTF-8?q?=E5=8C=85=E4=BB=A3=E7=A0=81=E6=B3=A8=E9=87=8A=20&=20=E5=BD=A9?=
 =?UTF-8?q?=E8=89=B2=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/SaManager.java |   43 +-
 .../satoken/annotation/SaCheckBasic.java      |   16 +-
 .../satoken/annotation/SaCheckDisable.java    |   20 +-
 .../satoken/annotation/SaCheckLogin.java      |   13 +-
 .../satoken/annotation/SaCheckPermission.java |   37 +-
 .../dev33/satoken/annotation/SaCheckRole.java |   30 +-
 .../dev33/satoken/annotation/SaCheckSafe.java |   19 +-
 .../cn/dev33/satoken/annotation/SaIgnore.java |    8 +-
 .../cn/dev33/satoken/annotation/SaMode.java   |    5 +-
 .../satoken/application/SaApplication.java    |   18 +-
 .../application/SaGetValueInterface.java      |   41 +-
 .../application/SaSetValueInterface.java      |    5 +-
 .../dev33/satoken/basic/SaBasicTemplate.java  |   11 +-
 .../cn/dev33/satoken/basic/SaBasicUtil.java   |    7 +-
 .../dev33/satoken/config/SaCookieConfig.java  |   33 +-
 .../cn/dev33/satoken/config/SaSignConfig.java |    9 +
 .../dev33/satoken/config/SaTokenConfig.java   |  249 ++--
 .../satoken/config/SaTokenConfigFactory.java  |   10 +-
 .../cn/dev33/satoken/context/SaHolder.java    |   32 +-
 .../dev33/satoken/context/SaTokenContext.java |   33 +-
 .../context/SaTokenContextDefaultImpl.java    |   30 +-
 .../context/SaTokenContextForThreadLocal.java |   12 +-
 .../SaTokenContextForThreadLocalStorage.java  |   42 +-
 .../dev33/satoken/context/model/SaCookie.java |    5 +-
 .../satoken/context/model/SaRequest.java      |   43 +-
 .../satoken/context/model/SaResponse.java     |    9 +-
 .../satoken/context/model/SaStorage.java      |   15 +-
 .../satoken/context/model/package-info.java   |    3 +-
 .../context/second/SaTokenSecondContext.java  |    8 +-
 .../second/SaTokenSecondContextCreator.java   |    6 +-
 .../java/cn/dev33/satoken/dao/SaTokenDao.java |  137 +-
 .../satoken/dao/SaTokenDaoDefaultImpl.java    |  100 +-
 .../cn/dev33/satoken/error/SaErrorCode.java   |  103 +-
 .../exception/ApiDisabledException.java       |    8 +-
 .../exception/BackResultException.java        |    5 +-
 .../exception/DisableServiceException.java    |    5 +-
 .../exception/IdTokenInvalidException.java    |   25 -
 .../exception/InvalidContextException.java    |    6 +-
 .../exception/NotBasicAuthException.java      |    6 +-
 .../satoken/exception/NotImplException.java   |    2 +-
 .../satoken/exception/NotLoginException.java  |   16 +-
 .../exception/NotPermissionException.java     |    6 +-
 .../satoken/exception/NotRoleException.java   |    6 +-
 .../satoken/exception/NotSafeException.java   |    3 +-
 .../exception/NotWebContextException.java     |    6 +-
 .../exception/SaJsonConvertException.java     |    3 +-
 .../satoken/exception/SaSignException.java    |    2 +-
 .../satoken/exception/SaTokenException.java   |    9 +-
 .../exception/SameTokenInvalidException.java  |    6 +-
 .../satoken/exception/StopMatchException.java |    5 +-
 .../cn/dev33/satoken/filter/SaFilter.java     |   14 +-
 .../satoken/filter/SaFilterAuthStrategy.java  |   10 +-
 .../satoken/filter/SaFilterErrorStrategy.java |   12 +-
 .../cn/dev33/satoken/fun/IsRunFunction.java   |    6 +-
 .../java/cn/dev33/satoken/fun/SaFunction.java |    8 +-
 .../fun/SaGenerateUniqueTokenFunction.java    |    4 +-
 .../cn/dev33/satoken/fun/SaParamFunction.java |    7 +-
 .../dev33/satoken/fun/SaParamRetFunction.java |    7 +-
 .../cn/dev33/satoken/fun/SaRetFunction.java   |    7 +-
 .../cn/dev33/satoken/fun/SaRouteFunction.java |   24 +
 .../cn/dev33/satoken/json/SaJsonTemplate.java |   16 +-
 .../json/SaJsonTemplateDefaultImpl.java       |   18 +-
 .../satoken/listener/SaTokenEventCenter.java  |   33 +-
 .../satoken/listener/SaTokenListener.java     |   40 +-
 .../listener/SaTokenListenerForLog.java       |    4 +-
 .../listener/SaTokenListenerForSimple.java    |    4 +-
 .../main/java/cn/dev33/satoken/log/SaLog.java |   14 +-
 .../cn/dev33/satoken/log/SaLogForConsole.java |   88 +-
 .../cn/dev33/satoken/router/SaHttpMethod.java |    8 +-
 .../dev33/satoken/router/SaRouteFunction.java |   24 -
 .../cn/dev33/satoken/router/SaRouter.java     |   15 +-
 .../dev33/satoken/router/SaRouterStaff.java   |    4 +-
 .../cn/dev33/satoken/same/SaSameTemplate.java |    2 +-
 .../cn/dev33/satoken/same/SaSameUtil.java     |    2 +-
 .../cn/dev33/satoken/secure/SaBase64Util.java |    5 +-
 .../cn/dev33/satoken/secure/SaSecureUtil.java |    4 +-
 .../cn/dev33/satoken/session/SaSession.java   |   15 +-
 .../satoken/session/SaSessionCustomUtil.java  |   36 +-
 .../cn/dev33/satoken/session/TokenSign.java   |    7 +-
 .../cn/dev33/satoken/sign/SaSignTemplate.java |   22 +-
 .../cn/dev33/satoken/sign/SaSignUtil.java     |    2 +-
 .../cn/dev33/satoken/stp/SaLoginConfig.java   |   15 +-
 .../cn/dev33/satoken/stp/SaLoginModel.java    |   12 +-
 .../cn/dev33/satoken/stp/SaTokenInfo.java     |   86 +-
 .../cn/dev33/satoken/stp/StpInterface.java    |   10 +-
 .../satoken/stp/StpInterfaceDefaultImpl.java  |    5 +-
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 1195 ++++++++++-------
 .../java/cn/dev33/satoken/stp/StpUtil.java    |  744 +++++-----
 .../cn/dev33/satoken/strategy/SaStrategy.java |   62 +-
 .../dev33/satoken/temp/SaTempDefaultImpl.java |    5 +-
 .../dev33/satoken/temp/SaTempInterface.java   |   71 +-
 .../cn/dev33/satoken/temp/SaTempUtil.java     |   31 +-
 .../java/cn/dev33/satoken/util/SaFoxUtil.java |   42 +-
 .../java/cn/dev33/satoken/util/SaResult.java  |   28 +-
 .../cn/dev33/satoken/util/SaTokenConsts.java  |   41 +-
 .../cn/dev33/satoken/util/StrFormatter.java   |    3 +-
 .../SaTokenAloneRedisClusterApplication.java  |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../com/pj/SaTokenAloneRedisApplication.java  |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../java/com/pj/SaTokenCaseApplication.java   |    2 +-
 .../com/pj/cases/test/TestController.java     |    2 +-
 .../com/pj/cases/up/DisableController.java    |    2 +-
 .../com/pj/cases/up/HttpBasicController.java  |    2 +-
 .../com/pj/cases/up/MutexLoginController.java |    2 +-
 .../com/pj/cases/up/NotCookieController.java  |    2 +-
 .../com/pj/cases/up/RememberMeController.java |    2 +-
 .../com/pj/cases/up/SafeAuthController.java   |    2 +-
 .../pj/cases/up/SearchSessionController.java  |    2 +-
 .../com/pj/cases/up/SecureController.java     |    2 +-
 .../com/pj/cases/up/SwitchToController.java   |    2 +-
 .../com/pj/cases/use/AtCheckController.java   |    2 +-
 .../com/pj/cases/use/JurAuthController.java   |    2 +-
 .../com/pj/cases/use/KickoutController.java   |    2 +-
 .../com/pj/cases/use/LoginAuthController.java |    2 +-
 .../pj/cases/use/RouterCheckController.java   |    2 +-
 .../com/pj/cases/use/SaSessionController.java |    2 +-
 .../java/com/pj/current/NotFoundHandle.java   |    2 +-
 .../src/main/java/com/pj/model/SysUser.java   |    2 +-
 .../com/pj/satoken/MySaTokenListener.java     |    2 +-
 .../java/com/pj/satoken/SaLogForSlf4j.java    |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../java/com/pj/satoken/StpInterfaceImpl.java |    2 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |    2 +-
 .../com/pj/satoken/at/SaUserCheckLogin.java   |    2 +-
 .../pj/satoken/at/SaUserCheckPermission.java  |    2 +-
 .../com/pj/satoken/at/SaUserCheckRole.java    |    2 +-
 .../java/com/pj/satoken/at/StpUserUtil.java   |    2 +-
 .../main/java/com/pj/ConsumerApplication.java |    2 +-
 .../main/java/com/pj/ProviderApplication.java |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../java/com/pj/test/TestJwtController.java   |    2 +-
 .../com/pj/SaOAuth2ClientApplication.java     |    2 +-
 .../pj/oauth2/SaOAuthClientController.java    |    2 +-
 .../src/main/java/com/pj/utils/SoMap.java     |    2 +-
 .../com/pj/SaOAuth2ServerApplication.java     |    2 +-
 .../pj/oauth2/SaOAuth2ServerController.java   |    2 +-
 .../com/pj/oauth2/SaOAuth2TemplateImpl.java   |    2 +-
 .../src/main/java/com/pj/SaQuicikStartup.java |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../java/com/pj/satoken/SaLogForSolon.java    |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/SSOController.java  |    2 +-
 .../com/pj/test/StressTestController.java     |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../main/java/com/pj/test/UserController.java |    2 +-
 .../src/main/java/com/pj/util/Ttime.java      |    2 +-
 .../java/com/pj/SaTokenDemoApplication.java   |    4 +-
 .../java/com/pj/current/NotFoundHandle.java   |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/AtController.java   |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 .../com/pj/test/StressTestController.java     |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../src/main/java/com/pj/util/Ttime.java      |    2 +-
 .../java/com/pj/SaTokenDemoApplication.java   |    2 +-
 .../java/com/pj/current/NotFoundHandle.java   |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/AtController.java   |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 .../com/pj/test/StressTestController.java     |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../src/main/java/com/pj/util/Ttime.java      |    2 +-
 .../java/com/pj/SaTokenDemoApplication.java   |    2 +-
 .../java/com/pj/current/NotFoundHandle.java   |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/AtController.java   |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 .../com/pj/test/StressTestController.java     |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../src/main/java/com/pj/util/Ttime.java      |    2 +-
 .../com/pj/SaTokenSpringBoot3Application.java |    2 +-
 .../java/com/pj/current/NotFoundHandle.java   |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/AtController.java   |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 .../com/pj/test/StressTestController.java     |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../src/main/java/com/pj/util/Ttime.java      |    2 +-
 .../src/main/java/com/pj/h5/CorsFilter.java   |    2 +-
 .../src/main/java/com/pj/h5/H5Controller.java |    2 +-
 .../com/pj/sso/GlobalExceptionFilter.java     |    2 +-
 .../java/com/pj/sso/SsoServerController.java  |    2 +-
 .../src/main/java/com/pj/SaSso1ClientApp.java |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 .../src/main/java/com/pj/h5/CorsFilter.java   |    2 +-
 .../src/main/java/com/pj/h5/H5Controller.java |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 .../src/main/java/com/pj/h5/CorsFilter.java   |    2 +-
 .../src/main/java/com/pj/h5/H5Controller.java |    2 +-
 .../com/pj/sso/GlobalExceptionHandler.java    |    2 +-
 .../java/com/pj/sso/SsoServerController.java  |    2 +-
 .../java/com/pj/SaSso1ClientApplication.java  |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 .../src/main/java/com/pj/h5/CorsFilter.java   |    2 +-
 .../src/main/java/com/pj/h5/H5Controller.java |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 .../main/java/com/pj/sso/SsoRequestUtil.java  |    2 +-
 .../com/pj/sso/util/MyHttpSessionHolder.java  |    2 +-
 .../java/com/pj/sso/SsoClientController.java  |    2 +-
 sa-token-demo/sa-token-demo-test/pom.xml      |   64 +-
 .../main/java/com/pj/SaTokenApplication.java  |    4 +-
 .../java/com/pj/current/NotFoundHandle.java   |    2 +-
 .../src/main/java/com/pj/model/SysUser.java   |    2 +-
 .../java/com/pj/satoken/SaLogForSlf4j.java    |    7 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |    2 +-
 .../main/java/com/pj/test/AtController.java   |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 .../com/pj/test/StressTestController.java     |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../src/main/java/com/pj/util/Ttime.java      |    2 +-
 .../src/main/resources/application.yml        |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../SaTokenWebfluxSpringboot3Application.java |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../com/pj/SaTokenWebfluxApplication.java     |    2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |    2 +-
 .../main/java/com/pj/test/TestController.java |    2 +-
 .../pj/SaTokenWebSocketSpringApplication.java |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 .../java/com/pj/ws/MyWebSocketHandler.java    |    2 +-
 .../main/java/com/pj/ws/WebSocketConfig.java  |    2 +-
 .../java/com/pj/ws/WebSocketInterceptor.java  |    2 +-
 .../com/pj/SaTokenWebSocketApplication.java   |    2 +-
 .../java/com/pj/test/LoginController.java     |    2 +-
 sa-token-doc/fun/log.md                       |    2 +-
 sa-token-doc/micro/gateway-auth.md            |    2 +-
 sa-token-doc/sso/sso-type1.md                 |    2 +-
 .../satoken/dao/alone/SaAloneRedisInject.java |    2 +-
 .../SaTokenSecondContextCreatorForDubbo.java  |    2 +-
 .../dubbo/SaTokenSecondContextForDubbo.java   |    2 +-
 .../filter/SaTokenDubboConsumerFilter.java    |    2 +-
 .../filter/SaTokenDubboProviderFilter.java    |    2 +-
 .../dubbo/model/SaRequestForDubbo.java        |    2 +-
 .../dubbo/model/SaResponseForDubbo.java       |    2 +-
 .../dubbo/model/SaStorageForDubbo.java        |    2 +-
 .../SaTokenSecondContextCreatorForDubbo3.java |    2 +-
 .../dubbo3/SaTokenSecondContextForDubbo3.java |    2 +-
 .../filter/SaTokenDubbo3ConsumerFilter.java   |    2 +-
 .../filter/SaTokenDubbo3ProviderFilter.java   |    2 +-
 .../dubbo3/model/SaRequestForDubbo3.java      |    2 +-
 .../dubbo3/model/SaResponseForDubbo3.java     |    2 +-
 .../dubbo3/model/SaStorageForDubbo3.java      |    2 +-
 .../dao/SaSessionForFastjsonCustomized.java   |    2 +-
 .../dao/SaSessionForFastjson2Customized.java  |    2 +-
 .../dao/SaSessionForJacksonCustomized.java    |    2 +-
 .../satoken/dao/SaTokenDaoRedisJackson.java   |    2 +-
 .../cn/dev33/satoken/dao/SaTokenDaoRedis.java |    2 +-
 .../dao/SaSessionForJacksonCustomized.java    |    2 +-
 .../thymeleaf/dialect/SaTokenDialect.java     |    2 +-
 .../dialect/SaTokenTagProcessor.java          |    2 +-
 .../cn/dev33/satoken/jwt/SaJwtTemplate.java   |    2 +-
 .../java/cn/dev33/satoken/jwt/SaJwtUtil.java  |    2 +-
 .../satoken/jwt/StpLogicJwtForMixin.java      |    2 +-
 .../satoken/jwt/StpLogicJwtForSimple.java     |    2 +-
 .../satoken/jwt/StpLogicJwtForStateless.java  |    2 +-
 .../satoken/jwt/error/SaJwtErrorCode.java     |    2 +-
 .../satoken/jwt/exception/SaJwtException.java |    2 +-
 .../dev33/satoken/oauth2/SaOAuth2Manager.java |    2 +-
 .../satoken/oauth2/config/SaOAuth2Config.java |    2 +-
 .../oauth2/error/SaOAuth2ErrorCode.java       |    2 +-
 .../oauth2/exception/SaOAuth2Exception.java   |    2 +-
 .../satoken/oauth2/logic/SaOAuth2Consts.java  |    6 +-
 .../satoken/oauth2/logic/SaOAuth2Handle.java  |    2 +-
 .../oauth2/logic/SaOAuth2Template.java        |    2 +-
 .../satoken/oauth2/logic/SaOAuth2Util.java    |    2 +-
 .../oauth2/model/AccessTokenModel.java        |    2 +-
 .../oauth2/model/ClientTokenModel.java        |    2 +-
 .../dev33/satoken/oauth2/model/CodeModel.java |    2 +-
 .../oauth2/model/RefreshTokenModel.java       |    2 +-
 .../oauth2/model/RequestAuthModel.java        |    2 +-
 .../satoken/oauth2/model/SaClientModel.java   |    2 +-
 .../cn/dev33/satoken/quick/SaQuickInject.java |    2 +-
 .../dev33/satoken/quick/SaQuickManager.java   |    2 +-
 .../dev33/satoken/quick/SaQuickRegister.java  |    2 +-
 .../satoken/quick/config/SaQuickConfig.java   |    2 +-
 .../satoken/quick/web/SaQuickController.java  |    2 +-
 .../cn/dev33/satoken/aop/SaCheckAspect.java   |    2 +-
 .../cn/dev33/satoken/config/SaSsoConfig.java  |    2 +-
 .../cn/dev33/satoken/sso/SaSsoConsts.java     |    2 +-
 .../cn/dev33/satoken/sso/SaSsoManager.java    |    2 +-
 .../cn/dev33/satoken/sso/SaSsoProcessor.java  |    2 +-
 .../cn/dev33/satoken/sso/SaSsoTemplate.java   |    2 +-
 .../java/cn/dev33/satoken/sso/SaSsoUtil.java  |    2 +-
 .../satoken/sso/error/SaSsoErrorCode.java     |    2 +-
 .../satoken/sso/exception/SaSsoException.java |    2 +-
 .../cn/dev33/satoken/sso/name/ApiName.java    |    2 +-
 .../cn/dev33/satoken/sso/name/ParamName.java  |    2 +-
 .../cn/dev33/satoken/temp/jwt/SaJwtUtil.java  |    2 +-
 .../dev33/satoken/temp/jwt/SaTempForJwt.java  |    2 +-
 .../temp/jwt/error/SaTempJwtErrorCode.java    |    2 +-
 .../servlet/error/SaServletErrorCode.java     |    2 +-
 .../servlet/model/SaRequestForServlet.java    |    2 +-
 .../servlet/model/SaResponseForServlet.java   |    2 +-
 .../servlet/model/SaStorageForServlet.java    |    2 +-
 .../reactor/context/SaReactorHolder.java      |    2 +-
 .../reactor/context/SaReactorSyncHolder.java  |    2 +-
 .../error/SaReactorSpringBootErrorCode.java   |    2 +-
 .../reactor/filter/SaReactorFilter.java       |    2 +-
 .../reactor/model/SaRequestForReactor.java    |    2 +-
 .../reactor/model/SaResponseForReactor.java   |    2 +-
 .../reactor/model/SaStorageForReactor.java    |    2 +-
 .../SaTokenContextForSpringReactor.java       |    2 +-
 .../spring/SaTokenContextRegister.java        |    2 +-
 .../reactor/context/SaReactorHolder.java      |    2 +-
 .../reactor/context/SaReactorSyncHolder.java  |    2 +-
 .../error/SaReactorSpringBootErrorCode.java   |    2 +-
 .../reactor/filter/SaReactorFilter.java       |    2 +-
 .../reactor/model/SaRequestForReactor.java    |    2 +-
 .../reactor/model/SaResponseForReactor.java   |    2 +-
 .../reactor/model/SaStorageForReactor.java    |    2 +-
 .../SaTokenContextForSpringReactor.java       |    2 +-
 .../spring/SaTokenContextRegister.java        |    2 +-
 .../servlet/error/SaServletErrorCode.java     |    2 +-
 .../servlet/model/SaRequestForServlet.java    |    2 +-
 .../servlet/model/SaResponseForServlet.java   |    2 +-
 .../servlet/model/SaStorageForServlet.java    |    2 +-
 .../satoken/solon/error/SaSolonErrorCode.java |    2 +-
 .../src/test/java/demo/Config.java            |   84 +-
 .../src/test/java/demo2/Config.java           |   53 +-
 .../satoken/error/SaSpringBootErrorCode.java  |    2 +-
 .../cn/dev33/satoken/spring/SaBeanInject.java |    2 +-
 .../dev33/satoken/spring/SaBeanRegister.java  |    2 +-
 .../satoken/spring/SaPathMatcherHolder.java   |    2 +-
 .../spring/json/SaJsonTemplateForJackson.java |    2 +-
 .../spring/oauth2/SaOAuth2BeanInject.java     |    2 +-
 .../spring/oauth2/SaOAuth2BeanRegister.java   |    2 +-
 .../satoken/spring/sso/SaSsoBeanInject.java   |    2 +-
 .../satoken/spring/sso/SaSsoBeanRegister.java |    2 +-
 .../dev33/satoken/filter/SaServletFilter.java |    2 +-
 .../satoken/interceptor/SaInterceptor.java    |    2 +-
 .../spring/SaTokenContextForSpring.java       |    2 +-
 .../spring/SaTokenContextRegister.java        |    2 +-
 .../dev33/satoken/spring/SpringMVCUtil.java   |    2 +-
 .../dev33/satoken/filter/SaServletFilter.java |    2 +-
 .../satoken/interceptor/SaInterceptor.java    |    2 +-
 ...TokenContextForSpringInJakartaServlet.java |    2 +-
 .../spring/SaTokenContextRegister.java        |    2 +-
 .../dev33/satoken/spring/SpringMVCUtil.java   |    2 +-
 .../java/com/pj/test/JwtForMixinTest.java     |    2 +-
 .../java/com/pj/test/JwtForSimpleTest.java    |    2 +-
 .../java/com/pj/test/JwtForStatelessTest.java |    2 +-
 .../core/application/SaApplicationTest.java   |    2 +-
 .../core/config/SaTokenConfigTest.java        |    2 +-
 .../core/context/model/SaCookieTest.java      |    2 +-
 .../model/SaTokenContextDefaultImplTest.java  |    2 +-
 .../satoken/core/dao/SaTokenDaoTest.java      |    2 +-
 .../satoken/core/fun/IsRunFunctionTest.java   |    2 +-
 .../json/SaJsonTemplateDefaultImplTest.java   |    2 +-
 .../satoken/core/secure/SaBase64UtilTest.java |    2 +-
 .../satoken/core/secure/SaSecureUtilTest.java |    2 +-
 .../core/session/SaSessionCustomUtilTest.java |    2 +-
 .../satoken/core/session/SaSessionTest.java   |    2 +-
 .../satoken/core/session/TokenSignTest.java   |    2 +-
 .../satoken/core/sign/SaSignTemplateTest.java |    2 +-
 .../dev33/satoken/core/stp/TokenInfoTest.java |    2 +-
 .../dev33/satoken/core/temp/SaTempTest.java   |    2 +-
 .../satoken/core/util/SaFoxUtilTest.java      |    2 +-
 .../dev33/satoken/core/util/SaResultTest.java |    2 +-
 .../annotation/SaAnnotationController.java    |    2 +-
 .../SaAnnotationIgnoreController.java         |    2 +-
 .../integrate/configure/HandlerException.java |    2 +-
 .../integrate/configure/SaTokenConfigure.java |    2 +-
 .../integrate/configure/StpInterfaceImpl.java |    2 +-
 .../configure/inject/MySaOAuth2Template.java  |    2 +-
 .../configure/inject/MySaSsoTemplate.java     |    2 +-
 .../integrate/login/LoginController.java      |    2 +-
 .../integrate/login/LoginControllerTest.java  |    2 +-
 .../integrate/more/MoreController.java        |    2 +-
 .../integrate/more/MoreControllerTest.java    |    2 +-
 .../integrate/router/RouterController.java    |    2 +-
 .../router/RouterControllerTest.java          |    2 +-
 .../integrate/router/SaTokenConfigure2.java   |    2 +-
 .../integrate/same/SaSameTokenController.java |    2 +-
 .../same/SaSameTokenControllerTest.java       |    2 +-
 .../satoken/springboot/ManyLoginTest.java     |    2 +-
 .../satoken/springboot/SpringMVCUtilTest.java |    2 +-
 .../java/cn/dev33/satoken/util/SoMap.java     |    2 +-
 383 files changed, 2832 insertions(+), 2033 deletions(-)
 delete mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
 delete mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index 8e0d108b..59ccab70 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -28,14 +28,15 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * 管理 Sa-Token 所有全局组件  
- * @author kong
+ * 管理 Sa-Token 所有全局组件，可通过此类快速获取、写入各种全局组件对象
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaManager {
 
 	/**
-	 * 配置文件 Bean 
+	 * 全局配置对象
 	 */
 	public volatile static SaTokenConfig config;	
 	public static void setConfig(SaTokenConfig config) {
@@ -45,16 +46,26 @@ public class SaManager {
 		if(config !=null && config.getIsPrint()) {
 			SaFoxUtil.printSaToken();
 		}
-		
+
+		// 如果此 config 对象没有配置 isColorLog 的值，则框架为它自动判断一下
+		if(config != null && config.getIsLog() != null && config.getIsLog() && config.getIsColorLog() == null) {
+			config.setIsColorLog(SaFoxUtil.isCanColorLog());
+		}
+
 		// $$ 全局事件 
 		SaTokenEventCenter.doSetConfig(config);
 		
-		// 调用一次StpUtil中的方法，保证其可以尽早的初始化 StpLogic 
+		// 调用一次 StpUtil 中的方法，保证其可以尽早的初始化 StpLogic
 		StpUtil.getLoginType();
 	}
 	private static void setConfigMethod(SaTokenConfig config) {
 		SaManager.config = config;
 	}
+
+	/**
+	 * 获取 Sa-Token 的全局配置信息
+	 * @return
+	 */
 	public static SaTokenConfig getConfig() {
 		if (config == null) {
 			synchronized (SaManager.class) {
@@ -67,7 +78,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * 持久化 Bean 
+	 * 持久化组件
 	 */
 	private volatile static SaTokenDao saTokenDao;
 	public static void setSaTokenDao(SaTokenDao saTokenDao) {
@@ -92,7 +103,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * 权限认证 Bean 
+	 * 权限数据源组件
 	 */
 	private volatile static StpInterface stpInterface;
 	public static void setStpInterface(StpInterface stpInterface) {
@@ -111,7 +122,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * 上下文Context Bean  
+	 * 一级上下文 SaTokenContextContext
 	 */
 	private volatile static SaTokenContext saTokenContext;
 	public static void setSaTokenContext(SaTokenContext saTokenContext) {
@@ -123,7 +134,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * 二级Context 
+	 * 二级上下文 SaTokenSecondContext
 	 */
 	private volatile static SaTokenSecondContext saTokenSecondContext;
 	public static void setSaTokenSecondContext(SaTokenSecondContext saTokenSecondContext) {
@@ -135,7 +146,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * 获取一个可用的SaTokenContext 
+	 * 获取一个可用的 SaTokenContext （按照一级上下文、二级上下文、默认上下文的顺序来判断）
 	 * @return / 
 	 */
 	public static SaTokenContext getSaTokenContextOrSecond() {
@@ -159,7 +170,7 @@ public class SaManager {
 	}
 
 	/**
-	 * 临时令牌验证模块 Bean  
+	 * 临时 token 认证模块
 	 */
 	private volatile static SaTempInterface saTemp;
 	public static void setSaTemp(SaTempInterface saTemp) {
@@ -178,7 +189,7 @@ public class SaManager {
 	}
 
 	/**
-	 * JSON 转换器 Bean 
+	 * JSON 转换器
 	 */
 	private volatile static SaJsonTemplate saJsonTemplate;
 	public static void setSaJsonTemplate(SaJsonTemplate saJsonTemplate) {
@@ -197,7 +208,7 @@ public class SaManager {
 	}
 
 	/**
-	 * 参数签名 Bean 
+	 * API 参数签名
 	 */
 	private volatile static SaSignTemplate saSignTemplate;
 	public static void setSaSignTemplate(SaSignTemplate saSignTemplate) {
@@ -216,7 +227,7 @@ public class SaManager {
 	}
 
 	/**
-	 * Same-Token Bean 
+	 * Same-Token 同源系统认证模块
 	 */
 	private volatile static SaSameTemplate saSameTemplate;
 	public static void setSaSameTemplate(SaSameTemplate saSameTemplate) {
@@ -247,7 +258,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * StpLogic集合, 记录框架所有成功初始化的StpLogic 
+	 * StpLogic 集合, 记录框架所有成功初始化的 StpLogic
 	 */
 	public static Map<String, StpLogic> stpLogicMap = new LinkedHashMap<String, StpLogic>();
 	
@@ -269,7 +280,7 @@ public class SaManager {
 	}
 	
 	/**
-	 * 根据 LoginType 获取对应的StpLogic，如果不存在，isCreate参数=是否自动创建并返回 
+	 * 根据 LoginType 获取对应的StpLogic，如果不存在，isCreate = 是否自动创建并返回
 	 * @param loginType 对应的账号类型 
 	 * @param isCreate 在 StpLogic 不存在时，true=新建并返回，false=抛出异常
 	 * @return 对应的StpLogic
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
index 3c3821b5..f4fde9ff 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
@@ -1,17 +1,19 @@
 package cn.dev33.satoken.annotation;
 
+import cn.dev33.satoken.basic.SaBasicTemplate;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import cn.dev33.satoken.basic.SaBasicTemplate;
-
 /**
- * Http Basic 认证校验：只有通过 Basic 认证后才能进入该方法 
- * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * Http Basic 认证校验：只有通过 Http Basic 认证后才能进入该方法，否则抛出异常。
  *
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
@@ -19,13 +21,13 @@ public @interface SaCheckBasic {
 
     /**
      * 领域 
-     * @return see note 
+     * @return /
      */
     String realm() default SaBasicTemplate.DEFAULT_REALM;
 
     /**
      * 需要校验的账号密码，格式形如 sa:123456 
-     * @return see note 
+     * @return /
      */
     String account() default "";
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
index 4f99da9d..db9afd7c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
@@ -1,38 +1,40 @@
 package cn.dev33.satoken.annotation;
 
+import cn.dev33.satoken.util.SaTokenConsts;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import cn.dev33.satoken.util.SaTokenConsts;
-
 /**
- * 服务禁用校验：在没有被禁用指定服务的情况下才可以进入方法 
+ * 服务禁用校验：判断当前账号是否被禁用了指定服务，如果被禁用，会抛出异常，没有被禁用才能进入方法。
  *
- * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上）
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
  * @author videomonster
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface SaCheckDisable {
 
     /**
-     * 多账号体系下所属的账号体系标识
-     * @return see note
+     * 多账号体系下所属的账号体系标识，非多账号体系无需关注此值
+     *
+     * @return /
      */
     String type() default "";
     
     /**
-     * 服务标识 （要校验是否禁用的服务名称）
+     * 服务标识 （具体你要校验是否禁用的服务名称）
      * 
-     * @return see note
+     * @return /
      */
     String[] value() default { SaTokenConsts.DEFAULT_DISABLE_SERVICE };
 
     /**
-     * 封禁等级（只有 封禁等级 ≥ 此值 才会抛出异常）
+     * 封禁等级（如果当前账号的被封禁等级 ≥ 此值，请求就无法进入方法）
      * 
      * @return / 
      */
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
index 759d4eda..de7430f7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
@@ -6,18 +6,21 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 登录认证校验：只有登录之后才能进入该方法 
- * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * 登录认证校验：只有登录之后才能进入该方法。
  *
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
+ *
+ * @author kong
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface SaCheckLogin {
 
     /**
-     * 多账号体系下所属的账号体系标识 
-     * @return see note 
+     * 多账号体系下所属的账号体系标识，非多账号体系无需关注此值
+     *
+     * @return /
      */
     String type() default "";
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
index 784bcef6..0c5a3574 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
@@ -6,44 +6,49 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 权限认证校验：必须具有指定权限才能进入该方法 
- * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * 权限认证校验：必须具有指定权限才能进入该方法。
  *
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD,ElementType.TYPE})
 public @interface SaCheckPermission {
 
 	/**
-	 * 需要校验的权限码
-	 * @return 需要校验的权限码
+	 * 多账号体系下所属的账号体系标识，非多账号体系无需关注此值
+	 *
+	 * @return /
+	 */
+	String type() default "";
+
+	/**
+	 * 需要校验的权限码 [ 数组 ]
+	 *
+	 * @return /
 	 */
 	String [] value() default {};
 
 	/**
 	 * 验证模式：AND | OR，默认AND
-	 * @return 验证模式
+	 *
+	 * @return /
 	 */
 	SaMode mode() default SaMode.AND;
 
-    /**
-     * 多账号体系下所属的账号体系标识 
-     * @return see note 
-     */
-	String type() default "";
-
 	/**
-	 * 在权限认证不通过时的次要选择，两者只要其一认证成功即可通过校验  
+	 * 在权限校验不通过时的次要选择，两者只要其一校验成功即可通过校验
 	 * 
 	 * <p> 
 	 * 	例1：@SaCheckPermission(value="user-add", orRole="admin")，
-	 * 	代表本次请求只要具有 user-add权限 或 admin角色 其一即可通过校验 
+	 * 	代表本次请求只要具有 user-add权限 或 admin角色 其一即可通过校验。
 	 * </p>
 	 * 
 	 * <p> 
-	 * 	例2： orRole = {"admin", "manager", "staff"}，具有三个角色其一即可 <br> 
-	 * 	例3： orRole = {"admin, manager, staff"}，必须三个角色同时具备 
+	 * 	例2： orRole = {"admin", "manager", "staff"}，具有三个角色其一即可。 <br>
+	 * 	例3： orRole = {"admin, manager, staff"}，必须三个角色同时具备。
 	 * </p>
 	 * 
 	 * @return /
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
index 8dd422bb..b57ab221 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
@@ -6,32 +6,36 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 角色认证校验：必须具有指定角色标识才能进入该方法 
- * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * 角色认证校验：必须具有指定角色标识才能进入该方法。
  *
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD,ElementType.TYPE})
 public @interface SaCheckRole {
 
 	/**
-	 * 需要校验的角色标识
-	 * @return 需要校验的角色标识
+	 * 多账号体系下所属的账号体系标识，非多账号体系无需关注此值
+	 *
+	 * @return /
+	 */
+	String type() default "";
+
+	/**
+	 * 需要校验的角色标识 [ 数组 ]
+	 *
+	 * @return /
 	 */
 	String [] value() default {};
 
 	/**
 	 * 验证模式：AND | OR，默认AND
-	 * @return 验证模式
+	 *
+	 * @return /
 	 */
 	SaMode mode() default SaMode.AND;
 
-    /**
-     * 账号类型 
-     * <p> 建议使用常量，避免因错误拼写带来的bug 
-     * @return see note 
-     */
-	String type() default "";
-	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
index a22f8bf7..34048074 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
@@ -8,24 +8,27 @@ import java.lang.annotation.Target;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * 二级认证校验：必须二级认证之后才能进入该方法 
+ * 二级认证校验：客户端必须完成二级认证之后，才能进入该方法，否则将被抛出异常。
  * 
- * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）。
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
 public @interface SaCheckSafe {
 
-    /**
-     * 多账号体系下所属的账号体系标识 
-     * @return /
-     */
+	/**
+	 * 多账号体系下所属的账号体系标识，非多账号体系无需关注此值
+	 *
+	 * @return /
+	 */
 	String type() default "";
 
 	/**
-	 * 要校验的服务 
+	 * 要校验的服务
+	 *
 	 * @return /
 	 */
 	String value() default SaTokenConsts.DEFAULT_SAFE_AUTH_SERVICE;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
index 5c9be9a2..454ee0f1 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
@@ -6,12 +6,12 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * 忽略认证：表示被修饰的方法或类无需进行注解认证和路由拦截认证 
+ * 忽略认证：表示被修饰的方法或类无需进行注解认证和路由拦截认证。
  * 
- * <h2> 请注意：此注解的忽略效果只针对 SaInterceptor拦截器 和 AOP注解鉴权 生效，对自定义拦截器与过滤器不生效 </h2>
+ * <h3> 请注意：此注解的忽略效果只针对 SaInterceptor拦截器 和 AOP注解鉴权 生效，对自定义拦截器与过滤器不生效。 </h3>
  * 
- * @author kong
- * @since: 2022-8-21
+ * @author click33
+ * @since <= 1.34.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
index 684bcce3..57c5f6c5 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.annotation;
 
 /**
- * 注解鉴权的验证模式 
- * @author kong
+ * 注解鉴权的验证模式
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public enum SaMode {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
index df8c11ea..51f3cb53 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
@@ -7,10 +7,11 @@ import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.dao.SaTokenDao;
 
 /**
- * Application Model，全局作用域的读取值对象 
- * <p> 在应用全局范围内: 存值、取值
+ * Application Model，全局作用域的读取值对象。
+ *
+ * <p> 在应用全局范围内: 存值、取值。数据在应用重启后失效，如果集成了 Redis，则在 Redis 重启后失效。
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-17
  */
 public class SaApplication implements SaSetValueInterface {
@@ -57,15 +58,15 @@ public class SaApplication implements SaSetValueInterface {
 	}
 
 	/**
-	 * 返回存入的所有 key 
+	 * 返回当前存入的所有 key
 	 * @return / 
 	 */
 	public List<String> keys() {
-		// 查出来
+		// 从缓存中查询出所有此前缀的 key
 		String prefix = splicingDataKey("");
 		List<String> list = SaManager.getSaTokenDao().searchData(prefix, "", 0, -1, true);
 		
-		// 裁减掉固定前缀 
+		// 裁减掉固定前缀，保留 key 名称，塞入新集合
 		int prefixLength = prefix.length();
 		List<String> list2 = new ArrayList<>();
 		if(list != null) {
@@ -79,7 +80,7 @@ public class SaApplication implements SaSetValueInterface {
 	}
 	
 	/**
-	 * 清空存入的所有 key 
+	 * 清空当前存入的所有 key
 	 */
 	public void clear() {
 		List<String> keys = keys();
@@ -89,7 +90,8 @@ public class SaApplication implements SaSetValueInterface {
 	}
 
 	/**  
-	 * 拼接key：变量存储时使用的key 
+	 * 拼接key：当存入一个变量时，应该使用的 key
+	 *
 	 * @param key 原始 key 
 	 * @return 拼接后的 key 值 
 	 */
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
index 97bda787..6b6f3faa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
@@ -3,9 +3,10 @@ package cn.dev33.satoken.application;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * 对取值的一组方法封装 
+ * 对取值的一组方法封装
+ * <p> 封装 SaStorage、SaSession、SaApplication 等存取值的一些固定方法，减少重复编码 </p>
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-16
  */
 public interface SaGetValueInterface {
@@ -17,20 +18,20 @@ public interface SaGetValueInterface {
 	 * @param key key 
 	 * @return 值 
 	 */
-	public abstract Object get(String key);
+	Object get(String key);
 	
 	
 	// --------- 接口提供封装的方法 
 
 	/**
-	 * 
-	 * 取值 (指定默认值) 
+	 * 取值 (指定默认值)
+	 *
 	 * @param <T> 默认值的类型
 	 * @param key key 
 	 * @param defaultValue 取不到值时返回的默认值 
 	 * @return 值 
 	 */
-	public default <T> T get(String key, T defaultValue) {
+	default <T> T get(String key, T defaultValue) {
 		return getValueByDefaultValue(get(key), defaultValue);
 	}
 
@@ -39,7 +40,7 @@ public interface SaGetValueInterface {
 	 * @param key key 
 	 * @return 值 
 	 */
-	public default String getString(String key) {
+	default String getString(String key) {
 		Object value = get(key);
 		if(value == null) {
 			return null;
@@ -52,7 +53,7 @@ public interface SaGetValueInterface {
 	 * @param key key 
 	 * @return 值 
 	 */
-	public default int getInt(String key) {
+	default int getInt(String key) {
 		return getValueByDefaultValue(get(key), 0);
 	}
 
@@ -61,7 +62,7 @@ public interface SaGetValueInterface {
 	 * @param key key 
 	 * @return 值 
 	 */
-	public default long getLong(String key) {
+	default long getLong(String key) {
 		return getValueByDefaultValue(get(key), 0L);
 	}
 
@@ -70,7 +71,7 @@ public interface SaGetValueInterface {
 	 * @param key key 
 	 * @return 值 
 	 */
-	public default double getDouble(String key) {
+	default double getDouble(String key) {
 		return getValueByDefaultValue(get(key), 0.0);
 	}
 
@@ -79,7 +80,7 @@ public interface SaGetValueInterface {
 	 * @param key key 
 	 * @return 值 
 	 */
-	public default float getFloat(String key) {
+	default float getFloat(String key) {
 		return getValueByDefaultValue(get(key), 0.0f);
 	}
 
@@ -90,12 +91,12 @@ public interface SaGetValueInterface {
 	 * @param cs 指定转换类型 
 	 * @return 值 
 	 */
-	public default <T> T getModel(String key, Class<T> cs) {
+	default <T> T getModel(String key, Class<T> cs) {
 		return SaFoxUtil.getValueByType(get(key), cs);
 	}
 
 	/**
-	 * 取值 (指定转换类型, 并指定值为Null时返回的默认值)
+	 * 取值 (指定转换类型, 并指定值为 null 时返回的默认值)
 	 * @param <T> 泛型
 	 * @param key key 
 	 * @param cs 指定转换类型 
@@ -103,7 +104,7 @@ public interface SaGetValueInterface {
 	 * @return 值 
 	 */
 	@SuppressWarnings("unchecked")
-	public default <T> T getModel(String key, Class<T> cs, Object defaultValue) {
+	default <T> T getModel(String key, Class<T> cs, Object defaultValue) {
 		Object value = get(key);
 		if(valueIsNull(value)) {
 			return (T)defaultValue;
@@ -112,11 +113,11 @@ public interface SaGetValueInterface {
 	}
 
 	/**
-	 * 是否含有某个key
-	 * @param key has
+	 * 是否含有某个 key
+	 * @param key 指定 key
 	 * @return 是否含有
 	 */
-	public default boolean has(String key) {
+	default boolean has(String key) {
 		return !valueIsNull(get(key));
 	}
 
@@ -128,7 +129,7 @@ public interface SaGetValueInterface {
 	 * @param value 指定值 
 	 * @return 此value是否为null 
 	 */
-	public default boolean valueIsNull(Object value) {
+	default boolean valueIsNull(Object value) {
 		return value == null || value.equals("");
 	}
 
@@ -140,14 +141,14 @@ public interface SaGetValueInterface {
 	 * @return 转换后的值 
 	 */
 	@SuppressWarnings("unchecked")
-	public default <T> T getValueByDefaultValue(Object value, T defaultValue) {
+	default <T> T getValueByDefaultValue(Object value, T defaultValue) {
 		
 		// 如果 obj 为 null，则直接返回默认值 
 		if(valueIsNull(value)) {
 			return (T)defaultValue;
 		}
 		
-		// 开始转换
+		// 开始转换类型
 		Class<T> cs = (Class<T>) defaultValue.getClass();
 		return SaFoxUtil.getValueByType(value, cs);
 	}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
index a7edc991..d268fc2c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
@@ -3,9 +3,10 @@ package cn.dev33.satoken.application;
 import cn.dev33.satoken.fun.SaRetFunction;
 
 /**
- * 对写值的一组方法封装 
+ * 对写值的一组方法封装
+ * <p> 封装 SaStorage、SaSession、SaApplication 等存取值的一些固定方法，减少重复编码 </p>
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-17
  */
 public interface SaSetValueInterface extends SaGetValueInterface {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
index c63b971a..e6b75427 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
@@ -8,19 +8,20 @@ import cn.dev33.satoken.secure.SaBase64Util;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token Http Basic 认证模块 
- * @author kong
+ * Sa-Token Http Basic 认证模块
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaBasicTemplate {
 	
 	/**
-	 * 默认的 Realm 名称 
+	 * 默认的 Realm 领域名称
 	 */
 	public static final String DEFAULT_REALM = "Sa-Token";
 
 	/**
-	 * 设置响应头，并抛出异常 
+	 * 在校验失败时，设置响应头，并抛出异常
 	 * @param realm 领域 
 	 */
 	public void throwNotBasicAuthException(String realm) {
@@ -34,7 +35,7 @@ public class SaBasicTemplate {
 	 */
 	public String getAuthorizationValue() {
 		
-		// 获取请求头 Authorization 参数 
+		// 获取前端提交的请求头 Authorization 参数
 		String authorization = SaHolder.getRequest().getHeader("Authorization");
 		
 		// 如果不是以 Basic 作为前缀，则视为无效 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
index 5c5f600c..5361b9b5 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.basic;
 
 /**
- * Sa-Token Http Basic 认证 Util  
- * @author kong
+ * Sa-Token Http Basic 认证模块，Util 工具类
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaBasicUtil {
 
@@ -11,7 +12,7 @@ public class SaBasicUtil {
 	}
 	
 	/**
-	 * 底层 SaBasicTemplate 对象 
+	 * 底层使用的 SaBasicTemplate 对象
 	 */
 	public static SaBasicTemplate saBasicTemplate = new SaBasicTemplate();
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
index 8c260f99..fd16eb2a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
@@ -1,24 +1,31 @@
 package cn.dev33.satoken.config;
 
 /**
- * Sa-Token Cookie写入 相关配置  
- * @author kong
+ * Sa-Token Cookie写入 相关配置
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaCookieConfig {
-	
+
+	/*
+		Cookie 功能为浏览器通用标准，建议大家自行搜索文章了解各个属性的功能含义，此处源码仅做简单解释。
+	 */
+
     /**
-     * 域（写入Cookie时显式指定的作用域, 常用于单点登录二级域名共享Cookie的场景）
+     * 作用域
+	 * <p> 写入 Cookie 时显式指定的作用域, 常用于单点登录二级域名共享 Cookie 的场景。 </p>
+	 * <p> 一般情况下你不需要设置此值，因为浏览器默认会把 Cookie 写到当前域名下。 </p>
      */
     private String domain; 
 
     /**
-     * 路径 
+     * 路径 （一般只有当你在一个域名下部署多个项目时才会用到此值。）
      */
     private String path;
 
     /**
-     * 是否只在 https 协议下有效 
+     * 是否只在 https 协议下有效
      */
     private Boolean secure = false; 
     
@@ -33,14 +40,20 @@ public class SaCookieConfig {
 	private String sameSite;
 
 	/**
-	 * @return 域 （写入Cookie时显式指定的作用域, 常用于单点登录二级域名共享Cookie的场景）
+	 * 获取：Cookie 作用域
+	 * 	<p> 写入 Cookie 时显式指定的作用域, 常用于单点登录二级域名共享 Cookie 的场景。 </p>
+	 * 	<p> 一般情况下你不需要设置此值，因为浏览器默认会把 Cookie 写到当前域名下。 </p>
+	 * @return /
 	 */
 	public String getDomain() {
 		return domain;
 	}
 
 	/**
-	 * @param domain 域 （写入Cookie时显式指定的作用域, 常用于单点登录二级域名共享Cookie的场景）
+	 * 写入：Cookie 作用域
+	 * 	<p> 写入 Cookie 时显式指定的作用域, 常用于单点登录二级域名共享 Cookie 的场景。 </p>
+	 * 	<p> 一般情况下你不需要设置此值，因为浏览器默认会把 Cookie 写到当前域名下。 </p>
+	 * @param domain /
 	 * @return 对象自身 
 	 */
 	public SaCookieConfig setDomain(String domain) {
@@ -49,14 +62,14 @@ public class SaCookieConfig {
 	}
 
 	/**
-	 * @return 路径 
+	 * @return 路径  （一般只有当你在一个域名下部署多个项目时才会用到此值。）
 	 */
 	public String getPath() {
 		return path;
 	}
 
 	/**
-	 * @param path 路径 
+	 * @param path 路径  （一般只有当你在一个域名下部署多个项目时才会用到此值。）
 	 * @return 对象自身 
 	 */
 	public SaCookieConfig setPath(String path) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
index 90ca38d2..16cbffbf 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
@@ -15,6 +15,9 @@ public class SaSignConfig {
 
     /**
      * 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     *
+     * <p> 比如此处你配置了60秒，当一个请求从 client 发起后，如果 server 端60秒内没有处理，60秒后再想处理就无法校验通过了。</p>
+     * <p> timestamp + nonce 有效防止重放攻击。 </p>
      */
     private long timestampDisparity = 1000  * 60 * 15;
 
@@ -47,6 +50,9 @@ public class SaSignConfig {
     /**
      * 获取 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
      *
+     * <p> 比如此处你配置了60秒，当一个请求从 client 发起后，如果 server 端60秒内没有处理，60秒后再想处理就无法校验通过了。</p>
+     * <p> timestamp + nonce 有效防止重放攻击。 </p>
+     *
      * @return /
      */
     public long getTimestampDisparity() {
@@ -56,6 +62,9 @@ public class SaSignConfig {
     /**
      * 设置 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
      *
+     * <p> 比如此处你配置了60秒，当一个请求从 client 发起后，如果 server 端60秒内没有处理，60秒后再想处理就无法校验通过了。</p>
+     * <p> timestamp + nonce 有效防止重放攻击。 </p>
+     *
      * @param timestampDisparity /
      * @return 对象自身
      */
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index 5e82d7c4..c1a42b7d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -5,95 +5,132 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import java.io.Serializable;
 
 /**
- * Sa-Token 配置类 Model 
- * <p>
- * 你可以通过yml、properties、java代码等形式配置本类参数，具体请查阅官方文档: https://sa-token.cc/
- * 
- * @author kong
+ * Sa-Token 配置类 Model
  *
+ * <p> 你可以通过yml、properties、java代码等形式配置本类参数，具体请查阅官方文档: https://sa-token.cc/ </p>
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenConfig implements Serializable {
 
 	private static final long serialVersionUID = -6541180061782004705L;
 
-	/** token名称 (同时也是cookie名称) */
+	/** token 名称 （同时也是： cookie 名称、提交 token 时参数的名称、存储 token 时的 key 前缀） */
 	private String tokenName = "satoken";
 
-	/** token的长久有效期(单位:秒) 默认30天, -1代表永久 */
+	/** token 的长久有效期（单位:秒） 默认30天, -1代表永久 */
 	private long timeout = 60 * 60 * 24 * 30;
 
 	/**
-	 * token临时有效期 [指定时间内无操作就视为token过期] (单位: 秒), 默认-1 代表不限制
-	 * (例如可以设置为1800代表30分钟内无操作就过期)
+	 * token 临时有效期 [ 指定时间内无操作就视为 token 过期 ] （单位: 秒）, 默认-1 代表不限制
+	 * （例如可以设置为 1800 代表 30 分钟内无操作就过期）
 	 */
 	private long activityTimeout = -1;
 
-	/** 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) */
+	/**
+	 * 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+	 */
 	private Boolean isConcurrent = true;
 
-	/** 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) */
+	/**
+	 * 在多人登录同一账号时，是否共用一个token （为true时所有登录共用一个token, 为false时每次登录新建一个token）
+	 */
 	private Boolean isShare = true;
 
 	/**
-	 * 同一账号最大登录数量，-1代表不限 （只有在 isConcurrent=true, isShare=false 时此配置才有效）
+	 * 同一账号最大登录数量，-1代表不限 （只有在 isConcurrent=true, isShare=false 时此配置项才有意义）
 	 */
 	private int maxLoginCount = 12;
 
-	/** 在每次创建 token 时的最高循环次数，用于保证 token 唯一性（-1=不循环尝试，直接使用） */
+	/**
+	 * 在每次创建 token 时的最高循环次数，用于保证 token 唯一性（-1=不循环尝试，直接使用）
+	 */
 	private int maxTryTimes = 12;
 
-	/** 是否尝试从请求体里读取token */
+	/**
+	 * 是否尝试从请求体里读取 token
+	 */
 	private Boolean isReadBody = true;
 
-
-	/** 是否尝试从header里读取token */
+	/**
+	 * 是否尝试从 header 里读取 token
+	 */
 	private Boolean isReadHeader = true;
 
-	/** 是否尝试从cookie里读取token */
+	/**
+	 * 是否尝试从 cookie 里读取 token
+	 */
 	private Boolean isReadCookie = true;
 
-	/** 是否在登录后将 Token 写入到响应头 */
+	/**
+	 * 是否在登录后将 token 写入到响应头
+	 */
 	private Boolean isWriteHeader = false;
-	
-	/** token风格(默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik) */
-	private String tokenStyle = "uuid";
-
-	/** 默认dao层实现类中，每次清理过期数据间隔的时间 (单位: 秒) ，默认值30秒，设置为-1代表不启动定时清理 */
-	private int dataRefreshPeriod = 30;
-
-	/** 获取[token专属session]时是否必须登录 (如果配置为true，会在每次获取[token-session]时校验是否登录) */
-	private Boolean tokenSessionCheckLogin = true;
-
-	/** 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作)  */
-	private Boolean autoRenew = true;
-
-	/** token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx) */
-	private String tokenPrefix;
-
-	/** 是否在初始化配置时打印版本字符画 */
-	private Boolean isPrint = true;
-
-	/** 是否打印操作日志 */
-	private Boolean isLog = false;
-
-	/** 日志等级（trace、debug、info、warn、error、fatal） */
-	private String logLevel = "trace";
-
-	/** 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal） */
-	private int logLevelInt = 1;
-
 
 	/**
-	 * jwt秘钥 (只有集成 jwt 模块时此参数才会生效)   
+	 * token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
+	 */
+	private String tokenStyle = "uuid";
+
+	/**
+	 * 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为-1代表不启动定时清理
+	 */
+	private int dataRefreshPeriod = 30;
+
+	/**
+	 * 获取 Token-Session 时是否必须登录（如果配置为true，会在每次获取 getTokenSession() 时校验当前是否登录）
+	 */
+	private Boolean tokenSessionCheckLogin = true;
+
+	/**
+	 * 是否打开自动续签 activityTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
+	 */
+	private Boolean autoRenew = true;
+
+	/**
+	 * token 前缀, 前端提交 token 时应该填写的固定前缀，格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx)
+	 */
+	private String tokenPrefix;
+
+	/**
+	 * 是否在初始化配置时在控制台打印版本字符画
+	 */
+	private Boolean isPrint = true;
+
+	/**
+	 * 是否打印操作日志
+	 */
+	private Boolean isLog = false;
+
+	/**
+	 * 日志等级（trace、debug、info、warn、error、fatal），此值与 logLevelInt 联动
+	 */
+	private String logLevel = "trace";
+
+	/**
+	 * 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal），此值与 logLevel 联动
+	 */
+	private int logLevelInt = 1;
+
+	/**
+	 * 是否打印彩色日志
+	 */
+	private Boolean isColorLog = null;
+
+	/**
+	 * jwt秘钥（只有集成 jwt 相关模块时此参数才会生效）
 	 */
 	private String jwtSecretKey;
 
 	/**
-	 * Http Basic 认证的账号和密码 
+	 * Http Basic 认证的默认账号和密码 
 	 */
 	private String basic = "";
 
-	/** 配置当前项目的网络访问地址 */
+	/**
+	 * 配置当前项目的网络访问地址
+	 */
 	private String currDomain;
 
 	/**
@@ -101,10 +138,11 @@ public class SaTokenConfig implements Serializable {
 	 */
 	private long sameTokenTimeout = 60 * 60 * 24;
 
-	/** 是否校验Same-Token（部分rpc插件有效） */
+	/**
+	 * 是否校验 Same-Token（部分rpc插件有效）
+	 */
 	private Boolean checkSameToken = false;
 
-
 	/**
 	 * Cookie配置对象 
 	 */
@@ -117,14 +155,14 @@ public class SaTokenConfig implements Serializable {
 
 
 	/**
-	 * @return token名称 (同时也是cookie名称)
+	 * @return token 名称 （同时也是： cookie 名称、提交 token 时参数的名称、存储 token 时的 key 前缀）
 	 */
 	public String getTokenName() {
 		return tokenName;
 	}
 
 	/**
-	 * @param tokenName token名称 (同时也是cookie名称)
+	 * @param tokenName token 名称 （同时也是： cookie 名称、提交 token 时参数的名称、存储 token 时的 key 前缀）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTokenName(String tokenName) {
@@ -133,14 +171,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token的长久有效期(单位:秒) 默认30天, -1代表永久
+	 * @return token 的长久有效期（单位:秒） 默认30天, -1代表永久
 	 */
 	public long getTimeout() {
 		return timeout;
 	}
 
 	/**
-	 * @param timeout token的长久有效期(单位:秒) 默认30天, -1代表永久
+	 * @param timeout token 的长久有效期（单位:秒） 默认30天, -1代表永久
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTimeout(long timeout) {
@@ -149,16 +187,16 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token临时有效期 [指定时间内无操作就视为token过期] (单位: 秒), 默认-1 代表不限制
-	 *         (例如可以设置为1800代表30分钟内无操作就过期)
+	 * @return token 临时有效期 [ 指定时间内无操作就视为 token 过期 ] （单位: 秒）, 默认-1 代表不限制
+	 * （例如可以设置为 1800 代表 30 分钟内无操作就过期）
 	 */
 	public long getActivityTimeout() {
 		return activityTimeout;
 	}
 
 	/**
-	 * @param activityTimeout token临时有效期 [指定时间内无操作就视为token过期] (单位: 秒), 默认-1 代表不限制
-	 *                        (例如可以设置为1800代表30分钟内无操作就过期)
+	 * @param activityTimeout token 临时有效期 [ 指定时间内无操作就视为 token 过期 ] （单位: 秒）, 默认-1 代表不限制
+	 * 							（例如可以设置为 1800 代表 30 分钟内无操作就过期）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setActivityTimeout(long activityTimeout) {
@@ -167,14 +205,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+	 * @return 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 	 */
 	public Boolean getIsConcurrent() {
 		return isConcurrent;
 	}
 
 	/**
-	 * @param isConcurrent 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+	 * @param isConcurrent 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsConcurrent(Boolean isConcurrent) {
@@ -183,14 +221,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+	 * @return 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个token, 为 false 时每次登录新建一个 token）
 	 */
 	public Boolean getIsShare() {
 		return isShare;
 	}
 
 	/**
-	 * @param isShare 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+	 * @param isShare 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个token, 为 false 时每次登录新建一个 token）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsShare(Boolean isShare) {
@@ -199,14 +237,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 同一账号最大登录数量，-1代表不限 （只有在 isConcurrent=true, isShare=false 时此配置才有效）
+	 * @return 同一账号最大登录数量，-1代表不限 （只有在 isConcurrent=true, isShare=false 时此配置项才有意义）
 	 */
 	public int getMaxLoginCount() {
 		return maxLoginCount;
 	}
 
 	/**
-	 * @param maxLoginCount 同一账号最大登录数量，-1代表不限 （只有在 isConcurrent=true, isShare=false 时此配置才有效）
+	 * @param maxLoginCount 同一账号最大登录数量，-1代表不限 （只有在 isConcurrent=true, isShare=false 时此配置项才有意义）
 	 * @return 对象自身 
 	 */
 	public SaTokenConfig setMaxLoginCount(int maxLoginCount) {
@@ -231,14 +269,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否尝试从请求体里读取token
+	 * @return 是否尝试从请求体里读取 token
 	 */
 	public Boolean getIsReadBody() {
 		return isReadBody;
 	}
 
 	/**
-	 * @param isReadBody 是否尝试从请求体里读取token
+	 * @param isReadBody 是否尝试从请求体里读取 token
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsReadBody(Boolean isReadBody) {
@@ -247,14 +285,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否尝试从header里读取token
+	 * @return 是否尝试从 header 里读取 token
 	 */
 	public Boolean getIsReadHeader() {
 		return isReadHeader;
 	}
 
 	/**
-	 * @param isReadHeader 是否尝试从header里读取token
+	 * @param isReadHeader 是否尝试从 header 里读取 token
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsReadHeader(Boolean isReadHeader) {
@@ -263,14 +301,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否尝试从cookie里读取token
+	 * @return 是否尝试从 cookie 里读取 token
 	 */
 	public Boolean getIsReadCookie() {
 		return isReadCookie;
 	}
 
 	/**
-	 * @param isReadCookie 是否尝试从cookie里读取token
+	 * @param isReadCookie 是否尝试从 cookie 里读取 token
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsReadCookie(Boolean isReadCookie) {
@@ -279,14 +317,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否在登录后将 Token 写入到响应头
+	 * @return 是否在登录后将 token 写入到响应头
 	 */
 	public Boolean getIsWriteHeader() {
 		return isWriteHeader;
 	}
 
 	/**
-	 * @param isWriteHeader 是否在登录后将 Token 写入到响应头
+	 * @param isWriteHeader 是否在登录后将 token 写入到响应头
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsWriteHeader(Boolean isWriteHeader) {
@@ -295,14 +333,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token风格(默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik)
+	 * @return token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 	 */
 	public String getTokenStyle() {
 		return tokenStyle;
 	}
 
 	/**
-	 * @param tokenStyle token风格(默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik)
+	 * @param tokenStyle token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTokenStyle(String tokenStyle) {
@@ -311,15 +349,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 默认dao层实现类中，每次清理过期数据间隔的时间 (单位: 秒) ，默认值30秒，设置为-1代表不启动定时清理
+	 * @return 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为-1代表不启动定时清理
 	 */
 	public int getDataRefreshPeriod() {
 		return dataRefreshPeriod;
 	}
 
 	/**
-	 * @param dataRefreshPeriod 默认dao层实现类中，每次清理过期数据间隔的时间 (单位: 秒)
-	 *                          ，默认值30秒，设置为-1代表不启动定时清理
+	 * @param dataRefreshPeriod 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为-1代表不启动定时清理
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setDataRefreshPeriod(int dataRefreshPeriod) {
@@ -328,15 +365,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 获取[token专属session]时是否必须登录 (如果配置为true，会在每次获取[token-session]时校验是否登录)
+	 * @return 获取 Token-Session 时是否必须登录（如果配置为true，会在每次获取 getTokenSession() 时校验当前是否登录）
 	 */
 	public Boolean getTokenSessionCheckLogin() {
 		return tokenSessionCheckLogin;
 	}
 
 	/**
-	 * @param tokenSessionCheckLogin 获取[token专属session]时是否必须登录
-	 *                               (如果配置为true，会在每次获取[token-session]时校验是否登录)
+	 * @param tokenSessionCheckLogin 获取 Token-Session 时是否必须登录（如果配置为true，会在每次获取 getTokenSession() 时校验当前是否登录）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTokenSessionCheckLogin(Boolean tokenSessionCheckLogin) {
@@ -345,14 +381,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否打开了自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作) 
+	 * @return 是否打开自动续签 activityTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
 	 */
 	public Boolean getAutoRenew() {
 		return autoRenew;
 	}
 
 	/**
-	 * @param autoRenew 是否打开自动续签 (如果此值为true, 框架会在每次直接或间接调用getLoginId()时进行一次过期检查与续签操作) 
+	 * @param autoRenew 是否打开自动续签 activityTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setAutoRenew(Boolean autoRenew) {
@@ -361,14 +397,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx)
+	 * @return token 前缀, 前端提交 token 时应该填写的固定前缀，格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx)
 	 */
 	public String getTokenPrefix() {
 		return tokenPrefix;
 	}
 
 	/**
-	 * @param tokenPrefix token前缀, 格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx)
+	 * @param tokenPrefix token 前缀, 前端提交 token 时应该填写的固定前缀，格式样例(satoken: Bearer xxxx-xxxx-xxxx-xxxx)
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTokenPrefix(String tokenPrefix) {
@@ -377,14 +413,14 @@ public class SaTokenConfig implements Serializable {
 	}
 	
 	/**
-	 * @return 是否在初始化配置时打印版本字符画
+	 * @return 是否在初始化配置时在控制台打印版本字符画
 	 */
 	public Boolean getIsPrint() {
 		return isPrint;
 	}
 
 	/**
-	 * @param isPrint 是否在初始化配置时打印版本字符画
+	 * @param isPrint 是否在初始化配置时在控制台打印版本字符画
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setIsPrint(Boolean isPrint) {
@@ -409,14 +445,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 日志等级（trace、debug、info、warn、error、fatal）
+	 * @return 日志等级（trace、debug、info、warn、error、fatal），此值与 logLevelInt 联动
 	 */
 	public String getLogLevel() {
 		return logLevel;
 	}
 
 	/**
-	 * @param logLevel 日志等级（trace、debug、info、warn、error、fatal）
+	 * @param logLevel 日志等级（trace、debug、info、warn、error、fatal），此值与 logLevelInt 联动
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setLogLevel(String logLevel) {
@@ -426,14 +462,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal）
+	 * @return 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal），此值与 logLevel 联动
 	 */
 	public int getLogLevelInt() {
 		return logLevelInt;
 	}
 
 	/**
-	 * @param logLevelInt 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal）
+	 * @param logLevelInt 日志等级 int 值（1=trace、2=debug、3=info、4=warn、5=error、6=fatal），此值与 logLevel 联动
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setLogLevelInt(int logLevelInt) {
@@ -441,16 +477,36 @@ public class SaTokenConfig implements Serializable {
 		this.logLevel = SaFoxUtil.translateLogLevelToString(logLevelInt);
 		return this;
 	}
-	
+
 	/**
-	 * @return jwt秘钥 (只有集成 jwt 模块时此参数才会生效)    
+	 * 获取：是否打印彩色日志
+	 *
+	 * @return isColorLog 是否打印彩色日志
+	 */
+	public Boolean getIsColorLog() {
+		return this.isColorLog;
+	}
+
+	/**
+	 * 设置：是否打印彩色日志
+	 *
+	 * @param isColorLog 是否打印彩色日志
+	 * @return 对象自身
+	 */
+	public SaTokenConfig setIsColorLog(Boolean isColorLog) {
+		this.isColorLog = isColorLog;
+		return this;
+	}
+
+	/**
+	 * @return jwt秘钥（只有集成 jwt 相关模块时此参数才会生效）
 	 */
 	public String getJwtSecretKey() {
 		return jwtSecretKey;
 	}
 
 	/**
-	 * @param jwtSecretKey jwt秘钥 (只有集成 jwt 模块时此参数才会生效)  
+	 * @param jwtSecretKey jwt秘钥（只有集成 jwt 相关模块时此参数才会生效）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setJwtSecretKey(String jwtSecretKey) {
@@ -459,14 +515,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return Http Basic 认证的账号和密码 
+	 * @return Http Basic 认证的默认账号和密码 
 	 */
 	public String getBasic() {
 		return basic;
 	}
 
 	/**
-	 * @param basic Http Basic 认证的账号和密码 
+	 * @param basic Http Basic 认证的默认账号和密码 
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setBasic(String basic) {
@@ -577,6 +633,7 @@ public class SaTokenConfig implements Serializable {
 				+ ", isLog=" + isLog 
 				+ ", logLevel=" + logLevel 
 				+ ", logLevelInt=" + logLevelInt
+				+ ", isColorLog=" + isColorLog
 				+ ", jwtSecretKey=" + jwtSecretKey 
 				+ ", basic=" + basic 
 				+ ", currDomain=" + currDomain 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
index e00644a7..ce769062 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
@@ -13,10 +13,10 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * Sa-Token配置文件的构建工厂类
- * <p>
- * 用于手动读取配置文件初始化 SaTokenConfig 对象，只有在非IOC环境下你才会用到此类 
+ *
+ * <p> 用于手动读取配置文件初始化 SaTokenConfig 对象，只有在非IOC环境下你才会用到此类 </p>
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-30
  */
 public class SaTokenConfigFactory {
@@ -30,7 +30,7 @@ public class SaTokenConfigFactory {
 	public static String configPath = "sa-token.properties";
 
 	/**
-	 * 根据configPath路径获取配置信息 
+	 * 根据 configPath 路径获取配置信息
 	 * 
 	 * @return 一个SaTokenConfig对象
 	 */
@@ -42,7 +42,7 @@ public class SaTokenConfigFactory {
 	 * 根据指定路径路径获取配置信息 
 	 * 
 	 * @param path 配置文件路径 
-	 * @return 一个SaTokenConfig对象
+	 * @return 一个 SaTokenConfig 对象
 	 */
 	public static SaTokenConfig createConfig(String path) {
 		Map<String, String> map = readPropToMap(path);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
index e1accd9d..7ab61411 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
@@ -7,52 +7,58 @@ import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.context.model.SaStorage;
 
 /**
- * Sa-Token 上下文持有类 
- * @author kong
+ * Sa-Token 上下文持有类，你可以通过此类快速获取当前环境下的 SaRequest、SaResponse、SaStorage、SaApplication 对象。
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaHolder {
 	
 	/**
-	 * 获取当前请求的 SaTokenContext
+	 * 获取当前请求的 SaTokenContext 上下文对象
+	 * @see SaTokenContext
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaTokenContext getContext() {
 		return SaManager.getSaTokenContextOrSecond();
 	}
 
 	/**
-	 * 获取当前请求的 [Request] 对象
+	 * 获取当前请求的 Request 包装对象
+	 * @see SaRequest
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaRequest getRequest() {
 		return SaManager.getSaTokenContextOrSecond().getRequest();
 	}
 
 	/**
-	 * 获取当前请求的 [Response] 对象
+	 * 获取当前请求的 Response 包装对象
+	 * @see SaResponse
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaResponse getResponse() {
 		return SaManager.getSaTokenContextOrSecond().getResponse();
 	}
 
 	/**
-	 * 获取当前请求的 [存储器] 对象 
-	 * 
-	 * @return see note 
+	 * 获取当前请求的 Storage 包装对象
+	 * @see SaStorage
+	 *
+	 * @return /
 	 */
 	public static SaStorage getStorage() {
 		return SaManager.getSaTokenContextOrSecond().getStorage();
 	}
 
 	/**
-	 * 获取全局 SaApplication 对象 
+	 * 获取全局 SaApplication 对象
+	 * @see SaApplication
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaApplication getApplication() {
 		return SaApplication.defaultInstance;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
index c1edfae0..e9d45c35 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
@@ -6,43 +6,56 @@ import cn.dev33.satoken.context.model.SaResponse;
 
 /**
  * Sa-Token 上下文处理器
- * @author kong
  *
+ * <p> 上下文处理器封装了当前应用环境的底层操作，是 Sa-Token 对接不同 web 框架的关键，详细可参考在线文档 “自定义 SaTokenContext 指南”章节 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaTokenContext {
 
 	/**
-	 * 获取当前请求的 [Request] 对象
+	 * 获取当前请求的 Request 包装对象
+	 * @see SaRequest
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public SaRequest getRequest();
 
 	/**
-	 * 获取当前请求的 [Response] 对象
+	 * 获取当前请求的 Response 包装对象
+	 * @see SaResponse
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public SaResponse getResponse();
 
 	/**
-	 * 获取当前请求的 [存储器] 对象 
+	 * 获取当前请求的 Storage 包装对象
+	 * @see SaStorage
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public SaStorage getStorage();
 
 	/**
-	 * 校验指定路由匹配符是否可以匹配成功指定路径 
+	 * 判断：指定路由匹配符是否可以匹配成功指定路径
+	 * <pre>
+	 *     判断规则由底层 web 框架决定，例如在 springboot 中：
+	 *     	- matchPath("/user/*", "/user/login")  返回: true
+	 *     	- matchPath("/user/*", "/article/edit")  返回: false
+	 * </pre>
 	 * 
 	 * @param pattern 路由匹配符 
 	 * @param path 需要匹配的路径 
-	 * @return see note 
+	 * @return /
 	 */
 	public boolean matchPath(String pattern, String path);
 
 	/**
-	 * 此上下文是否有效 
+	 * 判断：在本次请求中，此上下文是否可用。
+	 * <p> 例如在部分 rpc 调用时， 一级上下文会返回 false，这时候框架就会选择使用二级上下文来处理请求 </p>
+	 *
 	 * @return / 
 	 */
 	public default boolean isValid() {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
index 30599097..d2c9e0c0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
@@ -7,15 +7,15 @@ import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.InvalidContextException;
 
 /**
- * Sa-Token 上下文处理器 [默认实现类]
+ * Sa-Token 上下文处理器 [ 默认实现类 ]
  * 
  * <p>  
- * 一般情况下框架会为你自动注入合适的上下文处理器，如果代码断点走到了此默认实现类，
- * 说明你引入的依赖有问题或者错误的调用了Sa-Token的API， 请在[在线开发文档 → 附录 → 常见问题排查] 中按照提示进行排查
+ * 	一般情况下框架会为你自动注入合适的上下文处理器，如果代码断点走到了此默认实现类，
+ * 	说明你引入的依赖有问题或者错误的调用了 Sa-Token 的API， 请在 [ 在线开发文档 → 附录 → 常见问题排查 ] 中按照提示进行排查
  * </p>
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenContextDefaultImpl implements SaTokenContext {
 	
@@ -25,37 +25,25 @@ public class SaTokenContextDefaultImpl implements SaTokenContext {
 	public static SaTokenContextDefaultImpl defaultContext = new SaTokenContextDefaultImpl();
 
 	/**
-	 * 默认的错误提示语 
+	 * 错误提示语
 	 */
 	public static final String ERROR_MESSAGE = "未能获取有效的上下文处理器";
-	
-	/**
-	 * 获取当前请求的 [Request] 对象
-	 */
+
 	@Override
 	public SaRequest getRequest() {
 		throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001);
 	}
-	
-	/**
-	 * 获取当前请求的 [Response] 对象
-	 */
+
 	@Override
 	public SaResponse getResponse() {
 		throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001);
 	}
 
-	/**
-	 * 获取当前请求的 [存储器] 对象 
-	 */
 	@Override
 	public SaStorage getStorage() {
 		throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001);
 	}
-	
-	/**
-	 * 校验指定路由匹配符是否可以匹配成功指定路径 
-	 */
+
 	@Override
 	public boolean matchPath(String pattern, String path) {
 		throw new InvalidContextException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10001);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
index e2c637f8..97d82359 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
@@ -5,15 +5,17 @@ import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.context.model.SaStorage;
 
 /**
- * Sa-Token 上下文处理器 [ThreadLocal版本] 
+ * Sa-Token 上下文处理器 [ ThreadLocal 版本 ]
  * 
  * <p>
- * 	使用 [ThreadLocal版本] 上下文处理器需要在全局过滤器或者拦截器内率先调用 
- * 	SaTokenContextForThreadLocalStorage.setBox(req,res, sto) 初始化上下文 
+ * 	使用 [ ThreadLocal 版本 ] 上下文处理器需要在全局过滤器或者拦截器内率先调用
+ * 	SaTokenContextForThreadLocalStorage.setBox(req, res, sto) 初始化上下文
  * </p>
- * 
- * @author kong
  *
+ * <p> 一般情况下你不需要直接操作此类，因为框架的 starter 集成包里已经封装了完整的上下文操作 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenContextForThreadLocal implements SaTokenContext {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
index d2af1f52..a9e4ae89 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
@@ -7,20 +7,22 @@ import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.InvalidContextException;
 
 /**
- * Sa-Token 上下文处理器 [ThreadLocal版本] ---- 对象存储器 
- * 
- * @author kong
+ * Sa-Token 上下文处理器 [ThreadLocal 版本] ---- 对象存储器
  *
+ * <p> 一般情况下你不需要直接操作此类，因为框架的 starter 集成包里已经封装了完整的上下文操作 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenContextForThreadLocalStorage {
 	
 	/**
-	 * 基于 ThreadLocal 的 [Box存储器] 
+	 * 基于 ThreadLocal 的 [ Box 存储器 ]
 	 */
 	public static ThreadLocal<Box> boxThreadLocal = new InheritableThreadLocal<Box>();
 	
 	/**
-	 * 初始化 [Box存储器]
+	 * 初始化当前线程的 [ Box 存储器 ]
 	 * @param request {@link SaRequest}
 	 * @param response {@link SaResponse}
 	 * @param storage {@link SaStorage}
@@ -31,23 +33,23 @@ public class SaTokenContextForThreadLocalStorage {
 	};
 
 	/**
-	 * 清除 [Box存储器]
+	 * 清除当前线程的 [ Box 存储器 ]
 	 */
 	public static void clearBox() {
 		boxThreadLocal.remove();
 	};
 
 	/**
-	 * 获取 [Box存储器]
-	 * @return see note
+	 * 获取当前线程的 [ Box 存储器 ]
+	 * @return /
 	 */
 	public static Box getBox() {
 		return boxThreadLocal.get();
 	};
 	
 	/**
-	 * 获取 [Box存储器], 如果为空则抛出异常 
-	 * @return see note
+	 * 获取当前线程的 [ Box 存储器 ], 如果为空则抛出异常
+	 * @return /
 	 */
 	public static Box getBoxNotNull() {
 		Box box = boxThreadLocal.get();
@@ -58,27 +60,27 @@ public class SaTokenContextForThreadLocalStorage {
 	};
 
 	/**
-	 * 在 [Box存储器] 获取 [Request] 对象
+	 * 在当前线程的 SaRequest 包装对象
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaRequest getRequest() {
 		return getBoxNotNull().getRequest();
 	}
 
 	/**
-	 * 在 [Box存储器] 获取 [Response] 对象
+	 * 在当前线程的 SaResponse 包装对象
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaResponse getResponse() {
 		return getBoxNotNull().getResponse();
 	}
 
 	/**
-	 * 在 [Box存储器] 获取 [存储器] 对象 
+	 * 在当前线程的 SaStorage 存储器包装对象
 	 * 
-	 * @return see note 
+	 * @return /
 	 */
 	public static SaStorage getStorage() {
 		return getBoxNotNull().getStorage();
@@ -86,11 +88,13 @@ public class SaTokenContextForThreadLocalStorage {
 
 	
 	/**
-	 * 临时内部类，用于存储[request、response、storage]三个对象 
-	 * @author kong
+	 * Box 临时内部类，用于存储 [ SaRequest、SaResponse、SaStorage ] 三个包装对象
+	 *
+	 * @author click33
+	 * @since <= 1.34.0
 	 */
 	/**
-	 * @author kong
+	 * @author click33
 	 *
 	 */
 	public static class Box {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
index 23cb072c..4c2fe6fa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
@@ -10,9 +10,10 @@ import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Cookie Model
- * @author kong
+ * Cookie Model，代表一个 Cookie 应该具有的所有参数
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaCookie {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
index 8dfb402e..697870bf 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
@@ -8,27 +8,28 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Request 包装类
- * @author kong
+ * Request 请求对象 包装类
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaRequest {
 	
 	/**
-	 * 获取底层源对象 
-	 * @return see note 
+	 * 获取底层被包装的源对象
+	 * @return /
 	 */
 	public Object getSource();
 	
 	/**
-	 * 在 [请求体] 里获取一个值 
+	 * 在 [ 请求体 ] 里获取一个参数值
 	 * @param name 键 
 	 * @return 值 
 	 */
 	public String getParam(String name);
 
 	/**
-	 * 在 [请求体] 里获取一个值，值为空时返回默认值  
+	 * 在 [ 请求体 ] 里获取一个参数值，值为空时返回默认值
 	 * @param name 键 
 	 * @param defaultValue 值为空时的默认值  
 	 * @return 值 
@@ -42,7 +43,7 @@ public interface SaRequest {
 	}
 
 	/**
-	 * 检测提供的参数是否为指定值 
+	 * 在 [ 请求体 ] 里检测提供的参数是否为指定值
 	 * @param name 键 
 	 * @param value 值 
 	 * @return 是否相等 
@@ -53,7 +54,7 @@ public interface SaRequest {
 	}
 
 	/**
-	 * 检测请求是否提供了指定参数 
+	 * 在 [ 请求体 ] 里检测请求是否提供了指定参数
 	 * @param name 参数名称 
 	 * @return 是否提供 
 	 */
@@ -62,7 +63,7 @@ public interface SaRequest {
 	}
 	
 	/**
-	 * 在 [请求体] 里获取一个值 （此值必须存在，否则抛出异常 ）
+	 * 在 [ 请求体 ] 里获取一个值 （此值必须存在，否则抛出异常 ）
 	 * @param name 键
 	 * @return 参数值 
 	 */
@@ -75,26 +76,26 @@ public interface SaRequest {
 	}
 
 	/**
-	 * 获取 [请求体] 里提交的所有参数名称
+	 * 获取 [ 请求体 ] 里提交的所有参数名称
 	 * @return 参数名称列表
 	 */
 	public List<String> getParamNames();
 
 	/**
-	 * 获取 [请求体] 里提交的所有参数
+	 * 获取 [ 请求体 ] 里提交的所有参数
 	 * @return 参数列表
 	 */
 	public Map<String, String> getParamMap();
 
 	/**
-	 * 在 [请求头] 里获取一个值 
+	 * 在 [ 请求头 ] 里获取一个值 
 	 * @param name 键 
 	 * @return 值 
 	 */
 	public String getHeader(String name);
 
 	/**
-	 * 在 [请求头] 里获取一个值 
+	 * 在 [ 请求头 ] 里获取一个值 
 	 * @param name 键 
 	 * @param defaultValue 值为空时的默认值  
 	 * @return 值 
@@ -108,7 +109,7 @@ public interface SaRequest {
 	}
 
 	/**
-	 * 在 [Cookie作用域] 里获取一个值 
+	 * 在 [ Cookie作用域 ] 里获取一个值
 	 * @param name 键 
 	 * @return 值 
 	 */
@@ -116,14 +117,14 @@ public interface SaRequest {
 
 	/**
 	 * 返回当前请求path (不包括上下文名称) 
-	 * @return see note
+	 * @return /
 	 */
 	public String getRequestPath();
 
 	/**
-	 * 返回当前请求path是否为指定值 
+	 * 返回当前请求 path 是否为指定值
 	 * @param path path 
-	 * @return see note
+	 * @return /
 	 */
 	public default boolean isPath(String path) {
 		return getRequestPath().equals(path);
@@ -131,19 +132,19 @@ public interface SaRequest {
 
 	/**
 	 * 返回当前请求的url，不带query参数，例：http://xxx.com/test
-	 * @return see note
+	 * @return /
 	 */
 	public String getUrl();
 	
 	/**
 	 * 返回当前请求的类型 
-	 * @return see note
+	 * @return /
 	 */
 	public String getMethod();
 	
 	/**
-	 * 此请求是否为Ajax请求 
-	 * @return see note 
+	 * 判断此请求是否为 Ajax 异步请求
+	 * @return /
 	 */
 	public default boolean isAjax() {
 		return getHeader("X-Requested-With") != null;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
index 78c11be0..e643219d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.context.model;
 
 /**
- * Response 包装类 
- * @author kong
+ * Response 响应对象 包装类
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaResponse {
 
@@ -13,8 +14,8 @@ public interface SaResponse {
 	public static final String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers";
 	
 	/**
-	 * 获取底层源对象 
-	 * @return see note 
+	 * 获取底层被包装的源对象
+	 * @return /
 	 */
 	public Object getSource();
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
index b64aa2f3..51157cc1 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
@@ -3,17 +3,18 @@ package cn.dev33.satoken.context.model;
 import cn.dev33.satoken.application.SaSetValueInterface;
 
 /**
- * Storage Model，请求作用域的读取值对象 
- * <p> 在一次请求范围内: 存值、取值
- * 
- * @author kong
+ * Storage Model，请求作用域的读取值对象。
  *
+ * <p> 在一次请求范围内: 存值、取值。数据在请求结束后失效。
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaStorage extends SaSetValueInterface {
 
 	/**
-	 * 获取底层源对象 
-	 * @return see note 
+	 * 获取底层被包装的源对象
+	 * @return /
 	 */
 	public Object getSource();
 
@@ -26,7 +27,7 @@ public interface SaStorage extends SaSetValueInterface {
 	/** 写值 */
 	@Override
 	public SaStorage set(String key, Object value);
-	
+
 	/** 删值 */
 	@Override
 	public SaStorage delete(String key);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
index 435ca3a7..80d550a6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
@@ -1,4 +1,5 @@
 /**
- * 因为不能确定最终运行的容器属于标准Servlet模型还是非Servlet模型，特封装此包下的包装类进行对接 
+ * 因为不能确定最终运行的 web 容器属于标准 Servlet 模型还是非 Servlet 模型，特封装此包下的包装类进行对接。
+ * 调用路径为：Sa-Token 功能函数 -> SaRequest 封装接口 -> SaRequest 具体实现类。
  */
 package cn.dev33.satoken.context.model;
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
index f1047e1b..2df81d07 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
@@ -5,10 +5,12 @@ import cn.dev33.satoken.context.SaTokenContext;
 /**
  * Sa-Token 二级Context - 基础接口
  * 
- * <p> (利用继承机制实现区别 [一级Context] 与 [二级Context] 的目的)
- * 
- * @author kong
+ * <p> (利用继承机制实现区别 [ 一级Context ] 与 [ 二级Context ] 的目的)
  *
+ * @see SaTokenContext SaTokenContext 上下文处理器
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaTokenSecondContext extends SaTokenContext {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
index 005afaf3..cb5b065f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
@@ -3,14 +3,14 @@ package cn.dev33.satoken.context.second;
 /**
  * Sa-Token 二级Context - 创建器  
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 @FunctionalInterface
 public interface SaTokenSecondContextCreator {
 	
 	/**
-	 * 创建一个二级 Context 
+	 * 创建一个二级 Context 处理器
 	 * @return / 
 	 */
 	public SaTokenSecondContext create();
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
index bc4264a8..3f369b81 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
@@ -1,163 +1,172 @@
 package cn.dev33.satoken.dao;
 
-import java.util.List;
-
 import cn.dev33.satoken.session.SaSession;
 
+import java.util.List;
+
 /**
- * Sa-Token持久层接口 
- * @author kong 
+ * Sa-Token 持久层接口
+ *
+ * <p>
+ *     此接口的不同实现类可将数据存储至不同位置，如：内存Map、Redis 等等。
+ *     如果你要自定义数据存储策略，也需通过实现此接口来完成。
+ * </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaTokenDao {
 
-	/** 常量，表示一个key永不过期 (在一个key被标注为永远不过期时返回此值) */ 
-	public static final long NEVER_EXPIRE = -1;
+	/** 常量，表示一个 key 永不过期 （在一个 key 被标注为永远不过期时返回此值） */
+	long NEVER_EXPIRE = -1;
 	
-	/** 常量，表示系统中不存在这个缓存 (在对不存在的key获取剩余存活时间时返回此值) */ 
-	public static final long NOT_VALUE_EXPIRE = -2;
+	/** 常量，表示系统中不存在这个缓存（在对不存在的 key 获取剩余存活时间时返回此值） */
+	long NOT_VALUE_EXPIRE = -2;
 
 	
 	// --------------------- 字符串读写 ---------------------
 	
 	/**
-	 * 获取Value，如无返空 
+	 * 获取 value，如无返空
+	 *
 	 * @param key 键名称 
 	 * @return value
 	 */
-	public String get(String key);
+	String get(String key);
 
 	/**
-	 * 写入Value，并设定存活时间 (单位: 秒)
+	 * 写入 value，并设定存活时间（单位: 秒）
+	 *
 	 * @param key 键名称 
 	 * @param value 值 
-	 * @param timeout 过期时间(值大于0时限时存储，值=-1时永久存储，值=0或小于-2时不存储)
+	 * @param timeout 数据有效期（值大于0时限时存储，值=-1时永久存储，值=0或小于-2时不存储）
 	 */
-	public void set(String key, String value, long timeout);
+	void set(String key, String value, long timeout);
 
 	/**
-	 * 更新Value (过期时间不变) 
+	 * 更新 value （过期时间不变）
 	 * @param key 键名称 
 	 * @param value 值 
 	 */
-	public void update(String key, String value);
+	void update(String key, String value);
 
 	/**
-	 * 删除Value 
+	 * 删除 value
 	 * @param key 键名称 
 	 */
-	public void delete(String key);
+	void delete(String key);
 	
 	/**
-	 * 获取Value的剩余存活时间 (单位: 秒) 
-	 * @param key 指定key 
-	 * @return 这个key的剩余存活时间 
+	 * 获取 value 的剩余存活时间（单位: 秒）
+	 * @param key 指定 key
+	 * @return 这个 key 的剩余存活时间
 	 */
-	public long getTimeout(String key);
+	long getTimeout(String key);
 	
 	/**
-	 * 修改Value的剩余存活时间 (单位: 秒) 
-	 * @param key 指定key
-	 * @param timeout 过期时间 
+	 * 修改 value 的剩余存活时间（单位: 秒）
+	 * @param key 指定 key
+	 * @param timeout 过期时间（单位: 秒）
 	 */
-	public void updateTimeout(String key, long timeout);
+	void updateTimeout(String key, long timeout);
 
 	
 	// --------------------- 对象读写 ---------------------
 
 	/**
-	 * 获取Object，如无返空 
+	 * 获取 Object，如无返空
 	 * @param key 键名称 
 	 * @return object
 	 */
-	public Object getObject(String key);
+	Object getObject(String key);
 
 	/**
-	 * 写入Object，并设定存活时间 (单位: 秒)
+	 * 写入 Object，并设定存活时间 （单位: 秒）
 	 * @param key 键名称 
 	 * @param object 值 
-	 * @param timeout 存活时间 (值大于0时限时存储，值=-1时永久存储，值=0或小于-2时不存储)
+	 * @param timeout 存活时间（值大于0时限时存储，值=-1时永久存储，值=0或小于-2时不存储）
 	 */
-	public void setObject(String key, Object object, long timeout);
+	void setObject(String key, Object object, long timeout);
 
 	/**
-	 * 更新Object (过期时间不变) 
+	 * 更新 Object （过期时间不变）
 	 * @param key 键名称 
 	 * @param object 值 
 	 */
-	public void updateObject(String key, Object object);
+	void updateObject(String key, Object object);
 
 	/**
-	 * 删除Object 
+	 * 删除 Object
 	 * @param key 键名称 
 	 */
-	public void deleteObject(String key);
+	void deleteObject(String key);
 	
 	/**
-	 * 获取Object的剩余存活时间 (单位: 秒)
-	 * @param key 指定key 
-	 * @return 这个key的剩余存活时间 
+	 * 获取 Object 的剩余存活时间 （单位: 秒）
+	 * @param key 指定 key
+	 * @return 这个 key 的剩余存活时间
 	 */
-	public long getObjectTimeout(String key);
+	long getObjectTimeout(String key);
 	
 	/**
-	 * 修改Object的剩余存活时间 (单位: 秒)
-	 * @param key 指定key
-	 * @param timeout 过期时间 
+	 * 修改 Object 的剩余存活时间（单位: 秒）
+	 * @param key 指定 key
+	 * @param timeout 剩余存活时间
 	 */
-	public void updateObjectTimeout(String key, long timeout);
+	void updateObjectTimeout(String key, long timeout);
 
 	
-	// --------------------- Session读写 ---------------------
+	// --------------------- SaSession 读写 （默认复用 Object 读写方法） ---------------------
 
 	/**
-	 * 获取Session，如无返空 
+	 * 获取 SaSession，如无返空
 	 * @param sessionId sessionId
 	 * @return SaSession
 	 */
-	public default SaSession getSession(String sessionId) {
+	default SaSession getSession(String sessionId) {
 		return (SaSession)getObject(sessionId);
 	}
 
 	/**
-	 * 写入Session，并设定存活时间 (单位: 秒) 
-	 * @param session 要保存的Session对象
-	 * @param timeout 过期时间 (单位: 秒)
+	 * 写入 SaSession，并设定存活时间（单位: 秒）
+	 * @param session 要保存的 SaSession 对象
+	 * @param timeout 过期时间（单位: 秒）
 	 */
-	public default void setSession(SaSession session, long timeout) {
+	default void setSession(SaSession session, long timeout) {
 		setObject(session.getId(), session, timeout);
 	}
 
 	/**
-	 * 更新Session
-	 * @param session 要更新的session对象
+	 * 更新 SaSession
+	 * @param session 要更新的 SaSession 对象
 	 */
-	public default void updateSession(SaSession session) {
+	default void updateSession(SaSession session) {
 		updateObject(session.getId(), session);
 	}
 	
 	/**
-	 * 删除Session
+	 * 删除 SaSession
 	 * @param sessionId sessionId
 	 */
-	public default void deleteSession(String sessionId) {
+	default void deleteSession(String sessionId) {
 		deleteObject(sessionId);
 	}
 
 	/**
-	 * 获取Session剩余存活时间 (单位: 秒) 
-	 * @param sessionId 指定Session 
-	 * @return 这个Session的剩余存活时间 
+	 * 获取 SaSession 剩余存活时间（单位: 秒）
+	 * @param sessionId 指定 SaSession
+	 * @return 这个 SaSession 的剩余存活时间
 	 */
-	public default long getSessionTimeout(String sessionId) {
+	default long getSessionTimeout(String sessionId) {
 		return getObjectTimeout(sessionId);
 	}
 	
 	/**
-	 * 修改Session剩余存活时间 (单位: 秒) 
-	 * @param sessionId 指定Session 
-	 * @param timeout 过期时间 
+	 * 修改 SaSession 剩余存活时间（单位: 秒）
+	 * @param sessionId 指定 SaSession
+	 * @param timeout 剩余存活时间
 	 */
-	public default void updateSessionTimeout(String sessionId, long timeout) {
+	default void updateSessionTimeout(String sessionId, long timeout) {
 		updateObjectTimeout(sessionId, timeout);
 	}
 	
@@ -169,12 +178,12 @@ public interface SaTokenDao {
 	 * @param prefix 前缀 
 	 * @param keyword 关键字 
 	 * @param start 开始处索引
-	 * @param size 获取数量  (-1代表从start处一直取到末尾) 
+	 * @param size 获取数量  (-1代表从 start 处一直取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
 	 * 
 	 * @return 查询到的数据集合 
 	 */
-	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType);
+	List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType);
 	
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
index 2fff7026..cbc339a7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
@@ -1,32 +1,32 @@
 package cn.dev33.satoken.dao;
 
 
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.util.SaFoxUtil;
+
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.util.SaFoxUtil;
-
 /**
- * Sa-Token持久层接口 [默认实现类, 基于内存Map] 
- * @author kong
+ * Sa-Token 持久层接口，默认实现类（基于内存 Map，系统重启后数据丢失）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenDaoDefaultImpl implements SaTokenDao {
-	
 
 	/**
-	 * 数据集合 
+	 * 存储数据的集合
 	 */
-	public Map<String, Object> dataMap = new ConcurrentHashMap<String, Object>();
+	public Map<String, Object> dataMap = new ConcurrentHashMap<>();
 
 	/**
-	 * 过期时间集合 (单位: 毫秒) , 记录所有key的到期时间 [注意不是剩余存活时间] 
+	 * 存储数据过期时间的集合（单位: 毫秒）, 记录所有 key 的到期时间 （注意存储的是到期时间，不是剩余存活时间）
 	 */
-	public Map<String, Long> expireMap = new ConcurrentHashMap<String, Long>();
-	
+	public Map<String, Long> expireMap = new ConcurrentHashMap<>();
+
 	/**
 	 * 构造函数
 	 */
@@ -121,17 +121,30 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 	
 	// ------------------------ Session 读写操作 
 	// 使用接口默认实现 
-	
 
-	// ------------------------ 过期时间相关操作 
+
+	// --------- 会话管理
+
+	@Override
+	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
+		return SaFoxUtil.searchList(expireMap.keySet(), prefix, keyword, start, size, sortType);
+	}
+
+
+	// ------------------------ 以下是一个定时缓存的简单实现，采用：惰性检查 + 异步循环扫描
+
+	// --------- 过期时间相关操作
 
 	/**
-	 * 如果指定key已经过期，则立即清除它 
-	 * @param key 指定key 
+	 * 如果指定的 key 已经过期，则立即清除它
+	 * @param key 指定 key
 	 */
 	void clearKeyByTimeout(String key) {
 		Long expirationTime = expireMap.get(key);
-		// 清除条件：如果不为空 && 不是[永不过期] && 已经超过过期时间 
+		// 清除条件：
+		// 		1、数据存在。
+		// 		2、不是 [ 永不过期 ]。
+		// 		3、已经超过过期时间。
 		if(expirationTime != null && expirationTime != SaTokenDao.NEVER_EXPIRE && expirationTime < System.currentTimeMillis()) {
 			dataMap.remove(key);
 			expireMap.remove(key);
@@ -139,23 +152,32 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 	}
 
 	/**
-	 * 获取指定key的剩余存活时间 (单位：秒)
+	 * 获取指定 key 的剩余存活时间 （单位：秒）
+	 * @param key 指定 key
+	 * @return 这个 key 的剩余存活时间
 	 */
 	long getKeyTimeout(String key) {
-		// 先检查是否已经过期
+		// 由于数据过期检测属于惰性扫描，很可能此时这个 key 已经是过期状态了，所以这里需要先检查一下
 		clearKeyByTimeout(key);
-		// 获取过期时间 
+
+		// 获取这个 key 的过期时间
 		Long expire = expireMap.get(key);
-		// 如果根本没有这个值 
+
+		// 如果 expire 数据不存在，说明框架没有存储这个 key，此时返回 NOT_VALUE_EXPIRE
 		if(expire == null) {
 			return SaTokenDao.NOT_VALUE_EXPIRE;
 		}
-		// 如果被标注为永不过期 
+
+		// 如果 expire 被标注为永不过期，则返回 NEVER_EXPIRE
 		if(expire == SaTokenDao.NEVER_EXPIRE) {
 			return SaTokenDao.NEVER_EXPIRE;
 		}
-		// ---- 计算剩余时间并返回 
+
+		// ---- 代码至此，说明这个 key 是有过期时间的，且未过期，那么：
+
+		// 计算剩余时间并返回 （过期时间戳 - 当前时间戳） / 1000 转秒
 		long timeout = (expire - System.currentTimeMillis()) / 1000;
+
 		// 小于零时，视为不存在 
 		if(timeout < 0) {
 			dataMap.remove(key);
@@ -164,12 +186,11 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 		}
 		return timeout;
 	}
-	
-	
-	// --------------------- 定时清理过期数据  
+
+	// --------- 定时清理过期数据
 	
 	/**
-	 * 执行数据清理的线程
+	 * 执行数据清理的线程引用
 	 */
 	public Thread refreshThread;
 	
@@ -177,10 +198,9 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 	 * 是否继续执行数据清理的线程标记
 	 */
 	public volatile boolean refreshFlag;
-	
 
 	/**
-	 * 清理所有已经过期的key 
+	 * 清理所有已经过期的 key
 	 */
 	public void refreshDataMap() {
 		Iterator<String> keys = expireMap.keySet().iterator();
@@ -190,14 +210,15 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 	}
 	
 	/**
-	 * 初始化定时任务 
+	 * 初始化定时任务，定时清理过期数据
 	 */
 	public void initRefreshThread() {
 
-		// 如果配置了<=0的值，则不启动定时清理
+		// 如果开发者配置了 <=0 的值，则不启动定时清理
 		if(SaManager.getConfig().getDataRefreshPeriod() <= 0) {
 			return;
 		}
+
 		// 启动定时刷新
 		this.refreshFlag = true;
 		this.refreshThread = new Thread(() -> {
@@ -228,27 +249,10 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 	}
 	
 	/**
-	 * 结束定时任务
+	 * 结束定时任务，不再定时清理过期数据
 	 */
 	public void endRefreshThread() {
 		this.refreshFlag = false;
 	}
 
-
-	
-
-	// --------------------- 会话管理 
-	
-	@Override
-	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
-		return SaFoxUtil.searchList(expireMap.keySet(), prefix, keyword, start, size, sortType);
-	}
-
-
-	
-
-
-	
-	
-	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
index d1d1831c..30031ed3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
@@ -3,167 +3,166 @@ package cn.dev33.satoken.error;
 /**
  * 定义所有异常细分状态码 
  * 
- * @author kong
- * @since: 2022-10-30
+ * @author click33
+ * @since 2022-10-30
  */
 public interface SaErrorCode {
 	
 	/** 代表这个异常在抛出时未指定异常细分状态码 */
-	public static final int CODE_UNDEFINED = -1;
+	int CODE_UNDEFINED = -1;
 
 	// ------------ 
 	
 	/** 未能获取有效的上下文处理器 */
-	public static final int CODE_10001 = 10001;
+	int CODE_10001 = 10001;
 
 	/** 未能获取有效的上下文 */
-	public static final int CODE_10002 = 10002;
+	int CODE_10002 = 10002;
 
 	/** JSON 转换器未实现 */
-	public static final int CODE_10003 = 10003;
+	int CODE_10003 = 10003;
 
 	/** 未能从全局 StpLogic 集合中找到对应 type 的 StpLogic */
-	public static final int CODE_10011 = 10011;
+	int CODE_10011 = 10011;
 
 	/** 指定的配置文件加载失败 */
-	public static final int CODE_10021 = 10021;
+	int CODE_10021 = 10021;
 
 	/** 配置文件属性无法正常读取 */
-	public static final int CODE_10022 = 10022;
+	int CODE_10022 = 10022;
 
 	/** 重置的侦听器集合不可以为空 */
-	public static final int CODE_10031 = 10031;
+	int CODE_10031 = 10031;
 
 	/** 注册的侦听器不可以为空 */
-	public static final int CODE_10032 = 10032;
+	int CODE_10032 = 10032;
 
 	// 1030x core模块
 
 	/** 提供的 Same-Token 是无效的 */
-	public static final int CODE_10301 = 10301;
+	int CODE_10301 = 10301;
 
 	/** 表示未能通过 Http Basic 认证校验 */
-	public static final int CODE_10311 = 10311;
+	int CODE_10311 = 10311;
 
 	/** 提供的 HttpMethod 是无效的 */
-	public static final int CODE_10321 = 10321;
+	int CODE_10321 = 10321;
 
 	// 1100x StpLogic
 
 	/** 未能读取到有效Token */
-	public static final int CODE_11001 = 11001;
+	int CODE_11001 = 11001;
 
 	/** 登录时的账号id值为空 */
-	public static final int CODE_11002 = 11002;
+	int CODE_11002 = 11002;
 
 	/** 更改 Token 指向的 账号Id 时，账号Id值为空 */
-	public static final int CODE_11003 = 11003;
+	int CODE_11003 = 11003;
 
 	/** 未能读取到有效Token */
-	public static final int CODE_11011 = 11011;
+	int CODE_11011 = 11011;
 	
 	/** Token无效 */
-	public static final int CODE_11012 = 11012;
+	int CODE_11012 = 11012;
 
 	/** Token已过期 */
-	public static final int CODE_11013 = 11013;
+	int CODE_11013 = 11013;
 	
 	/** Token已被顶下线 */
-	public static final int CODE_11014 = 11014;
+	int CODE_11014 = 11014;
 
 	/** Token已被踢下线 */
-	public static final int CODE_11015 = 11015;
+	int CODE_11015 = 11015;
 
 	/** Token已临时过期 */
-	public static final int CODE_11016 = 11016;
+	int CODE_11016 = 11016;
 	
 	/** 在未集成 sa-token-jwt 插件时调用 getExtra() 抛出异常 */
-	public static final int CODE_11031 = 11031;
+	int CODE_11031 = 11031;
 
 	/** 缺少指定的角色 */
-	public static final int CODE_11041 = 11041;
+	int CODE_11041 = 11041;
 
 	/** 缺少指定的权限 */
-	public static final int CODE_11051 = 11051;
+	int CODE_11051 = 11051;
 
 	/** 当前账号未通过服务封禁校验 */
-	public static final int CODE_11061 = 11061;
+	int CODE_11061 = 11061;
 
 	/** 提供要解禁的账号无效 */
-	public static final int CODE_11062 = 11062;
+	int CODE_11062 = 11062;
 
 	/** 提供要解禁的服务无效 */
-	public static final int CODE_11063 = 11063;
+	int CODE_11063 = 11063;
 
 	/** 提供要解禁的等级无效 */
-	public static final int CODE_11064 = 11064;
+	int CODE_11064 = 11064;
 
 	/** 二级认证校验未通过 */
-	public static final int CODE_11071 = 11071;
-	
-	
+	int CODE_11071 = 11071;
 	
+
 	// ------------ 
 	
 	/** 请求中缺少指定的参数 */
-	public static final int CODE_12001 = 12001;
+	int CODE_12001 = 12001;
 
 	/** 构建 Cookie 时缺少 name 参数 */
-	public static final int CODE_12002 = 12002;
+	int CODE_12002 = 12002;
 
 	/** 构建 Cookie 时缺少 value 参数 */
-	public static final int CODE_12003 = 12003;
+	int CODE_12003 = 12003;
 
 	// ------------ 
 
 	/** Base64 编码异常 */
-	public static final int CODE_12101 = 12101;
+	int CODE_12101 = 12101;
 
 	/** Base64 解码异常 */
-	public static final int CODE_12102 = 12102;
+	int CODE_12102 = 12102;
 
 	/** URL 编码异常 */
-	public static final int CODE_12103 = 12103;
+	int CODE_12103 = 12103;
 
 	/** URL 解码异常 */
-	public static final int CODE_12104 = 12104;
+	int CODE_12104 = 12104;
 
 	/** md5 加密异常 */
-	public static final int CODE_12111 = 12111;
+	int CODE_12111 = 12111;
 
 	/** sha1 加密异常 */
-	public static final int CODE_12112 = 12112;
+	int CODE_12112 = 12112;
 
 	/** sha256 加密异常 */
-	public static final int CODE_12113 = 12113;
+	int CODE_12113 = 12113;
 
 	/** AES 加密异常 */
-	public static final int CODE_12114 = 12114;
+	int CODE_12114 = 12114;
 
 	/** AES 解密异常 */
-	public static final int CODE_12115 = 12115;
+	int CODE_12115 = 12115;
 
 	/** RSA 公钥加密异常 */
-	public static final int CODE_12116 = 12116;
+	int CODE_12116 = 12116;
 
 	/** RSA 私钥加密异常 */
-	public static final int CODE_12117 = 12117;
+	int CODE_12117 = 12117;
 
 	/** RSA 公钥解密异常 */
-	public static final int CODE_12118 = 12118;
+	int CODE_12118 = 12118;
 
 	/** RSA 私钥解密异常 */
-	public static final int CODE_12119 = 12119;
+	int CODE_12119 = 12119;
 
 	// ------------ 
 
 	/** 参与参数签名的秘钥不可为空 */
-	public static final int CODE_12201 = 12201;
+	int CODE_12201 = 12201;
 
 	/** 给定的签名无效 */
-	public static final int CODE_12202 = 12202;
+	int CODE_12202 = 12202;
 
 	/** timestamp 超出允许的范围 */
-	public static final int CODE_12203 = 12203;
+	int CODE_12203 = 12203;
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
index 052a456d..83a315e9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
@@ -1,8 +1,12 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表 API 已被禁用 
- * @author kong
+ * 一个异常：代表 API 已被禁用
+ *
+ * <p> 一般在 API 不合适调用的时候抛出，例如在集成 jwt 模块后调用数据持久化相关方法 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class ApiDisabledException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
index b978bea0..28b1f74c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表停止匹配，直接退出，向前端输出结果 
+ * 一个异常：代表停止匹配，直接退出，向前端输出结果 （框架内部专属异常，一般情况下开发者无需关注）
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public class BackResultException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
index 535f033c..e5c062c8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表指定账号指定服务已被封禁 
+ * 一个异常：代表指定账号的指定服务已被封禁
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public class DisableServiceException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java
deleted file mode 100644
index 543274a6..00000000
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/IdTokenInvalidException.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package cn.dev33.satoken.exception;
-
-/**
- * <h1> 本类设计已过时，未来版本可能移除此类，请及时更换为 SameTokenInvalidException ，使用方式保持不变 </h1>
- * 一个异常：代表提供的 Id-Token 无效 
- * 
- * @author kong
- */
-@Deprecated
-public class IdTokenInvalidException extends SaTokenException {
-
-	/**
-	 * 序列化版本号
-	 */
-	private static final long serialVersionUID = 6806129545290130144L;
-	
-	/**
-	 * 一个异常：代表提供的 Id-Token 无效 
-	 * @param message 异常描述 
-	 */
-	public IdTokenInvalidException(String message) {
-		super(message);
-	}
-
-}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
index 54450698..1c046b85 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
@@ -1,9 +1,9 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表未能获取有效的上下文
+ * 一个异常：代表框架未能获取有效的上下文
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-29
  */
 public class InvalidContextException extends SaTokenException {
@@ -14,7 +14,7 @@ public class InvalidContextException extends SaTokenException {
 	private static final long serialVersionUID = 6806129545290130144L;
 
 	/**
-	 * 一个异常：代表未能获取有效的上下文
+	 * 一个异常：代表框架未能获取有效的上下文
 	 * @param message 异常描述 
 	 */
 	public InvalidContextException(String message) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
index bbbd5ee9..b5c5aebb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
@@ -1,8 +1,10 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表会话未能通过 Http Basic 认证 
- * @author kong
+ * 一个异常：代表会话未能通过 Http Basic 认证校验
+ *
+ * @author click33
+ * @since 2022-10-29
  */
 public class NotBasicAuthException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
index 3778ef28..66cea87d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.exception;
 /**
  * 一个异常：代表组件或方法未被提供有效的实现
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-30
  */
 public class NotImplException extends SaTokenException {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
index 751b245c..c8ca5d58 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
@@ -6,8 +6,10 @@ import java.util.List;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * 一个异常：代表会话未能通过登录认证 
- * @author kong 
+ * 一个异常：代表会话未能通过登录认证校验
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class NotLoginException extends SaTokenException {
 	
@@ -26,23 +28,23 @@ public class NotLoginException extends SaTokenException {
 	
 	/** 表示未提供token */
 	public static final String NOT_TOKEN = "-1";
-	public static final String NOT_TOKEN_MESSAGE = "未能读取到有效Token";
+	public static final String NOT_TOKEN_MESSAGE = "未能读取到有效 token";
 	
 	/** 表示token无效 */
 	public static final String INVALID_TOKEN = "-2";
-	public static final String INVALID_TOKEN_MESSAGE = "Token无效";
+	public static final String INVALID_TOKEN_MESSAGE = "token 无效";
 	
 	/** 表示token已过期 */
 	public static final String TOKEN_TIMEOUT = "-3";
-	public static final String TOKEN_TIMEOUT_MESSAGE = "Token已过期";
+	public static final String TOKEN_TIMEOUT_MESSAGE = "token 已过期";
 	
 	/** 表示token已被顶下线 */
 	public static final String BE_REPLACED = "-4";
-	public static final String BE_REPLACED_MESSAGE = "Token已被顶下线";
+	public static final String BE_REPLACED_MESSAGE = "token 已被顶下线";
 	
 	/** 表示token已被踢下线 */
 	public static final String KICK_OUT = "-5";
-	public static final String KICK_OUT_MESSAGE = "Token已被踢下线";
+	public static final String KICK_OUT_MESSAGE = "token 已被踢下线";
 
 	/** 默认的提示语 */
 	public static final String DEFAULT_MESSAGE = "当前会话未登录";
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
index de8a29b6..223134c3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
@@ -3,10 +3,10 @@ package cn.dev33.satoken.exception;
 import cn.dev33.satoken.stp.StpUtil;
 
 /**
- * 一个异常：代表会话未能通过权限认证 
+ * 一个异常：代表会话未能通过权限认证校验
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class NotPermissionException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
index 59d773d1..fc95022e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
@@ -3,10 +3,10 @@ package cn.dev33.satoken.exception;
 import cn.dev33.satoken.stp.StpUtil;
 
 /**
- * 一个异常：代表会话未能通过角色认证 
+ * 一个异常：代表会话未能通过角色认证校验
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class NotRoleException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
index 1b1d2abc..96ab669e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
@@ -3,7 +3,8 @@ package cn.dev33.satoken.exception;
 /**
  * 一个异常：代表会话未能通过二级认证校验 
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public class NotSafeException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
index 5241444d..9261f785 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
@@ -1,9 +1,9 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表不是 Web 上下文 
+ * 一个异常：代表当前不是 Web 上下文，无法调用某个 API
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-29
  */
 public class NotWebContextException extends SaTokenException {
@@ -14,7 +14,7 @@ public class NotWebContextException extends SaTokenException {
 	private static final long serialVersionUID = 6806129545290130144L;
 
 	/**
-	 * 一个异常：代表不是 Web 上下文
+	 * 一个异常：代表当前不是 Web 上下文，无法调用某个 API
 	 * @param message 异常描述 
 	 */
 	public NotWebContextException(String message) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
index 9c4526e9..6102a146 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
@@ -3,7 +3,8 @@ package cn.dev33.satoken.exception;
 /**
  * 一个异常：代表 JSON 转换失败 
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaJsonConvertException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
index 491bed46..8a120d3a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * 一个异常：代表 API 参数签名校验失败
  * 
- * @author kong
+ * @author click33
  * @since 2023-5-3
  */
 public class SaSignException extends SaTokenException {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
index 4e3cabf9..a18292f4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
@@ -4,11 +4,12 @@ import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token框架内部逻辑发生错误抛出的异常 
- * (自定义此异常方便开发者在做全局异常处理时分辨异常类型)
- * 
- * @author kong
+ * Sa-Token 框架内部逻辑发生错误抛出的异常
  *
+ * <p> 框架其它异常均继承自此类，开发者可通过捕获此异常来捕获框架内部抛出的所有异常 </p>
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenException extends RuntimeException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
index 160cbf3a..791bb1a0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
@@ -1,9 +1,9 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表提供的 Same-Token 无效 
+ * 一个异常：代表 Same-Token 校验未通过
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-24
  */
 public class SameTokenInvalidException extends SaTokenException {
@@ -14,7 +14,7 @@ public class SameTokenInvalidException extends SaTokenException {
 	private static final long serialVersionUID = 6806129545290130144L;
 	
 	/**
-	 * 一个异常：代表提供的 Same-Token 无效 
+	 * 一个异常：代表 Same-Token 校验未通过
 	 * @param message 异常描述 
 	 */
 	public SameTokenInvalidException(String message) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
index 2fa4366f..f7795cfb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.exception;
 
 /**
- * 一个异常：代表停止路由匹配，进入Controller 
+ * 一个异常：代表停止路由匹配，进入 Controller （框架内部专属异常，一般情况下开发者无需关注）
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public class StopMatchException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
index 65774195..a8cbb239 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
@@ -19,28 +19,28 @@ public interface SaFilter {
      * @param paths 路由
      * @return 对象自身
      */
-    public SaFilter addInclude(String... paths);
+    SaFilter addInclude(String... paths);
 
     /**
      * 添加 [ 放行路由 ]
      * @param paths 路由
      * @return 对象自身
      */
-    public SaFilter addExclude(String... paths);
+    SaFilter addExclude(String... paths);
 
     /**
      * 写入 [ 拦截路由 ] 集合
      * @param pathList 路由集合
      * @return 对象自身
      */
-    public SaFilter setIncludeList(List<String> pathList);
+    SaFilter setIncludeList(List<String> pathList);
 
     /**
      * 写入 [ 放行路由 ] 集合
      * @param pathList 路由集合
      * @return 对象自身
      */
-    public SaFilter setExcludeList(List<String> pathList);
+    SaFilter setExcludeList(List<String> pathList);
 
 
     // ------------------------ 钩子函数
@@ -50,14 +50,14 @@ public interface SaFilter {
      * @param auth see note
      * @return 对象自身
      */
-    public SaFilter setAuth(SaFilterAuthStrategy auth);
+    SaFilter setAuth(SaFilterAuthStrategy auth);
 
     /**
      * 写入[ 异常处理函数 ]：每次[ 认证函数 ]发生异常时执行此函数
      * @param error see note
      * @return 对象自身
      */
-    public SaFilter setError(SaFilterErrorStrategy error);
+    SaFilter setError(SaFilterErrorStrategy error);
 
     /**
      * 写入[ 前置函数 ]：在每次[ 认证函数 ]之前执行。
@@ -65,6 +65,6 @@ public interface SaFilter {
      * @param beforeAuth /
      * @return 对象自身
      */
-    public SaFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth);
+    SaFilter setBeforeAuth(SaFilterAuthStrategy beforeAuth);
 
 }
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
index 1873d5f0..f4145f5a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
@@ -1,16 +1,18 @@
 package cn.dev33.satoken.filter;
 
 /**
- * Sa-Token全局过滤器-认证策略
- * @author kong
+ * Sa-Token 全局过滤器 - 认证策略封装，方便 lambda 表达式风格调用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
+@FunctionalInterface
 public interface SaFilterAuthStrategy {
 	
 	/**
 	 * 执行方法 
-	 * @param r 无含义参数，留作扩展 
+	 * @param obj 无含义参数，留作扩展
 	 */
-	public void run(Object r);
+	void run(Object obj);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
index b1fff413..76a3b69a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
@@ -1,17 +1,21 @@
 package cn.dev33.satoken.filter;
 
 /**
- * Sa-Token全局过滤器-异常处理策略
- * @author kong
+ * Sa-Token 全局过滤器 - 异常处理策略封装，方便 lambda 表达式风格调用
  *
+ * <p> 此方法的返回值将在 toString() 后返回给前端，如果你要返回 JSON 数据，需要在返回前自行序列化为 JSON 字符串 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
+@FunctionalInterface
 public interface SaFilterErrorStrategy {
 	
 	/**
 	 * 执行方法 
 	 * @param e 异常对象
-	 * @return 输出对象(请提前序列化)
+	 * @return 输出对象，此返回值将在 toString() 后返回给前端，如果你要返回 JSON 数据，需要在返回前自行序列化为 JSON 字符串
 	 */
-	public Object run(Throwable e);
+	Object run(Throwable e);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
index 7d611a64..8829edcd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
@@ -1,10 +1,10 @@
 package cn.dev33.satoken.fun;
 
 /**
- * 根据Boolean变量，决定是否执行一个函数
+ * lambda 表达式辅助封装：根据 Boolean 变量，决定是否执行一个函数
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class IsRunFunction {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
index e8ad5e5d..65c0336d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
@@ -1,10 +1,10 @@
 package cn.dev33.satoken.fun;
 
 /**
- * 设定一个函数，方便在Lambda表达式下的函数式编程
+ * 无形参、无返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 @FunctionalInterface
 public interface SaFunction {
@@ -12,6 +12,6 @@ public interface SaFunction {
 	/**
 	 * 执行的方法
 	 */
-	public void run();
+	void run();
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
index 76f4cc6d..131a2812 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
@@ -4,7 +4,7 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
- * 生成唯一式 token 的方法签名
+ * 生成唯一式 token 的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
  * @author click33
  * @since 2023/4/30
@@ -21,7 +21,7 @@ public interface SaGenerateUniqueTokenFunction {
      * @param checkTokenFunction 校验 token 是否唯一的函数（返回 true 表示唯一，可用）
      * @return 最终生成的唯一式 token
      */
-    public String execute(
+    String execute(
             String elementName,
             int maxTryTimes,
             Supplier<String> createTokenFunction,
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
index 52442204..2197c549 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.fun;
 
 /**
- * 设定一个函数，并传入一个参数，方便在Lambda表达式下的函数式编程
- * @author kong
+ * 单形参、无返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @FunctionalInterface
 public interface SaParamFunction<T> {
@@ -12,6 +13,6 @@ public interface SaParamFunction<T> {
 	 * 执行的方法 
 	 * @param r 传入的参数 
 	 */
-	public void run(T r);
+	void run(T r);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
index 2e0536ff..b6b9af34 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.fun;
 
 /**
- * 设定一个函数，传入一个参数，并返回一个值，方便在Lambda表达式下的函数式编程
- * @author kong
+ * 单形参、有返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @FunctionalInterface
 public interface SaParamRetFunction<T, R> {
@@ -13,6 +14,6 @@ public interface SaParamRetFunction<T, R> {
 	 * @param param 传入的参数 
 	 * @return 返回值 
 	 */
-	public R run(T param);
+	R run(T param);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
index 58cc7ea3..132cb206 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.fun;
 
 /**
- * 设定一个函数，并返回一个值，方便在Lambda表达式下的函数式编程
- * @author kong
+ * 无形参、有返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @FunctionalInterface
 public interface SaRetFunction {
@@ -12,6 +13,6 @@ public interface SaRetFunction {
 	 * 执行的方法 
 	 * @return 返回值 
 	 */
-	public Object run();
+	Object run();
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
new file mode 100644
index 00000000..1e048376
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
@@ -0,0 +1,24 @@
+package cn.dev33.satoken.fun;
+
+import cn.dev33.satoken.context.model.SaRequest;
+import cn.dev33.satoken.context.model.SaResponse;
+
+/**
+ * 路由拦截器验证方法的函数式接口，方便开发者进行 lambda 表达式风格调用
+ * 
+ * @author click33
+ * @since <= 1.34.0
+ */
+@FunctionalInterface
+public interface SaRouteFunction {
+
+	/**
+	 * 执行验证的方法
+	 * 
+	 * @param request  Request 包装对象
+	 * @param response Response 包装对象
+	 * @param handler  处理对象
+	 */
+	void run(SaRequest request, SaResponse response, Object handler);
+
+}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
index 5ad60d17..9869a66b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
@@ -5,24 +5,24 @@ import java.util.Map;
 /**
  * JSON 转换器 
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaJsonTemplate {
 
 	/**
-	 * 将任意对象转换为 json 字符串
+	 * 将任意对象序列化为 json 字符串
 	 *
 	 * @param obj 对象
 	 * @return 转换后的 json 字符串
 	 */
-	public String toJsonString(Object obj);
+	String toJsonString(Object obj);
 
 	/**
-	 * 解析 json 字符串为map对象 
-	 * @param jsonStr json字符串 
-	 * @return map对象
+	 * 解析 json 字符串为 map 对象
+	 * @param jsonStr json 字符串
+	 * @return map 对象
 	 */
-	public Map<String, Object> parseJsonToMap(String jsonStr);
+	Map<String, Object> parseJsonToMap(String jsonStr);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
index 67f0de0f..1f44e463 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
@@ -6,26 +6,22 @@ import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.NotImplException;
 
 /**
- * JSON 相关操作接口 
- * 
- * @author kong
+ * JSON 转换器，默认实现类
  *
+ * <p> 如果代码断点走到了此默认实现类，说明框架没有注入有效的 JSON 转换器，需要开发者自行实现并注入 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaJsonTemplateDefaultImpl implements SaJsonTemplate {
 
 	public static final String ERROR_MESSAGE = "未实现具体的 json 转换器";
-	
-	/**
-	 * 将任意对象转换为 json 字符串 
-	 */
+
 	@Override
 	public String toJsonString(Object obj) {
 		throw new NotImplException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10003);
 	}
-	
-	/**
-	 * 将 json 字符串解析为 Map 
-	 */
+
 	@Override
 	public Map<String, Object> parseJsonToMap(String jsonStr) {
 		throw new NotImplException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10003);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
index 4bb1890a..ac434e7a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
@@ -11,8 +11,10 @@ import cn.dev33.satoken.stp.StpLogic;
 
 /**
  * Sa-Token 事件中心 事件发布器
+ *
+ * <p> 提供侦听器注册、事件发布能力 </p>
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-19
  */
 public class SaTokenEventCenter {
@@ -127,7 +129,7 @@ public class SaTokenEventCenter {
 	// --------- 事件发布 
 	
 	/**
-	 * 每次登录时触发 
+	 * 事件发布：xx 账号登录
 	 * @param loginType 账号类别
 	 * @param loginId 账号id
 	 * @param tokenValue 本次登录产生的 token 值 
@@ -140,7 +142,7 @@ public class SaTokenEventCenter {
 	}
 			
 	/**
-	 * 每次注销时触发 
+	 * 事件发布：xx 账号注销
 	 * @param loginType 账号类别
 	 * @param loginId 账号id
 	 * @param tokenValue token值
@@ -152,7 +154,7 @@ public class SaTokenEventCenter {
 	}
 	
 	/**
-	 * 每次被踢下线时触发 
+	 * 事件发布：xx 账号被踢下线
 	 * @param loginType 账号类别 
 	 * @param loginId 账号id 
 	 * @param tokenValue token值 
@@ -164,7 +166,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 每次被顶下线时触发
+	 * 事件发布：xx 账号被顶下线
 	 * @param loginType 账号类别
 	 * @param loginId 账号id
 	 * @param tokenValue token值
@@ -176,7 +178,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 每次被封禁时触发
+	 * 事件发布：xx 账号被封禁
 	 * @param loginType 账号类别
 	 * @param loginId 账号id
 	 * @param service 指定服务 
@@ -190,7 +192,7 @@ public class SaTokenEventCenter {
 	}
 	
 	/**
-	 * 每次被解封时触发
+	 * 事件发布：xx 账号被解封
 	 * @param loginType 账号类别
 	 * @param loginId 账号id
 	 * @param service 指定服务 
@@ -202,7 +204,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 每次打开二级认证时触发
+	 * 事件发布：xx 账号完成二级认证
 	 * @param loginType 账号类别
 	 * @param tokenValue token值
 	 * @param service 指定服务 
@@ -215,7 +217,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 每次关闭二级认证时触发
+	 * 事件发布：xx 账号关闭二级认证
 	 * @param loginType 账号类别
 	 * @param service 指定服务 
 	 * @param tokenValue token值
@@ -227,7 +229,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 每次创建Session时触发
+	 * 事件发布：创建了一个新的 SaSession
 	 * @param id SessionId
 	 */
 	public static void doCreateSession(String id) {
@@ -237,7 +239,7 @@ public class SaTokenEventCenter {
 	}
 	
 	/**
-	 * 每次注销Session时触发
+	 * 事件发布：一个 SaSession 注销了
 	 * @param id SessionId
 	 */
 	public static void doLogoutSession(String id) {
@@ -247,7 +249,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 每次Token续期时触发
+	 * 事件发布：指定 Token 续期成功
 	 * 
 	 * @param tokenValue token 值 
 	 * @param loginId 账号id 
@@ -259,9 +261,8 @@ public class SaTokenEventCenter {
 		}
 	}
 
-	
 	/**
-	 * 全局组件载入 
+	 * 事件发布：有新的全局组件载入到框架中
 	 * @param compName 组件名称
 	 * @param compObj 组件对象
 	 */
@@ -272,7 +273,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * StpLogic 对象替换 
+	 * 事件发布：有新的 StpLogic 载入到框架中
 	 * @param stpLogic / 
 	 */
 	public static void doSetStpLogic(StpLogic stpLogic) {
@@ -282,7 +283,7 @@ public class SaTokenEventCenter {
 	}
 
 	/**
-	 * 载入全局配置 
+	 * 事件发布：有新的全局配置载入到框架中
 	 * @param config / 
 	 */
 	public static void doSetConfig(SaTokenConfig config) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
index 6cb6ffe8..fdc9d034 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
@@ -6,9 +6,11 @@ import cn.dev33.satoken.stp.StpLogic;
 
 /**
  * Sa-Token 侦听器
- * <p> 你可以通过实现此接口在用户登陆、退出等关键性操作时进行一些AOP操作 
- * @author kong
  *
+ * <p> 你可以通过实现此接口在用户登录、退出等关键性操作时进行一些AOP切面操作 </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaTokenListener {
 
@@ -19,7 +21,7 @@ public interface SaTokenListener {
 	 * @param tokenValue 本次登录产生的 token 值 
 	 * @param loginModel 登录参数
 	 */
-	public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel);
+	void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel);
 			
 	/**
 	 * 每次注销时触发 
@@ -27,7 +29,7 @@ public interface SaTokenListener {
 	 * @param loginId 账号id
 	 * @param tokenValue token值
 	 */
-	public void doLogout(String loginType, Object loginId, String tokenValue);
+	void doLogout(String loginType, Object loginId, String tokenValue);
 	
 	/**
 	 * 每次被踢下线时触发 
@@ -35,7 +37,7 @@ public interface SaTokenListener {
 	 * @param loginId 账号id 
 	 * @param tokenValue token值 
 	 */
-	public void doKickout(String loginType, Object loginId, String tokenValue);
+	void doKickout(String loginType, Object loginId, String tokenValue);
 
 	/**
 	 * 每次被顶下线时触发
@@ -43,7 +45,7 @@ public interface SaTokenListener {
 	 * @param loginId 账号id
 	 * @param tokenValue token值
 	 */
-	public void doReplaced(String loginType, Object loginId, String tokenValue);
+	void doReplaced(String loginType, Object loginId, String tokenValue);
 
 	/**
 	 * 每次被封禁时触发
@@ -53,7 +55,7 @@ public interface SaTokenListener {
 	 * @param level 封禁等级 
 	 * @param disableTime 封禁时长，单位: 秒
 	 */
-	public void doDisable(String loginType, Object loginId, String service, int level, long disableTime);
+	void doDisable(String loginType, Object loginId, String service, int level, long disableTime);
 	
 	/**
 	 * 每次被解封时触发
@@ -61,7 +63,7 @@ public interface SaTokenListener {
 	 * @param loginId 账号id
 	 * @param service 指定服务 
 	 */
-	public void doUntieDisable(String loginType, Object loginId, String service);
+	void doUntieDisable(String loginType, Object loginId, String service);
 
 	/**
 	 * 每次打开二级认证时触发
@@ -70,7 +72,7 @@ public interface SaTokenListener {
 	 * @param service 指定服务 
 	 * @param safeTime 认证时间，单位：秒 
 	 */
-	public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime);
+	void doOpenSafe(String loginType, String tokenValue, String service, long safeTime);
 
 	/**
 	 * 每次关闭二级认证时触发
@@ -78,46 +80,46 @@ public interface SaTokenListener {
 	 * @param tokenValue token值
 	 * @param service 指定服务 
 	 */
-	public void doCloseSafe(String loginType, String tokenValue, String service);
+	void doCloseSafe(String loginType, String tokenValue, String service);
 
 	/**
-	 * 每次创建Session时触发
+	 * 每次创建 SaSession 时触发
 	 * @param id SessionId
 	 */
-	public void doCreateSession(String id);
+	void doCreateSession(String id);
 	
 	/**
-	 * 每次注销Session时触发
+	 * 每次注销 SaSession 时触发
 	 * @param id SessionId
 	 */
-	public void doLogoutSession(String id);
+	void doLogoutSession(String id);
 
 	/**
-	 * 每次Token续期时触发 
+	 * 每次 Token 续期时触发（注意：是 timeout 续期，而不是 activity-timeout 续期）
 	 * 
 	 * @param tokenValue token 值 
 	 * @param loginId 账号id 
 	 * @param timeout 续期时间 
 	 */
-	public void doRenewTimeout(String tokenValue,  Object loginId, long timeout);
+	void doRenewTimeout(String tokenValue,  Object loginId, long timeout);
 
 	/**
 	 * 全局组件载入 
 	 * @param compName 组件名称
 	 * @param compObj 组件对象
 	 */
-	public default void doRegisterComponent(String compName, Object compObj) {}
+	default void doRegisterComponent(String compName, Object compObj) {}
 
 	/**
 	 * StpLogic 对象替换 
 	 * @param stpLogic / 
 	 */
-	public default void doSetStpLogic(StpLogic stpLogic) {}
+	default void doSetStpLogic(StpLogic stpLogic) {}
 
 	/**
 	 * 载入全局配置 
 	 * @param config / 
 	 */
-	public default void doSetConfig(SaTokenConfig config) {}
+	default void doSetConfig(SaTokenConfig config) {}
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
index 8b763056..d88950c6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
@@ -8,9 +8,9 @@ import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 侦听器实现：Log 打印 
+ * Sa-Token 侦听器的一个实现：Log 打印
  * 
- * @author kong
+ * @author click33
  * @since 2022-11-2
  */
 public class SaTokenListenerForLog implements SaTokenListener {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
index 21cb87b4..ba7507b0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
@@ -5,9 +5,9 @@ import cn.dev33.satoken.stp.SaLoginModel;
 /**
  * Sa-Token 侦听器，默认空实现 
  * 
- * <p> 对所有事件方法提供空实现，方便开发者通过继承此类快速实现一个可用的侦听器 
+ * <p> 对所有事件方法提供空实现，方便开发者通过继承此类快速实现一个可用的侦听器 </p>
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-20
  */
 public class SaTokenListenerForSimple implements SaTokenListener {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
index 769bcef8..820d933f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.log;
 /**
  * Sa-Token 日志输出接口
  * 
- * @author kong
+ * @author click33
  * @since 2022-11-1
  */
 public interface SaLog {
@@ -13,41 +13,41 @@ public interface SaLog {
      * @param str 日志内容
      * @param args 参数列表
      */
-    public void trace(String str, Object ...args);
+    void trace(String str, Object ...args);
 
     /**
      * 输出 debug 日志 
      * @param str 日志内容
      * @param args 参数列表
      */
-    public void debug(String str, Object ...args);
+    void debug(String str, Object ...args);
 
     /**
      * 输出 info 日志 
      * @param str 日志内容
      * @param args 参数列表
      */
-    public void info(String str, Object ...args);
+    void info(String str, Object ...args);
 
     /**
      * 输出 warn 日志 
      * @param str 日志内容
      * @param args 参数列表
      */
-    public void warn(String str, Object ...args);
+    void warn(String str, Object ...args);
 
     /**
      * 输出 error 日志 
      * @param str 日志内容
      * @param args 参数列表
      */
-    public void error(String str, Object ...args);
+    void error(String str, Object ...args);
 
     /**
      * 输出 fatal 日志 
      * @param str 日志内容
      * @param args 参数列表
      */
-    public void fatal(String str, Object ...args);
+    void fatal(String str, Object ...args);
     
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
index 837a92e9..8aae35ae 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
@@ -5,18 +5,13 @@ import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.util.StrFormatter;
 
 /**
- * Sa-Token 日志实现类 [控制台打印] 
+ * Sa-Token 日志实现类 [ 控制台打印 ]
  * 
- * @author kong
+ * @author click33
  * @since 2022-11-1
  */
 public class SaLogForConsole implements SaLog {
 
-	/**
-	 * 日志输出的前缀
-	 */
-	public static String LOG_PREFIX = "SaLog -->: ";
-	
 	/**
 	 * 日志等级 
 	 */
@@ -26,48 +21,107 @@ public class SaLogForConsole implements SaLog {
 	public static final int warn = 4;
 	public static final int error = 5;
 	public static final int fatal = 6;
-	
+
+	/**
+	 * 日志输出的前缀
+	 */
+	public static String LOG_PREFIX = "SaLog -->: ";
+	public static String TRACE_PREFIX = "SA [TRACE]-->: ";
+	public static String DEBUG_PREFIX = "SA [DEBUG]-->: ";
+	public static String INFO_PREFIX  = "SA [INFO] -->: ";
+	public static String WARN_PREFIX  = "SA [WARN] -->: ";
+	public static String ERROR_PREFIX = "SA [ERROR]-->: ";
+	public static String FATAL_PREFIX = "SA [FATAL]-->: ";
+
+	/**
+	 * 日志输出的颜色
+	 */
+	public static String TRACE_COLOR = "\033[39m";
+	public static String DEBUG_COLOR = "\033[34m";
+	public static String INFO_COLOR  = "\033[32m";
+	public static String WARN_COLOR  = "\033[33m";
+	public static String ERROR_COLOR = "\033[31m";
+	public static String FATAL_COLOR = "\033[35m";
+
+	public static String DEFAULT_COLOR = "\033[39m";
+
 	@Override
 	public void trace(String str, Object... args) {
-		println(trace, str, args);
+		println(trace, TRACE_COLOR, TRACE_PREFIX, str, args);
 	}
 
 	@Override
 	public void debug(String str, Object... args) {
-		println(debug, str, args);
+		println(debug, DEBUG_COLOR, DEBUG_PREFIX, str, args);
 	}
 
 	@Override
 	public void info(String str, Object... args) {
-		println(info, str, args);
+		println(info, INFO_COLOR, INFO_PREFIX, str, args);
 	}
 
 	@Override
 	public void warn(String str, Object... args) {
-		println(warn, str, args);
+		println(warn, WARN_COLOR, WARN_PREFIX, str, args);
 	}
 
 	@Override
 	public void error(String str, Object... args) {
-		println(error, str, args);
+		println(error, ERROR_COLOR, ERROR_PREFIX, str, args);
 	}
 
 	@Override
 	public void fatal(String str, Object... args) {
-		println(fatal, str, args);
+		println(fatal, FATAL_COLOR, FATAL_PREFIX, str, args);
 	}
 
 	/**
 	 * 打印日志到控制台 
-	 * @param level 日志等级 
+	 * @param level 日志等级
+	 * @param color 颜色编码
+	 * @param prefix 前缀
 	 * @param str 字符串
 	 * @param args 参数列表 
 	 */
-	public void println(int level, String str, Object... args) {
+	public void println(int level, String color, String prefix, String str, Object... args) {
 		SaTokenConfig config = SaManager.getConfig();
 		if(config.getIsLog() && level >= config.getLogLevelInt()) {
-			System.out.println(LOG_PREFIX + StrFormatter.format(str, args));
+			if(config.getIsColorLog() == Boolean.TRUE) {
+				// 彩色日志
+				System.out.println(color + prefix + StrFormatter.format(str, args) + DEFAULT_COLOR);
+			} else {
+				// 黑白日志
+				System.out.println(prefix + StrFormatter.format(str, args));
+			}
 		}
 	}
 
+	/*
+		// 三种写法速度对比
+		// if( config.getIsColorLog() != null && config.getIsColorLog() )  10亿次，2058ms
+		// if( config.getIsColorLog() == Boolean.TRUE ) 	10亿次，1050ms   最快
+		// if( Objects.equals(config.getIsColorLog(), Boolean.TRUE) )  	10亿次，1543ms
+	 */
+
+	/*
+		颜色参考：
+			DEFAULT  	39
+			BLACK  		30
+			RED  		31
+			GREEN  		32
+			YELLOW  	33
+			BLUE  		34
+			MAGENTA  	35
+			CYAN  		36
+			WHITE  		37
+			BRIGHT_BLACK  	90
+			BRIGHT_RED  	91
+			BRIGHT_GREEN  	92
+			BRIGHT_YELLOW  	93
+			BRIGHT_BLUE  	94
+			BRIGHT_MAGENTA	95
+			BRIGHT_CYAN  	96
+			BRIGHT_WHITE  	97
+	 */
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
index 36d353f3..6b24c19d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
@@ -11,8 +11,8 @@ import cn.dev33.satoken.exception.SaTokenException;
  * 
  * <p> 参考：Spring - HttpMethod 
  * 
- * @author kong 
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public enum SaHttpMethod {
 	
@@ -34,7 +34,7 @@ public enum SaHttpMethod {
 	/**
 	 * String 转 enum 
 	 * @param method 请求类型 
-	 * @return ReqMethod 对象 
+	 * @return SaHttpMethod 对象
 	 */
 	public static SaHttpMethod toEnum(String method) {
 		if(method == null) {
@@ -50,7 +50,7 @@ public enum SaHttpMethod {
 	/**
 	 * String[] 转 enum[]
 	 * @param methods 请求类型数组 
-	 * @return ReqMethod 对象 
+	 * @return SaHttpMethod 数组
 	 */
 	public static SaHttpMethod[] toEnumArray(String... methods) {
 		SaHttpMethod [] arr = new SaHttpMethod[methods.length];
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java
deleted file mode 100644
index 7ec2af19..00000000
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouteFunction.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package cn.dev33.satoken.router;
-
-import cn.dev33.satoken.context.model.SaRequest;
-import cn.dev33.satoken.context.model.SaResponse;
-
-/**
- * 路由拦截器验证方法Lambda 
- * 
- * @author kong
- *
- */
-@FunctionalInterface
-public interface SaRouteFunction {
-
-	/**
-	 * 执行验证的方法
-	 * 
-	 * @param request  Request包装对象
-	 * @param response Response包装对象
-	 * @param handler  处理对象
-	 */
-	public void run(SaRequest request, SaResponse response, Object handler);
-
-}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
index 41c1e91b..14228909 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
@@ -11,9 +11,20 @@ import cn.dev33.satoken.fun.SaParamFunction;
 import cn.dev33.satoken.fun.SaParamRetFunction;
 
 /**
- * 路由匹配操作工具类 
- * @author kong
+ * 路由匹配操作工具类
  *
+ * <p> 提供了一系列的路由匹配操作方法，一般用在全局拦截器、过滤器做路由拦截鉴权。 </p>
+ * <p> 简单示例： </p>
+ * <pre>
+ *    	// 指定一条 match 规则
+ *    	SaRouter
+ *    	   	.match("/**")    // 拦截的 path 列表，可以写多个
+ *   	   	.notMatch("/user/doLogin")        // 排除掉的 path 列表，可以写多个
+ *   	   	.check(r->StpUtil.checkLogin());        // 要执行的校验动作，可以写完整的 lambda 表达式
+ * </pre>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRouter {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
index 63d1974f..5f14d09f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
@@ -11,8 +11,8 @@ import cn.dev33.satoken.fun.SaParamRetFunction;
 /**
  * 路由匹配操作对象 
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRouterStaff {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
index eaacc17f..29bcfc6d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * 
  * <p> 解决同源系统互相调用时的身份认证校验， 例如：微服务网关请求转发鉴权、微服务RPC调用鉴权 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-24
  */
 public class SaSameTemplate {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
index 55729930..951eecff 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
  * 
  * <p> 解决同源系统互相调用时的身份认证校验， 例如：微服务网关请求转发鉴权、微服务RPC调用鉴权 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-24
  */
 public class SaSameUtil {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
index a04aec8e..c512e07f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
@@ -7,9 +7,10 @@ import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.SaTokenException;
 
 /**
- * Sa-Token Base64工具类
- * @author kong
+ * Sa-Token Base64 工具类
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaBase64Util {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
index 58e9c405..683e4fdc 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
@@ -29,8 +29,8 @@ import cn.dev33.satoken.exception.SaTokenException;
 /**
  * Sa-Token 常见加密算法工具类
  *
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaSecureUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index 9f61271c..6bf476db 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -15,11 +15,20 @@ import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Session Model，会话作用域的读取值对象 
- * <p> 在一次会话范围内: 存值、取值
+ * Session Model，会话作用域的读取值对象
  *
- * @author kong
+ * <p> 在一次会话范围内: 存值、取值。数据在注销登录后失效。</p>
+ * <p>
+ *    在 Sa-Token 中，SaSession 分为三种，分别是：	<br>
+ *     	- Account-Session: 指的是框架为每个 账号id 分配的 SaSession。	<br>
+ * 		- Token-Session: 指的是框架为每个 token 分配的 SaSession。	<br>
+ * 		- Custom-Session: 指的是以一个 特定的值 作为SessionId，来分配的 SaSession。	<br>
+ * 	  <br>
+ * 	  注意：以上分类仅为框架设计层面的概念区分，实际上它们的数据存储格式都是一致的。
+ * </p>
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaSession implements SaSetValueInterface, Serializable {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
index 1fe670c8..b7b843f8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
@@ -2,9 +2,10 @@ package cn.dev33.satoken.session;
 
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.strategy.SaStrategy;
+import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * 自定义 Session 工具类 
+ * 自定义 SaSession 工具类，快捷的读取、操作自定义 SaSession
  * 
  * <p>样例：
  * <pre>
@@ -18,8 +19,8 @@ import cn.dev33.satoken.strategy.SaStrategy;
  * 		System.out.println("count=" + count);
  * </pre>
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaSessionCustomUtil {
 
@@ -27,13 +28,13 @@ public class SaSessionCustomUtil {
 	}
 	
 	/**
-	 * 添加上指定前缀，防止恶意伪造Session 
+	 * 添加上指定前缀，防止恶意伪造数据
 	 */
 	public static String sessionKey = "custom";
 
 	/**
-	 * 拼接Key: 自定义Session的Id 
-	 * 
+	 * 拼接Key: 在存储自定义 SaSession 时应该使用的 key
+	 *
 	 * @param sessionId 会话id
 	 * @return sessionId
 	 */
@@ -42,9 +43,9 @@ public class SaSessionCustomUtil {
 	}
 
 	/**
-	 * 指定key的Session是否存在
+	 * 判断：指定 key 的 SaSession 是否存在
 	 * 
-	 * @param sessionId Session的id
+	 * @param sessionId SaSession 的 id
 	 * @return 是否存在
 	 */
 	public static boolean isExists(String sessionId) {
@@ -52,35 +53,36 @@ public class SaSessionCustomUtil {
 	}
 
 	/**
-	 * 获取指定key的Session
+	 * 获取指定 key 的 SaSession 对象, 如果此 SaSession 尚未在 DB 创建，isCreate 参数代表是否则新建并返回
 	 * 
-	 * @param sessionId key
-	 * @param isCreate  如果此Session尚未在DB创建，是否新建并返回
-	 * @return SaSession
+	 * @param sessionId SaSession 的 id
+	 * @param isCreate  如果此 SaSession 尚未在 DB 创建，是否新建并返回
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionById(String sessionId, boolean isCreate) {
 		SaSession session = SaManager.getSaTokenDao().getSession(splicingSessionKey(sessionId));
 		if (session == null && isCreate) {
 			session = SaStrategy.me.createSession.apply(splicingSessionKey(sessionId));
+			session.setType(SaTokenConsts.SESSION_TYPE__CUSTOM);
 			SaManager.getSaTokenDao().setSession(session, SaManager.getConfig().getTimeout());		
 		}
 		return session;
 	}
 
 	/**
-	 * 获取指定key的Session, 如果此Session尚未在DB创建，则新建并返回
+	 * 获取指定 key 的 SaSession, 如果此 SaSession 尚未在 DB 创建，则新建并返回
 	 * 
-	 * @param sessionId key
-	 * @return session对象
+	 * @param sessionId SaSession 的 id
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionById(String sessionId) {
 		return getSessionById(sessionId, true);
 	}
 
 	/**
-	 * 删除指定key的Session 
+	 * 删除指定 key 的 SaSession
 	 * 
-	 * @param sessionId 指定key
+	 * @param sessionId SaSession 的 id
 	 */
 	public static void deleteSessionById(String sessionId) {
 		SaManager.getSaTokenDao().deleteSession(splicingSessionKey(sessionId));
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
index 298ee942..a5795405 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
@@ -4,10 +4,11 @@ import java.io.Serializable;
 
 /**
  * Token 签名 Model
- * <p>
- * 挂在到 SaSession 上的 Token 签名
  *
- * @author kong
+ * <p> 挂在到 SaSession 上的 Token 签名，一般情况下，一个 TokenSign 代表一个登录的会话。</p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class TokenSign implements Serializable {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index c9057058..ada8025e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -12,9 +12,17 @@ import java.util.Map;
 import java.util.TreeMap;
 
 /**
- * API 参数签名算法
+ * API 参数签名算法，在跨系统接口调用时防参数篡改、防重放攻击。
  *
- * @author kong
+ * <p>
+ *     以 SSO 数据拉取为例，流程大致如下：
+ *     <br> 1. 以 md5( loginId={账号id}8nonce={随机字符串}8timestamp={13位时间戳}8key={secretkey秘钥} ) 生成签名 sign。
+ *     <br> 2. 将 sign 作为参数，拼接到请求地址后面，如：http://xxx.com?loginId=100018nonce=xxx8timestamp=xxx8sign=xxx。
+ *     <br> 3. 服务端接收到请求后，以同样的算法生成一次 sign 。
+ *     <br> 4. 对比两次 sign 是否一致，一致则通过，否则拒绝 。
+ * </p>
+ *
+ * @author click33
  * @since 2022-4-27
  */
 public class SaSignTemplate {
@@ -35,6 +43,7 @@ public class SaSignTemplate {
 	 * 获取：API 签名配置：
 	 * 	1. 如果用户自定义了 signConfig ，则使用用户自定义的。
 	 * 	2. 否则使用全局默认配置。
+	 *
 	 * @return /
 	 */
 	public SaSignConfig getSignConfigOrGlobal() {
@@ -136,6 +145,15 @@ public class SaSignTemplate {
 		// 计算签名
 		String paramsStr = joinParamsDictSort(paramsMap);
 		String fullStr = paramsStr + "&" + key + "=" + secretKey;
+		return abstractStr(fullStr);
+	}
+
+	/**
+	 * 使用摘要算法创建签名
+	 * @param fullStr 待摘要的字符串
+	 * @return 签名
+	 */
+	public String abstractStr(String fullStr) {
 		return SaSecureUtil.md5(fullStr);
 	}
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
index 649b9b2c..1f6a9525 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
@@ -8,7 +8,7 @@ import java.util.Map;
 /**
  * API 参数签名算法 - 工具类
  *
- * @author kong
+ * @author click33
  * @since 2022-4-27
  */
 public class SaSignUtil {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
index e25b7ebf..d0da8323 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
@@ -3,11 +3,18 @@ package cn.dev33.satoken.stp;
 import java.util.Map;
 
 /**
- * 
- * 快速构建 调用 `StpUtil.login()` 时的 [配置参数 Model ]
- * 
- * @author kong
+ * 快速、简洁的构建：调用 `StpUtil.login()` 时的 [ 配置参数 SaLoginModel ]
  *
+ * <pre>
+ *     	// 例如：在登录时指定 token 有效期为七天，代码如下：
+ *     	StpUtil.login(10001, SaLoginConfig.setTimeout(60 * 60 * 24 * 7));
+ *
+ *     	// 上面的代码与下面的代码等价
+ *     	StpUtil.login(10001, new SaLoginModel().setTimeout(60 * 60 * 24 * 7));
+ * </pre>
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaLoginConfig {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index 1813890f..48e9093d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -9,9 +9,15 @@ import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * 调用 `StpUtil.login()` 时的 [配置参数 Model ]
- * @author kong
+ * 在调用 `StpUtil.login()` 时的 配置参数 Model，决定登录的一些细节行为 <br>
  *
+ * <pre>
+ *     	// 例如：在登录时指定 token 有效期为七天，代码如下：
+ *     	StpUtil.login(10001, new SaLoginModel().setTimeout(60 * 60 * 24 * 7));
+ * </pre>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaLoginModel {
 
@@ -185,8 +191,8 @@ public class SaLoginModel {
 				+ "]";
 	}
 
+
 	// ------ 附加方法 
-	
 
 	/**
 	 * 写入扩展数据（只在jwt模式下生效） 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
index 6812bca3..8ac4f0fb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
@@ -1,169 +1,187 @@
 package cn.dev33.satoken.stp;
 
 /**
- * Token信息Model: 用来描述一个Token的常用参数
- * 
- * @author kong
+ * Token 信息 Model: 用来描述一个 Token 的常见参数。
  *
+ * <p>
+ *     例如：<br>
+ *     <pre>
+ *     {
+ *         "tokenName": "satoken",           // token名称
+ *         "tokenValue": "e67b99f1-3d7a-4a8d-bb2f-e888a0805633",      // token值
+ *         "isLogin": true,                  // 此token是否已经登录
+ *         "loginId": "10001",               // 此token对应的LoginId，未登录时为null
+ *         "loginType": "login",              // 账号类型标识
+ *         "tokenTimeout": 2591977,          // token剩余有效期 (单位: 秒)
+ *         "sessionTimeout": 2591977,        // User-Session剩余有效时间 (单位: 秒)
+ *         "tokenSessionTimeout": -2,        // Token-Session剩余有效时间 (单位: 秒) (-2表示系统中不存在这个缓存)
+ *         "tokenActivityTimeout": -1,       // token剩余无操作有效时间 (单位: 秒)
+ *         "loginDevice": "default-device"   // 登录设备类型
+ *     }
+ *     </pre>
+ * </p>
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenInfo {
 
-	/** token名称 */
+	/** token 名称 */
 	public String tokenName;
 
-	/** token值 */
+	/** token 值 */
 	public String tokenValue;
 
-	/** 此token是否已经登录 */
+	/** 此 token 是否已经登录 */
 	public Boolean isLogin;
 
-	/** 此token对应的LoginId，未登录时为null */
+	/** 此 token 对应的 LoginId，未登录时为 null */
 	public Object loginId;
 
-	/** 账号类型 */
+	/** 多账号体系下的账号类型 */
 	public String loginType;
 
-	/** token剩余有效期 (单位: 秒) */
+	/** token 剩余有效期（单位: 秒） */
 	public long tokenTimeout;
 
-	/** User-Session剩余有效时间 (单位: 秒) */
+	/** Account-Session 剩余有效时间（单位: 秒） */
 	public long sessionTimeout;
 
-	/** Token-Session剩余有效时间 (单位: 秒) */
+	/** Token-Session 剩余有效时间（单位: 秒） */
 	public long tokenSessionTimeout;
 
-	/** token剩余无操作有效时间 (单位: 秒) */
+	/** token 剩余无操作有效时间（单位: 秒） */
 	public long tokenActivityTimeout;
 
 	/** 登录设备类型 */
 	public String loginDevice;
 
-	/** 自定义数据 */
+	/** 自定义数据（暂无意义，留作扩展） */
 	public String tag;
 	
 
 
 	/**
-	 * @return token名称 
+	 * @return token 名称
 	 */
 	public String getTokenName() {
 		return tokenName;
 	}
 
 	/**
-	 * @param tokenName token名称 
+	 * @param tokenName token 名称
 	 */
 	public void setTokenName(String tokenName) {
 		this.tokenName = tokenName;
 	}
 
 	/**
-	 * @return token值 
+	 * @return token 值
 	 */
 	public String getTokenValue() {
 		return tokenValue;
 	}
 
 	/**
-	 * @param tokenValue token值 
+	 * @param tokenValue token 值
 	 */
 	public void setTokenValue(String tokenValue) {
 		this.tokenValue = tokenValue;
 	}
 
 	/**
-	 * @return 此token是否已经登录 
+	 * @return 此 token 是否已经登录
 	 */
 	public Boolean getIsLogin() {
 		return isLogin;
 	}
 
 	/**
-	 * @param isLogin 此token是否已经登录 
+	 * @param isLogin 此 token 是否已经登录
 	 */
 	public void setIsLogin(Boolean isLogin) {
 		this.isLogin = isLogin;
 	}
 
 	/**
-	 * @return 此token对应的LoginId，未登录时为null 
+	 * @return 此 token 对应的LoginId，未登录时为null
 	 */
 	public Object getLoginId() {
 		return loginId;
 	}
 
 	/**
-	 * @param loginId 此token对应的LoginId，未登录时为null 
+	 * @param loginId 此 token 对应的LoginId，未登录时为null
 	 */
 	public void setLoginId(Object loginId) {
 		this.loginId = loginId;
 	}
 
 	/**
-	 * @return 账号类型
+	 * @return 多账号体系下的账号类型
 	 */
 	public String getLoginType() {
 		return loginType;
 	}
 
 	/**
-	 * @param loginType 账号类型
+	 * @param loginType 多账号体系下的账号类型
 	 */
 	public void setLoginType(String loginType) {
 		this.loginType = loginType;
 	}
 
 	/**
-	 * @return token剩余有效期 (单位: 秒) 
+	 * @return token 剩余有效期（单位: 秒）
 	 */
 	public long getTokenTimeout() {
 		return tokenTimeout;
 	}
 
 	/**
-	 * @param tokenTimeout token剩余有效期 (单位: 秒) 
+	 * @param tokenTimeout token剩余有效期（单位: 秒）
 	 */
 	public void setTokenTimeout(long tokenTimeout) {
 		this.tokenTimeout = tokenTimeout;
 	}
 
 	/**
-	 * @return User-Session剩余有效时间 (单位: 秒) 
+	 * @return Account-Session 剩余有效时间（单位: 秒）
 	 */
 	public long getSessionTimeout() {
 		return sessionTimeout;
 	}
 
 	/**
-	 * @param sessionTimeout User-Session剩余有效时间 (单位: 秒) 
+	 * @param sessionTimeout Account-Session剩余有效时间（单位: 秒）
 	 */
 	public void setSessionTimeout(long sessionTimeout) {
 		this.sessionTimeout = sessionTimeout;
 	}
 
 	/**
-	 * @return Token-Session剩余有效时间 (单位: 秒) 
+	 * @return Token-Session剩余有效时间（单位: 秒）
 	 */
 	public long getTokenSessionTimeout() {
 		return tokenSessionTimeout;
 	}
 
 	/**
-	 * @param tokenSessionTimeout Token-Session剩余有效时间 (单位: 秒) 
+	 * @param tokenSessionTimeout Token-Session剩余有效时间（单位: 秒）
 	 */
 	public void setTokenSessionTimeout(long tokenSessionTimeout) {
 		this.tokenSessionTimeout = tokenSessionTimeout;
 	}
 
 	/**
-	 * @return token剩余无操作有效时间 (单位: 秒)
+	 * @return token 剩余无操作有效时间（单位: 秒）
 	 */
 	public long getTokenActivityTimeout() {
 		return tokenActivityTimeout;
 	}
 
 	/**
-	 * @param tokenActivityTimeout token剩余无操作有效时间 (单位: 秒)
+	 * @param tokenActivityTimeout token 剩余无操作有效时间（单位: 秒）
 	 */
 	public void setTokenActivityTimeout(long tokenActivityTimeout) {
 		this.tokenActivityTimeout = tokenActivityTimeout;
@@ -184,14 +202,14 @@ public class SaTokenInfo {
 	}
 
 	/**
-	 * @return 自定义数据
+	 * @return 自定义数据（暂无意义，留作扩展）
 	 */
 	public String getTag() {
 		return tag;
 	}
 
 	/**
-	 * @param tag 自定义数据
+	 * @param tag 自定义数据（暂无意义，留作扩展）
 	 */
 	public void setTag(String tag) {
 		this.tag = tag;
@@ -208,7 +226,5 @@ public class SaTokenInfo {
 				+ ", tokenActivityTimeout=" + tokenActivityTimeout + ", loginDevice=" + loginDevice + ", tag=" + tag
 				+ "]";
 	}
-	
-	
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
index 092beaa9..6d953360 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
@@ -3,9 +3,15 @@ package cn.dev33.satoken.stp;
 import java.util.List;
 
 /**
- * 权限认证接口，实现此接口即可集成权限认证功能
+ * 权限数据加载源接口
+ *
+ * <p>
+ *     在使用权限校验 API 之前，你必须实现此接口，告诉框架哪些用户拥有哪些权限。<br>
+ *     框架默认不对数据进行缓存，如果你的数据是从数据库中读取的，一般情况下你需要手动实现数据的缓存读写。
+ * </p>
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface StpInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
index b2f7f8de..6b191082 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
@@ -6,9 +6,10 @@ import java.util.List;
 /**
  * 对 {@link StpInterface} 接口默认的实现类
  * <p>
- * 如果开发者没有实现StpInterface接口，则使用此默认实现
+ * 如果开发者没有实现 StpInterface 接口，则框架会使用此默认实现类，所有方法都返回空集合，即：用户不具有任何权限和角色。
  * 
- * @author kong
+ * @author click33
+ * @since <= 1.34.0
  */
 public class StpInterfaceDefaultImpl implements StpInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 09ea2826..7873c05b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1,18 +1,7 @@
 package cn.dev33.satoken.stp;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-
 import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.annotation.SaCheckDisable;
-import cn.dev33.satoken.annotation.SaCheckLogin;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import cn.dev33.satoken.annotation.SaCheckRole;
-import cn.dev33.satoken.annotation.SaCheckSafe;
-import cn.dev33.satoken.annotation.SaMode;
+import cn.dev33.satoken.annotation.*;
 import cn.dev33.satoken.config.SaCookieConfig;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.context.SaHolder;
@@ -22,13 +11,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.context.model.SaStorage;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.error.SaErrorCode;
-import cn.dev33.satoken.exception.ApiDisabledException;
-import cn.dev33.satoken.exception.DisableServiceException;
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.exception.NotPermissionException;
-import cn.dev33.satoken.exception.NotRoleException;
-import cn.dev33.satoken.exception.NotSafeException;
-import cn.dev33.satoken.exception.SaTokenException;
+import cn.dev33.satoken.exception.*;
 import cn.dev33.satoken.fun.SaFunction;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.session.SaSession;
@@ -37,60 +20,81 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
 /**
- * Sa-Token 权限认证，逻辑实现类 
- * @author kong
+ * Sa-Token 权限认证，逻辑实现类
+ *
+ * <p>
+ *     Sa-Token 的核心，框架大多数功能均由此类提供具体逻辑实现。
+ * </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class StpLogic {
 
 	/**
-	 * 账号类型，多账号体系时以此值区分，比如：login、user、admin 
+	 * 账号类型标识，多账号体系时（一个系统多套用户表）用此值区分具体要校验的是哪套用户，比如：login、user、admin
 	 */
 	public String loginType;
 	
 	/**
-	 * 初始化StpLogic, 并指定账号类型 
-	 * @param loginType 账号体系标识 
+	 * 初始化 StpLogic, 并指定账号类型
+	 *
+	 * @param loginType 账号类型标识
 	 */
 	public StpLogic(String loginType) {
 		this.loginType = loginType;
-		// 在 SaTokenManager 中记录下此 StpLogic，以便根据 LoginType 进行查找此对象 
+
+		// 在 SaManager 中记录下此 StpLogic，以便后续根据 LoginType 进行查找此对象
 		SaManager.putStpLogic(this);
 	}
 
 	/**
-	 * 获取当前 StpLogic 的账号类型
-	 * @return See Note 
+	 * 获取当前 StpLogic 账号类型标识
+	 *
+	 * @return /
 	 */
 	public String getLoginType(){
 		return loginType;
 	}
 
 	/**
-	 * 设置当前账号类型
-	 * @param loginType loginType
+	 * 安全的重置当前账号类型
+	 *
+	 * @param loginType 账号类型标识
 	 * @return 对象自身
 	 */
 	public StpLogic setLoginType(String loginType){
 		this.loginType = loginType;
+
+		// 因为 loginType 变了，所以需要往 SaManager 中重新 put 一下
 		SaManager.putStpLogic(this);
+
 		return this;
 	}
 	
 	
-	// ------------------- 获取token 相关 -------------------  
+	// ------------------- 获取 token 相关 -------------------
 	
 	/**
-	 * 返回token名称 
-	 * @return 此StpLogic的token名称
+	 * 返回 token 名称，此名称在以下地方体现：Cookie 保存 token 时的名称、提交 token 时参数的名称、存储 token 时的 key 前缀
+	 *
+	 * @return /
 	 */
 	public String getTokenName() {
  		return splicingKeyTokenName();
  	}
 
 	/**
-	 * 创建一个TokenValue
-	 * @param loginId loginId
+	 * 为指定账号创建一个 token （只是把 token 创建出来，并不持久化存储）
+	 *
+	 * @param loginId 账号id
 	 * @param device 设备类型
 	 * @param timeout 过期时间
 	 * @param extraData 扩展信息
@@ -101,16 +105,18 @@ public class StpLogic {
 	}
 
  	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
+ 	 * 在当前会话写入指定 token 值
+	 *
+ 	 * @param tokenValue token 值
  	 */
 	public void setTokenValue(String tokenValue){
 		setTokenValue(tokenValue, new SaLoginModel().setTimeout(getConfig().getTimeout()));
 	}
 	
  	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
+	 * 在当前会话写入指定 token 值
+	 *
+ 	 * @param tokenValue token 值
  	 * @param cookieTimeout Cookie存活时间(秒)
  	 */
 	public void setTokenValue(String tokenValue, int cookieTimeout){
@@ -118,54 +124,60 @@ public class StpLogic {
 	}
 
  	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
+ 	 * 在当前会话写入指定 token 值
+	 *
+ 	 * @param tokenValue token 值
  	 * @param loginModel 登录参数 
  	 */
 	public void setTokenValue(String tokenValue, SaLoginModel loginModel){
-		
+
+		// 先判断一下，如果提供 token 为空，则不执行任何动作
 		if(SaFoxUtil.isEmpty(tokenValue)) {
 			return;
 		}
 		
-		// 1. 将 Token 保存到 [存储器] 里  
+		// 1、将 token 写入到当前请求的 Storage 存储器里
 		setTokenValueToStorage(tokenValue);
 		
-		// 2. 将 Token 保存到 [Cookie] 里 
+		// 2. 将 token 写入到当前会话的 Cookie 里
 		if (getConfig().getIsReadCookie()) {
 			setTokenValueToCookie(tokenValue, loginModel.getCookieTimeout());
 		}
 		
-		// 3. 将 Token 写入到响应头里 
+		// 3. 将 token 写入到当前请求的响应头中
 		if(loginModel.getIsWriteHeaderOrGlobalConfig()) {
 			setTokenValueToResponseHeader(tokenValue);
 		}
 	}
 
  	/**
- 	 * 将 Token 保存到 [Storage] 里 
- 	 * @param tokenValue token值 
+ 	 * 将 token 写入到当前请求的 Storage 存储器里
+	 *
+ 	 * @param tokenValue 要保存的 token 值
  	 */
 	public void setTokenValueToStorage(String tokenValue){
-		// 1. 将token保存到[存储器]里  
+		// 1、获取当前请求的 Storage 存储器
 		SaStorage storage = SaHolder.getStorage();
-		
-		// 2. 如果打开了 Token 前缀模式，则拼接上前缀
+
+		// 2、保存 token
+		//	- 如果没有配置前缀模式，直接保存
+		// 	- 如果配置了前缀模式，则拼接上前缀保存
 		String tokenPrefix = getConfig().getTokenPrefix();
-		if(SaFoxUtil.isEmpty(tokenPrefix) == false) {
-			storage.set(splicingKeyJustCreatedSave(), tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT + tokenValue);	
+		if( SaFoxUtil.isEmpty(tokenPrefix) ) {
+			storage.set(splicingKeyJustCreatedSave(), tokenValue);
 		} else {
-			storage.set(splicingKeyJustCreatedSave(), tokenValue);	
+			storage.set(splicingKeyJustCreatedSave(), tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT + tokenValue);
 		}
 		
-		// 3. 写入 (无前缀) 
+		// 3、以无前缀的方式再写入一次
 		storage.set(SaTokenConsts.JUST_CREATED_NOT_PREFIX, tokenValue);  
 	}
 	
  	/**
- 	 * 将 Token 保存到 [Cookie] 里 
- 	 * @param tokenValue token值 
- 	 * @param cookieTimeout Cookie存活时间(秒)
+ 	 * 将 token 写入到当前会话的 Cookie 里
+	 *
+ 	 * @param tokenValue token 值
+ 	 * @param cookieTimeout Cookie存活时间（单位：秒，填-1代表为内存Cookie，浏览器关闭后消失）
  	 */
 	public void setTokenValueToCookie(String tokenValue, int cookieTimeout){
 		SaCookieConfig cfg = getConfig().getCookie();
@@ -183,32 +195,37 @@ public class StpLogic {
 	}
 
  	/**
- 	 * 将 Token 写入到 [响应头] 里 
- 	 * @param tokenValue token值 
+ 	 * 将 token 写入到当前请求的响应头中
+	 *
+ 	 * @param tokenValue token 值
  	 */
 	public void setTokenValueToResponseHeader(String tokenValue){
+		// 写入到响应头
 		String tokenName = getTokenName();
 		SaResponse response = SaHolder.getResponse();
 		response.setHeader(tokenName, tokenValue);
+
+		// 此处必须在响应头里指定 Access-Control-Expose-Headers: token-name，否则前端无法读取到这个响应头
 		response.addHeader(SaResponse.ACCESS_CONTROL_EXPOSE_HEADERS, tokenName);
 	}
  	
 	/**
-	 * 获取当前TokenValue
+	 * 获取当前请求的 token 值
+	 *
 	 * @return 当前tokenValue
 	 */
 	public String getTokenValue(){
 		// 1. 获取
 		String tokenValue = getTokenValueNotCut();
 		
-		// 2. 如果打开了前缀模式，则裁剪掉 
+		// 2. 如果打开了前缀模式，则裁剪掉它
 		String tokenPrefix = getConfig().getTokenPrefix();
 		if(SaFoxUtil.isEmpty(tokenPrefix) == false) {
-			// 如果token并没有按照指定的前缀开头，则视为未提供token 
+			// 如果 token 并没有按照指定的前缀开头，则视为未提供token
 			if(SaFoxUtil.isEmpty(tokenValue) || tokenValue.startsWith(tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT) == false) {
 				tokenValue = null;
 			} else {
-				// 则裁剪掉前缀 
+				// 裁剪掉前缀
 				tokenValue = tokenValue.substring(tokenPrefix.length() + SaTokenConsts.TOKEN_CONNECTOR_CHAT.length());
 			}
 		}
@@ -218,40 +235,43 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 获取当前TokenValue (不裁剪前缀)
+	 * 获取当前请求的 token 值 （不裁剪前缀）
+	 *
 	 * @return / 
 	 */
 	public String getTokenValueNotCut(){
-		// 0. 获取相应对象 
+
+		// 获取相应对象
 		SaStorage storage = SaHolder.getStorage();
 		SaRequest request = SaHolder.getRequest();
 		SaTokenConfig config = getConfig();
 		String keyTokenName = getTokenName();
 		String tokenValue = null;
 		
-		// 1. 尝试从Storage里读取 
+		// 1. 先尝试从 Storage 存储器里读取
 		if(storage.get(splicingKeyJustCreatedSave()) != null) {
 			tokenValue = String.valueOf(storage.get(splicingKeyJustCreatedSave()));
 		}
-		// 2. 尝试从请求体里面读取 
+		// 2. 再尝试从 请求体 里面读取
 		if(tokenValue == null && config.getIsReadBody()){
 			tokenValue = request.getParam(keyTokenName);
 		}
-		// 3. 尝试从header里读取 
+		// 3. 再尝试从 header 头里读取
 		if(tokenValue == null && config.getIsReadHeader()){
 			tokenValue = request.getHeader(keyTokenName);
 		}
-		// 4. 尝试从cookie里读取 
+		// 4. 最后尝试从 cookie 里读取
 		if(tokenValue == null && config.getIsReadCookie()){
 			tokenValue = request.getCookieValue(keyTokenName);
 		}
 		
-		// 5. 返回 
+		// 5. 至此，不管有没有读取到，都不再尝试了，直接返回
 		return tokenValue;
 	}
 
 	/**
-	 * 获取当前上下文的 TokenValue（如果获取不到则抛出异常）
+	 * 获取当前请求的 token 值，如果获取不到则抛出异常
+	 *
 	 * @return / 
 	 */
 	public String getTokenValueNotNull(){
@@ -263,8 +283,9 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 获取当前会话的Token信息 
-	 * @return token信息 
+	 * 获取当前会话的 token 参数信息
+	 *
+	 * @return token 参数信息
 	 */
 	public SaTokenInfo getTokenInfo() {
 		SaTokenInfo info = new SaTokenInfo();
@@ -287,7 +308,8 @@ public class StpLogic {
 	// --- 登录 
 	
 	/**
-	 * 会话登录 
+	 * 会话登录
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 */
 	public void login(Object id) {
@@ -296,6 +318,7 @@ public class StpLogic {
 
 	/**
 	 * 会话登录，并指定登录设备类型
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param device 设备类型 
 	 */
@@ -304,27 +327,29 @@ public class StpLogic {
 	}
 
 	/**
-	 * 会话登录，并指定是否 [记住我] 
+	 * 会话登录，并指定是否 [记住我]
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
-	 * @param isLastingCookie 是否为持久Cookie 
+	 * @param isLastingCookie 是否为持久Cookie，值为 true 时记住我，值为 false 时关闭浏览器需要重新登录
 	 */
 	public void login(Object id, boolean isLastingCookie) {
 		login(id, new SaLoginModel().setIsLastingCookie(isLastingCookie));
 	}
 
 	/**
-	 * 会话登录，并指定此次登录token的有效期, 单位:秒
+	 * 会话登录，并指定此次登录 token 的有效期, 单位:秒
 	 *
 	 * @param id      账号id，建议的类型：（long | int | String）
-	 * @param timeout 此次登录token的有效期, 单位:秒
+	 * @param timeout 此次登录 token 的有效期, 单位:秒
 	 */
 	public void login(Object id, long timeout) {
 		login(id, new SaLoginModel().setTimeout(timeout));
 	}
 
 	/**
-	 * 会话登录，并指定所有登录参数Model 
-	 * @param id 登录id，建议的类型：（long | int | String）
+	 * 会话登录，并指定所有登录参数 Model
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param loginModel 此次登录的参数Model 
 	 */
 	public void login(Object id, SaLoginModel loginModel) {
@@ -336,8 +361,9 @@ public class StpLogic {
 	}
 
 	/**
-	 * 创建指定账号id的登录会话 
-	 * @param id 登录id，建议的类型：（long | int | String）
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @return 返回会话令牌 
 	 */
 	public String createLoginSession(Object id) {
@@ -345,83 +371,92 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 创建指定账号id的登录会话
-	 * @param id 登录id，建议的类型：（long | int | String）
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param loginModel 此次登录的参数Model 
 	 * @return 返回会话令牌 
 	 */
 	public String createLoginSession(Object id, SaLoginModel loginModel) {
 
-		// ------ 前置检查
-		SaTokenException.throwByNull(id, "账号id不能为空", SaErrorCode.CODE_11002);
+		// 1、先检查一下，传入的账号id是否可用
+		if(SaFoxUtil.isEmpty(id)) {
+			throw new SaTokenException("账号 id 不能为空").setCode(SaErrorCode.CODE_11002);
+		}
 		
-		// ------ 1、初始化 loginModel 
+		// 2、初始化 loginModel ，给一些参数补上默认值
 		SaTokenConfig config = getConfig();
 		loginModel.build(config);
-		
-		// ------ 2、分配一个可用的 Token  
+
+		// 3、给这个账号分配一个可用的 token
 		String tokenValue = distUsableToken(id, loginModel);
 		
-		// ------ 3. 获取 User-Session , 续期 
+		// 4、获取此账号的 Account-Session , 续期
 		SaSession session = getSessionByLoginId(id, true);
 		session.updateMinTimeout(loginModel.getTimeout());
 		
-		// 在 User-Session 上记录token签名 
+		// 5、在 Account-Session 上记录本次登录的 token 签名
 		session.addTokenSign(tokenValue, loginModel.getDeviceOrDefault());
-		
-		// ------ 4. 持久化其它数据 
-		// token -> id 映射关系  
+
+		// 6、保存 token -> id 的映射关系，方便日后根据 token 找账号 id
 		saveTokenToIdMapping(tokenValue, id, loginModel.getTimeout());
 
-		// 写入 [token-last-activity] 
+		// 7、写入这个 token 的最后活跃时间 token-last-activity
 		setLastActivityToNow(tokenValue); 
 
-		// $$ 发布事件：账号 xxx 登录成功 
+		// 8、$$ 发布全局事件：账号 xxx 登录成功
 		SaTokenEventCenter.doLogin(loginType, id, tokenValue, loginModel);
 
-		// 检查此账号会话数量是否超出最大值 
+		// 9、检查此账号会话数量是否超出最大值，如果超过，则按照登录时间顺序，把最开始登录的给注销掉
 		if(config.getMaxLoginCount() != -1) {
 			logoutByMaxLoginCount(id, session, null, config.getMaxLoginCount());
 		}
 		
-		// 返回Token 
+		// 10、一切处理完毕，返回会话凭证 token
 		return tokenValue;
 	}
 
 	/**
-	 * 为指定账号id的登录操作，分配一个可用的 Token 
+	 * 为指定账号 id 的登录操作，分配一个可用的 token
+	 *
 	 * @param id 账号id 
 	 * @param loginModel 此次登录的参数Model 
-	 * @return 返回 Token
+	 * @return 返回 token
 	 */
 	protected String distUsableToken(Object id, SaLoginModel loginModel) {
 
-		// 获取全局配置
+		// 1、获取全局配置的 isConcurrent 参数
+		//    如果配置为：不允许一个账号多地同时登录，则需要先将这个账号的历史登录会话标记为：被顶下线
 		Boolean isConcurrent = getConfig().getIsConcurrent();
-		
-		// 如果配置为：不允许并发登录，则先将这个账号的历史登录标记为：被顶下线 
 		if(isConcurrent == false) {
 			replaced(id, loginModel.getDevice());
 		}
 		
-		// 如果调用者预定了Token，则直接返回这个预定的 
+		// 2、如果调用者预定了要生成的 token，则直接返回这个预定的值，框架无需再操心了
 		if(SaFoxUtil.isNotEmpty(loginModel.getToken())) {
 			return loginModel.getToken();
 		} 
 
-		// 只有在配置为 [允许并发登录] 时，才尝试复用旧 Token，这样可以避免不必须的查询，节省开销 
+		// 3、只有在配置了 [ 允许一个账号多地同时登录 ] 时，才尝试复用旧 token，这样可以避免不必须的查询，节省开销
 		if(isConcurrent) {
-			// 全局配置是否允许复用旧 Token 
+
+			// 3.1、看看全局配置的 IsShare 参数，配置为 true 才是允许复用旧 token
 			if(getConfigOfIsShare()) {
+
+				// 根据账号id + 设备标识，尝试获取旧的 token
 				String tokenValue = getTokenValueByLoginId(id, loginModel.getDeviceOrDefault());
-				// 复用成功的话就直接返回，否则还是要继续新建Token 
+
+				// 如果有值，那就直接复用
 				if(SaFoxUtil.isNotEmpty(tokenValue)) {
 					return tokenValue;
 				}
+
+				// 如果没值，那还是要继续往下走，尝试新建 token
+				// ↓↓↓
 			}
 		}
 		
-		// 如果代码走到此处，说明未能成功复用旧Token，需要新建Token
+		// 4、如果代码走到此处，说明未能成功复用旧 token，需要根据算法新建 token
 		return SaStrategy.me.generateUniqueToken.execute(
 				"token",
 				getConfigOfMaxTryTimes(),
@@ -437,28 +472,29 @@ public class StpLogic {
 	// --- 注销 
 	
 	/** 
-	 * 会话注销 
+	 * 在当前客户端会话注销
 	 */
 	public void logout() {
-		// 如果连 Token 都没有，那么无需执行任何操作
+		// 1、如果本次请求连 Token 都没有提交，那么它本身也不属于登录状态，此时无需执行任何操作
 		String tokenValue = getTokenValue();
  		if(SaFoxUtil.isEmpty(tokenValue)) {
  			return;
  		}
  		
- 		// 如果打开了 Cookie 模式，则把 Cookie 清除掉
+ 		// 2、如果打开了 Cookie 模式，则先把 Cookie 数据清除掉
  		if(getConfig().getIsReadCookie()){
  			SaCookieConfig cookie = getConfig().getCookie();
  			SaHolder.getResponse().deleteCookie(getTokenName(), cookie.getPath(), cookie.getDomain());
 		}
 
- 		// 从当前 [Storage存储器] 里删除 Token
- 		SaHolder.getStorage().delete(splicingKeyJustCreatedSave());
+ 		// 3、然后从当前 Storage 存储器里删除 Token
+		SaStorage storage = SaHolder.getStorage();
+		storage.delete(splicingKeyJustCreatedSave());
 
- 		// 清除当前上下文的 [临时有效期check标记]
- 	 	SaHolder.getStorage().delete(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY);
+ 		// 4、清除当前上下文的 [ 临时有效期 check 标记 ]
+		storage.delete(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY);
 
- 		// 清除这个 Token 的相关信息
+ 		// 5、清除这个 token 的其它相关信息
  		logoutByTokenValue(tokenValue);
 	}
 
@@ -475,86 +511,114 @@ public class StpLogic {
 	 * 会话注销，根据账号id 和 设备类型
 	 * 
 	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表注销所有设备类型) 
+	 * @param device 设备类型 (填 null 代表注销该账号的所有设备类型)
 	 */
 	public void logout(Object loginId, String device) {
+		// 1、获取此账号的 Account-Session，上面记录了此账号的所有登录客户端数据
 		SaSession session = getSessionByLoginId(loginId, false);
 		if(session != null) {
+
+			// 2、遍历此账号所有从这个 device 设备上登录的客户端，清除相关数据
 			for (TokenSign tokenSign: session.tokenSignListCopyByDevice(device)) {
-				// 清理： token签名、token最后活跃时间 
+
+				// 2.1、获取此客户端的 token 值
 				String tokenValue = tokenSign.getValue();
-				session.removeTokenSign(tokenValue); 
-				clearLastActivity(tokenValue); 	
-		 		// 删除Token-Id映射 & 清除Token-Session 
+
+				// 2.2、从 Account-Session 上清除 token 签名
+				session.removeTokenSign(tokenValue);
+
+				// 2.3、清除这个 token 的最后活跃时间记录
+				clearLastActivity(tokenValue);
+
+		 		// 2.4、清除 token -> id 的映射关系
 				deleteTokenToIdMapping(tokenValue);
+
+				// 2.5、清除这个 token 的 Token-Session 对象
 				deleteTokenSession(tokenValue);
-				// $$ 发布事件：指定账号注销 
+
+				// 2.6、$$ 发布事件：xx 账号的 xx 客户端注销了
 				SaTokenEventCenter.doLogout(loginType, loginId, tokenValue);
 			}
-			// 注销 Session 
+
+			// 3、如果代码走到这里的时候，此账号已经没有客户端在登录了，则直接注销掉这个 Account-Session
 			session.logoutByTokenSignCountToZero();
 		}
 	}
 	
 	/**
-	 * 会话注销，根据账号id 和 设备类型 和 最大同时在线数量 
+	 * 如果指定账号 id、设备类型的登录客户端已经超过了指定数量，则按照登录时间顺序，把最开始登录的给注销掉
 	 * 
 	 * @param loginId 账号id 
-	 * @param session 此账号的 Session 对象，可填写null，框架将自动获取 
-	 * @param device 设备类型 (填null代表注销所有设备类型) 
-	 * @param maxLoginCount 保留最近的几次登录 
+	 * @param session 此账号的 Account-Session 对象，可填写 null，框架将自动获取
+	 * @param device 设备类型（填 null 代表注销此账号所有设备类型的登录）
+	 * @param maxLoginCount 最大登录数量，超过此数量的将被注销
 	 */
 	public void logoutByMaxLoginCount(Object loginId, SaSession session, String device, int maxLoginCount) {
+
+		// 1、如果调用者提供的  Account-Session 对象为空，则我们先手动获取一下
 		if(session == null) {
 			session = getSessionByLoginId(loginId, false);
 			if(session == null) {
 				return;
 			}
 		}
+
+		// 2、获取这个账号指定设备类型下的所有登录客户端
 		List<TokenSign> list = session.tokenSignListCopyByDevice(device);
-		// 遍历操作，只操作前n条
+
+		// 3、按照登录时间倒叙，超过 maxLoginCount 数量的，全部注销掉
 		for (int i = 0; i < list.size() - maxLoginCount; i++) {
-			// 清理： token签名、token最后活跃时间
+
+			// 3.1、获取此客户端的 token 值
 			String tokenValue = list.get(i).getValue();
-			session.removeTokenSign(tokenValue); 
-			clearLastActivity(tokenValue); 	
-	 		// 删除Token-Id映射 & 清除Token-Session 
+
+			// 3.2、从 Account-Session 上清除 token 签名
+			session.removeTokenSign(tokenValue);
+
+			// 3.3、清除这个 token 的最后活跃时间记录
+			clearLastActivity(tokenValue);
+
+	 		// 3.4、清除 token -> id 的映射关系
 			deleteTokenToIdMapping(tokenValue);
+
+			// 3.5、清除这个 token 的 Token-Session 对象
 			deleteTokenSession(tokenValue);
-			// $$ 发布事件：指定账号注销 
+
+			// 3.6、$$ 发布事件：xx 账号的 xx 客户端注销了
 			SaTokenEventCenter.doLogout(loginType, loginId, tokenValue);
 		}
-		// 注销 Session 
+
+		// 4、如果代码走到这里的时候，此账号已经没有客户端在登录了，则直接注销掉这个 Account-Session
 		session.logoutByTokenSignCountToZero();
 	}
 	
 	/**
 	 * 会话注销，根据指定 Token 
 	 * 
-	 * @param tokenValue 指定token
+	 * @param tokenValue 指定 token
 	 */
 	public void logoutByTokenValue(String tokenValue) {
-		// 1. 清理 token-last-activity
-		clearLastActivity(tokenValue); 	
+		// 1、清除这个 token 的最后活跃时间记录
+		clearLastActivity(tokenValue);
 		
-		// 2. 注销 Token-Session 
+		// 2、清除这个 token 的 Token-Session 对象
 		deleteTokenSession(tokenValue);
 
-		// 3. 清理 token -> id 索引
+		// 3、清除 token -> id 的映射关系
  		String loginId = getLoginIdNotHandle(tokenValue);
  		if(loginId != null) {
  			deleteTokenToIdMapping(tokenValue);
  		}
 
-		// if. 无效 loginId 立即返回
- 	 	if(isValidLoginId(loginId) == false) {
+		// 4、判断一下：如果此 token 映射的是一个无效 loginId，则此处立即返回，不需要再往下处理了
+ 	 	if( ! isValidLoginId(loginId) ) {
  			return;
  		}
  	 	
- 	 	// $$ 发布事件：某某Token注销下线了 
+ 	 	// 5、$$ 发布事件：某某账号的某某 token 注销下线了
  		SaTokenEventCenter.doLogout(loginType, loginId, tokenValue);
  		
-		// 4. 清理User-Session上的token签名 & 尝试注销User-Session 
+		// 6、清理这个账号的 Account-Session 上的 token 签名，并且尝试注销掉 Account-Session
  	 	SaSession session = getSessionByLoginId(loginId, false);
  	 	if(session != null) {
  	 	 	session.removeTokenSign(tokenValue); 
@@ -564,7 +628,7 @@ public class StpLogic {
 	
 	/**
 	 * 踢人下线，根据账号id 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
 	 * 
 	 * @param loginId 账号id 
 	 */
@@ -574,53 +638,69 @@ public class StpLogic {
 	
 	/**
 	 * 踢人下线，根据账号id 和 设备类型 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
 	 * 
 	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表踢出所有设备类型) 
+	 * @param device 设备类型 (填 null 代表踢出该账号的所有设备类型)
 	 */
 	public void kickout(Object loginId, String device) {
+		// 1、获取此账号的 Account-Session，上面记录了此账号的所有登录客户端数据
 		SaSession session = getSessionByLoginId(loginId, false);
 		if(session != null) {
+
+			// 2、遍历此账号所有从这个 device 设备上登录的客户端，清除相关数据
 			for (TokenSign tokenSign: session.tokenSignListCopyByDevice(device)) {
-				// 清理： token签名、token最后活跃时间 
+
+				// 2.1、获取此客户端的 token 值
 				String tokenValue = tokenSign.getValue();
-				session.removeTokenSign(tokenValue); 
-				clearLastActivity(tokenValue); 	
-				// 将此 token 标记为已被踢下线  
+
+				// 2.2、从 Account-Session 上清除 token 签名
+				session.removeTokenSign(tokenValue);
+
+				// 2.3、清除这个 token 的最后活跃时间记录
+				clearLastActivity(tokenValue);
+
+				// 2.4、将此 token 标记为：已被踢下线
 				updateTokenToIdMapping(tokenValue, NotLoginException.KICK_OUT);
+
+				// 2.5、此处不需要清除它的 Token-Session 对象
+				// deleteTokenSession(tokenValue);
+
+				// 2.6、$$ 发布事件：xx 账号的 xx 客户端被踢下线了
 				SaTokenEventCenter.doKickout(loginType, loginId, tokenValue);
 			}
-			// 注销 Session 
+
+			// 3、如果代码走到这里的时候，此账号已经没有客户端在登录了，则直接注销掉这个 Account-Session
 			session.logoutByTokenSignCountToZero();
 		}
 	}
 
 	/**
-	 * 踢人下线，根据指定 Token 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
+	 * 踢人下线，根据指定 token
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
 	 * 
-	 * @param tokenValue 指定token
+	 * @param tokenValue 指定 token
 	 */
 	public void kickoutByTokenValue(String tokenValue) {
-		// 1. 清理 token-last-activity
+		// 1、清除这个 token 的最后活跃时间记录
 		clearLastActivity(tokenValue); 	
 		
-		// 2. 不注销 Token-Session 
+		// 2、此处不需要清除它的 Token-Session 对象
+		// deleteTokenSession(tokenValue);
 
- 		// if. 无效 loginId 立即返回 
+		// 3、判断一下：如果此 token 映射的是一个无效 loginId，则此处立即返回，不需要再往下处理了
  		String loginId = getLoginIdNotHandle(tokenValue);
- 	 	if(isValidLoginId(loginId) == false) {
+ 	 	if( ! isValidLoginId(loginId) ) {
  			return;
  		}
  	 	
- 		// 3. 给token打上标记：被踢下线 
+ 		// 4、将此 token 标记为：已被踢下线
  	 	updateTokenToIdMapping(tokenValue, NotLoginException.KICK_OUT);
 		
- 	 	// $$. 发布事件：某某Token被踢下线了 
+ 	 	// 5、$$. 发布事件：某某 token 被踢下线了
  		SaTokenEventCenter.doKickout(loginType, loginId, tokenValue);
 
-		// 4. 清理User-Session上的token签名 & 尝试注销User-Session 
+		// 6、清理这个账号的 Account-Session 上的 token 签名，并且尝试注销掉 Account-Session
  	 	SaSession session = getSessionByLoginId(loginId, false);
  	 	if(session != null) {
  	 	 	session.removeTokenSign(tokenValue); 
@@ -630,34 +710,54 @@ public class StpLogic {
 	
 	/**
 	 * 顶人下线，根据账号id 和 设备类型 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-4 </p>
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-4 </p>
 	 * 
 	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表顶替所有设备类型) 
+	 * @param device 设备类型 （填 null 代表顶替该账号的所有设备类型）
 	 */
 	public void replaced(Object loginId, String device) {
+		// 1、获取此账号的 Account-Session，上面记录了此账号的所有登录客户端数据
 		SaSession session = getSessionByLoginId(loginId, false);
 		if(session != null) {
+
+			// 2、遍历此账号所有从这个 device 设备上登录的客户端，清除相关数据
 			for (TokenSign tokenSign: session.tokenSignListCopyByDevice(device)) {
-				// 清理： token签名、token最后活跃时间 
+
+				// 2.1、获取此客户端的 token 值
 				String tokenValue = tokenSign.getValue();
-				session.removeTokenSign(tokenValue); 
-				clearLastActivity(tokenValue); 	
-				// 将此 token 标记为已被顶替 
+
+				// 2.2、从 Account-Session 上清除 token 签名
+				session.removeTokenSign(tokenValue);
+
+				// 2.3、清除这个 token 的最后活跃时间记录
+				clearLastActivity(tokenValue);
+
+				// 2.4、将此 token 标记为：已被顶下线
 				updateTokenToIdMapping(tokenValue, NotLoginException.BE_REPLACED);
+
+				// 2.5、此处不需要清除它的 Token-Session 对象
+				// deleteTokenSession(tokenValue);
+
+				// 2.6、$$ 发布事件：xx 账号的 xx 客户端注销了
 				SaTokenEventCenter.doReplaced(loginType, loginId, tokenValue);
 			}
+
+			// 3、因为调用顶替下线时，一般都是在新客户端正在登录，所以此处不需要清除该账号的 Account-Session
+			// session.logoutByTokenSignCountToZero();
 		}
 	}
 	
 	// ---- 会话查询 
 	
  	/** 
- 	 * 当前会话是否已经登录 
- 	 * @return 是否已登录 
+ 	 * 判断当前会话是否已经登录
+	 *
+ 	 * @return 已登录返回 true，未登录返回 false
  	 */
  	public boolean isLogin() {
- 		// 判断条件：不为null，并且不在异常项集合里 
+ 		// 判断条件：
+		// 		1、获取到的 loginId 不为 null，
+		// 		2、并且不在异常项集合里（此项在 getLoginIdDefaultNull() 方法里完成判断）
  		return getLoginIdDefaultNull() != null;
  	}
  	
@@ -665,105 +765,121 @@ public class StpLogic {
  	 * 检验当前会话是否已经登录，如未登录，则抛出异常 
  	 */
  	public void checkLogin() {
- 		getLoginId();
+		// 效果与 getLoginId() 相同，只是 checkLogin() 更加语义化一些
+		getLoginId();
  	}
  	
  	/** 
- 	 * 获取当前会话账号id, 如果未登录，则抛出异常 
+ 	 * 获取当前会话账号id，如果未登录，则抛出异常
+	 *
  	 * @return 账号id
  	 */
  	public Object getLoginId() {
-		// 如果正在[临时身份切换], 则返回临时身份 
+
+		// 1、先判断一下当前会话是否正在 [ 临时身份切换 ], 如果是则返回临时身份
 		if(isSwitch()) {
 			return getSwitchLoginId();
 		}
- 		// 如果获取不到token，则抛出: 无token
+
+ 		// 2、如果前端没有提交 token，则抛出异常: 未能读取到有效 token
  		String tokenValue = getTokenValue();
- 		if(tokenValue == null) {
+ 		if(SaFoxUtil.isEmpty(tokenValue)) {
  			throw NotLoginException.newInstance(loginType, NotLoginException.NOT_TOKEN).setCode(SaErrorCode.CODE_11011);
  		}
- 		// 查找此token对应loginId, 如果找不到则抛出：无效token 
+
+ 		// 3、查找此 token 对应的 loginId，如果找不到则抛出：token 无效
  		String loginId = getLoginIdNotHandle(tokenValue);
- 		if(loginId == null) {
+ 		if(SaFoxUtil.isEmpty(loginId)) {
  			throw NotLoginException.newInstance(loginType, NotLoginException.INVALID_TOKEN, tokenValue).setCode(SaErrorCode.CODE_11012);
  		}
- 		// 如果是已经过期，则抛出：已经过期 
+
+ 		// 4、如果这个 token 指向的是值是：过期标记，则抛出：token 已过期
  		if(loginId.equals(NotLoginException.TOKEN_TIMEOUT)) {
  			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_TIMEOUT, tokenValue).setCode(SaErrorCode.CODE_11013);
  		}
- 		// 如果是已经被顶替下去了, 则抛出：已被顶下线 
+
+ 		// 5、如果这个 token 指向的是值是：被顶替标记，则抛出：token 已被顶下线
  		if(loginId.equals(NotLoginException.BE_REPLACED)) {
  			throw NotLoginException.newInstance(loginType, NotLoginException.BE_REPLACED, tokenValue).setCode(SaErrorCode.CODE_11014);
  		}
- 		// 如果是已经被踢下线了, 则抛出：已被踢下线 
+
+ 		// 6、如果这个 token 指向的是值是：被踢下线标记，则抛出：token 已被踢下线
  		if(loginId.equals(NotLoginException.KICK_OUT)) {
  			throw NotLoginException.newInstance(loginType, NotLoginException.KICK_OUT, tokenValue).setCode(SaErrorCode.CODE_11015);
  		}
- 		// 检查是否已经 [临时过期]
+
+ 		// 7、检查此 token 的最后活跃时间是否已经超过了 activity-timeout 的限制，
+		//    如果是则代表其已经临时过期，需要抛出：token 已过期
 	 	checkActivityTimeout(tokenValue);
- 		// 如果配置了自动续签, 则: 更新[最后操作时间] 
+
+		// ------ 至此，loginId 已经是一个合法的值，代表当前会话是一个正常的登录状态了
+
+ 		// 8、如果配置了自动续签功能, 则: 更新这个 token 的最后活跃时间 （注意此处的续签是在续 activity-timeout，而非 timeout）
  		if(getConfig().getAutoRenew()) {
  	 		updateLastActivityToNow(tokenValue);
  		}
- 		// 至此，返回loginId 
+
+ 		// 9、返回 loginId
  		return loginId;
  	}
 	
  	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回默认值 
+	 * 获取当前会话账号id, 如果未登录，则返回默认值
+	 *
 	 * @param <T> 返回类型 
 	 * @param defaultValue 默认值
 	 * @return 登录id 
 	 */
  	@SuppressWarnings("unchecked")
-	public <T>T getLoginId(T defaultValue) {
+	public <T> T getLoginId(T defaultValue) {
+		// 1、先正常获取一下当前会话的 loginId
 		Object loginId = getLoginIdDefaultNull();
-		// 如果loginId为null，则返回默认值 
+
+		// 2、如果 loginId 为 null，则返回默认值
 		if(loginId == null) {
 			return defaultValue;
 		}
-		// 开始尝试类型转换，只尝试三种类型：int、long、String 
-		if(defaultValue instanceof Integer) {
-			return (T)Integer.valueOf(loginId.toString());
-		}
-		if(defaultValue instanceof Long) {
-			return (T)Long.valueOf(loginId.toString());
-		}
-		if(defaultValue instanceof String) {
-			return (T)loginId.toString();
-		}
-		return (T)loginId;
+
+		// 3、不为 null，则开始尝试类型转换
+		return (T)SaFoxUtil.getValueByType(loginId, defaultValue.getClass());
  	}
  	
  	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回null 
+	 * 获取当前会话账号id, 如果未登录，则返回null
+	 *
 	 * @return 账号id 
 	 */
 	public Object getLoginIdDefaultNull() {
-		// 如果正在[临时身份切换]
+
+		// 1、先判断一下当前会话是否正在 [ 临时身份切换 ], 如果是则返回临时身份
 		if(isSwitch()) {
 			return getSwitchLoginId();
 		}
-		// 如果连token都是空的，则直接返回 
+
+		// 2、如果前端连 token 都没有提交，则直接返回 null
 		String tokenValue = getTokenValue();
  		if(tokenValue == null) {
  			return null;
  		}
- 		// loginId为null或者在异常项里面，均视为未登录, 返回null 
+
+ 		// 3、根据 token 找到对应的 loginId，如果 loginId 为 null 或者属于异常标记里面，均视为未登录, 统一返回 null
  		Object loginId = getLoginIdNotHandle(tokenValue);
- 		if(isValidLoginId(loginId) == false) {
+ 		if( ! isValidLoginId(loginId) ) {
  			return null;
  		}
- 		// 如果已经[临时过期] 
+
+ 		// 4、如果根本获取不到这个 token 的最后活跃时间数据，则也视为其：已经临时过期，也返回 null
  		if(getTokenActivityTimeoutByToken(tokenValue) == SaTokenDao.NOT_VALUE_EXPIRE) {
  			return null;
  		}
- 		// 执行到此，证明loginId已经是个正常的账号id了 
+
+ 		// 5、执行到此，证明此 loginId 已经是个正常合法的账号id了，可以返回
  		return loginId;
  	}
 
 	/** 
-	 * 获取当前会话账号id, 并转换为String类型
+	 * 获取当前会话账号id, 并转换为 String 类型
+	 *
 	 * @return 账号id 
 	 */
  	public String getLoginIdAsString() {
@@ -771,7 +887,8 @@ public class StpLogic {
  	}
 
  	/** 
-	 * 获取当前会话账号id, 并转换为int类型
+	 * 获取当前会话账号id, 并转换为 int 类型
+	 *
 	 * @return 账号id 
 	 */
  	public int getLoginIdAsInt() {
@@ -779,7 +896,8 @@ public class StpLogic {
  	}
 
  	/**
-	 * 获取当前会话账号id, 并转换为long类型 
+	 * 获取当前会话账号id, 并转换为 long 类型
+	 *
 	 * @return 账号id 
 	 */
  	public long getLoginIdAsLong() {
@@ -787,27 +905,32 @@ public class StpLogic {
  	}
  	
  	/** 
- 	 * 获取指定Token对应的账号id，如果未登录，则返回 null 
+ 	 * 获取指定 token 对应的账号id，如果未登录，则返回 null
+	 *
  	 * @param tokenValue token
  	 * @return 账号id
  	 */
  	public Object getLoginIdByToken(String tokenValue) {
- 		// token为空时，直接返回null 
+
+ 		// 1、如果提供的 token 为空，则直接返回 null
  		if(SaFoxUtil.isEmpty(tokenValue)) {
  	 		return null;
  		}
- 		// loginId为无效值时，直接返回null 
+
+		// 2、查找此 token 对应的 loginId，如果找不到或找的到但属于无效值，则返回 null
  		String loginId = getLoginIdNotHandle(tokenValue);
- 		if(isValidLoginId(loginId) == false) {
+ 		if( ! isValidLoginId(loginId) ) {
  			return null;
  		}
- 		// 
+
+ 		// 3、返回
  		return loginId;
  	}
 
  	 /**
- 	  * 获取指定Token对应的账号id (不做任何特殊处理) 
- 	  * @param tokenValue token值 
+ 	  * 获取指定 token 对应的账号id （不做任何特殊处理）
+	  *
+ 	  * @param tokenValue token 值
  	  * @return 账号id
  	  */
  	public String getLoginIdNotHandle(String tokenValue) {
@@ -816,6 +939,7 @@ public class StpLogic {
 
 	/**
 	 * 获取当前 Token 的扩展信息（此函数只在jwt模式下生效）
+	 *
 	 * @param key 键值 
 	 * @return 对应的扩展数据 
 	 */
@@ -825,6 +949,7 @@ public class StpLogic {
 
 	/**
 	 * 获取指定 Token 的扩展信息（此函数只在jwt模式下生效）
+	 *
 	 * @param tokenValue 指定的 Token 值
 	 * @param key 键值
 	 * @return 对应的扩展数据
@@ -833,48 +958,59 @@ public class StpLogic {
 		throw new ApiDisabledException().setCode(SaErrorCode.CODE_11031);
 	}
 
- 	
-	// ---- 其它操作 
+	// ---- 其它操作
+
  	/**
-	 * 判断一个 loginId 是否是有效的 
+	 * 判断一个 loginId 是否是有效的
+	 *
 	 * @param loginId 账号id 
 	 * @return / 
 	 */
 	public boolean isValidLoginId(Object loginId) {
+		// 判断标准：不为null，且不在异常标记项里面
 		return loginId != null && !NotLoginException.ABNORMAL_LIST.contains(loginId.toString());
 	}
+
 	/**
-	 * 删除 Token-Id 映射 
-	 * @param tokenValue token值 
-	 */
-	public void deleteTokenToIdMapping(String tokenValue) {
-		getSaTokenDao().delete(splicingKeyTokenValue(tokenValue));
-	}
-	/**
-	 * 更改 Token 指向的 账号Id 值 
-	 * @param tokenValue token值 
-	 * @param loginId 新的账号Id值
-	 */
-	public void updateTokenToIdMapping(String tokenValue, Object loginId) {
-		SaTokenException.throwBy(SaFoxUtil.isEmpty(loginId), "LoginId 不能为空", SaErrorCode.CODE_11003);
-		getSaTokenDao().update(splicingKeyTokenValue(tokenValue), loginId.toString());
-	}
-	/**
-	 * 存储 Token-Id 映射 
-	 * @param tokenValue token值 
-	 * @param loginId 账号id 
-	 * @param timeout 会话有效期 (单位: 秒) 
+	 * 存储 token - id 映射关系
+	 *
+	 * @param tokenValue token值
+	 * @param loginId 账号id
+	 * @param timeout 会话有效期 (单位: 秒)
 	 */
 	public void saveTokenToIdMapping(String tokenValue, Object loginId, long timeout) {
 		getSaTokenDao().set(splicingKeyTokenValue(tokenValue), String.valueOf(loginId), timeout);
 	}
-	
-	
-	
-	// ------------------- User-Session 相关 -------------------  
+
+	/**
+	 * 更改 token - id 映射关系
+	 *
+	 * @param tokenValue token值 
+	 * @param loginId 新的账号Id值
+	 */
+	public void updateTokenToIdMapping(String tokenValue, Object loginId) {
+		// 先判断一下，是否传入了空值
+		SaTokenException.throwBy(SaFoxUtil.isEmpty(loginId), "loginId 不能为空", SaErrorCode.CODE_11003);
+
+		// 更新缓存中的 token 指向
+		getSaTokenDao().update(splicingKeyTokenValue(tokenValue), loginId.toString());
+	}
+
+	/**
+	 * 删除 token - id 映射
+	 *
+	 * @param tokenValue token值
+	 */
+	public void deleteTokenToIdMapping(String tokenValue) {
+		getSaTokenDao().delete(splicingKeyTokenValue(tokenValue));
+	}
+
+
+	// ------------------- Account-Session 相关 -------------------
 
 	/** 
-	 * 获取指定key的Session, 如果Session尚未创建，isCreate=是否新建并返回
+	 * 获取指定 key 的 SaSession, 如果该 SaSession 尚未创建，isCreate = 是否立即新建并返回
+	 *
 	 * @param sessionId SessionId
 	 * @param isCreate 是否新建
 	 * @param appendOperation 如果这个 SaSession 是新建的，则要追加执行的动作
@@ -901,7 +1037,8 @@ public class StpLogic {
 	}
 
 	/** 
-	 * 获取指定key的Session, 如果Session尚未创建，则返回null
+	 * 获取指定 key 的 SaSession, 如果该 SaSession 尚未创建，则返回 null
+	 *
 	 * @param sessionId SessionId
 	 * @return Session对象 
 	 */
@@ -910,14 +1047,16 @@ public class StpLogic {
 	}
 
 	/** 
-	 * 获取指定账号id的User-Session, 如果Session尚未创建，isCreate=是否新建并返回
+	 * 获取指定账号 id 的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
 	 * @param loginId 账号id
 	 * @param isCreate 是否新建
-	 * @return Session对象
+	 * @return SaSession 对象
 	 */
 	public SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
 		return getSessionBySessionId(splicingKeySession(loginId), isCreate, session -> {
-			// 设定这个 SaSession 的各种基础信息：类型、账号体系、账号id
+			// 这里是该 Account-Session 首次创建时才会被执行的方法：
+			// 		设定这个 SaSession 的各种基础信息：类型、账号体系、账号id
 			session.setType(SaTokenConsts.SESSION_TYPE__ACCOUNT);
 			session.setLoginType(getLoginType());
 			session.setLoginId(loginId);
@@ -925,16 +1064,18 @@ public class StpLogic {
 	}
 
 	/** 
-	 * 获取指定账号id的User-Session，如果Session尚未创建，则新建并返回 
+	 * 获取指定账号 id 的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @param loginId 账号id 
-	 * @return Session对象 
+	 * @return SaSession 对象
 	 */
 	public SaSession getSessionByLoginId(Object loginId) {
 		return getSessionByLoginId(loginId, true);
 	}
 
 	/** 
-	 * 获取当前User-Session, 如果Session尚未创建，isCreate=是否新建并返回 
+	 * 获取当前已登录账号的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
 	 * @param isCreate 是否新建 
 	 * @return Session对象 
 	 */
@@ -943,7 +1084,8 @@ public class StpLogic {
 	}
 	
 	/** 
-	 * 获取当前User-Session，如果Session尚未创建，则新建并返回 
+	 * 获取当前已登录账号的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @return Session对象 
 	 */
 	public SaSession getSession() {
@@ -954,14 +1096,16 @@ public class StpLogic {
 	// ------------------- Token-Session 相关 -------------------  
 
 	/** 
-	 * 获取指定Token-Session，如果Session尚未创建，isCreate代表是否新建并返回
+	 * 获取指定 token 的 Token-Session，如果该 SaSession 尚未创建，isCreate代表是否新建并返回
+	 *
 	 * @param tokenValue token值
 	 * @param isCreate 是否新建 
 	 * @return session对象
 	 */
 	public SaSession getTokenSessionByToken(String tokenValue, boolean isCreate) {
 		return getSessionBySessionId(splicingKeyTokenSession(tokenValue), isCreate, session -> {
-			// 设定这个 SaSession 的各种基础信息：类型、账号体系、Token 值
+			// 这里是该 Token-Session 首次创建时才会被执行的方法：
+			// 		设定这个 SaSession 的各种基础信息：类型、账号体系、Token 值
 			session.setType(SaTokenConsts.SESSION_TYPE__TOKEN);
 			session.setLoginType(getLoginType());
 			session.setToken(tokenValue);
@@ -969,7 +1113,8 @@ public class StpLogic {
 	}
 	
 	/** 
-	 * 获取指定Token-Session，如果Session尚未创建，则新建并返回 
+	 * 获取指定 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @param tokenValue Token值
 	 * @return Session对象  
 	 */
@@ -978,30 +1123,32 @@ public class StpLogic {
 	}
 
 	/** 
-	 * 获取当前Token-Session，如果Session尚未创建，isCreate代表是否新建并返回 
+	 * 获取当前 token 的 Token-Session，如果该 SaSession 尚未创建，isCreate代表是否新建并返回
+	 *
 	 * @param isCreate 是否新建 
 	 * @return Session对象  
 	 */
 	public SaSession getTokenSession(boolean isCreate) {
 
-		// 如果配置了：tokenSessionCheckLogin == true，则需要先校验当前是否登录
+		// 1、如果配置了：tokenSessionCheckLogin == true，则需要先校验当前是否登录，未登录情况下不允许拿到 Token-Session
 		if(getConfig().getTokenSessionCheckLogin()) {
 			checkLogin();
 		}
 
-		// 如果前端没有提供 Token ，则直接返回 null
+		// 2、如果前端根本没有提供 Token ，则直接返回 null
 		String tokenValue = getTokenValue();
 		if(SaFoxUtil.isEmpty(tokenValue)) {
 			return null;
 		}
 
-		// 代码至此：tokenSessionCheckLogin 校验通过、且 Token 有值
-		// 现在根据前端提供的 Token 获取它对应的 Token-Session 对象（SaSession）
+		// 3、代码至此：tokenSessionCheckLogin 校验通过、且 Token 有值
+		//    现在根据前端提供的 Token 获取它对应的 Token-Session 对象（SaSession）
 		return getTokenSessionByToken(tokenValue, isCreate);
 	}
 
 	/**
-	 * 获取当前Token-Session，如果Session尚未创建，则新建并返回
+	 * 获取当前 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @return Session对象
 	 */
 	public SaSession getTokenSession() {
@@ -1009,14 +1156,15 @@ public class StpLogic {
 	}
 
 	/**
-	 * 获取当前匿名 Token-Session （可在未登录情况下使用的Token-Session）
+	 * 获取当前匿名 Token-Session （可在未登录情况下使用的 Token-Session）
+	 *
 	 * @param isCreate 在 Token-Session 尚未创建的情况是否新建并返回
 	 * @return Token-Session 对象
 	 */
 	public SaSession getAnonTokenSession(boolean isCreate) {
 		/*
 		 * 情况1、如果调用方提供了有效 Token，则：直接返回其 [Token-Session]
-		 * 情况2、如果调用方提供了无效 Token，或根本没有提供 Token，则：创建新 Token -> 返回 [Token-Session]
+		 * 情况2、如果调用方提供了无效 Token，或根本没有提供 Token，则：创建新 Token -> 返回 [ Token-Session ]
 		 */
 		String tokenValue = getTokenValue();
 
@@ -1026,11 +1174,13 @@ public class StpLogic {
 		 * 条件2、能查出 LoginId
 		 */
 		if(SaFoxUtil.isNotEmpty(tokenValue)) {
+
 			// 符合条件1
 			SaSession session = getTokenSessionByToken(tokenValue, false);
 			if(session != null) {
 				return session;
 			}
+
 			// 符合条件2
 			String loginId = getLoginIdNotHandle(tokenValue);
 			if(isValidLoginId(loginId)) {
@@ -1056,10 +1206,12 @@ public class StpLogic {
 					}
 			);
 
-			// 写入 [最后操作时间]
+			// 写入此 token 的最后活跃时间
 			setLastActivityToNow(tokenValue);
+
 			// 在当前上下文写入此 TokenValue
 			setTokenValue(tokenValue);
+
 			// 返回其 Token-Session 对象
 			return getTokenSessionByToken(tokenValue, isCreate);
 		}
@@ -1070,6 +1222,7 @@ public class StpLogic {
 
 	/** 
 	 * 获取当前匿名 Token-Session （可在未登录情况下使用的Token-Session）
+	 *
 	 * @return Token-Session 对象
 	 */
 	public SaSession getAnonTokenSession() {
@@ -1077,104 +1230,126 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 删除Token-Session 
+	 * 删除指定 token 的 Token-Session
+	 *
 	 * @param tokenValue token值 
 	 */
 	public void deleteTokenSession(String tokenValue) {
 		getSaTokenDao().delete(splicingKeyTokenSession(tokenValue));
 	}
- 	
-	// ------------------- [临时有效期] 验证相关 -------------------  
+
+
+	// ------------------- Activity-Timeout 临时有效期 验证相关 -------------------
 
 	/**
- 	 * 写入指定token的 [最后操作时间] 为当前时间戳 
+ 	 * 写入指定 token 的 [ 最后活跃时间 ] 为当前时间戳
+	 *
  	 * @param tokenValue 指定token 
  	 */
  	protected void setLastActivityToNow(String tokenValue) {
- 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
- 		if(tokenValue == null || isOpenActivityCheck() == false) {
+ 		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+ 		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
  			return;
  		}
- 		// 将[最后操作时间]标记为当前时间戳 
+
+ 		// 将[ 最后活跃时间 ] 标记为当前时间戳
  		getSaTokenDao().set(splicingKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()), getConfig().getTimeout());
  	}
  	
  	/**
- 	 * 清除指定 Token 的 [最后操作时间记录]
- 	 * @param tokenValue 指定token 
+ 	 * 清除指定 Token 的 [ 最后活跃时间记录 ]
+	 *
+ 	 * @param tokenValue 指定 token
  	 */
  	protected void clearLastActivity(String tokenValue) {
- 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
- 		if(tokenValue == null || isOpenActivityCheck() == false) {
- 			return;
- 		}
- 		// 删除[最后操作时间]
+		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
+			return;
+		}
+
+ 		// 删除 [ 最后活跃时间 ]
  		getSaTokenDao().delete(splicingKeyLastActivityTime(tokenValue));
  	}
  	
  	/**
- 	 * 检查指定token 是否已经[临时过期]，如果已经过期则抛出异常  
+ 	 * 检查指定token 是否已经 [ 临时过期 ]，如果已经过期则抛出异常
+	 *
  	 * @param tokenValue 指定token
  	 */
  	public void checkActivityTimeout(String tokenValue) {
- 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
- 		if(tokenValue == null || isOpenActivityCheck() == false) {
- 			return;
- 		}
- 		// 如果本次请求已经有了[检查标记], 则立即返回 
+
+		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
+			return;
+		}
+
+ 		// 如果本次请求已经有了 [ 检查标记 ]，说明已经校验过了，此时无需重复校验，立即返回
  		SaStorage storage = SaHolder.getStorage();
  		if(storage.get(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY) != null) {
  			return;
  		}
- 		// ------------ 验证是否已经 [临时过期] 
- 		// 获取 [临时剩余时间]
+
+ 		// ------------ 下面开始校验这个 token 是否已经 [ 临时过期 ]
+
+ 		// 1、获取这个 token 的临时剩余时间
  		long timeout = getTokenActivityTimeoutByToken(tokenValue);
- 		// -1 代表此token已经被设置永不过期，无须继续验证 
- 		if(timeout == SaTokenDao.NEVER_EXPIRE) {
- 			return;
- 		}
- 		// -2 代表已过期，抛出异常 
- 		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
- 			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_TIMEOUT, tokenValue).setCode(SaErrorCode.CODE_11016);
- 		}
+
+		// 2、值为 -1 代表此 token 已经被设置永不过期，无须继续验证
+		if(timeout == SaTokenDao.NEVER_EXPIRE) {
+			// 此句代码含义参考最下面
+			storage.set(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY, true);
+			return;
+		}
+
+		// 3、值为 -2 代表已临时过期，此时需要抛出异常
+		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
+			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_TIMEOUT, tokenValue).setCode(SaErrorCode.CODE_11016);
+		}
  		// --- 至此，验证已通过 
 
- 		// 打上[检查标记]，标记一下当前请求已经通过验证，避免一次请求多次验证，造成不必要的性能消耗 
+ 		// 4、打上 [ 检查标记 ]，标记一下当前请求已经通过校验，避免一次请求多次校验，造成不必要的性能消耗
  		storage.set(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY, true);
  	}
 
  	/**
- 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
+ 	 * 检查当前 token 是否已经[临时过期]，如果已经过期则抛出异常
  	 */
  	public void checkActivityTimeout() {
  		checkActivityTimeout(getTokenValue());
  	}
  	
  	/**
- 	 * 续签指定token：(将 [最后操作时间] 更新为当前时间戳) 
+ 	 * 续签指定 token：将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
+	 *
  	 * @param tokenValue 指定token 
  	 */
  	public void updateLastActivityToNow(String tokenValue) {
- 		// 如果token == null 或者 设置了[永不过期], 则立即返回 
- 		if(tokenValue == null || isOpenActivityCheck() == false) {
- 			return;
- 		}
- 		getSaTokenDao().update(splicingKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()));
+		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
+			return;
+		}
+
+		// 将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
+		getSaTokenDao().update(splicingKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()));
  	}
 
  	/**
- 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
- 	 * <h1>请注意: 即使token已经 [临时过期] 也可续签成功，
- 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
+ 	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
+ 	 * <h2>
+	 * 		请注意: 即使 token 已经 [ 临时过期 ] 也可续签成功，
+ 	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可
+	 * </h2>
  	 */
  	public void updateLastActivityToNow() {
  		updateLastActivityToNow(getTokenValue());
  	}
- 	
-	// ------------------- 过期时间相关 -------------------  
+
+
+	// ------------------- 过期时间相关 -------------------
 
  	/**
- 	 * 获取当前登录者的 token 剩余有效时间 (单位: 秒)
+ 	 * 获取当前会话 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
  	 * @return token剩余有效时间
  	 */
  	public long getTokenTimeout() {
@@ -1182,7 +1357,8 @@ public class StpLogic {
  	}
  	
  	/**
- 	 * 获取指定 loginId 的 token 剩余有效时间 (单位: 秒) 
+ 	 * 获取指定账号 id 的 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
  	 * @param loginId 指定loginId 
  	 * @return token剩余有效时间 
  	 */
@@ -1191,7 +1367,8 @@ public class StpLogic {
  	}
 
  	/**
- 	 * 获取当前登录者的 User-Session 剩余有效时间 (单位: 秒)
+ 	 * 获取当前登录账号的 Account-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
  	 * @return token剩余有效时间
  	 */
  	public long getSessionTimeout() {
@@ -1199,7 +1376,8 @@ public class StpLogic {
  	}
  	
  	/**
- 	 * 获取指定 loginId 的 User-Session 剩余有效时间 (单位: 秒) 
+ 	 * 获取指定账号 id 的 Account-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
  	 * @param loginId 指定loginId 
  	 * @return token剩余有效时间 
  	 */
@@ -1208,7 +1386,8 @@ public class StpLogic {
  	}
 
  	/**
- 	 * 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
+ 	 * 获取当前 token 的 Token-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
  	 * @return token剩余有效时间
  	 */
  	public long getTokenSessionTimeout() {
@@ -1216,110 +1395,132 @@ public class StpLogic {
  	}
  	
  	/**
- 	 * 获取指定 Token-Session 剩余有效时间 (单位: 秒) 
+ 	 * 获取指定 token 的 Token-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
  	 * @param tokenValue 指定token 
- 	 * @return token剩余有效时间 
+ 	 * @return token 剩余有效时间
  	 */
  	public long getTokenSessionTimeoutByTokenValue(String tokenValue) {
  		return getSaTokenDao().getSessionTimeout(splicingKeyTokenSession(tokenValue));
  	}
 
  	/**
- 	 * 获取当前 token [临时过期] 剩余有效时间 (单位: 秒)
- 	 * @return token [临时过期] 剩余有效时间
+ 	 * 获取当前 token [ 临时过期 ] 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+ 	 * @return /
  	 */
  	public long getTokenActivityTimeout() {
  		return getTokenActivityTimeoutByToken(getTokenValue());
  	}
  	
  	/**
- 	 * 获取指定 token [临时过期] 剩余有效时间 (单位: 秒)
- 	 * @param tokenValue 指定token 
- 	 * @return token[临时过期]剩余有效时间
+ 	 * 获取指定 token [ 临时过期 ] 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+ 	 * @param tokenValue 指定 token
+ 	 * @return /
  	 */
  	public long getTokenActivityTimeoutByToken(String tokenValue) {
- 		// 如果token为null , 则返回 -2
- 		if(tokenValue == null) {
+
+ 		// 如果提供的 token 为 null，则返回 -2
+ 		if(SaFoxUtil.isEmpty(tokenValue)) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		}
- 		// 如果设置了永不过期, 则返回 -1 
- 		if(isOpenActivityCheck() == false) {
+
+ 		// 如果全局配置了永不过期, 则返回 -1
+ 		if( ! isOpenActivityCheck() ) {
  			return SaTokenDao.NEVER_EXPIRE;
  		}
- 		// ------ 开始查询 
- 		// 获取相关数据 
+
+ 		// ------ 开始查询
+
+ 		// 1、先获取这个 token 的最后活跃时间，13位时间戳
  		String keyLastActivityTime = splicingKeyLastActivityTime(tokenValue);
  		String lastActivityTimeString = getSaTokenDao().get(keyLastActivityTime);
- 		// 查不到，返回-2 
+
+ 		// 2、如果查不到，返回-2
  		if(lastActivityTimeString == null) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		}
- 		// 计算相差时间
+
+ 		// 3、计算最后活跃时间 和 此时此刻 的时间差
+		//    计算公式为: (当前时间 - 最后活跃时间) / 1000
  		long lastActivityTime = Long.parseLong(lastActivityTimeString);
  		long apartSecond = (System.currentTimeMillis() - lastActivityTime) / 1000;
- 		long timeout = getConfig().getActivityTimeout() - apartSecond;
- 		// 如果 < 0， 代表已经过期 ，返回-2 
+
+ 		// 4、校验这个时间差是否超过了允许的值
+		//    计算公式为: 允许的最大时间差 - 实际时间差，判断是否 < 0， 如果是则代表已经临时过期 ，返回-2
+		long timeout = getConfig().getActivityTimeout() - apartSecond;
  		if(timeout < 0) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
- 		}
- 		return timeout;
+ 		} else {
+			// 否则代表没过期，返回剩余有效时间
+			return timeout;
+		}
  	}
 
  	/**
- 	 * 对当前 Token 的 timeout 值进行续期 
+ 	 * 对当前 token 的 timeout 值进行续期
+	 *
  	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
  	 */
  	public void renewTimeout(long timeout) {
- 		// 续期 db 数据 
+ 		// 1、续期缓存数据
  		String tokenValue = getTokenValue();
  		renewTimeout(tokenValue, timeout);
  		
- 		// 续期客户端Cookie有效期 
+ 		// 2、续期客户端 Cookie 有效期
  		if(getConfig().getIsReadCookie()) {
+			// 如果 timeout = -1，代表永久，但是一般浏览器不支持永久 Cookie，所以此处设置为 int 最大值
+			// 如果 timeout 大于 int 最大值，会造成数据溢出，所以也要将其设置为 int 最大值
+			if(timeout == SaTokenDao.NEVER_EXPIRE || timeout > Integer.MAX_VALUE) {
+				 timeout = Integer.MAX_VALUE;
+			}
  			setTokenValueToCookie(tokenValue, (int)timeout);
  		}
  	}
  	
  	/**
- 	 * 对指定 Token 的 timeout 值进行续期 
- 	 * @param tokenValue 指定token 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
+ 	 * 对指定 token 的 timeout 值进行续期
+	 *
+ 	 * @param tokenValue 指定 token
+ 	 * @param timeout 要修改成为的有效时间 (单位: 秒，填 -1 代表要续为永久有效)
  	 */
  	public void renewTimeout(String tokenValue, long timeout) {
  		
- 		// Token 指向的 LoginId 异常时，不进行任何操作 
+ 		// 1、如果 token 指向的 loginId 为空，或者属于异常项时，不进行任何操作
  		Object loginId = getLoginIdByToken(tokenValue);
  		if(loginId == null) {
  			return;
  		}
- 		
- 		SaTokenDao dao = getSaTokenDao();
- 		
- 		// 续期 Token 有效期 
+
+ 		// 2、续期此 token 本身的有效期 （改 ttl）
+		SaTokenDao dao = getSaTokenDao();
  		dao.updateTimeout(splicingKeyTokenValue(tokenValue), timeout);
 
- 		// 续期 Token-Session 有效期 
+ 		// 3、续期此 token 的 Token-Session 有效期
 		SaSession tokenSession = getTokenSessionByToken(tokenValue, false);
 		if(tokenSession != null) {
 			tokenSession.updateTimeout(timeout);
 		}
 		
- 		// 续期指向的 User-Session 有效期 
+ 		// 4、续期此 token 指向的账号的 Account-Session 有效期
  		getSessionByLoginId(loginId).updateMinTimeout(timeout);
  		
- 		// Token-Activity 活跃检查相关 
+ 		// 5、更新此 token 的最后活跃时间
  		if(isOpenActivityCheck()) {
  			dao.updateTimeout(splicingKeyLastActivityTime(tokenValue), timeout);
  		}
 
-		// 通知更新超时事件
+		// 6、$$ 发布事件：某某 token 被续期了
 		SaTokenEventCenter.doRenewTimeout(tokenValue, loginId, timeout);
  	}
- 	
-	// ------------------- 角色验证操作 -------------------  
+
+
+	// ------------------- 角色认证操作 -------------------
 
 	/**
-	 * 获取：当前账号的角色集合 
+	 * 获取：当前账号的角色集合
+	 *
 	 * @return /
 	 */
 	public List<String> getRoleList() {
@@ -1331,7 +1532,8 @@ public class StpLogic {
 	}
  	
 	/**
-	 * 获取：指定账号的角色集合 
+	 * 获取：指定账号的角色集合
+	 *
 	 * @param loginId 指定账号id 
 	 * @return /
 	 */
@@ -1340,7 +1542,8 @@ public class StpLogic {
 	}
 
  	/** 
- 	 * 判断：当前账号是否拥有指定角色, 返回true或false 
+ 	 * 判断：当前账号是否拥有指定角色, 返回 true 或 false
+	 *
  	 * @param role 角色
  	 * @return / 
  	 */
@@ -1349,7 +1552,8 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 判断：指定账号是否含有指定角色标识, 返回true或false 
+ 	 * 判断：指定账号是否含有指定角色标识, 返回 true 或 false
+	 *
  	 * @param loginId 账号id
  	 * @param role 角色标识
  	 * @return 是否含有指定角色标识
@@ -1359,7 +1563,8 @@ public class StpLogic {
  	}
  	
  	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
+ 	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
  	 * @param roleArray 角色标识数组
  	 * @return true或false
  	 */
@@ -1373,7 +1578,8 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
+ 	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
  	 * @param roleArray 角色标识数组
  	 * @return true或false
  	 */
@@ -1387,7 +1593,8 @@ public class StpLogic {
  	}
  	
  	/** 
- 	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException 
+ 	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException
+	 *
  	 * @param role 角色标识
  	 */
  	public void checkRole(String role) {
@@ -1397,14 +1604,15 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
+ 	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
  	 * @param roleArray 角色标识数组
  	 */
  	public void checkRoleAnd(String... roleArray){
 		// 先获取当前是哪个账号id
 		Object loginId = getLoginId();
 
-		// 如果没有指定权限，那么直接跳过
+		// 如果没有指定要校验的角色，那么直接跳过
 		if(roleArray == null || roleArray.length == 0) {
 			return;
 		}
@@ -1419,7 +1627,8 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
+ 	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
  	 * @param roleArray 角色标识数组
  	 */
  	public void checkRoleOr(String... roleArray){
@@ -1445,10 +1654,11 @@ public class StpLogic {
  	}
 
  	
-	// ------------------- 权限验证操作 -------------------  
+	// ------------------- 权限认证操作 -------------------
 
 	/**
-	 * 获取：当前账号的权限码集合 
+	 * 获取：当前账号的权限码集合
+	 *
 	 * @return / 
 	 */
 	public List<String> getPermissionList() {
@@ -1460,7 +1670,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 获取：指定账号的权限码集合 
+	 * 获取：指定账号的权限码集合
+	 *
 	 * @param loginId 指定账号id
 	 * @return / 
 	 */
@@ -1469,7 +1680,8 @@ public class StpLogic {
 	}
 
  	/** 
- 	 * 判断：当前账号是否含有指定权限, 返回true或false 
+ 	 * 判断：当前账号是否含有指定权限, 返回 true 或 false
+	 *
  	 * @param permission 权限码
  	 * @return 是否含有指定权限
  	 */
@@ -1478,8 +1690,9 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 判断：指定账号id是否含有指定权限, 返回true或false 
- 	 * @param loginId 账号id
+ 	 * 判断：指定账号 id 是否含有指定权限, 返回 true 或 false
+	 *
+ 	 * @param loginId 账号 id
  	 * @param permission 权限码
  	 * @return 是否含有指定权限
  	 */
@@ -1488,7 +1701,8 @@ public class StpLogic {
  	}
  	
  	/** 
- 	 * 判断：当前账号是否含有指定权限, [指定多个，必须全部具有] 
+ 	 * 判断：当前账号是否含有指定权限 [ 指定多个，必须全部具有 ]
+	 *
  	 * @param permissionArray 权限码数组
  	 * @return true 或 false 
  	 */
@@ -1502,7 +1716,8 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 判断：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
+ 	 * 判断：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
  	 * @param permissionArray 权限码数组
  	 * @return true 或 false 
  	 */
@@ -1516,7 +1731,8 @@ public class StpLogic {
  	}
  	
  	/** 
- 	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException 
+ 	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException
+	 *
  	 * @param permission 权限码
  	 */
  	public void checkPermission(String permission) {
@@ -1526,7 +1742,8 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，必须全部验证通过] 
+ 	 * 校验：当前账号是否含有指定权限 [ 指定多个，必须全部验证通过 ]
+	 *
  	 * @param permissionArray 权限码数组
  	 */
  	public void checkPermissionAnd(String... permissionArray){
@@ -1548,14 +1765,15 @@ public class StpLogic {
  	}
 
  	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
+ 	 * 校验：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
  	 * @param permissionArray 权限码数组
  	 */
  	public void checkPermissionOr(String... permissionArray){
 		// 先获取当前是哪个账号id
 		Object loginId = getLoginId();
 
-		// 如果没有指定权限，那么直接跳过
+		// 如果没有指定要校验的权限，那么直接跳过
 		if(permissionArray == null || permissionArray.length == 0) {
 			return;
 		}
@@ -1578,9 +1796,12 @@ public class StpLogic {
 	// ------------------- id 反查 token 相关操作 -------------------  
 	
 	/** 
-	 * 获取指定账号id的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	 * 获取指定账号 id 的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
 	 * @return token值 
 	 */
@@ -1589,11 +1810,14 @@ public class StpLogic {
 	}
 
 	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	 * 获取指定账号 id 指定设备类型端的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @param device 设备类型，填null代表不限设备类型 
+	 * @param device 设备类型，填 null 代表不限设备类型
 	 * @return token值 
 	 */
 	public String getTokenValueByLoginId(Object loginId, String device) {
@@ -1602,27 +1826,30 @@ public class StpLogic {
 	}
 	
  	/** 
-	 * 获取指定账号id的tokenValue集合 
+	 * 获取指定账号 id 的 token 集合
+	 *
 	 * @param loginId 账号id 
-	 * @return 此loginId的所有相关token 
+	 * @return 此 loginId 的所有相关 token
  	 */
 	public List<String> getTokenValueListByLoginId(Object loginId) {
 		return getTokenValueListByLoginId(loginId, null);
 	}
 
  	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 集合 
+	 * 获取指定账号 id 指定设备类型端的 token 集合
+	 *
 	 * @param loginId 账号id 
-	 * @param device 设备类型，填null代表不限设备类型
-	 * @return 此loginId的所有相关token 
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 token
  	 */
 	public List<String> getTokenValueListByLoginId(Object loginId, String device) {
-		// 如果session为null的话直接返回空集合  
+		// 如果该账号的 Account-Session 为 null，说明此账号尚没有客户端在登录，此时返回空集合
 		SaSession session = getSessionByLoginId(loginId, false);
 		if(session == null) {
 			return Collections.emptyList();
 		}
-		// 遍历解析 
+
+		// 遍历解析，按照设备类型进行筛选
 		List<TokenSign> tokenSignList = session.tokenSignListCopy();
 		List<String> tokenValueList = new ArrayList<>();
 		for (TokenSign tokenSign : tokenSignList) {
@@ -1635,30 +1862,38 @@ public class StpLogic {
 	
 	/**
 	 * 返回当前会话的登录设备类型
+	 *
 	 * @return 当前令牌的登录设备类型
 	 */
 	public String getLoginDevice() {
-		// 如果没有token，直接返回 null 
+		// 1、如果前端没有提交 token，直接返回 null
 		String tokenValue = getTokenValue();
 		if(tokenValue == null) {
 			return null;
 		}
-		// 如果还未登录，直接返回 null 
+
+		// 2、如果当前会话还未登录，直接返回 null
 		if(!isLogin()) {
 			return null;
 		}
-		// 如果session为null的话直接返回 null 
+
+		// 3、获取当前账号的 Account-Session
 		SaSession session = getSessionByLoginId(getLoginIdDefaultNull(), false);
+
+		// 4、为 null 说明尚未登录，当然也就不存在什么设备类型，直接返回 null
 		if(session == null) {
 			return null;
 		}
-		// 遍历解析 
+
+		// 5、遍历 Account-Session 上的客户端 token 列表，寻找当前 token 对应的设备类型
 		List<TokenSign> tokenSignList = session.tokenSignListCopy();
 		for (TokenSign tokenSign : tokenSignList) {
 			if(tokenSign.getValue().equals(tokenValue)) {
 				return tokenSign.getDevice();
 			}
 		}
+
+		// 6、没有找到，还是返回 null
 		return null;
 	}
 	
@@ -1666,7 +1901,8 @@ public class StpLogic {
 	// ------------------- 会话管理 -------------------  
 
 	/**
-	 * 根据条件查询Token 
+	 * 根据条件查询缓存中所有的 token
+	 *
 	 * @param keyword 关键字 
 	 * @param start 开始处索引
 	 * @param size 获取数量 (-1代表一直获取到末尾) 
@@ -1679,7 +1915,8 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 根据条件查询SessionId 
+	 * 根据条件查询缓存中所有的 SessionId
+	 *
 	 * @param keyword 关键字 
 	 * @param start 开始处索引 
 	 * @param size 获取数量  (-1代表一直获取到末尾) 
@@ -1692,7 +1929,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 根据条件查询Token专属Session的Id 
+	 * 根据条件查询缓存中所有的 Token-Session-Id
+	 *
 	 * @param keyword 关键字 
 	 * @param start 开始处索引 
 	 * @param size 获取数量 (-1代表一直获取到末尾) 
@@ -1708,7 +1946,8 @@ public class StpLogic {
 	// ------------------- 注解鉴权 -------------------  
 
 	/**
-	 * 根据注解(@SaCheckLogin)鉴权
+	 * 根据注解 ( @SaCheckLogin ) 鉴权
+	 *
 	 * @param at 注解对象 
 	 */
 	public void checkByAnnotation(SaCheckLogin at) {
@@ -1716,7 +1955,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 根据注解(@SaCheckRole)鉴权
+	 * 根据注解 ( @SaCheckRole ) 鉴权
+	 *
 	 * @param at 注解对象 
 	 */
 	public void checkByAnnotation(SaCheckRole at) {
@@ -1729,7 +1969,8 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 根据注解(@SaCheckPermission)鉴权
+	 * 根据注解 ( @SaCheckPermission ) 鉴权
+	 *
 	 * @param at 注解对象 
 	 */
 	public void checkByAnnotation(SaCheckPermission at) {
@@ -1741,11 +1982,11 @@ public class StpLogic {
 				this.checkPermissionOr(permissionArray);	
 			}
 		} catch (NotPermissionException e) {
-			// 权限认证未通过，再开始角色认证 
+			// 权限认证校验未通过，再开始角色认证校验
 			if(at.orRole().length > 0) {
 				for (String role : at.orRole()) {
 					String[] rArr = SaFoxUtil.convertStringToArray(role);
-					// 某一项role认证通过，则可以提前退出了，代表通过 
+					// 某一项 role 认证通过，则可以提前退出了，代表通过
 					if(hasRoleAnd(rArr)) {
 						return;
 					}
@@ -1756,7 +1997,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 根据注解(@SaCheckSafe)鉴权
+	 * 根据注解 ( @SaCheckSafe ) 鉴权
+	 *
 	 * @param at 注解对象 
 	 */
 	public void checkByAnnotation(SaCheckSafe at) {
@@ -1764,7 +2006,7 @@ public class StpLogic {
 	}
 
 	/**
-	 * 根据注解(@SaCheckDisable)鉴权
+	 * 根据注解 ( @SaCheckDisable ) 鉴权
 	 *
 	 * @param at 注解对象
 	 */
@@ -1800,7 +2042,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
 	 */
 	public void checkDisable(Object loginId) {
@@ -1809,6 +2052,7 @@ public class StpLogic {
 	
 	/**
 	 * 获取：指定账号剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
 	 * @return / 
 	 */
@@ -1818,6 +2062,7 @@ public class StpLogic {
 
 	/**
 	 * 解封：指定账号
+	 *
 	 * @param loginId 账号id
 	 */
 	public void untieDisable(Object loginId) {
@@ -1830,6 +2075,7 @@ public class StpLogic {
 	/**
 	 * 封禁：指定账号的指定服务 
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
+	 *
 	 * @param loginId 指定账号id 
 	 * @param service 指定服务 
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
@@ -1839,7 +2085,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 判断：指定账号的指定服务 是否已被封禁 (true=已被封禁, false=未被封禁) 
+	 * 判断：指定账号的指定服务 是否已被封禁（true=已被封禁, false=未被封禁）
+	 *
 	 * @param loginId 账号id
 	 * @param service 指定服务 
 	 * @return / 
@@ -1849,7 +2096,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
 	 * @param services 指定服务，可以指定多个 
 	 */
@@ -1863,6 +2111,7 @@ public class StpLogic {
 
 	/**
 	 * 获取：指定账号 指定服务 剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
 	 * @param service 指定服务 
 	 * @return see note 
@@ -1873,18 +2122,21 @@ public class StpLogic {
 
 	/**
 	 * 解封：指定账号、指定服务
+	 *
 	 * @param loginId 账号id
 	 * @param services 指定服务，可以指定多个 
 	 */
 	public void untieDisable(Object loginId, String... services) {
-		// 空值检查 
+
+		// 先检查提供的参数是否有效
 		if(SaFoxUtil.isEmpty(loginId)) {
 			throw new SaTokenException("请提供要解禁的账号").setCode(SaErrorCode.CODE_11062);
 		}
 		if(services == null || services.length == 0) {
 			throw new SaTokenException("请提供要解禁的服务").setCode(SaErrorCode.CODE_11063);
 		}
-				
+
+		// 遍历逐个解禁
 		for (String service : services) {
 			// 解封 
 			getSaTokenDao().delete(splicingKeyDisable(loginId, service));
@@ -1898,7 +2150,8 @@ public class StpLogic {
 	// ------------------- 阶梯封禁 -------------------  
 
 	/**
-	 * 封禁：指定账号，并指定封禁等级 
+	 * 封禁：指定账号，并指定封禁等级
+	 *
 	 * @param loginId 指定账号id 
 	 * @param level 指定封禁等级 
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
@@ -1908,14 +2161,15 @@ public class StpLogic {
 	}
 
 	/**
-	 * 封禁：指定账号的指定服务，并指定封禁等级 
+	 * 封禁：指定账号的指定服务，并指定封禁等级
+	 *
 	 * @param loginId 指定账号id 
 	 * @param service 指定封禁服务 
 	 * @param level 指定封禁等级 
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public void disableLevel(Object loginId, String service, int level, long time) {
-		// 空值检查 
+		// 先检查提供的参数是否有效
 		if(SaFoxUtil.isEmpty(loginId)) {
 			throw new SaTokenException("请提供要封禁的账号").setCode(SaErrorCode.CODE_11062);
 		}
@@ -1926,7 +2180,7 @@ public class StpLogic {
 			throw new SaTokenException("封禁等级不可以小于最小值：" + SaTokenConsts.MIN_DISABLE_LEVEL).setCode(SaErrorCode.CODE_11064);
 		}
 
-		// 标注为已被封禁
+		// 打上封禁标记
 		getSaTokenDao().set(splicingKeyDisable(loginId, service), String.valueOf(level), time);
  		
  		// $$ 发布事件 
@@ -1953,12 +2207,13 @@ public class StpLogic {
 	 * @return / 
 	 */
 	public boolean isDisableLevel(Object loginId, String service, int level) {
-		// s1. 检查是否被封禁 
+		// 1、先前置检查一下这个账号是否被封禁了
 		int disableLevel = getDisableLevel(loginId, service);
 		if(disableLevel == SaTokenConsts.NOT_DISABLE_LEVEL) {
 			return false;
 		}
-		// s2. 检测被封禁的等级是否达到指定级别 
+
+		// 2、再判断被封禁的等级是否达到了指定级别
 		return disableLevel >= level;
 	}
 
@@ -1980,15 +2235,17 @@ public class StpLogic {
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
 	 */
 	public void checkDisableLevel(Object loginId, String service, int level) {
-		// s1. 检查是否被封禁 
+		// 1、先前置检查一下这个账号是否被封禁了
 		String value = getSaTokenDao().get(splicingKeyDisable(loginId, service));
 		if(SaFoxUtil.isEmpty(value)) {
 			return;
 		}
-		// s2. 检测被封禁的等级是否达到指定级别 
+
+		// 2、再判断被封禁的等级是否达到了指定级别
 		Integer disableLevel = SaFoxUtil.getValueByType(value, int.class);
 		if(disableLevel >= level) {
-			throw new DisableServiceException(loginType, loginId, service, disableLevel, level, getDisableTime(loginId, service)).setCode(SaErrorCode.CODE_11061);
+			throw new DisableServiceException(loginType, loginId, service, disableLevel, level, getDisableTime(loginId, service))
+					.setCode(SaErrorCode.CODE_11061);
 		}
 	}
 
@@ -2010,20 +2267,22 @@ public class StpLogic {
 	 * @return / 
 	 */
 	public int getDisableLevel(Object loginId, String service) {
-		// q1. 如果尚未被封禁，则返回-2 
+		// 1、判断是否被封禁了，如果尚未被封禁，返回-2
 		String value = getSaTokenDao().get(splicingKeyDisable(loginId, service));
 		if(SaFoxUtil.isEmpty(value)) {
 			return SaTokenConsts.NOT_DISABLE_LEVEL;
 		}
-		// q2. 转为 int 类型 
+
+		// 2、转为 int 类型返回
 		return SaFoxUtil.getValueByType(value, int.class);
 	}
 
 	
-	// ------------------- 身份切换 -------------------  
+	// ------------------- 临时身份切换 -------------------
 
 	/**
-	 * 临时切换身份为指定账号id 
+	 * 临时切换身份为指定账号id
+	 *
 	 * @param loginId 指定loginId 
 	 */
 	public void switchTo(Object loginId) {
@@ -2038,23 +2297,26 @@ public class StpLogic {
 	}
 
 	/**
-	 * 当前是否正处于[身份临时切换]中 
-	 * @return 是否正处于[身份临时切换]中 
+	 * 判断当前请求是否正处于 [ 身份临时切换 ] 中
+	 *
+	 * @return /
 	 */
 	public boolean isSwitch() {
 		return SaHolder.getStorage().get(splicingKeySwitch()) != null;
 	}
 	
 	/**
-	 * 返回[身份临时切换]的loginId 
-	 * @return 返回[身份临时切换]的loginId 
+	 * 返回 [ 身份临时切换 ] 的 loginId
+	 *
+	 * @return /
 	 */
 	public Object getSwitchLoginId() {
 		return SaHolder.getStorage().get(splicingKeySwitch());
 	}
 	
 	/**
-	 * 在一个代码段里方法内，临时切换身份为指定账号id
+	 * 在一个 lambda 代码段里，临时切换身份为指定账号id，lambda 结束后自动恢复
+	 *
 	 * @param loginId 指定账号id 
 	 * @param function 要执行的方法 
 	 */
@@ -2073,7 +2335,8 @@ public class StpLogic {
 	// ------------------- 二级认证 -------------------  
 	
 	/**
-	 * 在当前会话 开启二级认证 
+	 * 在当前会话 开启二级认证
+	 *
 	 * @param safeTime 维持时间 (单位: 秒) 
 	 */
 	public void openSafe(long safeTime) {
@@ -2081,24 +2344,26 @@ public class StpLogic {
 	}
 
 	/**
-	 * 在当前会话 开启二级认证 
+	 * 在当前会话 开启二级认证
+	 *
 	 * @param service 业务标识  
 	 * @param safeTime 维持时间 (单位: 秒) 
 	 */
 	public void openSafe(String service, long safeTime) {
-		// 开启二级认证前必须处于登录状态 
+		// 1、开启二级认证前必须处于登录状态，否则抛出异常
 		checkLogin();
 		
-		// 写入key 
+		// 2、写入指定的 可以 标记，打开二级认证
 		String tokenValue = getTokenValueNotNull();
 		getSaTokenDao().set(splicingKeySafe(tokenValue, service), SaTokenConsts.SAFE_AUTH_SAVE_VALUE, safeTime);
 		
-		// $$ 发布事件 
+		// 3、$$ 发布事件，某某 token 令牌开启了二级认证
 		SaTokenEventCenter.doOpenSafe(loginType, tokenValue, service, safeTime);
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
+	 * 判断：当前会话是否处于二级认证时间内
+	 *
 	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
 	 */
 	public boolean isSafe() {
@@ -2106,7 +2371,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
+	 * 判断：当前会话 是否处于指定业务的二级认证时间内
+	 *
 	 * @param service 业务标识  
 	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
 	 */
@@ -2115,31 +2381,33 @@ public class StpLogic {
 	}
 
 	/**
-	 * 指定 Token 是否处于二级认证时间内 
+	 * 判断：指定 token 是否处于二级认证时间内
+	 *
 	 * @param tokenValue Token 值  
 	 * @param service 业务标识  
 	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
 	 */
 	public boolean isSafe(String tokenValue, String service) {
-		// 如果 Token 为空，则直接视为未认证  
+		// 1、如果提供的 Token 为空，则直接视为未认证
 		if(SaFoxUtil.isEmpty(tokenValue)) {
 			return false;
 		}
 		
-		// 如果DB中可以查询出指定的键值，则代表已认证，否则视为未认证 
+		// 2、如果缓存中可以查询出指定的键值，则代表已认证，否则视为未认证
 		String value = getSaTokenDao().get(splicingKeySafe(tokenValue, service));
 		return !(SaFoxUtil.isEmpty(value));
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
+	 * 校验：当前会话是否已通过二级认证，如未通过则抛出异常
 	 */
 	public void checkSafe() {
 		checkSafe(SaTokenConsts.DEFAULT_SAFE_AUTH_SERVICE);
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
+	 * 校验：检查当前会话是否已通过指定业务的二级认证，如未通过则抛出异常
+	 *
 	 * @param service 业务标识  
 	 */
 	public void checkSafe(String service) {
@@ -2150,7 +2418,8 @@ public class StpLogic {
 	}
 	
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
 	 * @return 剩余有效时间
 	 */
 	public long getSafeTime() {
@@ -2158,18 +2427,19 @@ public class StpLogic {
 	}
 
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
 	 * @param service 业务标识  
 	 * @return 剩余有效时间
 	 */
 	public long getSafeTime(String service) {
-		// 如果上下文中没有 Token，则直接视为未认证 
+		// 1、如果前端没有提交 Token，则直接视为未认证
 		String tokenValue = getTokenValue();
 		if(SaFoxUtil.isEmpty(tokenValue)) {
 			return SaTokenDao.NOT_VALUE_EXPIRE;
 		}
 		
-		// 从DB中查询这个key的剩余有效期 
+		// 2、从缓存中查询这个 key 的剩余有效期
 		return getSaTokenDao().getTimeout(splicingKeySafe(tokenValue, service));
 	}
 
@@ -2181,28 +2451,30 @@ public class StpLogic {
 	}
 
 	/**
-	 * 在当前会话 结束二级认证 
+	 * 在当前会话 结束指定业务标识的二级认证
+	 *
 	 * @param service 业务标识  
 	 */
 	public void closeSafe(String service) {
-		// 如果上下文中没有 Token，则无需任何操作 
+		// 1、如果前端没有提交 Token，则无需任何操作
 		String tokenValue = getTokenValue();
 		if(SaFoxUtil.isEmpty(tokenValue)) {
 			return;
 		}
 		
-		// 删除 key 
+		// 2、删除 key
 		getSaTokenDao().delete(splicingKeySafe(tokenValue, service));
 		
-		// $$ 发布事件 
+		// 3、$$ 发布事件，某某 token 令牌关闭了二级认证
 		SaTokenEventCenter.doCloseSafe(loginType, tokenValue, service);
 	}
 
 	
-	// ------------------- 返回相应key -------------------  
+	// ------------------- 拼接相应key -------------------
 
 	/**
-	 * 拼接key：客户端 tokenName 
+	 * 获取：客户端 tokenName
+	 *
 	 * @return key
 	 */
 	public String splicingKeyTokenName() {
@@ -2210,7 +2482,8 @@ public class StpLogic {
  	}
 	
 	/**  
-	 * 拼接key： tokenValue 持久化 token-id
+	 * 拼接： 在保存 token - id 映射关系时，应该使用的key
+	 *
 	 * @param tokenValue token值
 	 * @return key
 	 */
@@ -2219,7 +2492,8 @@ public class StpLogic {
 	}
 	
 	/** 
-	 * 拼接key： Session 持久化  
+	 * 拼接： 在保存 Account-Session 时，应该使用的 key
+	 *
 	 * @param loginId 账号id
 	 * @return key
 	 */
@@ -2228,7 +2502,8 @@ public class StpLogic {
 	}
 	
 	/**  
-	 * 拼接key： tokenValue的Token-Session 
+	 * 拼接：在保存 Token-Session 时，应该使用的 key
+	 *
 	 * @param tokenValue token值
 	 * @return key
 	 */
@@ -2237,7 +2512,8 @@ public class StpLogic {
 	}
 	
 	/** 
-	 * 拼接key： 指定token的最后操作时间 持久化 
+	 * 拼接： 在保存 token 最后活跃时间时，应该使用的 key
+	 *
 	 * @param tokenValue token值
 	 * @return key
 	 */
@@ -2246,7 +2522,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 在进行身份切换时，使用的存储key 
+	 * 拼接：在进行临时身份切换时，应该使用的 key
+	 *
 	 * @return key
 	 */
 	public String splicingKeySwitch() {
@@ -2254,7 +2531,8 @@ public class StpLogic {
 	}
 
 	/**
-	 * 如果token为本次请求新创建的，则以此字符串为key存储在当前request中 
+	 * 如果 token 为本次请求新创建的，则以此字符串为 key 存储在当前 request 中
+	 *
 	 * @return key
 	 */
 	public String splicingKeyJustCreatedSave() {
@@ -2263,7 +2541,8 @@ public class StpLogic {
 	}
 
 	/**  
-	 * 拼接key： 账号封禁
+	 * 拼接： 在保存服务封禁标记时，应该使用的 key
+	 *
 	 * @param loginId 账号id
 	 * @param service 具体封禁的服务 
 	 * @return key 
@@ -2273,7 +2552,8 @@ public class StpLogic {
 	}
 
 	/**  
-	 * 拼接key： 二级认证 
+	 * 拼接： 在保存业务二级认证标记时，应该使用的 key
+	 *
 	 * @param tokenValue 要认证的 Token 
 	 * @param service 要认证的业务标识 
 	 * @return key 
@@ -2285,19 +2565,21 @@ public class StpLogic {
 	}
 
 	
-	// ------------------- Bean对象代理 -------------------  
+	// ------------------- Bean 对象、字段代理 -------------------
 	
 	/**
-	 * 返回全局配置对象 
+	 * 返回全局配置对象
+	 *
 	 * @return / 
 	 */
 	public SaTokenConfig getConfig() {
-		// 为什么再次代理一层? 为某些极端业务场景下[需要不同StpLogic不同配置]提供便利 
+		// 为什么再次代理一层? 为某些业务场景下需要 [ 不同StpLogic不同配置 ] 提供便利
 		return SaManager.getConfig();
 	}
 
 	/**
-	 * 返回全局配置对象的isShare属性 
+	 * 返回全局配置对象的 isShare 属性
+	 *
 	 * @return / 
 	 */
 	public boolean getConfigOfIsShare() {
@@ -2305,7 +2587,8 @@ public class StpLogic {
 	}
 
  	/**
- 	 * 返回全局配置是否开启了Token 活跃校验 
+ 	 * 返回全局配置是否开启了Token 活跃校验
+	 *
  	 * @return / 
  	 */
  	public boolean isOpenActivityCheck() {
@@ -2314,6 +2597,7 @@ public class StpLogic {
 
     /**
      * 返回全局配置的 Cookie 保存时长，单位：秒 （根据全局 timeout 计算）
+	 *
      * @return Cookie 应该保存的时长
      */
     public int getConfigOfCookieTimeout() {
@@ -2326,6 +2610,7 @@ public class StpLogic {
 
 	/**
 	 * 返回全局配置的 maxTryTimes 值，在每次创建 token 时，对其唯一性测试的最高次数（-1=不测试）
+	 *
 	 * @return /
 	 */
 	public int getConfigOfMaxTryTimes() {
@@ -2334,7 +2619,8 @@ public class StpLogic {
 
 
 	/**
-	 * 返回持久化对象 
+	 * 返回持久化对象
+	 *
 	 * @return / 
 	 */
 	public SaTokenDao getSaTokenDao() {
@@ -2343,6 +2629,7 @@ public class StpLogic {
 	
 	/**
 	 * 判断：集合中是否包含指定元素（模糊匹配）
+	 *
 	 * @param list 集合 
 	 * @param element 元素 
 	 * @return /
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index b4bededa..4fa52f39 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -1,40 +1,44 @@
 package cn.dev33.satoken.stp;
 
-import java.util.List;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.fun.SaFunction;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.session.SaSession;
 
+import java.util.List;
+
 /**
- * Sa-Token 权限认证工具类 
- * @author kong 
+ * Sa-Token 权限认证工具类
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class StpUtil {
 	
 	private StpUtil() {}
 	
 	/**
-	 * 账号类型标识 
+	 * 多账号体系下的类型标识
 	 */
 	public static final String TYPE = "login";
 	
 	/**
-	 * 底层的 StpLogic 对象  
+	 * 底层使用的 StpLogic 对象
 	 */
 	public static StpLogic stpLogic = new StpLogic(TYPE); 
 
 	/**
 	 * 获取当前 StpLogic 的账号类型
-	 * @return See Note 
+	 *
+	 * @return /
 	 */
 	public static String getLoginType(){
 		return stpLogic.getLoginType();
 	}
 
 	/**
-	 * 重置 StpLogic 对象
+	 * 安全的重置 StpLogic 对象
+	 *
 	 * <br> 1、更改此账户的 StpLogic 对象 
 	 * <br> 2、put 到全局 StpLogic 集合中 
 	 * <br> 3、发送日志 
@@ -42,19 +46,20 @@ public class StpUtil {
 	 * @param newStpLogic / 
 	 */
 	public static void setStpLogic(StpLogic newStpLogic) {
-		// 重置此账户的 StpLogic 对象 
+		// 1、重置此账户的 StpLogic 对象
 		stpLogic = newStpLogic;
 		
-		// 添加到全局 StpLogic 集合中
-		// 以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic 
+		// 2、添加到全局 StpLogic 集合中
+		//    以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic
 		SaManager.putStpLogic(newStpLogic);
 		
-		// $$ 全局事件  
+		// 3、$$ 发布事件：更新了 stpLogic 对象
 		SaTokenEventCenter.doSetStpLogic(stpLogic);
 	}
 
 	/**
 	 * 获取 StpLogic 对象
+	 *
 	 * @return / 
 	 */
 	public static StpLogic getStpLogic() {
@@ -62,44 +67,49 @@ public class StpUtil {
 	}
 	
 	
-	// ------------------- 获取token 相关 -------------------
+	// ------------------- 获取 token 相关 -------------------
 
 	/**
-	 * 返回token名称 
-	 * @return 此StpLogic的token名称
+	 * 返回 token 名称，此名称在以下地方体现：Cookie 保存 token 时的名称、提交 token 时参数的名称、存储 token 时的 key 前缀
+	 *
+	 * @return /
 	 */
 	public static String getTokenName() {
  		return stpLogic.getTokenName();
  	}
 
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 */
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 */
 	public static void setTokenValue(String tokenValue){
 		stpLogic.setTokenValue(tokenValue);
 	}
-	
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 * @param cookieTimeout Cookie存活时间(秒)
- 	 */
+
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 * @param cookieTimeout Cookie存活时间(秒)
+	 */
 	public static void setTokenValue(String tokenValue, int cookieTimeout){
 		stpLogic.setTokenValue(tokenValue, cookieTimeout);
 	}
 
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 * @param loginModel 登录参数 
- 	 */
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 * @param loginModel 登录参数
+	 */
 	public static void setTokenValue(String tokenValue, SaLoginModel loginModel){
 		stpLogic.setTokenValue(tokenValue, loginModel);
 	}
 
 	/**
-	 * 获取当前TokenValue
+	 * 获取当前请求的 token 值
+	 *
 	 * @return 当前tokenValue
 	 */
 	public static String getTokenValue() {
@@ -107,7 +117,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 获取当前TokenValue (不裁剪前缀) 
+	 * 获取当前请求的 token 值 （不裁剪前缀）
+	 *
 	 * @return / 
 	 */
 	public static String getTokenValueNotCut(){
@@ -115,8 +126,9 @@ public class StpUtil {
 	}
 
 	/**
-	 * 获取当前会话的Token信息 
-	 * @return token信息 
+	 * 获取当前会话的 token 参数信息
+	 *
+	 * @return token 参数信息
 	 */
 	public static SaTokenInfo getTokenInfo() {
 		return stpLogic.getTokenInfo();
@@ -126,9 +138,10 @@ public class StpUtil {
 	// ------------------- 登录相关操作 -------------------
 
 	// --- 登录 
-	
+
 	/**
-	 * 会话登录 
+	 * 会话登录
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 */
 	public static void login(Object id) {
@@ -137,6 +150,7 @@ public class StpUtil {
 
 	/**
 	 * 会话登录，并指定登录设备类型
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param device 设备类型
 	 */
@@ -147,27 +161,27 @@ public class StpUtil {
 	/**
 	 * 会话登录，并指定是否 [记住我]
 	 *
-	 * @param id              账号id，建议的类型：（long | int | String）
-	 * @param isLastingCookie 是否为持久Cookie
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @param isLastingCookie 是否为持久Cookie，值为 true 时记住我，值为 false 时关闭浏览器需要重新登录
 	 */
 	public static void login(Object id, boolean isLastingCookie) {
 		stpLogic.login(id, isLastingCookie);
 	}
 
 	/**
-	 * 会话登录，并指定此次登录token的有效期, 单位:秒
+	 * 会话登录，并指定此次登录 token 的有效期, 单位:秒
 	 *
 	 * @param id      账号id，建议的类型：（long | int | String）
-	 * @param timeout 此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
+	 * @param timeout 此次登录 token 的有效期, 单位:秒
 	 */
 	public static void login(Object id, long timeout) {
 		stpLogic.login(id, timeout);
 	}
 
 	/**
-	 * 会话登录，并指定所有登录参数Model
+	 * 会话登录，并指定所有登录参数 Model
 	 *
-	 * @param id         登录id，建议的类型：（long | int | String）
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param loginModel 此次登录的参数Model
 	 */
 	public static void login(Object id, SaLoginModel loginModel) {
@@ -175,28 +189,30 @@ public class StpUtil {
 	}
 
 	/**
-	 * 创建指定账号id的登录会话 
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @return 返回会话令牌 
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @return 返回会话令牌
 	 */
 	public static String createLoginSession(Object id) {
 		return stpLogic.createLoginSession(id);
 	}
-	
+
 	/**
-	 * 创建指定账号id的登录会话
-	 * @param id 登录id，建议的类型：（long | int | String）
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param loginModel 此次登录的参数Model 
-	 * @return 返回会话令牌 
+	 * @return 返回会话令牌
 	 */
 	public static String createLoginSession(Object id, SaLoginModel loginModel) {
 		return stpLogic.createLoginSession(id, loginModel);
 	}
 	
 	// --- 注销 
-	
-	/** 
-	 * 会话注销 
+
+	/**
+	 * 在当前客户端会话注销
 	 */
 	public static void logout() {
 		stpLogic.logout();
@@ -204,7 +220,8 @@ public class StpUtil {
 
 	/**
 	 * 会话注销，根据账号id 
-	 * @param loginId 账号id 
+	 *
+	 * @param loginId 账号id
 	 */
 	public static void logout(Object loginId) {
 		stpLogic.logout(loginId);
@@ -212,146 +229,154 @@ public class StpUtil {
 
 	/**
 	 * 会话注销，根据账号id 和 设备类型
-	 * 
+	 *
 	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表注销所有设备类型) 
+	 * @param device 设备类型 (填 null 代表注销该账号的所有设备类型)
 	 */
 	public static void logout(Object loginId, String device) {
 		stpLogic.logout(loginId, device);
 	}
-	
+
 	/**
 	 * 会话注销，根据指定 Token 
-	 * 
-	 * @param tokenValue 指定token
+	 *
+	 * @param tokenValue 指定 token
 	 */
 	public static void logoutByTokenValue(String tokenValue) {
 		stpLogic.logoutByTokenValue(tokenValue);
 	}
-	
+
 	/**
 	 * 踢人下线，根据账号id 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
 	 * @param loginId 账号id 
 	 */
 	public static void kickout(Object loginId) {
 		stpLogic.kickout(loginId);
 	}
-	
+
 	/**
 	 * 踢人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表踢出所有设备类型) 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 (填 null 代表踢出该账号的所有设备类型)
 	 */
 	public static void kickout(Object loginId, String device) {
 		stpLogic.kickout(loginId, device);
 	}
 
 	/**
-	 * 踢人下线，根据指定 Token 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param tokenValue 指定token
+	 * 踢人下线，根据指定 token
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param tokenValue 指定 token
 	 */
 	public static void kickoutByTokenValue(String tokenValue) {
 		stpLogic.kickoutByTokenValue(tokenValue);
 	}
-	
+
 	/**
 	 * 顶人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-4 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表顶替所有设备类型) 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-4 </p>
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 （填 null 代表顶替该账号的所有设备类型）
 	 */
 	public static void replaced(Object loginId, String device) {
 		stpLogic.replaced(loginId, device);
 	}
-	
-	
-	// 查询相关
 
-	/** 
- 	 * 当前会话是否已经登录 
- 	 * @return 是否已登录 
- 	 */
+	// 会话查询
+
+	/**
+	 * 判断当前会话是否已经登录
+	 *
+	 * @return 已登录返回 true，未登录返回 false
+	 */
 	public static boolean isLogin() {
 		return stpLogic.isLogin();
 	}
 
-	/** 
- 	 * 检验当前会话是否已经登录，如未登录，则抛出异常 
- 	 */
+	/**
+	 * 检验当前会话是否已经登录，如未登录，则抛出异常
+	 */
  	public static void checkLogin() {
  		stpLogic.checkLogin();
  	}
 
- 	/** 
- 	 * 获取当前会话账号id, 如果未登录，则抛出异常 
- 	 * @return 账号id
- 	 */
+	/**
+	 * 获取当前会话账号id，如果未登录，则抛出异常
+	 *
+	 * @return 账号id
+	 */
 	public static Object getLoginId() {
 		return stpLogic.getLoginId();
 	}
 
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回默认值 
+	/**
+	 * 获取当前会话账号id, 如果未登录，则返回默认值
+	 *
 	 * @param <T> 返回类型 
 	 * @param defaultValue 默认值
-	 * @return 登录id 
+	 * @return 登录id
 	 */
 	public static <T> T getLoginId(T defaultValue) {
 		return stpLogic.getLoginId(defaultValue);
 	}
 
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回null 
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 如果未登录，则返回null
+	 *
+	 * @return 账号id
 	 */
 	public static Object getLoginIdDefaultNull() {
 		return stpLogic.getLoginIdDefaultNull();
  	}
 
-	/** 
-	 * 获取当前会话账号id, 并转换为String类型
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 并转换为 String 类型
+	 *
+	 * @return 账号id
 	 */
 	public static String getLoginIdAsString() {
 		return stpLogic.getLoginIdAsString();
 	}
 
-	/** 
-	 * 获取当前会话账号id, 并转换为int类型
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 并转换为 int 类型
+	 *
+	 * @return 账号id
 	 */
 	public static int getLoginIdAsInt() {
 		return stpLogic.getLoginIdAsInt();
 	}
 
 	/**
-	 * 获取当前会话账号id, 并转换为long类型 
-	 * @return 账号id 
+	 * 获取当前会话账号id, 并转换为 long 类型
+	 *
+	 * @return 账号id
 	 */
 	public static long getLoginIdAsLong() {
 		return stpLogic.getLoginIdAsLong();
 	}
 
-	/** 
- 	 * 获取指定Token对应的账号id，如果未登录，则返回 null 
- 	 * @param tokenValue token
- 	 * @return 账号id
- 	 */
+	/**
+	 * 获取指定 token 对应的账号id，如果未登录，则返回 null
+	 *
+	 * @param tokenValue token
+	 * @return 账号id
+	 */
  	public static Object getLoginIdByToken(String tokenValue) {
  		return stpLogic.getLoginIdByToken(tokenValue);
  	}
 
 	/**
 	 * 获取当前 Token 的扩展信息（此函数只在jwt模式下生效）
+	 *
 	 * @param key 键值 
-	 * @return 对应的扩展数据 
+	 * @return 对应的扩展数据
 	 */
 	public static Object getExtra(String key) {
 		return stpLogic.getExtra(key);
@@ -359,57 +384,63 @@ public class StpUtil {
 
 	/**
 	 * 获取指定 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param tokenValue 指定的 Token 值 
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
+	 *
+	 * @param tokenValue 指定的 Token 值
+	 * @param key 键值
+	 * @return 对应的扩展数据
 	 */
 	public static Object getExtra(String tokenValue, String key) {
 		return stpLogic.getExtra(tokenValue, key);
 	}
  	
  	
-	// ------------------- User-Session 相关 -------------------
+	// ------------------- Account-Session 相关 -------------------
 
- 	/** 
-	 * 获取指定账号id的Session, 如果Session尚未创建，isCreate=是否新建并返回
+	/**
+	 * 获取指定账号 id 的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
 	 * @param loginId 账号id
 	 * @param isCreate 是否新建
-	 * @return Session对象
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
 		return stpLogic.getSessionByLoginId(loginId, isCreate);
 	}
 
-	/** 
-	 * 获取指定key的Session, 如果Session尚未创建，则返回null
+	/**
+	 * 获取指定 key 的 SaSession, 如果该 SaSession 尚未创建，则返回 null
+	 *
 	 * @param sessionId SessionId
-	 * @return Session对象 
+	 * @return Session对象
 	 */
 	public static SaSession getSessionBySessionId(String sessionId) {
 		return stpLogic.getSessionBySessionId(sessionId);
 	}
 
-	/** 
-	 * 获取指定账号id的Session，如果Session尚未创建，则新建并返回 
-	 * @param loginId 账号id 
-	 * @return Session对象 
+	/**
+	 * 获取指定账号 id 的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @param loginId 账号id
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionByLoginId(Object loginId) {
 		return stpLogic.getSessionByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取当前会话的Session, 如果Session尚未创建，isCreate=是否新建并返回 
+	/**
+	 * 获取当前已登录账号的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
 	 * @param isCreate 是否新建 
-	 * @return Session对象 
+	 * @return Session对象
 	 */
 	public static SaSession getSession(boolean isCreate) {
 		return stpLogic.getSession(isCreate);
 	}
 
-	/** 
-	 * 获取当前会话的Session，如果Session尚未创建，则新建并返回 
-	 * @return Session对象 
+	/**
+	 * 获取当前已登录账号的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @return Session对象
 	 */
 	public static SaSession getSession() {
 		return stpLogic.getSession();
@@ -417,47 +448,52 @@ public class StpUtil {
 
 	
 	// ------------------- Token-Session 相关 -------------------  
-	
-	/** 
-	 * 获取指定Token-Session，如果Session尚未创建，则新建并返回 
+
+	/**
+	 * 获取指定 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @param tokenValue Token值
-	 * @return Session对象  
+	 * @return Session对象
 	 */
 	public static SaSession getTokenSessionByToken(String tokenValue) {
 		return stpLogic.getTokenSessionByToken(tokenValue);
 	}
-	
-	/** 
-	 * 获取当前Token-Session，如果Session尚未创建，则新建并返回
-	 * @return Session对象 
+
+	/**
+	 * 获取当前 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @return Session对象
 	 */
 	public static SaSession getTokenSession() {
 		return stpLogic.getTokenSession();
 	}
 
-	/** 
+	/**
 	 * 获取当前匿名 Token-Session （可在未登录情况下使用的Token-Session）
-	 * @return Token-Session 对象 
+	 *
+	 * @return Token-Session 对象
 	 */
 	public static SaSession getAnonTokenSession() {
 		return stpLogic.getAnonTokenSession();
 	}
 	
 
-	// ------------------- [临时有效期] 验证相关 -------------------  
+	// ------------------- Activity-Timeout 临时有效期 验证相关 -------------------
 
 	/**
- 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
- 	 */
+	 * 检查当前 token 是否已经[临时过期]，如果已经过期则抛出异常
+	 */
  	public static void checkActivityTimeout() {
  		stpLogic.checkActivityTimeout();
  	}
 
- 	/**
- 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
- 	 * <h1>请注意: 即使token已经 [临时过期] 也可续签成功，
- 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
- 	 */
+	/**
+	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
+	 * <h2>
+	 * 		请注意: 即使 token 已经 [ 临时过期 ] 也可续签成功，
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可
+	 * </h2>
+	 */
  	public static void updateLastActivityToNow() {
  		stpLogic.updateLastActivityToNow();
  	}
@@ -465,60 +501,67 @@ public class StpUtil {
 
 	// ------------------- 过期时间相关 -------------------  
 
- 	/**
- 	 * 获取当前登录者的 token 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
+	/**
+	 * 获取当前会话 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
  	public static long getTokenTimeout() {
  		return stpLogic.getTokenTimeout();
  	}
- 	
- 	/**
- 	 * 获取当前登录者的 User-Session 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
+
+	/**
+	 * 获取当前登录账号的 Account-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
  	public static long getSessionTimeout() {
  		return stpLogic.getSessionTimeout();
  	}
 
- 	/**
- 	 * 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
- 	 * @return token剩余有效时间
- 	 */
+	/**
+	 * 获取当前 token 的 Token-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
  	public static long getTokenSessionTimeout() {
  		return stpLogic.getTokenSessionTimeout();
  	}
- 	
- 	/**
- 	 * 获取当前 token [临时过期] 剩余有效时间 (单位: 秒)
- 	 * @return token [临时过期] 剩余有效时间
- 	 */
+
+	/**
+	 * 获取当前 token [ 临时过期 ] 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return /
+	 */
  	public static long getTokenActivityTimeout() {
  		return stpLogic.getTokenActivityTimeout();
  	}
 
- 	/**
- 	 * 对当前 Token 的 timeout 值进行续期 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
+	/**
+	 * 对当前 token 的 timeout 值进行续期
+	 *
+	 * @param timeout 要修改成为的有效时间 (单位: 秒)
+	 */
  	public static void renewTimeout(long timeout) {
  		stpLogic.renewTimeout(timeout);
  	}
- 	
- 	/**
- 	 * 对指定 Token 的 timeout 值进行续期 
- 	 * @param tokenValue 指定token 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
+
+	/**
+	 * 对指定 token 的 timeout 值进行续期
+	 *
+	 * @param tokenValue 指定 token
+	 * @param timeout 要修改成为的有效时间 (单位: 秒，填 -1 代表要续为永久有效)
+	 */
  	public static void renewTimeout(String tokenValue, long timeout) {
  		stpLogic.renewTimeout(tokenValue, timeout);
  	}
  	
  	
-	// ------------------- 角色验证操作 -------------------  
+	// ------------------- 角色认证操作 -------------------
 
 	/**
-	 * 获取：当前账号的角色集合 
+	 * 获取：当前账号的角色集合
+	 *
 	 * @return /
 	 */
 	public static List<String> getRoleList() {
@@ -526,7 +569,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 获取：指定账号的角色集合 
+	 * 获取：指定账号的角色集合
+	 *
 	 * @param loginId 指定账号id 
 	 * @return /
 	 */
@@ -534,72 +578,80 @@ public class StpUtil {
 		return stpLogic.getRoleList(loginId);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否拥有指定角色, 返回true或false 
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
+	/**
+	 * 判断：当前账号是否拥有指定角色, 返回 true 或 false
+	 *
+	 * @param role 角色
+	 * @return /
+	 */
  	public static boolean hasRole(String role) {
  		return stpLogic.hasRole(role);
  	}
 
- 	/** 
- 	 * 判断：指定账号是否含有指定角色标识, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
+	/**
+	 * 判断：指定账号是否含有指定角色标识, 返回 true 或 false
+	 *
+	 * @param loginId 账号id
+	 * @param role 角色标识
+	 * @return 是否含有指定角色标识
+	 */
  	public static boolean hasRole(Object loginId, String role) {
  		return stpLogic.hasRole(loginId, role);
  	}
- 	
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
+
+	/**
+	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 * @return true或false
+	 */
  	public static boolean hasRoleAnd(String... roleArray){
  		return stpLogic.hasRoleAnd(roleArray);
  	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 * @return true或false
+	 */
  	public static boolean hasRoleOr(String... roleArray){
  		return stpLogic.hasRoleOr(roleArray);
  	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException 
- 	 * @param role 角色标识
- 	 */
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException
+	 *
+	 * @param role 角色标识
+	 */
  	public static void checkRole(String role) {
  		stpLogic.checkRole(role);
  	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 */
  	public static void checkRoleAnd(String... roleArray){
  		stpLogic.checkRoleAnd(roleArray);
  	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 */
  	public static void checkRoleOr(String... roleArray){
  		stpLogic.checkRoleOr(roleArray);
  	}
 
 	
-	// ------------------- 权限验证操作 -------------------
+	// ------------------- 权限认证操作 -------------------
 
 	/**
-	 * 获取：当前账号的权限码集合 
+	 * 获取：当前账号的权限码集合
+	 *
 	 * @return / 
 	 */
 	public static List<String> getPermissionList() {
@@ -607,7 +659,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 获取：指定账号的权限码集合 
+	 * 获取：指定账号的权限码集合
+	 *
 	 * @param loginId 指定账号id
 	 * @return / 
 	 */
@@ -615,114 +668,130 @@ public class StpUtil {
 		return stpLogic.getPermissionList(loginId);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, 返回true或false 
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限, 返回 true 或 false
+	 *
+	 * @param permission 权限码
+	 * @return 是否含有指定权限
+	 */
 	public static boolean hasPermission(String permission) {
 		return stpLogic.hasPermission(permission);
 	}
 
- 	/** 
- 	 * 判断：指定账号id是否含有指定权限, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
+	/**
+	 * 判断：指定账号 id 是否含有指定权限, 返回 true 或 false
+	 *
+	 * @param loginId 账号 id
+	 * @param permission 权限码
+	 * @return 是否含有指定权限
+	 */
 	public static boolean hasPermission(Object loginId, String permission) {
 		return stpLogic.hasPermission(loginId, permission);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, [指定多个，必须全部具有] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限 [ 指定多个，必须全部具有 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 * @return true 或 false
+	 */
  	public static boolean hasPermissionAnd(String... permissionArray){
  		return stpLogic.hasPermissionAnd(permissionArray);
  	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 * @return true 或 false
+	 */
  	public static boolean hasPermissionOr(String... permissionArray){
  		return stpLogic.hasPermissionOr(permissionArray);
  	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException 
- 	 * @param permission 权限码
- 	 */
+
+	/**
+	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException
+	 *
+	 * @param permission 权限码
+	 */
 	public static void checkPermission(String permission) {
 		stpLogic.checkPermission(permission);
 	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，必须全部验证通过] 
- 	 * @param permissionArray 权限码数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定权限 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 */
 	public static void checkPermissionAnd(String... permissionArray) {
 		stpLogic.checkPermissionAnd(permissionArray);
 	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 */
 	public static void checkPermissionOr(String... permissionArray) {
 		stpLogic.checkPermissionOr(permissionArray);
 	}
 
 
-	// ------------------- id 反查token 相关操作 -------------------  
-	
-	/** 
-	 * 获取指定账号id的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	// ------------------- id 反查 token 相关操作 -------------------
+
+	/**
+	 * 获取指定账号 id 的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @return token值 
+	 * @return token值
 	 */
 	public static String getTokenValueByLoginId(Object loginId) {
 		return stpLogic.getTokenValueByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	/**
+	 * 获取指定账号 id 指定设备类型端的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @param device 设备类型
-	 * @return token值 
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return token值
 	 */
 	public static String getTokenValueByLoginId(Object loginId, String device) {
 		return stpLogic.getTokenValueByLoginId(loginId, device);
 	}
-	
-	/** 
-	 * 获取指定账号id的tokenValue集合 
-	 * @param loginId 账号id 
-	 * @return 此loginId的所有相关token 
- 	 */
+
+	/**
+	 * 获取指定账号 id 的 token 集合
+	 *
+	 * @param loginId 账号id
+	 * @return 此 loginId 的所有相关 token
+	 */
 	public static List<String> getTokenValueListByLoginId(Object loginId) {
 		return stpLogic.getTokenValueListByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 集合 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 
-	 * @return 此loginId的所有相关token 
- 	 */
+	/**
+	 * 获取指定账号 id 指定设备类型端的 token 集合
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 token
+	 */
 	public static List<String> getTokenValueListByLoginId(Object loginId, String device) {
 		return stpLogic.getTokenValueListByLoginId(loginId, device);
 	}
-	
+
 	/**
 	 * 返回当前会话的登录设备类型
+	 *
 	 * @return 当前令牌的登录设备类型
 	 */
 	public static String getLoginDevice() {
@@ -733,39 +802,42 @@ public class StpUtil {
 	// ------------------- 会话管理 -------------------  
 
 	/**
-	 * 根据条件查询Token 
-	 * @param keyword 关键字 
+	 * 根据条件查询缓存中所有的 token
+	 *
+	 * @param keyword 关键字
 	 * @param start 开始处索引
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * @param size 获取数量 (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return token集合 
+	 *
+	 * @return token集合
 	 */
 	public static List<String> searchTokenValue(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchTokenValue(keyword, start, size, sortType);
 	}
-	
+
 	/**
-	 * 根据条件查询SessionId 
-	 * @param keyword 关键字 
+	 * 根据条件查询缓存中所有的 SessionId
+	 *
+	 * @param keyword 关键字
 	 * @param start 开始处索引
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * @param size 获取数量  (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
+	 *
+	 * @return sessionId集合
 	 */
 	public static List<String> searchSessionId(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchSessionId(keyword, start, size, sortType);
 	}
 
 	/**
-	 * 根据条件查询Token专属Session的Id 
-	 * @param keyword 关键字 
-	 * @param start 开始处索引 
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * 根据条件查询缓存中所有的 Token-Session-Id
+	 *
+	 * @param keyword 关键字
+	 * @param start 开始处索引
+	 * @param size 获取数量 (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
+	 *
+	 * @return sessionId集合
 	 */
 	public static List<String> searchTokenSessionId(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchTokenSessionId(keyword, start, size, sortType);
@@ -777,7 +849,7 @@ public class StpUtil {
 	/**
 	 * 封禁：指定账号
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
@@ -787,7 +859,7 @@ public class StpUtil {
 
 	/**
 	 * 判断：指定账号是否已被封禁 (true=已被封禁, false=未被封禁) 
-	 * 
+	 *
 	 * @param loginId 账号id
 	 * @return / 
 	 */
@@ -796,7 +868,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
 	 */
 	public static void checkDisable(Object loginId) {
@@ -805,6 +878,7 @@ public class StpUtil {
 
 	/**
 	 * 获取：指定账号剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
 	 * @return / 
 	 */
@@ -814,6 +888,7 @@ public class StpUtil {
 
 	/**
 	 * 解封：指定账号
+	 *
 	 * @param loginId 账号id
 	 */
 	public static void untieDisable(Object loginId) {
@@ -826,7 +901,8 @@ public class StpUtil {
 	/**
 	 * 封禁：指定账号的指定服务 
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * @param loginId 指定账号id 
+	 *
+	 * @param loginId 指定账号id
 	 * @param service 指定服务 
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
@@ -835,7 +911,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 判断：指定账号的指定服务 是否已被封禁 (true=已被封禁, false=未被封禁) 
+	 * 判断：指定账号的指定服务 是否已被封禁（true=已被封禁, false=未被封禁）
+	 *
 	 * @param loginId 账号id
 	 * @param service 指定服务 
 	 * @return / 
@@ -845,7 +922,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
 	 * @param services 指定服务，可以指定多个 
 	 */
@@ -855,6 +933,7 @@ public class StpUtil {
 
 	/**
 	 * 获取：指定账号 指定服务 剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
 	 * @param service 指定服务 
 	 * @return see note 
@@ -865,6 +944,7 @@ public class StpUtil {
 
 	/**
 	 * 解封：指定账号、指定服务
+	 *
 	 * @param loginId 账号id
 	 * @param services 指定服务，可以指定多个 
 	 */
@@ -876,7 +956,8 @@ public class StpUtil {
 	// ------------------- 阶梯封禁 -------------------  
 
 	/**
-	 * 封禁：指定账号，并指定封禁等级 
+	 * 封禁：指定账号，并指定封禁等级
+	 *
 	 * @param loginId 指定账号id 
 	 * @param level 指定封禁等级 
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
@@ -886,7 +967,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 封禁：指定账号的指定服务，并指定封禁等级 
+	 * 封禁：指定账号的指定服务，并指定封禁等级
+	 *
 	 * @param loginId 指定账号id 
 	 * @param service 指定封禁服务 
 	 * @param level 指定封禁等级 
@@ -898,7 +980,7 @@ public class StpUtil {
 
 	/**
 	 * 判断：指定账号是否已被封禁到指定等级
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @param level 指定封禁等级 
 	 * @return / 
@@ -909,7 +991,7 @@ public class StpUtil {
 
 	/**
 	 * 判断：指定账号的指定服务，是否已被封禁到指定等级 
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @param service 指定封禁服务 
 	 * @param level 指定封禁等级 
@@ -921,7 +1003,7 @@ public class StpUtil {
 
 	/**
 	 * 校验：指定账号是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
 	 */
@@ -931,7 +1013,7 @@ public class StpUtil {
 
 	/**
 	 * 校验：指定账号的指定服务，是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @param service 指定封禁服务 
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
@@ -942,7 +1024,7 @@ public class StpUtil {
 
 	/**
 	 * 获取：指定账号被封禁的等级，如果未被封禁则返回-2 
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @return / 
 	 */
@@ -952,7 +1034,7 @@ public class StpUtil {
 
 	/**
 	 * 获取：指定账号的 指定服务 被封禁的等级，如果未被封禁则返回-2 
-	 * 
+	 *
 	 * @param loginId 指定账号id 
 	 * @param service 指定封禁服务 
 	 * @return / 
@@ -962,16 +1044,17 @@ public class StpUtil {
 	}
 	
 	
-	// ------------------- 身份切换 -------------------  
+	// ------------------- 临时身份切换 -------------------
 
 	/**
-	 * 临时切换身份为指定账号id 
+	 * 临时切换身份为指定账号id
+	 *
 	 * @param loginId 指定loginId 
 	 */
 	public static void switchTo(Object loginId) {
 		stpLogic.switchTo(loginId);
 	}
-	
+
 	/**
 	 * 结束临时切换身份
 	 */
@@ -980,15 +1063,17 @@ public class StpUtil {
 	}
 
 	/**
-	 * 当前是否正处于[身份临时切换]中 
-	 * @return 是否正处于[身份临时切换]中 
+	 * 判断当前请求是否正处于 [ 身份临时切换 ] 中
+	 *
+	 * @return /
 	 */
 	public static boolean isSwitch() {
 		return stpLogic.isSwitch();
 	}
 
 	/**
-	 * 在一个代码段里方法内，临时切换身份为指定账号id
+	 * 在一个 lambda 代码段里，临时切换身份为指定账号id，lambda 结束后自动恢复
+	 *
 	 * @param loginId 指定账号id 
 	 * @param function 要执行的方法 
 	 */
@@ -998,9 +1083,10 @@ public class StpUtil {
 	
 
 	// ------------------- 二级认证 -------------------  
-	
+
 	/**
-	 * 在当前会话 开启二级认证 
+	 * 在当前会话 开启二级认证
+	 *
 	 * @param safeTime 维持时间 (单位: 秒) 
 	 */
 	public static void openSafe(long safeTime) {
@@ -1008,7 +1094,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 在当前会话 开启二级认证 
+	 * 在当前会话 开启二级认证
+	 *
 	 * @param service 业务标识  
 	 * @param safeTime 维持时间 (单位: 秒) 
 	 */
@@ -1017,7 +1104,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
+	 * 判断：当前会话是否处于二级认证时间内
+	 *
 	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
 	 */
 	public static boolean isSafe() {
@@ -1025,7 +1113,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
+	 * 判断：当前会话 是否处于指定业务的二级认证时间内
+	 *
 	 * @param service 业务标识  
 	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
 	 */
@@ -1034,7 +1123,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 指定 Token 是否处于二级认证时间内 
+	 * 判断：指定 token 是否处于二级认证时间内
+	 *
 	 * @param tokenValue Token 值  
 	 * @param service 业务标识  
 	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
@@ -1044,22 +1134,24 @@ public class StpUtil {
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
+	 * 校验：当前会话是否已通过二级认证，如未通过则抛出异常
 	 */
 	public static void checkSafe() {
 		stpLogic.checkSafe();
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
+	 * 校验：检查当前会话是否已通过指定业务的二级认证，如未通过则抛出异常
+	 *
 	 * @param service 业务标识  
 	 */
 	public static void checkSafe(String service) {
 		stpLogic.checkSafe(service);
 	}
-	
+
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
 	 * @return 剩余有效时间
 	 */
 	public static long getSafeTime() {
@@ -1067,7 +1159,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
 	 * @param service 业务标识  
 	 * @return 剩余有效时间
 	 */
@@ -1083,7 +1176,8 @@ public class StpUtil {
 	}
 
 	/**
-	 * 在当前会话 结束二级认证 
+	 * 在当前会话 结束指定业务标识的二级认证
+	 *
 	 * @param service 业务标识  
 	 */
 	public static void closeSafe(String service) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 4b0095dd..fd3346d6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -32,8 +32,8 @@ import java.util.function.Supplier;
 	});
  * </pre>
  * 
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public final class SaStrategy {
 
@@ -49,37 +49,43 @@ public final class SaStrategy {
 	
 	/**
 	 * 创建 Token 的策略 
-	 * <p> 参数 [账号id, 账号类型] 
+	 * <p> 参数 [ 账号id, 账号类型 ]
 	 */
 	public BiFunction<Object, String, String> createToken = (loginId, loginType) -> {
 		// 根据配置的tokenStyle生成不同风格的token 
 		String tokenStyle = SaManager.getConfig().getTokenStyle();
-		// uuid 
-		if(SaTokenConsts.TOKEN_STYLE_UUID.equals(tokenStyle)) {
-			return UUID.randomUUID().toString();
+
+		switch (tokenStyle) {
+			// uuid
+			case SaTokenConsts.TOKEN_STYLE_UUID:
+				return UUID.randomUUID().toString();
+
+			// 简单uuid (不带下划线)
+			case SaTokenConsts.TOKEN_STYLE_SIMPLE_UUID:
+				return UUID.randomUUID().toString().replaceAll("-", "");
+
+			// 32位随机字符串
+			case SaTokenConsts.TOKEN_STYLE_RANDOM_32:
+				return SaFoxUtil.getRandomString(32);
+
+			// 64位随机字符串
+			case SaTokenConsts.TOKEN_STYLE_RANDOM_64:
+				return SaFoxUtil.getRandomString(64);
+
+			// 128位随机字符串
+			case SaTokenConsts.TOKEN_STYLE_RANDOM_128:
+				return SaFoxUtil.getRandomString(128);
+
+			// tik风格 (2_14_16)
+			case SaTokenConsts.TOKEN_STYLE_TIK:
+				return SaFoxUtil.getRandomString(2) + "_" + SaFoxUtil.getRandomString(14) + "_" + SaFoxUtil.getRandomString(16) + "__";
+
+			// 默认，还是uuid
+			default:
+				SaManager.getLog().warn("配置的 tokenStyle 值无效：{}，仅允许以下取值: " +
+						"uuid、simple-uuid、random-32、random-64、random-128、tik", tokenStyle);
+				return UUID.randomUUID().toString();
 		}
-		// 简单uuid (不带下划线)
-		if(SaTokenConsts.TOKEN_STYLE_SIMPLE_UUID.equals(tokenStyle)) {
-			return UUID.randomUUID().toString().replaceAll("-", "");
-		}
-		// 32位随机字符串
-		if(SaTokenConsts.TOKEN_STYLE_RANDOM_32.equals(tokenStyle)) {
-			return SaFoxUtil.getRandomString(32);
-		}
-		// 64位随机字符串
-		if(SaTokenConsts.TOKEN_STYLE_RANDOM_64.equals(tokenStyle)) {
-			return SaFoxUtil.getRandomString(64);
-		}
-		// 128位随机字符串
-		if(SaTokenConsts.TOKEN_STYLE_RANDOM_128.equals(tokenStyle)) {
-			return SaFoxUtil.getRandomString(128);
-		}
-		// tik风格 (2_14_16)
-		if(SaTokenConsts.TOKEN_STYLE_TIK.equals(tokenStyle)) {
-			return SaFoxUtil.getRandomString(2) + "_" + SaFoxUtil.getRandomString(14) + "_" + SaFoxUtil.getRandomString(16) + "__";
-		}
-		// 默认，还是uuid 
-		return UUID.randomUUID().toString();
 	};
 	
 	/**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
index e0ec0cbb..b0af6519 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.temp;
 
 /**
- * Sa-Token 临时令牌验证模块 默认实现类 
- * @author kong
+ * Sa-Token 临时令牌验证模块 默认实现类
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTempDefaultImpl implements SaTempInterface {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
index 1a12acbb..42b0c812 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
@@ -6,30 +6,37 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * Sa-Token 临时令牌验证模块接口 
- * @author kong
+ * Sa-Token 临时 token 验证模块 - 接口
  *
+ * <p>
+ *     有效期很短的一种token，一般用于一次性接口防盗用、短时间资源访问等业务场景
+ * </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public interface SaTempInterface {
 
+	// -------- 创建
+
 	/**
-	 * 为 指定值 创建一个临时 Token 
+	 * 为指定 value 创建一个临时 Token
 	 * @param value 指定值
-	 * @param timeout 有效期，单位：秒，-1代表永久有效
-	 * @return 生成的token
+	 * @param timeout 有效时间，单位：秒，-1代表永久有效
+	 * @return 生成的 token
 	 */
-	public default String createToken(Object value, long timeout) {
+	default String createToken(Object value, long timeout) {
 		return createToken(SaTokenConsts.DEFAULT_TEMP_TOKEN_SERVICE, value, timeout);
 	}
 
 	/**
-	 * 为 指定服务 指定值 创建一个 Token 
-	 * @param service 服务标识
+	 * 为指定 业务标识、指定 value 创建一个 Token
+	 * @param service 业务标识
 	 * @param value 指定值
 	 * @param timeout 有效期，单位：秒，-1代表永久有效
 	 * @return 生成的token
 	 */
-	public default String createToken(String service, Object value, long timeout) {
+	default String createToken(String service, Object value, long timeout) {
 		
 		// 生成 token 
 		String token = SaStrategy.me.createToken.apply(null, null);
@@ -41,23 +48,25 @@ public interface SaTempInterface {
 		// 返回 
 		return token;
 	}
-	
+
+	// -------- 解析
+
 	/**
 	 * 解析 Token 获取 value 
 	 * @param token 指定 Token 
 	 * @return  / 
 	 */
-	public default Object parseToken(String token) {
+	default Object parseToken(String token) {
 		return parseToken(SaTokenConsts.DEFAULT_TEMP_TOKEN_SERVICE, token);
 	}
 
 	/**
 	 * 解析 Token 获取 value 
-	 * @param service 服务标识
-	 * @param token 指定 Token 
+	 * @param service 业务标识
+	 * @param token 指定 Token
 	 * @return /
 	 */
-	public default Object parseToken(String service, String token) {
+	default Object parseToken(String service, String token) {
 		String key = splicingKeyTempToken(service, token);
 		return SaManager.getSaTokenDao().getObject(key);
 	}
@@ -69,19 +78,19 @@ public interface SaTempInterface {
 	 * @param <T> 默认值的类型 
 	 * @return /
 	 */
-	public default<T> T parseToken(String token, Class<T> cs) {
+	default<T> T parseToken(String token, Class<T> cs) {
 		return parseToken(SaTokenConsts.DEFAULT_TEMP_TOKEN_SERVICE, token, cs);
 	}
 
 	/**
 	 * 解析 Token 获取 value，并转换为指定类型
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token 
 	 * @param cs 指定类型 
 	 * @param <T> 默认值的类型 
 	 * @return /
 	 */
-	public default<T> T parseToken(String service, String token, Class<T> cs) {
+	default<T> T parseToken(String service, String token, Class<T> cs) {
 		return SaFoxUtil.getValueByType(parseToken(service, token), cs);
 	}
 	
@@ -91,54 +100,58 @@ public interface SaTempInterface {
 	 * @param token 指定 Token
 	 * @return /
 	 */
-	public default long getTimeout(String token) {
+	default long getTimeout(String token) {
 		return getTimeout(SaTokenConsts.DEFAULT_TEMP_TOKEN_SERVICE, token);
 	}
 
 	/**
-	 * 获取指定服务指定 Token 的剩余有效期，单位：秒 
+	 * 获取指定 业务标识、指定 Token 的剩余有效期，单位：秒
 	 * <p> 返回值 -1 代表永久，-2 代表token无效 
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token
 	 * @return / 
 	 */
-	public default long getTimeout(String service, String token) {
+	default long getTimeout(String service, String token) {
 		String key = splicingKeyTempToken(service, token);
 		return SaManager.getSaTokenDao().getObjectTimeout(key);
 	}
 
+	// -------- 删除
+
 	/**
 	 * 删除一个 Token
 	 * @param token 指定 Token 
 	 */
-	public default void deleteToken(String token) {
+	default void deleteToken(String token) {
 		deleteToken(SaTokenConsts.DEFAULT_TEMP_TOKEN_SERVICE, token);
 	}
 	
 	/**
 	 * 删除一个 Token
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token 
 	 */
-	public default void deleteToken(String service, String token) {
+	default void deleteToken(String service, String token) {
 		String key = splicingKeyTempToken(service, token);
 		SaManager.getSaTokenDao().deleteObject(key);
 	}
-	
+
+	// -------- 其它
+
 	/**  
-	 * 获取映射关系的持久化key 
-	 * @param service 服务标识
+	 * 获取：在存储临时 token 数据时，应该使用的 key
+	 * @param service 业务标识
 	 * @param token token值
 	 * @return key
 	 */
-	public default String splicingKeyTempToken(String service, String token) {
+	default String splicingKeyTempToken(String service, String token) {
 		return SaManager.getConfig().getTokenName() + ":temp-token:" + service + ":" + token;
 	}
 
 	/**
 	 * @return jwt秘钥 (只有集成 sa-token-temp-jwt 模块时此参数才会生效)  
 	 */
-	public default String getJwtSecretKey() {
+	default String getJwtSecretKey() {
 		return null;
 	}
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
index aaec7e2f..256473f7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
@@ -3,17 +3,24 @@ package cn.dev33.satoken.temp;
 import cn.dev33.satoken.SaManager;
 
 /**
- * Sa-Token 临时验证令牌模块 
- * @author kong
+ * Sa-Token 临时 token 验证模块 - 工具类
  *
+ * <p>
+ *     有效期很短的一种token，一般用于一次性接口防盗用、短时间资源访问等业务场景
+ * </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTempUtil {
 
 	private SaTempUtil() {
 	}
 
+	// -------- 创建
+
 	/**
-	 * 为 指定值 创建一个临时 Token 
+	 * 为指定 value 创建一个临时 Token
 	 * @param value 指定值
 	 * @param timeout 有效期，单位：秒，-1代表永久有效
 	 * @return 生成的token
@@ -23,8 +30,8 @@ public class SaTempUtil {
 	}
 
 	/**
-	 * 为 指定服务 指定值 创建一个 Token 
-	 * @param service 服务标识
+	 * 为指定 业务标识、指定 value 创建一个 Token
+	 * @param service 业务标识
 	 * @param value 指定值
 	 * @param timeout 有效期，单位：秒，-1代表永久有效
 	 * @return 生成的token
@@ -33,6 +40,8 @@ public class SaTempUtil {
 		return SaManager.getSaTemp().createToken(service, value, timeout);
 	}
 
+	// -------- 解析
+
 	/**
 	 * 解析 Token 获取 value 
 	 * @param token 指定 Token 
@@ -44,7 +53,7 @@ public class SaTempUtil {
 
 	/**
 	 * 解析 Token 获取 value 
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token 
 	 * @return /
 	 */
@@ -65,7 +74,7 @@ public class SaTempUtil {
 
 	/**
 	 * 解析 Token 获取 value，并转换为指定类型
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token 
 	 * @param cs 指定类型 
 	 * @param <T> 默认值的类型 
@@ -86,9 +95,9 @@ public class SaTempUtil {
 	}
 
 	/**
-	 * 获取指定服务指定 Token 的剩余有效期，单位：秒 
+	 * 获取指定 业务标识、指定 Token 的剩余有效期，单位：秒
 	 * <p> 返回值 -1 代表永久，-2 代表token无效 
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token
 	 * @return / 
 	 */
@@ -96,6 +105,8 @@ public class SaTempUtil {
 		return SaManager.getSaTemp().getTimeout(service, token);
 	}
 
+	// -------- 删除
+
 	/**
 	 * 删除一个 Token
 	 * @param token 指定 Token 
@@ -106,7 +117,7 @@ public class SaTempUtil {
 	
 	/**
 	 * 删除一个 Token
-	 * @param service 服务标识
+	 * @param service 业务标识
 	 * @param token 指定 Token 
 	 */
 	public static void deleteToken(String service, String token) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index 4dc0509f..bd309cea 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -3,6 +3,7 @@ package cn.dev33.satoken.util;
 import cn.dev33.satoken.error.SaErrorCode;
 import cn.dev33.satoken.exception.SaTokenException;
 
+import java.io.Console;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
@@ -18,8 +19,8 @@ import java.util.regex.Pattern;
 /**
  * Sa-Token 内部工具类
  *
- * @author kong
- *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaFoxUtil {
 
@@ -75,7 +76,7 @@ public class SaFoxUtil {
 	 * @return 是否为null或者空字符串
 	 */
 	public static boolean isNotEmpty(Object str) {
-		return isEmpty(str) == false;
+		return ! isEmpty(str);
 	}
 
 	/**
@@ -602,4 +603,39 @@ public class SaFoxUtil {
     	return logLevelList.get(level);
     }
 
+	/**
+	 * 判断当前系统是否可以打印彩色日志，判断准确率并非100%，但基本可以满足大部分场景
+	 * @return /
+	 */
+	public static boolean isCanColorLog() {
+
+		// 获取当前环境相关信息
+		Console console = System.console();
+		String term = System.getenv().get("TERM");
+
+		// 两者均为 null，一般是在 eclipse、idea 等 IDE 环境下运行的，此时可以打印彩色日志
+		if(console == null && term == null) {
+			return true;
+		}
+
+		// 两者均不为 null，一般是在 linux 环境下控制台运行的，此时可以打印彩色日志
+		if(console != null && term != null) {
+			return true;
+		}
+
+		// console 有值，term 为 null，一般是在 windows 的 cmd 控制台运行的，此时不可以打印彩色日志
+		if(console != null && term == null) {
+			return false;
+		}
+
+		// console 为 null，term 有值，一般是在 linux 的 nohup 命令运行的，此时不可以打印彩色日志
+		// 此时也有可能是在 windows 的 git bash 环境下运行的，此时可以打印彩色日志，但此场景无法和上述场景区分，所以统一不打印彩色日志
+		if(console == null && term != null) {
+			return false;
+		}
+
+		// 正常情况下，代码不会走到这里，但是方法又必须要有返回值，所以随便返回一个
+		return false;
+	}
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
index 08576971..ff378ca6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
@@ -5,19 +5,24 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
- * 对 Ajax 请求返回Json格式数据的简易封装 <br>
- * 所有预留字段：<br>
- * code=状态码 <br>
- * msg=描述信息 <br>
- * data=携带对象 <br>
- * 
- * @author kong
+ * 对请求接口返回 Json 格式数据的简易封装。
  *
+ * <p>
+ *     所有预留字段：<br>
+ * 		code = 状态码 <br>
+ * 		msg  = 描述信息 <br>
+ * 		data = 携带对象 <br>
+ * </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResult extends LinkedHashMap<String, Object> implements Serializable{
 
-	private static final long serialVersionUID = 1L;	// 序列化版本号
-	
+	// 序列化版本号
+	private static final long serialVersionUID = 1L;
+
+	// 预定的状态码
 	public static final int CODE_SUCCESS = 200;		
 	public static final int CODE_ERROR = 500;		
 
@@ -132,7 +137,7 @@ public class SaResult extends LinkedHashMap<String, Object> implements Serializa
 	}
 	
 	
-	// ============================  构建  ================================== 
+	// ============================  静态方法快速构建  ==================================
 	
 	// 构建成功
 	public static SaResult ok() {
@@ -182,6 +187,9 @@ public class SaResult extends LinkedHashMap<String, Object> implements Serializa
 	 * @return
 	 */
 	private String transValue(Object value) {
+		if(value == null) {
+			return null;
+		}
 		if(value instanceof String) {
 			return "\"" + value + "\"";
 		}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index c3f6eae7..b9925c92 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -1,9 +1,15 @@
 package cn.dev33.satoken.util;
 
 /**
- * Sa-Token常量类 
- * @author kong
+ * Sa-Token 常量类
  *
+ * <p>
+ *     一般的常量采用就近原则，定义在各自相应的模块中。
+ *     但有一些常量没有明确的归属模块，会在很多模块中使用到，比如版本号、开源地址等，属于全局性的础性常量，这些常量统一定义在此类中。
+ * </p>
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenConsts {
 
@@ -32,71 +38,72 @@ public class SaTokenConsts {
 	 */
 	public static final String DEV_DOC_URL = "https://sa-token.cc";
 	
-	// ------------------ 常量key标记
+	
+	// ------------------ 常量 key 标记
 	
 	/**
-	 * 常量key标记: 如果token为本次请求新创建的，则以此字符串为key存储在当前request中 
+	 * 常量 key 标记: 如果 token 为本次请求新创建的，则以此字符串为 key 存储在当前请求 str 中
 	 */
 	public static final String JUST_CREATED = "JUST_CREATED_"; 	
 
 	/**
-	 * 常量key标记: 如果token为本次请求新创建的，则以此字符串为key存储在当前request中（不拼接前缀，纯Token）
+	 * 常量 key 标记: 如果 token 为本次请求新创建的，则以此字符串为 key 存储在当前 request 中（不拼接前缀，纯Token）
 	 */
 	public static final String JUST_CREATED_NOT_PREFIX = "JUST_CREATED_NOT_PREFIX_"; 	
 
 	/**
-	 * 常量key标记: 如果本次请求已经验证过[无操作过期], 则以此值存储在当前request中 
+	 * 常量 key 标记: 如果本次请求已经验证过 [ 临时过期 ] , 则以此值存储在当前 request 中
 	 */
 	public static final String TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY = "TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY_"; 	
 
 	/**
-	 * 常量key标记: 在登录时，默认使用的设备类型 
+	 * 常量 key 标记: 在登录时，默认使用的设备类型 
 	 */
 	public static final String DEFAULT_LOGIN_DEVICE = "default-device"; 
 
 	/**
-	 * 常量key标记: 在封禁账号时，默认封禁的服务类型 
+	 * 常量 key 标记: 在封禁账号时，默认封禁的服务类型 
 	 */
 	public static final String DEFAULT_DISABLE_SERVICE = "login"; 
 
 	/**
-	 * 常量key标记: 在封禁账号时，默认封禁的等级 
+	 * 常量 key 标记: 在封禁账号时，默认封禁的等级 
 	 */
 	public static final int DEFAULT_DISABLE_LEVEL = 1; 
 
 	/**
-	 * 常量key标记: 在封禁账号时，可使用的最小封禁级别 
+	 * 常量 key 标记: 在封禁账号时，可使用的最小封禁级别 
 	 */
 	public static final int MIN_DISABLE_LEVEL = 1; 
 
 	/**
-	 * 常量key标记: 账号封禁级别，表示未被封禁 
+	 * 常量 key 标记: 账号封禁级别，表示未被封禁 
 	 */
 	public static final int NOT_DISABLE_LEVEL = -2; 
 	
 	/**
-	 * 常量key标记: 在进行临时身份切换时使用的key 
+	 * 常量 key 标记: 在进行临时身份切换时使用的 key
 	 */
 	public static final String SWITCH_TO_SAVE_KEY = "SWITCH_TO_SAVE_KEY_"; 
 
 	/**
-	 * 常量key标记: 在进行Token二级验证时，使用的key 
+	 * 常量 key 标记: 在进行 Token 二级验证时，使用的 key
 	 */
 	@Deprecated
 	public static final String SAFE_AUTH_SAVE_KEY = "SAFE_AUTH_SAVE_KEY_"; 
 
 	/**
-	 * 常量key标记: 在进行 Token 二级验证时，写入的 value 值
+	 * 常量 key 标记: 在进行 Token 二级认证时，写入的 value 值
 	 */
 	public static final String SAFE_AUTH_SAVE_VALUE = "SAFE_AUTH_SAVE_VALUE"; 
 
 	/**
-	 * 常量key标记: 在进行 Token 二级验证时，默认的业务类型 
+	 * 常量 key 标记: 在进行 Token 二级验证时，默认的业务类型 
 	 */
 	public static final String DEFAULT_SAFE_AUTH_SERVICE = "important"; 
 
 	/**
-	 * 常量key标记: 临时 Token 认证模块，默认的业务类型 
+	 * 常量 key 标记: 临时 Token 认证模块，默认的业务类型 
 	 */
 	public static final String DEFAULT_TEMP_TOKEN_SERVICE = "record"; 
 
@@ -155,7 +162,7 @@ public class SaTokenConsts {
 	// ------------------ 其它
 
 	/**
-	 * 连接Token前缀和Token值的字符 
+	 * 连接 Token 前缀和 Token 值的字符
 	 */
 	public static final String TOKEN_CONNECTOR_CHAT  = " "; 
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
index b02a4d8b..7f559c10 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
@@ -1,13 +1,14 @@
 package cn.dev33.satoken.util;
 
 /**
- * 字符串格式化工具
+ * 字符串格式化工具，将字符串中的 {} 按序替换为参数
  * <p>
  * 	本工具类 copy 自 Hutool：
  * 		https://github.com/dromara/hutool/blob/v5-master/hutool-core/src/main/java/cn/hutool/core/text/StrFormatter.java
  * </p>
  *
  * @author Looly
+ * @since <= 1.34.0
  */
 public class StrFormatter {
 
diff --git a/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/SaTokenAloneRedisClusterApplication.java b/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/SaTokenAloneRedisClusterApplication.java
index 84c733c5..616b5cc8 100644
--- a/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/SaTokenAloneRedisClusterApplication.java
+++ b/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/SaTokenAloneRedisClusterApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token整合SpringBoot 示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/test/TestController.java
index 634faeed..1b123e71 100644
--- a/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-alone-redis-cluster/src/main/java/com/pj/test/TestController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java b/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java
index f78e850e..1beb6d56 100644
--- a/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java
+++ b/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token整合SpringBoot 示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/test/TestController.java
index 634faeed..1b123e71 100644
--- a/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/test/TestController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/SaTokenCaseApplication.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/SaTokenCaseApplication.java
index 5261af0d..025814fc 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/SaTokenCaseApplication.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/SaTokenCaseApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token 示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/test/TestController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/test/TestController.java
index 4bc18059..16204f3a 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/test/TestController.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 测试专用 Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/DisableController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/DisableController.java
index cd017e9a..f7366647 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/DisableController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/DisableController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 账号封禁示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/HttpBasicController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/HttpBasicController.java
index 8d328576..5b6b97f0 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/HttpBasicController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/HttpBasicController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token Http Basic 认证 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/MutexLoginController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/MutexLoginController.java
index 688393c0..d22d7123 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/MutexLoginController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/MutexLoginController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 同端互斥登录示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/NotCookieController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/NotCookieController.java
index 903b6837..242d3a9f 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/NotCookieController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/NotCookieController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 前后端分离模式示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/RememberMeController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/RememberMeController.java
index fc4c9e4e..677a7fa8 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/RememberMeController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/RememberMeController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 记住我模式登录 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SafeAuthController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SafeAuthController.java
index 34caa912..cfbedc65 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SafeAuthController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SafeAuthController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 二级认证示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-16 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SearchSessionController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SearchSessionController.java
index d1835709..bef5116f 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SearchSessionController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SearchSessionController.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 会话查询示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SecureController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SecureController.java
index 15e3a58d..96762b7c 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SecureController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SecureController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 密码加密示例
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SwitchToController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SwitchToController.java
index 2bd25b0a..1d7fab63 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SwitchToController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/up/SwitchToController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 身份切换 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/AtCheckController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/AtCheckController.java
index 73393c4f..d37ac801 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/AtCheckController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/AtCheckController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 注解鉴权示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-13
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/JurAuthController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/JurAuthController.java
index f7a36c7f..75664959 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/JurAuthController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/JurAuthController.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 权限认证示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-13
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/KickoutController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/KickoutController.java
index 8d77e9fc..a8f07e41 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/KickoutController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/KickoutController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 权限认证示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-13
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
index 8af29e8c..263f5665 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 登录认证示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-13
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/RouterCheckController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/RouterCheckController.java
index fe83ee34..fe64ccc4 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/RouterCheckController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/RouterCheckController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 为路由拦截鉴权准备的路示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-15
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java
index ea85b84e..80db0cec 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/SaSessionController.java
@@ -16,7 +16,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token Session会话示例 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-15
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/current/NotFoundHandle.java
index 1e82e95a..81ff22e8 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/current/NotFoundHandle.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/current/NotFoundHandle.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 处理 404  
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class NotFoundHandle implements ErrorController {
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/model/SysUser.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/model/SysUser.java
index 7add568e..4f8b8a2d 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/model/SysUser.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/model/SysUser.java
@@ -5,7 +5,7 @@ import java.io.Serializable;
 /**
  * User 实体类 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-15
  */
 public class SysUser implements Serializable {
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java
index dd4bd66d..3a0f51e4 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/MySaTokenListener.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.stp.SaLoginModel;
 /**
  * Sa-Token 自定义侦听器的实现 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-17
  */
 //@Component	// 打开此注解，让 SpringBoot 扫描到组件，即可完成自定义侦听器的注入 
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaLogForSlf4j.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaLogForSlf4j.java
index 59d0a8dd..67599e79 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaLogForSlf4j.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaLogForSlf4j.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.log.SaLog;
 /**
  * 将 Sa-Token log 信息转接到 Slf4j 
  * 
- * @author kong
+ * @author click33
  * @since 2022-11-2
  */
 //@Component
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 7f41b5fb..537c32c5 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -18,7 +18,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpInterfaceImpl.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpInterfaceImpl.java
index 1c1e1e58..6d7a453d 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpInterfaceImpl.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpInterfaceImpl.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.stp.StpInterface;
 /**
  * 自定义权限认证接口扩展，Sa-Token 将从此实现类获取每个账号拥有的权限码 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-13
  */
 @Component	// 打开此注解，保证此类被springboot扫描，即可完成sa-token的自定义权限验证扩展 
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
index f969c2e7..7431acec 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.stp.StpLogic;
 
 /**
  * Sa-Token 权限认证工具类 （User版）
- * @author kong 
+ * @author click33 
  */
 @Component
 public class StpUserUtil {
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java
index 74014898..08085bbc 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.annotation.SaCheckLogin;
 /**
  * 登录认证(User版)：只有登录之后才能进入该方法 
  * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * @author click33
  *
  */
 @SaCheckLogin(type = StpUserUtil.TYPE)
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java
index 38312116..d63fe208 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.annotation.SaMode;
 /**
  * 权限认证(User版)：必须具有指定权限才能进入该方法 
  * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * @author click33
  *
  */
 @SaCheckPermission(type = StpUserUtil.TYPE)
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java
index c9b44f32..e8707280 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.annotation.SaMode;
 /**
  * 角色认证(User版)：必须具有指定角色标识才能进入该方法 
  * <p> 可标注在函数、类上（效果等同于标注在此类的所有方法上） 
- * @author kong
+ * @author click33
  *
  */
 @SaCheckRole(type = StpUserUtil.TYPE)
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java
index 30cdc1a9..7f817598 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.stp.StpLogic;
 
 /**
  * Sa-Token 权限认证工具类 (User版)
- * @author kong 
+ * @author click33 
  */
 public class StpUserUtil {
 	
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java b/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java
index 1936b0d5..9aac0a84 100644
--- a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java
+++ b/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java
@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 /**
  * Dubbo 服务消费端 
  * 
- * @author kong
+ * @author click33
  *
  */
 @EnableDubbo
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java b/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java
index 8eb9567c..05afb4fc 100644
--- a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java
+++ b/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java
@@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 /**
  * Dubbo 服务提供端 
  * 
- * @author kong
+ * @author click33
  *
  */
 @EnableDubbo
diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 29a77d96..d689844d 100644
--- a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.stp.StpLogic;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
index e3a5e8f4..218ae733 100644
--- a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
+++ b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
@@ -16,7 +16,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java b/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java
index 0bbe6c48..2312e2c8 100644
--- a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java
+++ b/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * 启动：Sa-OAuth2 ClientServer端 
- * @author kong 
+ * @author click33 
  */
 @SpringBootApplication 
 public class SaOAuth2ClientApplication {
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java b/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java
index aed42c2a..284901f0 100644
--- a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java
+++ b/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-OAuth2 Client端 控制器 
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class SaOAuthClientController {
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java b/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java
index 5258a6d3..dbb58d9d 100644
--- a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java
+++ b/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java
@@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * Map< String, Object> 是最常用的一种Map类型，但是它写着麻烦 
  * <p>所以特封装此类，继承Map，进行一些扩展，可以让Map更灵活使用 
  * <p>最新：2020-12-10 新增部分构造方法
- * @author kong
+ * @author click33
  */
 public class SoMap extends LinkedHashMap<String, Object> {
 
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java b/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java
index a588eee0..4accb81c 100644
--- a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java
+++ b/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * 启动：Sa-OAuth2 Server端 
- * @author kong 
+ * @author click33 
  */
 @SpringBootApplication 
 public class SaOAuth2ServerApplication {
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java b/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java
index 00b53033..7f49f746 100644
--- a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java
+++ b/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java
@@ -19,7 +19,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-OAuth2 Server端 控制器
- * @author kong
+ * @author click33
  * 
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java b/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java
index 194c2942..758b4090 100644
--- a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java
+++ b/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.oauth2.model.SaClientModel;
 
 /**
  * Sa-Token OAuth2.0 整合实现 
- * @author kong
+ * @author click33
  */
 @Component
 public class SaOAuth2TemplateImpl extends SaOAuth2Template {
diff --git a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaQuicikStartup.java b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaQuicikStartup.java
index 0bd61346..ceaae649 100644
--- a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaQuicikStartup.java
+++ b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/SaQuicikStartup.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.quick.SaQuickManager;
 
 /**
  * springboot启动之后 
- * @author kong
+ * @author click33
  *
  */
 @Component
diff --git a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java
index 5ad5cedb..b7a4d57a 100644
--- a/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-quick-login/src/main/java/com/pj/test/TestController.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaLogForSolon.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaLogForSolon.java
index ddfa4b49..01ee2354 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaLogForSolon.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaLogForSolon.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.util.StrFormatter;
 /**
  * 将 Sa-Token log 信息转接到 Solon  
  * 
- * @author kong
+ * @author click33
  * @since 2022-11-2
  */
 //@Component
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 567489d5..640d4654 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.context.SaHolder;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  * @author noear
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/SSOController.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/SSOController.java
index 7bf77a2f..8cc55287 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/SSOController.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/SSOController.java
@@ -10,7 +10,7 @@ import org.noear.solon.annotation.Param;
 
 /**
  * 测试: 同域单点登录
- * @author kong
+ * @author click33
  * @author noear
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/StressTestController.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/StressTestController.java
index f0ac2180..cb203812 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/StressTestController.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/StressTestController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * 压力测试 
- * @author kong
+ * @author click33
  * @author noear
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
index 8c9b4726..50e75177 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
@@ -20,7 +20,7 @@ import org.noear.solon.annotation.Param;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  * @author noear
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/UserController.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/UserController.java
index 20e3d28f..939d5c4d 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/UserController.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/UserController.java
@@ -6,7 +6,7 @@ import org.noear.solon.annotation.Mapping;
 
 /**
  * 登录测试
- * @author kong
+ * @author click33
  * @author noear
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/util/Ttime.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/util/Ttime.java
index cb17dcaa..dec4f1cb 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/util/Ttime.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/util/Ttime.java
@@ -3,7 +3,7 @@ package com.pj.util;
 
 /**
  * 用于测试用时
- * @author kong
+ * @author click33
  *
  */
 public class Ttime {
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java
index 7c01ff54..09416324 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/SaTokenDemoApplication.java
@@ -5,8 +5,8 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
- * Sa-Token整合SpringBoot 示例，整合redis  
- * @author kong
+ * Sa-Token整合SpringBoot 示例，整合redis
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/NotFoundHandle.java
index 1e82e95a..81ff22e8 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/NotFoundHandle.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/current/NotFoundHandle.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 处理 404  
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class NotFoundHandle implements ErrorController {
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 74e61a58..9dd25cd9 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -12,7 +12,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/AtController.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/AtController.java
index dc7c6f95..3af4c603 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/AtController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/AtController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 注解鉴权测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/LoginController.java
index ea94cfa7..34eea9a1 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/StressTestController.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/StressTestController.java
index a2384567..b4273109 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/StressTestController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/StressTestController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 压力测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java
index 308bcaa8..9838063e 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/test/TestController.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/util/Ttime.java b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/util/Ttime.java
index cb17dcaa..dec4f1cb 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/util/Ttime.java
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/java/com/pj/util/Ttime.java
@@ -3,7 +3,7 @@ package com.pj.util;
 
 /**
  * 用于测试用时
- * @author kong
+ * @author click33
  *
  */
 public class Ttime {
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/SaTokenDemoApplication.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/SaTokenDemoApplication.java
index 4f5e4467..58427670 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/SaTokenDemoApplication.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/SaTokenDemoApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token整合SpringBoot 示例，整合redis  
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/current/NotFoundHandle.java
index 1e82e95a..81ff22e8 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/current/NotFoundHandle.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/current/NotFoundHandle.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 处理 404  
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class NotFoundHandle implements ErrorController {
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 9de045f8..23e97876 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/AtController.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/AtController.java
index dc7c6f95..3af4c603 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/AtController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/AtController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 注解鉴权测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/LoginController.java
index ea94cfa7..34eea9a1 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/StressTestController.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/StressTestController.java
index a2384567..b4273109 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/StressTestController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/StressTestController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 压力测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/TestController.java
index d0aa2580..065fa706 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/test/TestController.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/util/Ttime.java b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/util/Ttime.java
index cb17dcaa..dec4f1cb 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/util/Ttime.java
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/java/com/pj/util/Ttime.java
@@ -3,7 +3,7 @@ package com.pj.util;
 
 /**
  * 用于测试用时
- * @author kong
+ * @author click33
  *
  */
 public class Ttime {
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/SaTokenDemoApplication.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/SaTokenDemoApplication.java
index edb06d7a..195754ec 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/SaTokenDemoApplication.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/SaTokenDemoApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token整合SpringBoot 示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java
index 1e82e95a..81ff22e8 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/current/NotFoundHandle.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 处理 404  
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class NotFoundHandle implements ErrorController {
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 9d628520..8feeb06f 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.interceptor.SaInterceptor;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/AtController.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/AtController.java
index dc7c6f95..3af4c603 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/AtController.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/AtController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 注解鉴权测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/LoginController.java
index ea94cfa7..34eea9a1 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/StressTestController.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/StressTestController.java
index 5c0b3ce1..4883e6ee 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/StressTestController.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/StressTestController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * 压力测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
index 92096114..cccdd95d 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/util/Ttime.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/util/Ttime.java
index cb17dcaa..dec4f1cb 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/util/Ttime.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/util/Ttime.java
@@ -3,7 +3,7 @@ package com.pj.util;
 
 /**
  * 用于测试用时
- * @author kong
+ * @author click33
  *
  */
 public class Ttime {
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java
index 5b6809d5..a5f6a097 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/SaTokenSpringBoot3Application.java
@@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * Sa-Token 整合 SpringBoot3 示例，整合redis  
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/current/NotFoundHandle.java
index 21ea1d72..6e744e4f 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/current/NotFoundHandle.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/current/NotFoundHandle.java
@@ -12,7 +12,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 处理 404  
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class NotFoundHandle implements ErrorController {
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
index c4cacc6e..47549281 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/AtController.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/AtController.java
index dc7c6f95..3af4c603 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/AtController.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/AtController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 注解鉴权测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/LoginController.java
index ea94cfa7..34eea9a1 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/StressTestController.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/StressTestController.java
index a2384567..b4273109 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/StressTestController.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/StressTestController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 压力测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/TestController.java
index d0aa2580..065fa706 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/test/TestController.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/util/Ttime.java b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/util/Ttime.java
index cb17dcaa..dec4f1cb 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/util/Ttime.java
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/java/com/pj/util/Ttime.java
@@ -3,7 +3,7 @@ package com.pj.util;
 
 /**
  * 用于测试用时
- * @author kong
+ * @author click33
  *
  */
 public class Ttime {
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java
index 13143a2a..db7651e3 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/CorsFilter.java
@@ -8,7 +8,7 @@ import org.noear.solon.core.handle.FilterChain;
 
 /**
  * 跨域过滤器 
- * @author kong 
+ * @author click33 
  */
 @Component(index = -200)
 public class CorsFilter implements Filter {
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java
index c585aeaa..566af4f3 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/h5/H5Controller.java
@@ -14,7 +14,7 @@ import org.noear.solon.core.handle.Render;
 /**
  * 前后台分离架构下集成SSO所需的代码 （SSO-Server端）
  * <p>（注：如果不需要前后端分离架构下集成SSO，可删除此包下所有代码）</p>
- * @author kong
+ * @author click33
  *
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java
index 7d56ad3a..fc311ae3 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/GlobalExceptionFilter.java
@@ -9,7 +9,7 @@ import org.noear.solon.core.handle.FilterChain;
 
 /**
  * 全局异常处理 
- * @author kong
+ * @author click33
  *
  */
 @Component
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java
index 4eb6acd9..36318606 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoServerController.java
@@ -7,7 +7,7 @@ import org.noear.solon.annotation.Mapping;
 
 /**
  * Sa-Token-SSO Server端 Controller 
- * @author kong
+ * @author click33
  *
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java
index f45f82dc..c3718225 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaSso1ClientApp.java
@@ -6,7 +6,7 @@ import org.noear.solon.annotation.SolonMain;
 
 /**
  * SSO模式一，Client端 Demo 
- * @author kong
+ * @author click33
  *
  */
 @SolonMain
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java
index 90c3fc48..f6251b81 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/sso/SsoClientController.java
@@ -12,7 +12,7 @@ import org.noear.solon.core.handle.Render;
 
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @Controller
 public class SsoClientController implements Render {
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java
index f7a95bc0..547aebed 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/CorsFilter.java
@@ -8,7 +8,7 @@ import org.noear.solon.core.handle.FilterChain;
 
 /**
  * 跨域过滤器
- * @author kong 
+ * @author click33 
  */
 @Component(index = -200)
 public class CorsFilter implements Filter {
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java
index efa3d801..1fbd1d87 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/h5/H5Controller.java
@@ -12,7 +12,7 @@ import org.noear.solon.core.handle.Render;
 /**
  * 前后台分离架构下集成SSO所需的代码 （SSO-Client端）
  * <p>（注：如果不需要前后端分离架构下集成SSO，可删除此包下所有代码）</p>
- * @author kong
+ * @author click33
  *
  */
 @Controller
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java
index 510b8b92..edd3f8fe 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/sso/SsoClientController.java
@@ -13,7 +13,7 @@ import org.noear.solon.core.handle.Render;
 
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @Controller
 public class SsoClientController implements Render {
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java
index 4bf81034..7567de9f 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/sso/SsoClientController.java
@@ -13,7 +13,7 @@ import org.noear.solon.core.handle.Render;
 
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @Controller
 public class SsoClientController implements Render {
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java
index dd942224..f705fecf 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/CorsFilter.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 跨域过滤器 
- * @author kong 
+ * @author click33 
  */
 @Component
 @Order(-200)
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java
index a974ae15..1ebe3f9a 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/h5/H5Controller.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 前后台分离架构下集成SSO所需的代码 （SSO-Server端）
  * <p>（注：如果不需要前后端分离架构下集成SSO，可删除此包下所有代码）</p>
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java
index 3438e440..12e3ae84 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/GlobalExceptionHandler.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 全局异常处理 
- * @author kong
+ * @author click33
  *
  */
 @RestControllerAdvice
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
index d399e905..582b4388 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
@@ -14,7 +14,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 /**
  * Sa-Token-SSO Server端 Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java
index eb4a8155..b5347d94 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/SaSso1ClientApplication.java
@@ -5,7 +5,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * SSO模式一，Client端 Demo 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java
index 2dbd0c33..0174ca9a 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/src/main/java/com/pj/sso/SsoClientController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @RestController
 public class SsoClientController {
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java
index 02590e5a..6f5193b6 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 
 /**
  * 跨域过滤器
- * @author kong 
+ * @author click33 
  */
 @Component
 @Order(-200)
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
index b6279bad..acc1958d 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/H5Controller.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 前后台分离架构下集成SSO所需的代码 （SSO-Client端）
  * <p>（注：如果不需要前后端分离架构下集成SSO，可删除此包下所有代码）</p>
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java
index 91746032..05571649 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/sso/SsoClientController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @RestController
 public class SsoClientController {
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java
index 051d92fa..243a0550 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoClientController.java
@@ -17,7 +17,7 @@ import com.pj.sso.util.MyHttpSessionHolder;
 
 /**
  * SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @RestController
 public class SsoClientController {
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
index bfc11e6c..4365f3f5 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
@@ -12,7 +12,7 @@ import com.pj.sso.util.AjaxJson;
 /**
  * 封装一些 sso 共用方法 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-4-30
  */
 public class SsoRequestUtil {
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
index dbc39e2e..dc580d19 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  * 
  * <b> 此种方式有性能问题，仅做demo示例，真实项目中请更换为其它方案记录用户会话数据 </b>
  * 
- * @author kong
+ * @author click33
  * @since: 2022-4-30
  */
 @Component
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
index adbcbeef..0945a73d 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/java/com/pj/sso/SsoClientController.java
@@ -16,7 +16,7 @@ import java.util.Map;
 
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @RestController
 public class SsoClientController {
diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml
index 18fffb8d..685a6122 100644
--- a/sa-token-demo/sa-token-demo-test/pom.xml
+++ b/sa-token-demo/sa-token-demo-test/pom.xml
@@ -18,6 +18,7 @@
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
 		<sa-token.version>1.34.0</sa-token.version>
+		<java.run.main.class>com.pj.SaTokenApplication</java.run.main.class>
 	</properties>
 
 	<dependencies>
@@ -38,7 +39,13 @@
             <artifactId>sa-token-spring-boot-starter</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
-        
+
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>5.8.16</version>
+		</dependency>
+
 		<!-- Sa-Token 整合  Redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
@@ -67,6 +74,59 @@
 		</dependency>
 		
 	</dependencies>
-	
+
+	<!-- 构建配置 -->
+	<build>
+		<!-- 配置资源目录  -->
+		<resources>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+			<resource>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/*.*</include>
+				</includes>
+			</resource>
+		</resources>
+		<plugins>
+			<!-- 打包jar文件时，配置manifest文件，加入lib包的jar依赖 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<classpathPrefix>lib/</classpathPrefix>
+							<mainClass>${java.run.main.class}</mainClass>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+			<!-- 拷贝依赖的jar包到lib目录 -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy</id>
+						<phase>package</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/lib
+							</outputDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 	
 </project>
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
index ef69b80c..08eaed43 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
@@ -1,13 +1,13 @@
 package com.pj;
 
 import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.filter.SaServletFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+
 /**
  * Sa-Token 测试  
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/NotFoundHandle.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/NotFoundHandle.java
index 1e82e95a..81ff22e8 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/NotFoundHandle.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/NotFoundHandle.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 处理 404  
- * @author kong 
+ * @author click33 
  */
 @RestController
 public class NotFoundHandle implements ErrorController {
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/model/SysUser.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/model/SysUser.java
index 3e3a2f22..8291aee7 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/model/SysUser.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/model/SysUser.java
@@ -3,7 +3,7 @@ package com.pj.model;
 /**
  * User 实体类 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-15
  */
 public class SysUser {
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaLogForSlf4j.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaLogForSlf4j.java
index 59d0a8dd..106506c7 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaLogForSlf4j.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaLogForSlf4j.java
@@ -1,14 +1,13 @@
 package com.pj.satoken;
 
+import cn.dev33.satoken.log.SaLog;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import cn.dev33.satoken.log.SaLog;
-
 /**
  * 将 Sa-Token log 信息转接到 Slf4j 
  * 
- * @author kong
+ * @author click33
  * @since 2022-11-2
  */
 //@Component
@@ -33,7 +32,7 @@ public class SaLogForSlf4j implements SaLog {
 
 	@Override
 	public void warn(String str, Object... args) {
-		log.trace(str, args);
+		log.warn(str, args);
 	}
 
 	@Override
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java
index a78355f1..2d8eeff9 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
index f969c2e7..7431acec 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.stp.StpLogic;
 
 /**
  * Sa-Token 权限认证工具类 （User版）
- * @author kong 
+ * @author click33 
  */
 @Component
 public class StpUserUtil {
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/AtController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/AtController.java
index dc7c6f95..3af4c603 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/AtController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/AtController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 注解鉴权测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java
index ea94cfa7..34eea9a1 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/StressTestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/StressTestController.java
index a2384567..b4273109 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/StressTestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/StressTestController.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 压力测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index 2d692f49..39433de4 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/util/Ttime.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/util/Ttime.java
index cb17dcaa..dec4f1cb 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/util/Ttime.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/util/Ttime.java
@@ -3,7 +3,7 @@ package com.pj.util;
 
 /**
  * 用于测试用时
- * @author kong
+ * @author click33
  *
  */
 public class Ttime {
diff --git a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
index e6a2ffa7..221cb0f1 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
@@ -17,7 +17,7 @@ sa-token:
     # token风格
     token-style: uuid
     # 是否输出操作日志 
-    is-log: false
+    is-log: true
 
 spring: 
     # redis配置 
diff --git a/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/satoken/SaTokenConfigure.java
index c0cce23d..52881c60 100644
--- a/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.thymeleaf.dialect.SaTokenDialect;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/test/TestController.java
index ad2f4a8d..d9a85afd 100644
--- a/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/test/TestController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-Token-SSO Server端 Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/SaTokenWebfluxSpringboot3Application.java b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/SaTokenWebfluxSpringboot3Application.java
index 2f1fc607..10d78354 100644
--- a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/SaTokenWebfluxSpringboot3Application.java
+++ b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/SaTokenWebfluxSpringboot3Application.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.SaManager;
 /**
  * Sa-Token整合webflux 示例 (springboot3)
  * 
- * @author kong
+ * @author click33
  * @since 2023年1月3日
  *
  */
diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 7dfe7b7c..287f9401 100644
--- a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.reactor.filter.SaReactorFilter;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/test/TestController.java
index d678cb08..e3d4ea72 100644
--- a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/java/com/pj/test/TestController.java
@@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/SaTokenWebfluxApplication.java b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/SaTokenWebfluxApplication.java
index 77946d3f..1965b02a 100644
--- a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/SaTokenWebfluxApplication.java
+++ b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/SaTokenWebfluxApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token整合webflux 示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 7dfe7b7c..287f9401 100644
--- a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.reactor.filter.SaReactorFilter;
 
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/TestController.java
index d678cb08..e3d4ea72 100644
--- a/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-webflux/src/main/java/com/pj/test/TestController.java
@@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
 
 /**
  * 测试专用Controller 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/SaTokenWebSocketSpringApplication.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/SaTokenWebSocketSpringApplication.java
index 431fab28..35ea8291 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/SaTokenWebSocketSpringApplication.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/SaTokenWebSocketSpringApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token 整合 WebSocket 鉴权示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/test/LoginController.java
index 11abbe3c..78f2ddc8 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java
index 6bfdd8e0..5619c91f 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java
@@ -11,7 +11,7 @@ import org.springframework.web.socket.handler.TextWebSocketHandler;
 /**
  * 处理 WebSocket 连接 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-11
  */
 public class MyWebSocketHandler extends TextWebSocketHandler {
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java
index 7c29ff93..38c70e8f 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java
@@ -8,7 +8,7 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry
 /**
  * WebSocket 相关配置 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-11
  */
 @Configuration
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java
index 6e253a14..26a7f68a 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.stp.StpUtil;
 /**
  * WebSocket 握手的前置拦截器 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-11
  */
 public class WebSocketInterceptor implements HandshakeInterceptor {
diff --git a/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/SaTokenWebSocketApplication.java b/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/SaTokenWebSocketApplication.java
index 6450ede8..97922289 100644
--- a/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/SaTokenWebSocketApplication.java
+++ b/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/SaTokenWebSocketApplication.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.SaManager;
 
 /**
  * Sa-Token 整合 WebSocket 鉴权示例 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootApplication
diff --git a/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/test/LoginController.java
index 11abbe3c..78f2ddc8 100644
--- a/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-websocket/src/main/java/com/pj/test/LoginController.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录测试 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-doc/fun/log.md b/sa-token-doc/fun/log.md
index 169b180d..79bfdb53 100644
--- a/sa-token-doc/fun/log.md
+++ b/sa-token-doc/fun/log.md
@@ -49,7 +49,7 @@ public class SaLogForSlf4j implements SaLog {
 	}
 	@Override
 	public void warn(String str, Object... args) {
-		log.trace(str, args);
+		log.warn(str, args);
 	}
 	@Override
 	public void error(String str, Object... args) {
diff --git a/sa-token-doc/micro/gateway-auth.md b/sa-token-doc/micro/gateway-auth.md
index aa9c8a01..6e764551 100644
--- a/sa-token-doc/micro/gateway-auth.md
+++ b/sa-token-doc/micro/gateway-auth.md
@@ -84,7 +84,7 @@ public class StpInterfaceImpl implements StpInterface {
 ``` java
 /**
  * [Sa-Token 权限认证] 配置类 
- * @author kong
+ * @author click33
  */
 @Configuration
 public class SaTokenConfigure {
diff --git a/sa-token-doc/sso/sso-type1.md b/sa-token-doc/sso/sso-type1.md
index 2b12a388..ad6ccfbf 100644
--- a/sa-token-doc/sso/sso-type1.md
+++ b/sa-token-doc/sso/sso-type1.md
@@ -127,7 +127,7 @@ implementation 'cn.dev33:sa-token-alone-redis:${sa.top.version}'
 ``` java
 /**
  * Sa-Token-SSO Client端 Controller 
- * @author kong
+ * @author click33
  */
 @RestController
 public class SsoClientController {
diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index 766c43ab..ff5b1fa5 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -21,7 +21,7 @@ import java.util.stream.Collectors;
 
 /**
  * 为 SaTokenDao 单独设置Redis连接信息 
- * @author kong
+ * @author click33
  */
 @Configuration
 public class SaAloneRedisInject implements EnvironmentAware{
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
index 7c2ca61b..a80e1ea0 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
 /**
  * Sa-Token 二级Context - 创建器 [Dubbo版] 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenSecondContextCreatorForDubbo implements SaTokenSecondContextCreator {
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
index 5d4a10af..0029c967 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.exception.ApiDisabledException;
 /**
  * Sa-Token 上下文 [Dubbo版本] 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenSecondContextForDubbo implements SaTokenSecondContext {
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
index 70c0b929..b2a85afe 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
@@ -19,7 +19,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * 
  * Sa-Token 整合 Dubbo Consumer端过滤器 
  * 
- * @author kong
+ * @author click33
  *
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = -30000)
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
index ba0bd635..7c8c1091 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.same.SaSameUtil;
  * 
  * Sa-Token 整合 Dubbo Provider端过滤器 
  * 
- * @author kong
+ * @author click33
  *
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = -30000)
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
index 9ee00aea..702319c8 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
@@ -10,7 +10,7 @@ import java.util.Map;
 /**
  * Request for Dubbo 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaRequestForDubbo implements SaRequest {
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
index fc28ffe6..90986cf4 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 
 /**
  * Response for Servlet
- * @author kong
+ * @author click33
  *
  */
 public class SaResponseForDubbo implements SaResponse {
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
index b853e7a0..8a1e9a24 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
  * Storage for Servlet 
- * @author kong
+ * @author click33
  *
  */
 public class SaStorageForDubbo implements SaStorage {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
index 4494dbab..8f21aa1a 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
 /**
  * Sa-Token 二级Context - 创建器 [Dubbo3版]
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenSecondContextCreatorForDubbo3 implements SaTokenSecondContextCreator {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
index c254ff0c..e2194027 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
@@ -13,7 +13,7 @@ import org.apache.dubbo.rpc.RpcContext;
 /**
  * Sa-Token 上下文 [Dubbo3版本]
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenSecondContextForDubbo3 implements SaTokenSecondContext {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
index cc63a641..c9ed3921 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
@@ -13,7 +13,7 @@ import org.apache.dubbo.rpc.*;
  * 
  * Sa-Token 整合 Dubbo3 Consumer端过滤器
  * 
- * @author kong
+ * @author click33
  *
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = -30000)
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
index a353c9ac..a42ff049 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
@@ -10,7 +10,7 @@ import org.apache.dubbo.rpc.*;
  * 
  * Sa-Token 整合 Dubbo3 Provider端过滤器
  * 
- * @author kong
+ * @author click33
  *
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = -30000)
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
index b2efb9fd..a1135c29 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
@@ -9,7 +9,7 @@ import java.util.Map;
 /**
  * Request for Dubbo3
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaRequestForDubbo3 implements SaRequest {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
index 59e933da..5e3fff3f 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
@@ -6,7 +6,7 @@ import org.apache.dubbo.rpc.RpcContext;
 
 /**
  * Response for Servlet
- * @author kong
+ * @author click33
  *
  */
 public class SaResponseForDubbo3 implements SaResponse {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
index 686ae5e2..3b56b4c8 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
@@ -6,7 +6,7 @@ import org.apache.dubbo.rpc.RpcContext;
 
 /**
  * Storage for Servlet 
- * @author kong
+ * @author click33
  *
  */
 public class SaStorageForDubbo3 implements SaStorage {
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
index 1c072fbc..9802fa53 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
+++ b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * Fastjson 定制版 SaSession，重写类型转换API 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-19
  */
 public class SaSessionForFastjsonCustomized extends SaSession {
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java b/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
index 8ea39cf2..73a81591 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
+++ b/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * Fastjson 定制版 SaSession，重写类型转换API 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-19
  */
 public class SaSessionForFastjson2Customized extends SaSession {
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index 4175f537..8c90b91c 100644
--- a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.session.SaSession;
 /**
  * Jackson定制版SaSession，忽略 timeout 等属性的序列化 
  *  
- * @author kong
+ * @author click33
  *
  */
 @JsonIgnoreProperties({"timeout"})
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
index 538bbe40..cc8da95f 100644
--- a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
+++ b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
@@ -34,7 +34,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * Sa-Token 持久层实现 [Redis存储、Jackson序列化]
  * 
- * @author kong
+ * @author click33
  * 
  */
 @Component
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
index 7bda2fa7..5c171dcb 100644
--- a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
+++ b/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
@@ -18,7 +18,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * Sa-Token 持久层实现 [Redis存储、JDK默认序列化] 
  * 
- * @author kong
+ * @author click33
  *
  */
 @Component
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index d4505508..bff900c9 100644
--- a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 /**
  * Jackson定制版SaSession，忽略 timeout 等属性的序列化 
  *  
- * @author kong
+ * @author click33
  *
  */
 @JsonIgnoreProperties({"timeout"})
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
index a1100368..d95484a2 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * Sa-Token 集成 Thymeleaf 标签方言 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenDialect extends AbstractProcessorDialect {
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
index 2841d10f..ad970276 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
@@ -11,7 +11,7 @@ import org.thymeleaf.templatemode.TemplateMode;
 
 /**
  * 封装 Sa-Token 标签方言处理器 
- * @author kong 
+ * @author click33 
  *
  */
 public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
index 4b5e7a75..1243f5d6 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
@@ -13,7 +13,7 @@ import cn.hutool.jwt.JWTException;
 
 /**
  * jwt 操作模板方法封装 
- * @author kong
+ * @author click33
  *
  */
 public class SaJwtTemplate {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
index 70aa435e..b6833f49 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
@@ -7,7 +7,7 @@ import cn.hutool.jwt.JWT;
 
 /**
  * jwt 操作工具类封装 
- * @author kong
+ * @author click33
  *
  */
 public class SaJwtUtil {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index 5b2612bb..9bbcf349 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * Sa-Token 整合 jwt -- Mixin 混入模式  
- * @author kong
+ * @author click33
  *
  */
 public class StpLogicJwtForMixin extends StpLogic {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
index 85b1acf6..322d25b9 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.stp.StpUtil;
 
 /**
  * Sa-Token 整合 jwt -- Simple 简单模式 
- * @author kong
+ * @author click33
  *
  */
 public class StpLogicJwtForSimple extends StpLogic {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index e521e15d..f6c72a37 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -16,7 +16,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * Sa-Token 整合 jwt -- Stateless 无状态模式 
- * @author kong
+ * @author click33
  *
  */
 public class StpLogicJwtForStateless extends StpLogic {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
index 879462da..606c4ee8 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.jwt.error;
 /**
  * 定义 sa-token-jwt 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-31
  */
 public class SaJwtErrorCode {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
index ad976182..901924c2 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * 一个异常：代表 jwt 相关错误  
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-31
  */
 public class SaJwtException extends SaTokenException {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
index 2ad2854b..823ff2f8 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
 /**
  * Sa-Token-OAuth2 模块 总控类
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaOAuth2Manager {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
index f9464bd7..ca14c581 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
@@ -8,7 +8,7 @@ import java.util.function.Supplier;
 
 /**
  * Sa-Token-OAuth2 配置类 Model 
- * @author kong
+ * @author click33
  *
  */
 public class SaOAuth2Config implements Serializable {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
index 3c7791ba..412a686a 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.oauth2.error;
 /**
  * 定义 sa-token-oauth2 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-31
  */
 public interface SaOAuth2ErrorCode {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
index fc2193f8..b9483eb2 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.exception.SaTokenException;
 /**
  * 一个异常：代表OAuth2认证流程错误 
  * 
- * @author kong
+ * @author click33
  */
 public class SaOAuth2Exception extends SaTokenException {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
index a538be55..770e08e2 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
@@ -2,14 +2,14 @@ package cn.dev33.satoken.oauth2.logic;
 
 /**
  * Sa-Token-OAuth2 所有常量 
- * @author kong
+ * @author click33
  *
  */
 public class SaOAuth2Consts {
 
 	/**
 	 * 所有API接口 
-	 * @author kong 
+	 * @author click33 
 	 */
 	public static final class Api {
 		public static String authorize = "/oauth2/authorize";
@@ -23,7 +23,7 @@ public class SaOAuth2Consts {
 	
 	/**
 	 * 所有参数名称 
-	 * @author kong 
+	 * @author click33 
 	 */
 	public static final class Param {
 		public static String response_type = "response_type";
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
index 246b7617..599df878 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-Token-OAuth2 请求处理类封装
- * @author kong
+ * @author click33
  *
  */
 public class SaOAuth2Handle {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
index 7eabaad0..1b5d1085 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
@@ -19,7 +19,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * Sa-Token-OAuth2 模块 代码实现
- * @author kong
+ * @author click33
  *
  */
 public class SaOAuth2Template {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
index 3c4acad4..69b27f2b 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.oauth2.model.SaClientModel;
 
 /**
  * Sa-Token-OAuth2 模块 工具类 
- * @author kong
+ * @author click33
  * 
  */
 public class SaOAuth2Util {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
index f4528450..7309c871 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
@@ -6,7 +6,7 @@ import java.util.Map;
 
 /**
  * Model: Access-Token
- * @author kong
+ * @author click33
  *
  */
 public class AccessTokenModel implements Serializable {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
index 681acb02..1218c66e 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
@@ -6,7 +6,7 @@ import java.util.Map;
 
 /**
  * Model: Client-Token
- * @author kong
+ * @author click33
  *
  */
 public class ClientTokenModel implements Serializable {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
index 774083fc..0d87f784 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 /**
  * Model: 授权码 
- * @author kong
+ * @author click33
  *
  */
 public class CodeModel implements Serializable {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
index 4414d56d..f68ff848 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 /**
  * Model: Refresh-Token 
- * @author kong
+ * @author click33
  *
  */
 public class RefreshTokenModel implements Serializable {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
index 511677cf..0bc441b5 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * 请求授权参数的Model
- * @author kong
+ * @author click33
  *
  */
 public class RequestAuthModel implements Serializable {
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
index 7d86744b..02f87cfe 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
 
 /**
  * Client应用信息 Model 
- * @author kong
+ * @author click33
  *
  */
 public class SaClientModel implements Serializable {
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
index b73c9da4..8e40894c 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.quick.web.SaQuickController;
 /**
  * Quick-Bean 注入
  * 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
index aa9c6568..09f51061 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * SaQuickManager 
- * @author kong
+ * @author click33
  *
  */
 public class SaQuickManager {
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
index a5d407c4..07fd12d4 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 /**
  * Quick-Bean 注册 
  * 
- * @author kong
+ * @author click33
  *
  */
 @Configuration
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
index 86705670..4469df2d 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.quick.config;
 /**
  * sa-quick 配置类 Model
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaQuickConfig {
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
index b3d5c5bd..dd3a2581 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 登录Controller
- * @author kong
+ * @author click33
  *
  */
 @Controller
diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index 415d8b59..8e102142 100644
--- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -17,7 +17,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 /**
  * sa-token 基于 Spring Aop 的注解鉴权
  * 
- * @author kong
+ * @author click33
  */
 @Aspect
 @Component
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index 8909fcd8..184dc506 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-Token SSO 单点登录模块 配置类 Model 
- * @author kong
+ * @author click33
  *
  */
 public class SaSsoConfig implements Serializable {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
index 564caadd..7f9dc7b1 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
@@ -2,7 +2,7 @@ package cn.dev33.satoken.sso;
 
 /**
  * Sa-Token-SSO模块相关常量 
- * @author kong
+ * @author click33
  *
  */
 public class SaSsoConsts {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
index 9835a76b..16dac10b 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.config.SaSsoConfig;
 /**
  * Sa-Token-SSO 模块 总控类
  *
- * @author kong
+ * @author click33
  *
  */
 public class SaSsoManager {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index b75702bd..2023cb41 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * SSO 请求处理器 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-25
  */
 public class SaSsoProcessor {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index 4386090a..25ea17a9 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -18,7 +18,7 @@ import java.util.*;
 
 /**
  * Sa-Token-SSO 单点登录模块 
- * @author kong
+ * @author click33
  *
  */
 public class SaSsoTemplate {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index a4fc2880..1cd602fd 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -6,7 +6,7 @@ import java.util.Map;
 
 /**
  * Sa-Token-SSO 单点登录模块 工具类 
- * @author kong
+ * @author click33
  *
  */
 public class SaSsoUtil {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
index 0763086f..8b0cdfac 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.sso.error;
 /**
  * 定义 sa-token-sso 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-31
  */
 public interface SaSsoErrorCode {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
index bfb926fe..252da4c7 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.exception.SaTokenException;
 /**
  * 一个异常：代表 SSO 认证流程错误 
  * 
- * @author kong
+ * @author click33
  */
 public class SaSsoException extends SaTokenException {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
index b3069532..3b99e959 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.sso.name;
 /**
  * SSO 模块所有 API 路由名称定义 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-25
  */
 public class ApiName {
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
index d2efb197..bb5e1fc5 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.sso.name;
 /**
  * SSO 模块所有参数名称定义 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-25
  */
 public class ParamName {
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
index 2898bf0e..93c17d5e 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
@@ -10,7 +10,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
 
 /**
  * jwt操作工具类 
- * @author kong
+ * @author click33
  *
  */
 public class SaJwtUtil {
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
index 624bdb84..0e8f6222 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * Sa-Token 临时令牌验证模块接口 JWT实现类 
- * @author kong
+ * @author click33
  *
  */
 public class SaTempForJwt implements SaTempInterface {
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
index 97000044..128815a7 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.temp.jwt.error;
 /**
  * 定义 sa-token-temp-jwt 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since 2022-10-31
  */
 public class SaTempJwtErrorCode {
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 5298f39a..9aa8a325 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.servlet.error;
 /**
  * 定义 sa-token-servlet 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-30
  */
 public interface SaServletErrorCode {
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 434ac1ee..d7903da4 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -15,7 +15,7 @@ import java.util.*;
 
 /**
  * Request for Jakarta Servlet 
- * @author kong
+ * @author click33
  *
  */
 public class SaRequestForServlet implements SaRequest {
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index 47c3def0..3eabb238 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -7,7 +7,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Response for Jakarta Servlet
- * @author kong
+ * @author click33
  *
  */
 public class SaResponseForServlet implements SaResponse {
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index e529c0b0..2f1b9ed6 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -5,7 +5,7 @@ import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Storage for Jakarta Servlet 
- * @author kong
+ * @author click33
  * 
  */
 public class SaStorageForServlet implements SaStorage {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index 5c3105b5..e110e20c 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -6,7 +6,7 @@ import reactor.core.publisher.Mono;
 
 /**
  * Reactor上下文操作 [异步] 
- * @author kong
+ * @author click33
  *
  */
 public class SaReactorHolder {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 1c418946..69aeff06 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.reactor.model.SaStorageForReactor;
 
 /**
  * Reactor上下文操作 [同步]
- * @author kong
+ * @author click33
  *
  */
 public class SaReactorSyncHolder {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index 3f631387..b9cc63ff 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.reactor.error;
 /**
  * 定义 sa-token-reactor-spring-boot-starter 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-30
  */
 public interface SaReactorSpringBootErrorCode {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index b9ec70e5..29d969e3 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -24,7 +24,7 @@ import reactor.core.publisher.Mono;
 
 /**
  * Reactor全局过滤器 
- * @author kong
+ * @author click33
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 35e58005..2c705557 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -16,7 +16,7 @@ import java.util.*;
 
 /**
  * Request for Reactor 
- * @author kong
+ * @author click33
  *
  */
 public class SaRequestForReactor implements SaRequest {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index 3bd6a28b..46f6f73d 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 
 /**
  * Response for Reactor
- * @author kong
+ * @author click33
  *
  */
 public class SaResponseForReactor implements SaResponse {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 5cfc080a..7bb94205 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.context.model.SaStorage;
 
 /**
  * Storage for Reactor 
- * @author kong
+ * @author click33
  *
  */
 public class SaStorageForReactor implements SaStorage {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index 97912591..fec0ffd6 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.spring.SaPathMatcherHolder;
 /**
  * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextForSpringReactor extends SaTokenContextForThreadLocal {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index 3f8ab4f9..2684ab0b 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.context.SaTokenContext;
 /**
  * 注册Sa-Token所需要的Bean 
  * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextRegister {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index abd1e0eb..f3211360 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -6,7 +6,7 @@ import reactor.core.publisher.Mono;
 
 /**
  * Reactor上下文操作 [异步] 
- * @author kong
+ * @author click33
  *
  */
 public class SaReactorHolder {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 1c418946..69aeff06 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.reactor.model.SaStorageForReactor;
 
 /**
  * Reactor上下文操作 [同步]
- * @author kong
+ * @author click33
  *
  */
 public class SaReactorSyncHolder {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index 3f631387..b9cc63ff 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.reactor.error;
 /**
  * 定义 sa-token-reactor-spring-boot-starter 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-30
  */
 public interface SaReactorSpringBootErrorCode {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 07207108..1177e3ab 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -24,7 +24,7 @@ import reactor.core.publisher.Mono;
 
 /**
  * Reactor全局过滤器 
- * @author kong
+ * @author click33
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index da8819c0..5e8f4ad2 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -19,7 +19,7 @@ import java.util.Set;
 
 /**
  * Request for Reactor 
- * @author kong
+ * @author click33
  *
  */
 public class SaRequestForReactor implements SaRequest {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index 3bd6a28b..46f6f73d 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 
 /**
  * Response for Reactor
- * @author kong
+ * @author click33
  *
  */
 public class SaResponseForReactor implements SaResponse {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 5cfc080a..7bb94205 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.context.model.SaStorage;
 
 /**
  * Storage for Reactor 
- * @author kong
+ * @author click33
  *
  */
 public class SaStorageForReactor implements SaStorage {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index 97912591..fec0ffd6 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.spring.SaPathMatcherHolder;
 /**
  * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextForSpringReactor extends SaTokenContextForThreadLocal {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index 3f8ab4f9..2684ab0b 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.context.SaTokenContext;
 /**
  * 注册Sa-Token所需要的Bean 
  * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextRegister {
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 5298f39a..9aa8a325 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.servlet.error;
 /**
  * 定义 sa-token-servlet 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-30
  */
 public interface SaServletErrorCode {
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 46b457c8..a8558029 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -16,7 +16,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * Request for Servlet 
- * @author kong
+ * @author click33
  *
  */
 public class SaRequestForServlet implements SaRequest {
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index d86dd593..04f7b5be 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.servlet.error.SaServletErrorCode;
 
 /**
  * Response for Servlet
- * @author kong
+ * @author click33
  *
  */
 public class SaResponseForServlet implements SaResponse {
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index bd10b8cd..7e692a56 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.context.model.SaStorage;
 
 /**
  * Storage for Servlet 
- * @author kong
+ * @author click33
  *
  */
 public class SaStorageForServlet implements SaStorage {
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
index 9173e9c3..c4b66bc9 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.solon.error;
 /**
  * 定义 sa-token-solon-plugin 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-30
  */
 public interface SaSolonErrorCode {
diff --git a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java
index 5893a69b..891be892 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo/Config.java
@@ -1,42 +1,42 @@
-package demo;
-
-import org.noear.solon.annotation.Bean;
-import org.noear.solon.annotation.Configuration;
-import org.noear.solon.core.handle.Filter;
-
-import cn.dev33.satoken.router.SaRouter;
-import cn.dev33.satoken.solon.integration.SaTokenPathFilter;
-import cn.dev33.satoken.stp.StpUtil;
-
-/**
- * @author noear 2022/3/30 created
- */
-@Configuration
-public class Config {
-
-	@Bean
-    public Filter saTokenFilter() {
-        return new SaTokenPathFilter()
-                // 指定 [拦截路由] 与 [放行路由]
-                .addInclude("/**").addExclude("/favicon.ico")
-
-                // 认证函数: 每次请求执行
-                .setAuth(s -> {
-                    SaRouter.match("/**", StpUtil::checkLogin);
-
-                    // 根据路由划分模块，不同模块不同鉴权
-                    SaRouter.match("/user/**", r -> StpUtil.checkPermission("user"));
-                    SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin"));
-                    SaRouter.match("/goods/**", r -> StpUtil.checkPermission("goods"));
-                    SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders"));
-                })
-
-                // 异常处理函数：每次认证函数发生异常时执行此函数
-                .setError(e -> {
-                    System.out.println("---------- sa全局异常 ");
-                    System.out.println(e.getMessage());
-                    StpUtil.login(123);
-                    return e.getMessage();
-                });
-    }
-}
+//package demo;
+//
+//import org.noear.solon.annotation.Bean;
+//import org.noear.solon.annotation.Configuration;
+//import org.noear.solon.core.handle.Filter;
+//
+//import cn.dev33.satoken.router.SaRouter;
+//import cn.dev33.satoken.solon.integration.SaTokenPathFilter;
+//import cn.dev33.satoken.stp.StpUtil;
+//
+///**
+// * @author noear 2022/3/30 created
+// */
+//@Configuration
+//public class Config {
+//
+//	@Bean
+//    public Filter saTokenFilter() {
+//        return new SaTokenPathFilter()
+//                // 指定 [拦截路由] 与 [放行路由]
+//                .addInclude("/**").addExclude("/favicon.ico")
+//
+//                // 认证函数: 每次请求执行
+//                .setAuth(s -> {
+//                    SaRouter.match("/**", StpUtil::checkLogin);
+//
+//                    // 根据路由划分模块，不同模块不同鉴权
+//                    SaRouter.match("/user/**", r -> StpUtil.checkPermission("user"));
+//                    SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin"));
+//                    SaRouter.match("/goods/**", r -> StpUtil.checkPermission("goods"));
+//                    SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders"));
+//                })
+//
+//                // 异常处理函数：每次认证函数发生异常时执行此函数
+//                .setError(e -> {
+//                    System.out.println("---------- sa全局异常 ");
+//                    System.out.println(e.getMessage());
+//                    StpUtil.login(123);
+//                    return e.getMessage();
+//                });
+//    }
+//}
diff --git a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java
index 7b970b72..5a4affba 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/test/java/demo2/Config.java
@@ -1,7 +1,6 @@
 package demo2;
 
 import cn.dev33.satoken.router.SaRouter;
-import cn.dev33.satoken.solon.integration.SaTokenPathInterceptor;
 import cn.dev33.satoken.stp.StpUtil;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.Bean;
@@ -12,32 +11,32 @@ import org.noear.solon.annotation.Configuration;
  */
 @Configuration
 public class Config {
-    @Bean
-    public void saTokenPathInterceptor() {
-        Solon.app().before(new SaTokenPathInterceptor()
-                // 指定 [拦截路由] 与 [放行路由]
-                .addInclude("/**").addExclude("/favicon.ico")
-
-                // 认证函数: 每次请求执行
-                .setAuth(s -> {
-                    SaRouter.match("/**", StpUtil::checkLogin);
-
-                    // 根据路由划分模块，不同模块不同鉴权
-                    SaRouter.match("/user/**", r -> StpUtil.checkPermission("user"));
-                    SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin"));
-                    SaRouter.match("/goods/**", r -> StpUtil.checkPermission("goods"));
-                    SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders"));
-                })
-
-                // 异常处理函数：每次认证函数发生异常时执行此函数
-                .setError(e -> {
-                    System.out.println("---------- sa全局异常 ");
-                    System.out.println(e.getMessage());
-                    StpUtil.login(123);
-                    return e.getMessage();
-                })
-        );
-    }
+//    @Bean
+//    public void saTokenPathInterceptor() {
+//        Solon.app().before(new SaTokenPathInterceptor()
+//                // 指定 [拦截路由] 与 [放行路由]
+//                .addInclude("/**").addExclude("/favicon.ico")
+//
+//                // 认证函数: 每次请求执行
+//                .setAuth(s -> {
+//                    SaRouter.match("/**", StpUtil::checkLogin);
+//
+//                    // 根据路由划分模块，不同模块不同鉴权
+//                    SaRouter.match("/user/**", r -> StpUtil.checkPermission("user"));
+//                    SaRouter.match("/admin/**", r -> StpUtil.checkPermission("admin"));
+//                    SaRouter.match("/goods/**", r -> StpUtil.checkPermission("goods"));
+//                    SaRouter.match("/orders/**", r -> StpUtil.checkPermission("orders"));
+//                })
+//
+//                // 异常处理函数：每次认证函数发生异常时执行此函数
+//                .setError(e -> {
+//                    System.out.println("---------- sa全局异常 ");
+//                    System.out.println(e.getMessage());
+//                    StpUtil.login(123);
+//                    return e.getMessage();
+//                })
+//        );
+//    }
 
     @Bean
     public void saTokenPathInterceptor2() {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
index c9de6f70..0967cbe1 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
@@ -3,7 +3,7 @@ package cn.dev33.satoken.error;
 /**
  * 定义 sa-token-spring-boot-starter 所有异常细分状态码 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-10-30 
  */
 public interface SaSpringBootErrorCode {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
index cdfdffc5..6c1f387d 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.temp.SaTempInterface;
 /**
  * 注入Sa-Token所需要的Bean 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaBeanInject {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java
index 5b7ffb1e..02da959c 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.spring.json.SaJsonTemplateForJackson;
 /**
  * 注册Sa-Token所需要的Bean 
  * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author kong
+ * @author click33
  *
  */
 public class SaBeanRegister {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
index 5824fb0a..99a1db47 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
@@ -5,7 +5,7 @@ import org.springframework.util.PathMatcher;
 
 /**
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaPathMatcherHolder {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
index 14671494..41ad8906 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.json.SaJsonTemplate;
 /**
  *  JSON 转换器， Jackson 版实现 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-4-26
  */
 public class SaJsonTemplateForJackson implements SaJsonTemplate {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
index fd0380e8..9d1049d9 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.oauth2.logic.SaOAuth2Util;
 /**
  * 注入 Sa-Token-OAuth2 所需要的Bean 
  * 
- * @author kong
+ * @author click33
  *
  */
 @ConditionalOnClass(SaOAuth2Manager.class)
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
index 0122d0a2..55c8cba2 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
 
 /**
  * 注册 Sa-Token-OAuth2 所需要的Bean 
- * @author kong
+ * @author click33
  *
  */
 @ConditionalOnClass(SaOAuth2Manager.class)
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
index daf94207..24c86218 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.sso.SaSsoUtil;
 /**
  * 注入 Sa-Token-SSO 所需要的Bean 
  * 
- * @author kong
+ * @author click33
  *
  */
 @ConditionalOnClass(SaSsoManager.class)
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
index ce38e199..83e1605f 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.sso.SaSsoManager;
 
 /**
  * 注册 Sa-Token-SSO 所需要的Bean 
- * @author kong
+ * @author click33
  *
  */
 @ConditionalOnClass(SaSsoManager.class)
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 15875222..91247fb3 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
  * Servlet全局过滤器 
- * @author kong
+ * @author click33
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index c1836c82..10737b66 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -17,7 +17,7 @@ import cn.dev33.satoken.strategy.SaStrategy;
 /**
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-21
  */
 public class SaInterceptor implements HandlerInterceptor {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
index 403fbfd4..18420f4f 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.servlet.model.SaStorageForServlet;
 /**
  * Sa-Token 上下文处理器 [ SpringMVC版本实现 ] 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextForSpring implements SaTokenContext {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index 38fb19b7..ff5de17b 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.context.SaTokenContext;
 /**
  * 注册Sa-Token所需要的Bean 
  * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextRegister {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index 2e9bd116..be96c7d6 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.exception.NotWebContextException;
 
 /**
  * SpringMVC相关操作  
- * @author kong
+ * @author click33
  *
  */
 public class SpringMVCUtil {
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 98aa8f0c..6650ab37 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -22,7 +22,7 @@ import jakarta.servlet.ServletResponse;
 
 /**
  * Servlet全局过滤器 
- * @author kong
+ * @author click33
  *
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index e00450ce..9b5edec2 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -16,7 +16,7 @@ import jakarta.servlet.http.HttpServletResponse;
 /**
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-8-21
  */
 public class SaInterceptor implements HandlerInterceptor {
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
index c07b4a6d..3baa09b5 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.servlet.model.SaStorageForServlet;
 /**
  * Sa-Token 上下文处理器 [ SpringBoot3 Jakarta Servlet 版 ] 
  * 
- * @author kong
+ * @author click33
  *
  */
 public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index 7b43b505..05c0e251 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.context.SaTokenContext;
 /**
  * SaTokenContext 上下文注册 
  * 
- * @author kong
+ * @author click33
  * @since 2023年1月1日
  *
  */
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index a015a8d2..8fc84a33 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -10,7 +10,7 @@ import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * SpringMVC相关操作  
- * @author kong
+ * @author click33
  *
  */
 public class SpringMVCUtil {
diff --git a/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForMixinTest.java b/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForMixinTest.java
index 24e03aae..fab48928 100644
--- a/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForMixinTest.java
+++ b/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForMixinTest.java
@@ -25,7 +25,7 @@ import cn.hutool.jwt.JWT;
 /**
  * Sa-Token 整合 jwt：mixin 模式 测试 
  * 
- * @author kong 
+ * @author click33 
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForSimpleTest.java b/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForSimpleTest.java
index 0e04ecf8..5e43c25d 100644
--- a/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForSimpleTest.java
+++ b/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForSimpleTest.java
@@ -19,7 +19,7 @@ import cn.hutool.jwt.JWT;
 /**
  * Sa-Token 整合 jwt：Simple 模式 测试
  * 
- * @author kong 
+ * @author click33 
  *
  */
 //@RunWith(SpringRunner.class)
diff --git a/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForStatelessTest.java b/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForStatelessTest.java
index 78793fea..53e0e67c 100644
--- a/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForStatelessTest.java
+++ b/sa-token-test/sa-token-jwt-test/src/test/java/com/pj/test/JwtForStatelessTest.java
@@ -21,7 +21,7 @@ import cn.hutool.jwt.JWT;
 /**
  * Sa-Token 整合 jwt：stateless 模式 测试 
  * 
- * @author kong 
+ * @author click33 
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
index 5535fac7..3cd58037 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.context.SaHolder;
 /**
  * SaApplication 存取值测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-4
  */
 public class SaApplicationTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
index c4f7e943..a7887f47 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.config.SaTokenConfigFactory;
 /**
  * 配置类测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-4
  */
 public class SaTokenConfigTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
index 6e419ce7..547c87bd 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.context.model.SaCookie;
 /**
  * SaFoxUtil 工具类测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-8 22:14:25
  */
 public class SaCookieTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
index fed6f81f..c9442516 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.exception.SaTokenException;
 /**
  * 默认上下文测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-5
  */
 public class SaTokenContextDefaultImplTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
index f34c6039..78ab1f56 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.session.SaSession;
 /**
  * SaTokenDao 持久层 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-9 15:39:38
  */
 public class SaTokenDaoTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
index 6e9cd19c..f839c96b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.fun.IsRunFunction;
 /**
  * IsRunFunction 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-9 16:11:10
  */
 public class IsRunFunctionTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
index 40729b5f..e13ed61f 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SoMap;
 /**
  * json默认实现类测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-1
  */
 public class SaJsonTemplateDefaultImplTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
index f89c9b89..dc17b834 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.secure.SaBase64Util;
 /**
  * SaBase64Util 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-9
  */
 public class SaBase64UtilTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
index 9bf681fb..5b319cdb 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.secure.SaSecureUtil;
 /**
  * SaSecureUtil 加密工具类 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-9
  */
 public class SaSecureUtilTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
index 9a634aa5..e40995a7 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.session.SaSessionCustomUtil;
 /**
  * SaSession 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-9 
  */
 public class SaSessionCustomUtilTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
index 5cb8d454..1c82229e 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
@@ -15,7 +15,7 @@ import cn.dev33.satoken.session.TokenSign;
 /**
  * SaSession 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-9 
  */
 public class SaSessionTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
index dec68792..ce9e7a6a 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
@@ -8,7 +8,7 @@ import cn.dev33.satoken.session.TokenSign;
 /**
  * TokenSign 相关测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-4
  */
 public class TokenSignTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
index 939b8f29..b0995aef 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SoMap;
 /**
  * API 接口签名测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-2
  */
 public class SaSignTemplateTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
index 64e3298b..9a5c5bc0 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 /**
  * Token 参数扩展 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-5
  */
 public class TokenInfoTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
index 758a8e8f..7282c110 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 /**
  * 临时Token模块测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-1
  */
 public class SaTempTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
index 398a8032..22fff7a6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
@@ -16,7 +16,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * SaFoxUtil 工具类测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-8 22:14:25
  */
 public class SaFoxUtilTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
index b582ccd2..9e06a514 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * SaResult 结果集 测试 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-2-8 22:14:25
  */
 public class SaResultTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
index 6141753d..b053a45b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 测试注解用的Controller 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-2
  */
 @RestController
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
index 3f56393d..1475c97b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 测试注解用的Controller 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-2
  */
 @SaCheckLogin
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java
index 8a7e97ea..75b031f7 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java
@@ -14,7 +14,7 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * 全局异常处理 
- * @author kong
+ * @author click33
  *
  */
 @RestControllerAdvice
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
index 2f238a3c..c1cd10b3 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.interceptor.SaInterceptor;
 /**
  * Sa-Token 相关配置类
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-2
  */
 @Configuration
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java
index 25f24ae2..ea76739e 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 /**
  * 自定义权限验证接口扩展 
  * 
- * @author kong
+ * @author click33
  *
  */
 @Component
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
index a93a9c16..b9a96875 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.oauth2.logic.SaOAuth2Template;
 /**
  * 自定义 Sa-OAuth2 模板方法 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-5
  */
 @Component
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
index 3ab7796f..1f54c781 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.sso.SaSsoTemplate;
 /**
  * 自定义 Sa-SSO 模板方法 
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-5
  */
 @Component
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java
index 9d82d10d..a69ea33d 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 登录测试 
  * 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java
index 27c102be..d7d665ad 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.util.SoMap;
 /**
  * Sa-Token 登录API测试 
  * 
- * @author kong 
+ * @author click33 
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java
index 939da8fb..eec89d0d 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 其它测试 
  * 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java
index 0e52ca4c..8f0da2b0 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 其它测试 
  * 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java
index 579ad1bc..314e91ea 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * 路由鉴权测试 
  * 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java
index 70f76168..8a0c23a6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java
@@ -32,7 +32,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * C Controller 测试 
  * 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
index 750904a9..ce4e9e06 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
@@ -17,7 +17,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * Sa-Token 相关配置类
  * 
- * @author kong
+ * @author click33
  * @since: 2022-9-2
  */
 @Configuration
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java
index 9d3100b5..c8c27cf9 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java
@@ -10,7 +10,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * same-token Controller 
  * 
- * @author kong
+ * @author click33
  *
  */
 @RestController
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java
index a63dbd07..dab7b6a6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.util.SaResult;
 /**
  * same-token Controller 测试 
  * 
- * @author kong
+ * @author click33
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
index 1cfe57aa..e506175b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
@@ -19,7 +19,7 @@ import cn.dev33.satoken.stp.StpUtil;
 /**
  * Sa-Token 多端登录测试 
  * 
- * @author kong 
+ * @author click33 
  *
  */
 @SpringBootTest(classes = StartUpApplication.class)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
index 1eebec11..ffb915a6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
@@ -11,7 +11,7 @@ import cn.dev33.satoken.spring.SpringMVCUtil;
 /**
  * SpringMVCUtil 测试 
  * 
- * @author kong  
+ * @author click33  
  *
  */
 public class SpringMVCUtilTest {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java
index efdbcb76..3430a67b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * Map< String, Object> 是最常用的一种Map类型，但是它写着麻烦 
  * <p>所以特封装此类，继承Map，进行一些扩展，可以让Map更灵活使用 
  * <p>最新：2020-12-10 新增部分构造方法
- * @author kong
+ * @author click33
  */
 public class SoMap extends LinkedHashMap<String, Object> {
 

From e7291340de6ed28bfcf28b5357e764956ccfc996 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 8 May 2023 15:23:02 +0800
Subject: [PATCH 031/129] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=9E=E5=8A=A9?=
 =?UTF-8?q?=E8=80=85=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/more/sa-token-donate.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/sa-token-doc/more/sa-token-donate.md b/sa-token-doc/more/sa-token-donate.md
index 7c14a304..8694211c 100644
--- a/sa-token-doc/more/sa-token-donate.md
+++ b/sa-token-doc/more/sa-token-donate.md
@@ -21,6 +21,9 @@ Sa-Token 采用 Apache-2.0 开源协议，**承诺框架本身与官网文档永
 
 | 赞助人											| 赞助金额		| 留言										| 时间			|
 | :--------										| :--------		| :--------									| :--------		|
+| [BeckJin](https://gitee.com/beckjin666)		| ¥ 100.0		| [明道云-零代码开发平台，快速响应业务需求。从“IT背锅侠”，变成“IT英雄”。](https://mingdao.com?s=st)					| 2023-05-08 	|
+| [SummerHy](https://gitee.com/hurumo)			| ¥ 10.0		| 国产，就是棒，：）							| 2023-05-07 	|
+| [gdl](https://gitee.com/gdl97)				| ¥ 20.0		| 感谢您的开源项目！作者牛逼！					| 2023-04-29 	|
 | [bootx](https://gitee.com/bootx)				| ¥ 100.0		| [Bootx-Platform：支付收单、三方对接、后端基于 Spring Boot、Spring Cloud 应用脚手架](https://gitee.com/bootx/bootx-platform)	| 2023-04-18 	|
 | c（微信打赏）									| ¥ 100.0		| 感谢您的开源项目！							| 2023-04-17 	|
 | [hurumo](https://gitee.com/hurumo)			| ¥ 20.0		| 感谢您的开源项目！							| 2023-04-17 	|

From def58b91018a6107eee752d52fe7ff58e2a784c3 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 10 May 2023 12:27:29 +0800
Subject: [PATCH 032/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/listener/SaTokenListenerForLog.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
index d88950c6..490f85cb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
@@ -20,7 +20,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doLogin(String loginType, Object loginId, String tokenValue, SaLoginModel loginModel) {
-		log.info("账号 {} 登录成功 (loginType={}), 会话凭证Token={}", loginId, loginType, tokenValue);
+		log.info("账号 {} 登录成功 (loginType={}), 会话凭证 token={}", loginId, loginType, tokenValue);
 	}
 
 	/**
@@ -28,7 +28,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doLogout(String loginType, Object loginId, String tokenValue) {
-		log.info("账号 {} 注销登录 (loginType={}), 会话凭证Token={}", loginId, loginType, tokenValue);
+		log.info("账号 {} 注销登录 (loginType={}), 会话凭证 token={}", loginId, loginType, tokenValue);
 	}
 
 	/**
@@ -36,7 +36,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doKickout(String loginType, Object loginId, String tokenValue) {
-		log.info("账号 {} 被踢下线 (loginType={}), 会话凭证Token={}", loginId, loginType, tokenValue);
+		log.info("账号 {} 被踢下线 (loginType={}), 会话凭证 token={}", loginId, loginType, tokenValue);
 	}
 
 	/**
@@ -44,7 +44,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doReplaced(String loginType, Object loginId, String tokenValue) {
-		log.info("账号 {} 被顶下线 (loginType={}), 会话凭证Token={}", loginId, loginType, tokenValue);
+		log.info("账号 {} 被顶下线 (loginType={}), 会话凭证 token={}", loginId, loginType, tokenValue);
 	}
 
 	/**
@@ -68,7 +68,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doOpenSafe(String loginType, String tokenValue, String service, long safeTime) {
-		log.info("Token 二级认证成功, 业务标识={}, 有效期={}秒, Token值={}", service, safeTime, tokenValue);
+		log.info("token 二级认证成功, 业务标识={}, 有效期={}秒, Token值={}", service, safeTime, tokenValue);
 	}
 
 	/**
@@ -76,7 +76,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doCloseSafe(String loginType, String tokenValue, String service) {
-		log.info("Token 二级认证关闭, 业务标识={}, Token值={}", service, tokenValue);
+		log.info("token 二级认证关闭, 业务标识={}, Token值={}", service, tokenValue);
 	}
 
 	/**
@@ -100,7 +100,7 @@ public class SaTokenListenerForLog implements SaTokenListener {
 	 */
 	@Override
 	public void doRenewTimeout(String tokenValue, Object loginId, long timeout) {
-		log.info("Token 续期成功, {} 秒后到期, 帐号={}, Token值={} ", timeout, loginId, tokenValue);
+		log.info("token 续期成功, {} 秒后到期, 帐号={}, token值={} ", timeout, loginId, tokenValue);
 	}
 
 

From facb7ca9b6317b76d4d40f67273573262afa48a4 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 05:35:43 +0800
Subject: [PATCH 033/129] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=A6=82=E5=BF=B5?=
 =?UTF-8?q?=EF=BC=9A=E4=B8=B4=E6=97=B6=E6=9C=89=E6=95=88=E6=9C=9F=20->=20t?=
 =?UTF-8?q?oken=20=E6=9C=80=E4=BD=8E=E6=B4=BB=E8=B7=83=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev33/satoken/config/SaTokenConfig.java   | 20 +++----
 .../cn/dev33/satoken/error/SaErrorCode.java   |  2 +-
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 56 +++++++++---------
 .../java/cn/dev33/satoken/stp/StpUtil.java    | 10 ++--
 sa-token-doc/fun/token-timeout.md             | 45 +++++++-------
 sa-token-doc/start/example.md                 | 24 ++++----
 sa-token-doc/start/solon-example.md           | 40 ++++++-------
 sa-token-doc/use/config.md                    | 58 +++++++++----------
 8 files changed, 129 insertions(+), 126 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index c1a42b7d..4427a69c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -19,12 +19,12 @@ public class SaTokenConfig implements Serializable {
 	/** token 名称 （同时也是： cookie 名称、提交 token 时参数的名称、存储 token 时的 key 前缀） */
 	private String tokenName = "satoken";
 
-	/** token 的长久有效期（单位:秒） 默认30天, -1代表永久 */
+	/** token 有效期（单位：秒） 默认30天，-1代表永久 */
 	private long timeout = 60 * 60 * 24 * 30;
 
 	/**
-	 * token 临时有效期 [ 指定时间内无操作就视为 token 过期 ] （单位: 秒）, 默认-1 代表不限制
-	 * （例如可以设置为 1800 代表 30 分钟内无操作就过期）
+	 * token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	 * （例如可以设置为 1800 代表 30 分钟内无操作就冻结）
 	 */
 	private long activityTimeout = -1;
 
@@ -34,7 +34,7 @@ public class SaTokenConfig implements Serializable {
 	private Boolean isConcurrent = true;
 
 	/**
-	 * 在多人登录同一账号时，是否共用一个token （为true时所有登录共用一个token, 为false时每次登录新建一个token）
+	 * 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 	 */
 	private Boolean isShare = true;
 
@@ -171,14 +171,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token 的长久有效期（单位:秒） 默认30天, -1代表永久
+	 * @return token 有效期（单位：秒） 默认30天，-1代表永久
 	 */
 	public long getTimeout() {
 		return timeout;
 	}
 
 	/**
-	 * @param timeout token 的长久有效期（单位:秒） 默认30天, -1代表永久
+	 * @param timeout token 有效期（单位：秒） 默认30天，-1代表永久
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTimeout(long timeout) {
@@ -187,16 +187,16 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token 临时有效期 [ 指定时间内无操作就视为 token 过期 ] （单位: 秒）, 默认-1 代表不限制
-	 * （例如可以设置为 1800 代表 30 分钟内无操作就过期）
+	 * @return token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	 * 							（例如可以设置为 1800 代表 30 分钟内无操作就冻结）
 	 */
 	public long getActivityTimeout() {
 		return activityTimeout;
 	}
 
 	/**
-	 * @param activityTimeout token 临时有效期 [ 指定时间内无操作就视为 token 过期 ] （单位: 秒）, 默认-1 代表不限制
-	 * 							（例如可以设置为 1800 代表 30 分钟内无操作就过期）
+	 * @param activityTimeout token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	 * 								（例如可以设置为 1800 代表 30 分钟内无操作就冻结）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setActivityTimeout(long activityTimeout) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
index 30031ed3..100d92fa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
@@ -74,7 +74,7 @@ public interface SaErrorCode {
 	/** Token已被踢下线 */
 	int CODE_11015 = 11015;
 
-	/** Token已临时过期 */
+	/** Token已被冻结 */
 	int CODE_11016 = 11016;
 	
 	/** 在未集成 sa-token-jwt 插件时调用 getExtra() 抛出异常 */
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 7873c05b..787a31b6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -491,7 +491,7 @@ public class StpLogic {
 		SaStorage storage = SaHolder.getStorage();
 		storage.delete(splicingKeyJustCreatedSave());
 
- 		// 4、清除当前上下文的 [ 临时有效期 check 标记 ]
+ 		// 4、清除当前上下文的 [ 活跃度校验 check 标记 ]
 		storage.delete(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY);
 
  		// 5、清除这个 token 的其它相关信息
@@ -809,7 +809,7 @@ public class StpLogic {
  		}
 
  		// 7、检查此 token 的最后活跃时间是否已经超过了 activity-timeout 的限制，
-		//    如果是则代表其已经临时过期，需要抛出：token 已过期
+		//    如果是则代表其已被冻结，需要抛出：token 已过期
 	 	checkActivityTimeout(tokenValue);
 
 		// ------ 至此，loginId 已经是一个合法的值，代表当前会话是一个正常的登录状态了
@@ -868,7 +868,7 @@ public class StpLogic {
  			return null;
  		}
 
- 		// 4、如果根本获取不到这个 token 的最后活跃时间数据，则也视为其：已经临时过期，也返回 null
+ 		// 4、如果 token 已被冻结，也返回 null
  		if(getTokenActivityTimeoutByToken(tokenValue) == SaTokenDao.NOT_VALUE_EXPIRE) {
  			return null;
  		}
@@ -1239,7 +1239,7 @@ public class StpLogic {
 	}
 
 
-	// ------------------- Activity-Timeout 临时有效期 验证相关 -------------------
+	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
  	 * 写入指定 token 的 [ 最后活跃时间 ] 为当前时间戳
@@ -1247,7 +1247,8 @@ public class StpLogic {
  	 * @param tokenValue 指定token 
  	 */
  	protected void setLastActivityToNow(String tokenValue) {
- 		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+
+ 		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
  		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
  			return;
  		}
@@ -1262,7 +1263,8 @@ public class StpLogic {
  	 * @param tokenValue 指定 token
  	 */
  	protected void clearLastActivity(String tokenValue) {
-		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+
+		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
 		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
 			return;
 		}
@@ -1272,13 +1274,13 @@ public class StpLogic {
  	}
  	
  	/**
- 	 * 检查指定token 是否已经 [ 临时过期 ]，如果已经过期则抛出异常
+ 	 * 检查指定 token 是否已被冻结，如果是则抛出异常
 	 *
- 	 * @param tokenValue 指定token
+ 	 * @param tokenValue 指定 token
  	 */
  	public void checkActivityTimeout(String tokenValue) {
 
-		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
 		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
 			return;
 		}
@@ -1289,19 +1291,19 @@ public class StpLogic {
  			return;
  		}
 
- 		// ------------ 下面开始校验这个 token 是否已经 [ 临时过期 ]
+ 		// ------------ 下面开始校验这个 token 是否已被冻结
 
- 		// 1、获取这个 token 的临时剩余时间
+ 		// 1、获取这个 token 的剩余活跃有效期
  		long timeout = getTokenActivityTimeoutByToken(tokenValue);
 
-		// 2、值为 -1 代表此 token 已经被设置永不过期，无须继续验证
+		// 2、值为 -1 代表此 token 已经被设置永不冻结，无须继续验证
 		if(timeout == SaTokenDao.NEVER_EXPIRE) {
 			// 此句代码含义参考最下面
 			storage.set(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY, true);
 			return;
 		}
 
-		// 3、值为 -2 代表已临时过期，此时需要抛出异常
+		// 3、值为 -2 代表已被冻结，此时需要抛出异常
 		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
 			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_TIMEOUT, tokenValue).setCode(SaErrorCode.CODE_11016);
 		}
@@ -1312,7 +1314,7 @@ public class StpLogic {
  	}
 
  	/**
- 	 * 检查当前 token 是否已经[临时过期]，如果已经过期则抛出异常
+ 	 * 检查当前 token 是否已被冻结，如果是则抛出异常
  	 */
  	public void checkActivityTimeout() {
  		checkActivityTimeout(getTokenValue());
@@ -1324,7 +1326,7 @@ public class StpLogic {
  	 * @param tokenValue 指定token 
  	 */
  	public void updateLastActivityToNow(String tokenValue) {
-		// 如果提供的 token 或者 全局配置了 [ 永不过期 ], 则立即返回，无需操作
+		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
 		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
 			return;
 		}
@@ -1336,8 +1338,8 @@ public class StpLogic {
  	/**
  	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
  	 * <h2>
-	 * 		请注意: 即使 token 已经 [ 临时过期 ] 也可续签成功，
- 	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可
+	 * 		请注意: 即使 token 已被冻结 也可续签成功，
+ 	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
 	 * </h2>
  	 */
  	public void updateLastActivityToNow() {
@@ -1405,7 +1407,7 @@ public class StpLogic {
  	}
 
  	/**
- 	 * 获取当前 token [ 临时过期 ] 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+ 	 * 获取当前 token 剩余活跃有效期：当前 token 距离被冻结还剩多少时间（单位: 秒，返回 -1 代表永不冻结，-2 代表没有这个值或 token 已被冻结了）
 	 *
  	 * @return /
  	 */
@@ -1414,23 +1416,23 @@ public class StpLogic {
  	}
  	
  	/**
- 	 * 获取指定 token [ 临时过期 ] 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+ 	 * 获取指定 token 剩余活跃有效期：这个 token 距离被冻结还剩多少时间（单位: 秒，返回 -1 代表永不冻结，-2 代表没有这个值或 token 已被冻结了）
 	 *
  	 * @param tokenValue 指定 token
  	 * @return /
  	 */
  	public long getTokenActivityTimeoutByToken(String tokenValue) {
 
+		// 如果全局配置了永不冻结, 则返回 -1
+		if( ! isOpenActivityCheck() ) {
+			return SaTokenDao.NEVER_EXPIRE;
+		}
+
  		// 如果提供的 token 为 null，则返回 -2
  		if(SaFoxUtil.isEmpty(tokenValue)) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		}
 
- 		// 如果全局配置了永不过期, 则返回 -1
- 		if( ! isOpenActivityCheck() ) {
- 			return SaTokenDao.NEVER_EXPIRE;
- 		}
-
  		// ------ 开始查询
 
  		// 1、先获取这个 token 的最后活跃时间，13位时间戳
@@ -1448,12 +1450,12 @@ public class StpLogic {
  		long apartSecond = (System.currentTimeMillis() - lastActivityTime) / 1000;
 
  		// 4、校验这个时间差是否超过了允许的值
-		//    计算公式为: 允许的最大时间差 - 实际时间差，判断是否 < 0， 如果是则代表已经临时过期 ，返回-2
+		//    计算公式为: 允许的最大时间差 - 实际时间差，判断是否 < 0， 如果是则代表已经被冻结 ，返回-2
 		long timeout = getConfig().getActivityTimeout() - apartSecond;
  		if(timeout < 0) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		} else {
-			// 否则代表没过期，返回剩余有效时间
+			// 否则代表没冻结，返回剩余有效时间
 			return timeout;
 		}
  	}
@@ -2587,7 +2589,7 @@ public class StpLogic {
 	}
 
  	/**
- 	 * 返回全局配置是否开启了Token 活跃校验
+ 	 * 返回全局配置是否开启了 Token 活跃度校验，返回 true 代表已打开，返回 false 代表不打开，此时永不冻结 token
 	 *
  	 * @return / 
  	 */
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index 4fa52f39..da7c5b24 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -478,10 +478,10 @@ public class StpUtil {
 	}
 	
 
-	// ------------------- Activity-Timeout 临时有效期 验证相关 -------------------
+	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
-	 * 检查当前 token 是否已经[临时过期]，如果已经过期则抛出异常
+	 * 检查当前 token 是否已被冻结，如果是则抛出异常
 	 */
  	public static void checkActivityTimeout() {
  		stpLogic.checkActivityTimeout();
@@ -490,8 +490,8 @@ public class StpUtil {
 	/**
 	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
 	 * <h2>
-	 * 		请注意: 即使 token 已经 [ 临时过期 ] 也可续签成功，
-	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可
+	 * 		请注意: 即使 token 已被冻结 也可续签成功，
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
 	 * </h2>
 	 */
  	public static void updateLastActivityToNow() {
@@ -529,7 +529,7 @@ public class StpUtil {
  	}
 
 	/**
-	 * 获取当前 token [ 临时过期 ] 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 * 获取当前 token 剩余活跃有效期：当前 token 距离被冻结还剩多少时间（单位: 秒，返回 -1 代表永不冻结，-2 代表没有这个值或 token 已被冻结了）
 	 *
 	 * @return /
 	 */
diff --git a/sa-token-doc/fun/token-timeout.md b/sa-token-doc/fun/token-timeout.md
index df5b7f27..e5397514 100644
--- a/sa-token-doc/fun/token-timeout.md
+++ b/sa-token-doc/fun/token-timeout.md
@@ -2,22 +2,22 @@
 
 <!-- 本篇介绍Token有效期的详细用法 -->
 
-Sa-Token 提供两种Token自动过期策略，分别是`timeout`与`activity-timeout`，配置方法如下：
+Sa-Token 提供两种 Token 自动过期策略，分别是 `timeout` 与 `activity-timeout`，配置方法如下：
 
 <!---------------------------- tabs:start ---------------------------->
 <!------------- tab:yaml 风格  ------------->
 ``` yaml
 sa-token: 
-    # Token 有效期，单位：秒，默认30天, -1代表永不过期 
-    timeout: 2592000
-    # Token 临时有效期 (指定时间内无操作就视为 Token 过期) 单位: 秒，-1代表不设限 
-    activity-timeout: -1
+	# token 有效期（单位：秒），默认30天，-1代表永不过期 
+	timeout: 2592000
+	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	activity-timeout: -1
 ```
 <!------------- tab:properties 风格  ------------->
 ``` properties
-# Token 有效期，单位：秒，默认30天, -1代表永不过期 
+# token 有效期（单位：秒），默认30天，-1代表永不过期 
 sa-token.timeout=2592000
-# Token 临时有效期 (指定时间内无操作就视为 Token 过期) 单位: 秒，-1代表不设限 
+# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 sa-token.activity-timeout=-1
 ```
 <!---------------------------- tabs:end ---------------------------->
@@ -29,41 +29,41 @@ sa-token.activity-timeout=-1
 > 2. 银行为你颁发一张储蓄卡（系统为你颁发一个Token），以后每次存取钱都要带上这张卡（后续每次访问系统都要提交 Token）。
 > 3. 银行为这张卡设定两个过期时间：
 > 	- 第一个是 `timeout`，代表这张卡的长久有效期，就是指这张卡最长能用多久，假设 `timeout=3年`，那么3年后此卡将被银行删除，想要继续来银行办理业务必须重新办卡（Token 过期后想要访问系统必须重新登录）。
-> 	- 第二个就是 `activity-timeout`，代表这张卡的临时有效期，就是指这张卡必须每隔多久来银行一次，假设 `activity-timeout=1月` ，你如果超过1月不来办一次业务，银行就将你的卡冻结，列为长期不动户（Token 长期不访问系统，被冻结，但不会被删除）。
+> 	- 第二个就是 `activity-timeout`，代表这张卡的最低活跃频率限制，就是指这张卡必须每隔多久来银行一次，假设 `activity-timeout=1月` ，你如果超过1月不来办一次业务，银行就将你的卡冻结，列为长期不动户（Token 长期不访问系统，被冻结，但不会被删除）。
 > 4. 两个过期策略可以单独配置，也可以同时配置，只要有其中一个有效期超出了范围，这张卡就会变得不可用（两个有效期只要有一个过期了，Token就无法成功访问系统了）。
 
 下面是对两个过期策略的详细解释：
 
 ### timeout
-1. `timeout`代表Token的长久有效期，单位/秒，例如将其配置为 2592000 (30天)，代表在30天后，Token必定过期，无法继续使用
+1. `timeout`代表 Token 的长久有效期，单位/秒，例如将其配置为 2592000 (30天)，代表在30天后，Token必定过期，无法继续使用。
 2. `timeout`~~无法续签，想要继续使用必须重新登录~~。v1.29.0+ 版本新增续期方法：`StpUtil.renewTimeout(100)`。
-3. `timeout`的值配置为-1后，代表永久有效，不会过期
+3. `timeout`的值配置为-1后，代表永久有效，不会过期。
 
 
 ### activity-timeout
-1. `activity-timeout`代表临时有效期，单位/秒，例如将其配置为 1800 (30分钟)，代表用户如果30分钟无操作，则此Token会立即过期
-2. 如果在30分钟内用户有操作，则会再次续签30分钟，用户如果一直操作则会一直续签，直到连续30分钟无操作，Token才会过期
-3. `activity-timeout`的值配置为-1后，代表永久有效，不会过期，此时也无需频繁续签
+1. `activity-timeout`代表最低活跃频率，单位/秒，例如将其配置为 1800 (30分钟)，代表用户如果30分钟无操作，则此Token会立即过期（被冻结，但不会删除掉）。
+2. 如果在30分钟内用户有操作，则会再次续签30分钟，用户如果一直操作则会一直续签，直到连续30分钟无操作，Token才会过期。
+3. `activity-timeout`的值配置为-1后，代表永久有效，不会过期，此时也无需频繁续签。
 
 
 ### 关于activity-timeout的续签
-如果`activity-timeout`配置了大于零的值，Sa-Token 会在登录时开始计时，在每次直接或间接调用`getLoginId()`时进行一次过期检查与续签操作。
+如果`activity-timeout`配置了大于零的值，Sa-Token 会在登录时开始计时，在每次直接或间接调用`getLoginId()`时进行一次冻结检查与续签操作。
 此时会有两种情况：
-1. 一种是会话无操作时间太长，Token已经过期，此时框架会抛出`NotLoginException`异常(场景值=-3)，
+1. 一种是会话无操作时间太长，Token已经被冻结，此时框架会抛出`NotLoginException`异常(场景值=-3)，
 2. 另一种则是会话在`activity-timeout`有效期内通过检查，此时Token可以成功续签 
 
 
-### 我可以手动续签吗？
+### 我可以手动续签 activity-timeout 吗？
 **可以！**
 如果框架的自动续签算法无法满足您的业务需求，你可以进行手动续签，Sa-Token 提供两个API供你操作：
-1. `StpUtil.checkActivityTimeout()`: 检查当前Token 是否已经[临时过期]，如果已经过期则抛出异常
+1. `StpUtil.checkActivityTimeout()`: 检查当前Token 是否已经被冻结，如果是则抛出异常
 2. `StpUtil.updateLastActivityToNow()`: 续签当前Token：(将 [最后操作时间] 更新为当前时间戳) 
 
-注意：在手动续签时，即使Token已经 [临时过期] 也可续签成功，如果此场景下需要提示续签失败，可采用先检查再续签的形式保证Token有效性 
+注意：在手动续签时，即使 Token 已经被冻结也可续签成功（解冻），如果此场景下需要提示续签失败，可采用先检查再续签的形式保证Token有效性 
 
 例如以下代码：
 ``` java
-// 先检查是否已过期
+// 先检查是否已被冻结
 StpUtil.checkActivityTimeout();
 // 检查通过后继续续签
 StpUtil.updateLastActivityToNow();
@@ -79,14 +79,15 @@ StpUtil.stpLogic.updateLastActivityToNow(tokenValue);
 ```
 
 
-### timeout与activity-timeout可以同时使用吗？
+### timeout 与 activity-timeout 可以同时使用吗？
 **可以同时使用！** 
 两者的认证逻辑彼此独立，互不干扰，可以同时使用。
 
-### StpUtil 类中哪些公开方法支持临时有效期自动续签? 
+
+### StpUtil 类中哪些公开方法支持临时有效期自动续签 activity-timeout? 
 > 直接或间接获取了当前用户id的方法 （间接调用过 StpLogic.getLoginId() 方法）
 
-| 支持自动续签的方法 |
+| 包括但不限于这些： |
 |---|
 | StpUtil.checkLogin() |
 | StpUtil.getLoginId() |
diff --git a/sa-token-doc/start/example.md b/sa-token-doc/start/example.md
index 6352e7e4..b5e267db 100644
--- a/sa-token-doc/start/example.md
+++ b/sa-token-doc/start/example.md
@@ -55,17 +55,17 @@ server:
 	
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token: 
-	# token名称 (同时也是cookie名称)
+	# token 名称（同时也是 cookie 名称）
 	token-name: satoken
-	# token有效期，单位s 默认30天, -1代表永不过期 
+	# token 有效期（单位：秒），默认30天，-1代表永不过期 
 	timeout: 2592000
-	# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 	activity-timeout: -1
-	# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+	# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 	is-concurrent: true
-	# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 	is-share: true
-	# token风格
+	# token 风格
 	token-style: uuid
 	# 是否输出操作日志 
 	is-log: false
@@ -78,17 +78,17 @@ server.port=8081
 	
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 
-# token名称 (同时也是cookie名称)
+# token名称（同时也是 cookie 名称）
 sa-token.token-name=satoken
-# token有效期，单位s 默认30天, -1代表永不过期 
+# token 有效期（单位：秒），默认30天，-1代表永不过期 
 sa-token.timeout=2592000
-# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 sa-token.activity-timeout=-1
-# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 sa-token.is-concurrent=true
-# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 sa-token.is-share=true
-# token风格
+# token 风格
 sa-token.token-style=uuid
 # 是否输出操作日志 
 sa-token.is-log=false
diff --git a/sa-token-doc/start/solon-example.md b/sa-token-doc/start/solon-example.md
index e5c5b575..bc502816 100644
--- a/sa-token-doc/start/solon-example.md
+++ b/sa-token-doc/start/solon-example.md
@@ -60,20 +60,20 @@ server:
     
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token: 
-    # token名称 (同时也是cookie名称)
-    token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
-    timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
-    is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
-    is-share: true
-    # token风格
-    token-style: uuid
-    # 是否输出操作日志 
-    is-log: false
+	# token 名称（同时也是 cookie 名称）
+	token-name: satoken
+	# token 有效期（单位：秒），默认30天，-1代表永不过期 
+	timeout: 2592000
+	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	activity-timeout: -1
+	# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+	is-concurrent: true
+	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+	is-share: true
+	# token 风格
+	token-style: uuid
+	# 是否输出操作日志 
+	is-log: false
 ```
 
 <!------------- tab:app.properties 风格  ------------->
@@ -83,17 +83,17 @@ server.port=8081
     
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 
-# token名称 (同时也是cookie名称)
+# token名称（同时也是 cookie 名称）
 sa-token.token-name=satoken
-# token有效期，单位s 默认30天, -1代表永不过期 
+# token 有效期（单位：秒），默认30天，-1代表永不过期 
 sa-token.timeout=2592000
-# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 sa-token.activity-timeout=-1
-# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 sa-token.is-concurrent=true
-# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 sa-token.is-share=true
-# token风格
+# token 风格
 sa-token.token-style=uuid
 # 是否输出操作日志 
 sa-token.is-log=false
diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index dd90b2ea..5fdb8cd8 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -12,17 +12,17 @@
 ``` yaml
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token: 
-	# token名称 (同时也是cookie名称)
+	# token 名称（同时也是 cookie 名称）
 	token-name: satoken
-	# token有效期，单位s 默认30天, -1代表永不过期 
+	# token 有效期（单位：秒），默认30天，-1代表永不过期 
 	timeout: 2592000
-	# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 	activity-timeout: -1
-	# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+	# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 	is-concurrent: true
-	# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 	is-share: true
-	# token风格
+	# token 风格
 	token-style: uuid
 	# 是否输出操作日志 
 	is-log: false
@@ -32,17 +32,17 @@ sa-token:
 ``` properties
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 
-# token名称 (同时也是cookie名称)
+# token名称（同时也是 cookie 名称）
 sa-token.token-name=satoken
-# token有效期，单位s 默认30天, -1代表永不过期 
+# token 有效期（单位：秒），默认30天，-1代表永不过期 
 sa-token.timeout=2592000
-# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 sa-token.activity-timeout=-1
-# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 sa-token.is-concurrent=true
-# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 sa-token.is-share=true
-# token风格
+# token 风格
 sa-token.token-style=uuid
 # 是否输出操作日志 
 sa-token.is-log=false
@@ -68,12 +68,12 @@ public class SaTokenConfigure {
     @Primary
     public SaTokenConfig getSaTokenConfigPrimary() {
 		SaTokenConfig config = new SaTokenConfig();
-		config.setTokenName("satoken");             // token名称 (同时也是cookie名称)
-		config.setTimeout(30 * 24 * 60 * 60);       // token有效期，单位s 默认30天
-		config.setActivityTimeout(-1);              // token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-		config.setIsConcurrent(true);               // 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
-		config.setIsShare(true);                    // 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
-		config.setTokenStyle("uuid");               // token风格 
+		config.setTokenName("satoken");             // token 名称（同时也是 cookie 名称）
+		config.setTimeout(30 * 24 * 60 * 60);       // token 有效期（单位：秒），默认30天，-1代表永不过期 
+		config.setActivityTimeout(-1);              // token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+		config.setIsConcurrent(true);               // 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+		config.setIsShare(true);                    // 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+		config.setTokenStyle("uuid");               // token 风格
 		config.setIsLog(false);                     // 是否输出操作日志 
 		return config;
 	}
@@ -90,12 +90,12 @@ public class SaTokenConfigure {
 	// 此配置会与 application.yml 中的配置合并 （代码配置优先）
 	@Autowired
 	public void configSaToken(SaTokenConfig config) {
-		config.setTokenName("satoken");             // token名称 (同时也是cookie名称)
-		config.setTimeout(30 * 24 * 60 * 60);       // token有效期，单位s 默认30天
-		config.setActivityTimeout(-1);              // token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-		config.setIsConcurrent(true);               // 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
-		config.setIsShare(true);                    // 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
-		config.setTokenStyle("uuid");               // token风格 
+		config.setTokenName("satoken");             // token 名称（同时也是 cookie 名称）
+		config.setTimeout(30 * 24 * 60 * 60);       // token 有效期（单位：秒），默认30天，-1代表永不过期 
+		config.setActivityTimeout(-1);              // token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+		config.setIsConcurrent(true);               // 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+		config.setIsShare(true);                    // 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+		config.setTokenStyle("uuid");               // token 风格
 		config.setIsLog(false);                     // 是否输出操作日志 
 	}
 }
@@ -115,11 +115,11 @@ public class SaTokenConfigure {
 | 参数名称				| 类型		| 默认值		| 说明																				|
 | :--------				| :--------	| :--------	| :--------																			|
 | tokenName				| String	| satoken	| Token 名称 （同时也是 Cookie 名称、数据持久化前缀）													|
-| timeout				| long		| 2592000	| Token 有效期，单位/秒 默认30天，-1代表永久有效	[参考：token有效期详解](/fun/token-timeout)		|
-| activityTimeout		| long		| -1		| Token 临时有效期 （指定时间内无操作就视为token过期） 单位: 秒, 默认-1 代表不限制 （例如可以设置为1800代表30分钟内无操作就过期） 	[参考：token有效期详解](/fun/token-timeout)													|
+| timeout				| long		| 2592000	| Token 有效期（单位：秒），默认30天，-1代表永不过期 [参考：token有效期详解](/fun/token-timeout)		|
+| activityTimeout		| long		| -1		| Token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结（例如可以设置为1800代表30分钟内无操作就过期） 	[参考：token有效期详解](/fun/token-timeout)													|
 | isConcurrent			| Boolean	| true		| 是否允许同一账号并发登录 （为 true 时允许一起登录，为 false 时新登录挤掉旧登录）															|
-| isShare				| Boolean	| true		| 在多人登录同一账号时，是否共用一个token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token） 	|
-| maxLoginCount			| int		| 12		| 同一账号最大登录数量，-1代表不限 （只有在 `isConcurrent=true`, `isShare=false` 时此配置才有效），[详解](/use/config?id=配置项详解：maxlogincount)	|
+| isShare				| Boolean	| true		| 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token） 	|
+| maxLoginCount			| int		| 12		| 同一账号最大登录数量，-1代表不限 （只有在 `isConcurrent=true`，`isShare=false` 时此配置才有效），[详解](/use/config?id=配置项详解：maxlogincount)	|
 | maxTryTimes			| int		| 12		| 在每次创建 Token 时的最高循环次数，用于保证 Token 唯一性（-1=不循环重试，直接使用）			|
 | isReadBody			| Boolean	| true		| 是否尝试从 请求体 里读取 Token														|
 | isReadHeader			| Boolean	| true		| 是否尝试从 header 里读取 Token														|
@@ -128,7 +128,7 @@ public class SaTokenConfigure {
 | tokenStyle			| String	| uuid		| token风格， [参考：自定义Token风格](/up/token-style)										|
 | dataRefreshPeriod		| int		| 30		| 默认数据持久组件实现类中，每次清理过期数据间隔的时间 （单位: 秒） ，默认值30秒，设置为-1代表不启动定时清理 		|
 | tokenSessionCheckLogin	| Boolean	| true	| 获取 `Token-Session` 时是否必须登录 （如果配置为true，会在每次获取 `Token-Session` 时校验是否登录），[详解](/use/config?id=配置项详解：tokenSessionCheckLogin)		|
-| autoRenew				| Boolean	| true		| 是否打开自动续签 （如果此值为true, 框架会在每次直接或间接调用 `getLoginId()` 时进行一次过期检查与续签操作），[参考：token有效期详解](/fun/token-timeout)		|
+| autoRenew				| Boolean	| true		| 是否打开自动续签 （如果此值为true，框架会在每次直接或间接调用 `getLoginId()` 时进行一次过期检查与续签操作），[参考：token有效期详解](/fun/token-timeout)		|
 | tokenPrefix			| String	| null		| token前缀，例如填写 `Bearer` 实际传参 `satoken: Bearer xxxx-xxxx-xxxx-xxxx` 	[参考：自定义Token前缀](/up/token-prefix) 			|
 | isPrint				| Boolean	| true		| 是否在初始化配置时打印版本字符画													|
 | isLog					| Boolean	| false		| 是否打印操作日志																	|

From ff77c210dff5d91b870ffff217b310a30156bd8c Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 10:22:33 +0800
Subject: [PATCH 034/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-spring-bo?=
 =?UTF-8?q?ot-autoconfig=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/package-info.java |  2 +-
 .../cn/dev33/satoken/spring/SaBeanInject.java    |  5 +++--
 .../satoken/spring/SaPathMatcherHolder.java      |  5 +++--
 .../spring/json/SaJsonTemplateForJackson.java    | 16 ++++++----------
 .../spring/oauth2/SaOAuth2BeanInject.java        | 10 +++++-----
 .../spring/oauth2/SaOAuth2BeanRegister.java      | 13 +++++++------
 .../satoken/spring/sso/SaSsoBeanInject.java      | 10 +++++-----
 .../satoken/spring/sso/SaSsoBeanRegister.java    |  7 ++++---
 8 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
index 56ef7301..b24005ea 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,4 +1,4 @@
 /**
- * sa-token集成SpringBoot的各个组件 
+ * Sa-Token 集成 SpringBoot 的各个组件
  */
 package cn.dev33.satoken;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
index 6c1f387d..af28592a 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
@@ -25,10 +25,10 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.temp.SaTempInterface;
 
 /**
- * 注入Sa-Token所需要的Bean 
+ * 注入 Sa-Token 所需要的 Bean
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaBeanInject {
 
@@ -36,6 +36,7 @@ public class SaBeanInject {
 	 * 组件注入 
 	 * <p> 为确保 Log 组件正常打印，必须将 SaLog 和 SaTokenConfig 率先初始化 </p> 
 	 * 
+	 * @param log log 对象
 	 * @param saTokenConfig 配置对象
 	 */
 	public SaBeanInject(
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
index 99a1db47..5c144a52 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
@@ -4,9 +4,10 @@ import org.springframework.util.AntPathMatcher;
 import org.springframework.util.PathMatcher;
 
 /**
- * 
- * @author click33
+ * 持有 PathMatcher 全局引用，方便快捷的调用 PathMatcher 相关方法
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaPathMatcherHolder {
 	
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
index 41ad8906..b1431243 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
@@ -1,19 +1,18 @@
 package cn.dev33.satoken.spring.json;
 
-import java.util.Map;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
 import cn.dev33.satoken.error.SaSpringBootErrorCode;
 import cn.dev33.satoken.exception.SaJsonConvertException;
 import cn.dev33.satoken.json.SaJsonTemplate;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.Map;
 
 /**
  *  JSON 转换器， Jackson 版实现 
  * 
  * @author click33
- * @since: 2022-4-26
+ * @since 2022-4-26
  */
 public class SaJsonTemplateForJackson implements SaJsonTemplate {
 
@@ -23,10 +22,7 @@ public class SaJsonTemplateForJackson implements SaJsonTemplate {
 	public ObjectMapper objectMapper = new ObjectMapper();
 
 	/**
-	 * 将任意对象转换为 json 字符串 
-	 * 
-	 * @param obj 对象 
-	 * @return 转换后的 json 字符串
+	 * 将任意对象转换为 json 字符串
 	 */
 	@Override
 	public String toJsonString(Object obj) {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
index 9d1049d9..fc9fa791 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
@@ -9,16 +9,16 @@ import cn.dev33.satoken.oauth2.logic.SaOAuth2Template;
 import cn.dev33.satoken.oauth2.logic.SaOAuth2Util;
 
 /**
- * 注入 Sa-Token-OAuth2 所需要的Bean 
+ * 注入 Sa-Token-OAuth2 所需要的组件
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @ConditionalOnClass(SaOAuth2Manager.class)
 public class SaOAuth2BeanInject {
 
 	/**
-	 * 注入OAuth2配置Bean 
+	 * 注入 OAuth2 配置对象
 	 * 
 	 * @param saOAuth2Config 配置对象 
 	 */
@@ -28,9 +28,9 @@ public class SaOAuth2BeanInject {
 	}
 
 	/**
-	 * 注入代码模板Bean 
+	 * 注入 OAuth2 模板代码类
 	 * 
-	 * @param saOAuth2Template 代码模板Bean 
+	 * @param saOAuth2Template 模板代码类
 	 */
 	@Autowired(required = false)
 	public void setSaOAuth2Interface(SaOAuth2Template saOAuth2Template) {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
index 55c8cba2..0e87470c 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
@@ -1,22 +1,23 @@
 package cn.dev33.satoken.spring.oauth2;
 
+import cn.dev33.satoken.oauth2.SaOAuth2Manager;
+import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 
-import cn.dev33.satoken.oauth2.SaOAuth2Manager;
-import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
-
 /**
- * 注册 Sa-Token-OAuth2 所需要的Bean 
- * @author click33
+ * 注册 Sa-Token-OAuth2 所需要的Bean
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @ConditionalOnClass(SaOAuth2Manager.class)
 public class SaOAuth2BeanRegister {
 
 	/**
-	 * 获取OAuth2配置Bean 
+	 * 获取 OAuth2 配置对象
+	 *
 	 * @return 配置对象 
 	 */
 	@Bean
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
index 24c86218..72fc5a4a 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
@@ -10,16 +10,16 @@ import cn.dev33.satoken.sso.SaSsoTemplate;
 import cn.dev33.satoken.sso.SaSsoUtil;
 
 /**
- * 注入 Sa-Token-SSO 所需要的Bean 
+ * 注入 Sa-Token-SSO 所需要的 Bean
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @ConditionalOnClass(SaSsoManager.class)
 public class SaSsoBeanInject {
 
 	/**
-	 * 注入 Sa-Token-SSO 配置Bean 
+	 * 注入 Sa-Token-SSO 配置类
 	 * 
 	 * @param saSsoConfig 配置对象 
 	 */
@@ -29,9 +29,9 @@ public class SaSsoBeanInject {
 	}
 
 	/**
-	 * 注入 Sa-Token-SSO 单点登录模块 Bean
+	 * 注入 SSO 模板代码类
 	 * 
-	 * @param ssoTemplate saSsoTemplate对象 
+	 * @param ssoTemplate SaSsoTemplate 对象
 	 */
 	@Autowired(required = false)
 	public void setSaSsoTemplate(SaSsoTemplate ssoTemplate) {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
index 83e1605f..53a6511c 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
@@ -8,15 +8,16 @@ import cn.dev33.satoken.config.SaSsoConfig;
 import cn.dev33.satoken.sso.SaSsoManager;
 
 /**
- * 注册 Sa-Token-SSO 所需要的Bean 
- * @author click33
+ * 注册 Sa-Token-SSO 所需要的 Bean
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @ConditionalOnClass(SaSsoManager.class)
 public class SaSsoBeanRegister {
 
 	/**
-	 * 获取 SSO 配置Bean 
+	 * 获取 SSO 配置对象
 	 * @return 配置对象 
 	 */
 	@Bean

From 5b5cd5181e87516159d6d1bac2acf6dc29424efa Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 15:18:10 +0800
Subject: [PATCH 035/129] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BF=AE=E9=A5=B0?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/context/SaTokenContext.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
index e9d45c35..b61d4958 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
@@ -20,7 +20,7 @@ public interface SaTokenContext {
 	 * 
 	 * @return /
 	 */
-	public SaRequest getRequest();
+	SaRequest getRequest();
 
 	/**
 	 * 获取当前请求的 Response 包装对象
@@ -28,7 +28,7 @@ public interface SaTokenContext {
 	 * 
 	 * @return /
 	 */
-	public SaResponse getResponse();
+	SaResponse getResponse();
 
 	/**
 	 * 获取当前请求的 Storage 包装对象
@@ -36,7 +36,7 @@ public interface SaTokenContext {
 	 * 
 	 * @return /
 	 */
-	public SaStorage getStorage();
+	SaStorage getStorage();
 
 	/**
 	 * 判断：指定路由匹配符是否可以匹配成功指定路径
@@ -50,7 +50,7 @@ public interface SaTokenContext {
 	 * @param path 需要匹配的路径 
 	 * @return /
 	 */
-	public boolean matchPath(String pattern, String path);
+	boolean matchPath(String pattern, String path);
 
 	/**
 	 * 判断：在本次请求中，此上下文是否可用。
@@ -58,7 +58,7 @@ public interface SaTokenContext {
 	 *
 	 * @return / 
 	 */
-	public default boolean isValid() {
+	default boolean isValid() {
 		return false;
 	}
 	

From bc3898bf3ebfe20f638dae925d8c1f46fe713594 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 15:22:18 +0800
Subject: [PATCH 036/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-spring-bo?=
 =?UTF-8?q?ot-starter=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/more/common-questions.md         |  2 +-
 .../dev33/satoken/filter/SaServletFilter.java |  8 +++++--
 .../satoken/interceptor/SaInterceptor.java    | 23 +++++++++++--------
 .../spring/SaTokenContextForSpring.java       | 16 ++++++-------
 .../spring/SaTokenContextRegister.java        | 10 ++++----
 .../dev33/satoken/spring/SpringMVCUtil.java   | 15 ++++++------
 6 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/sa-token-doc/more/common-questions.md b/sa-token-doc/more/common-questions.md
index 6eb729fb..053979e0 100644
--- a/sa-token-doc/more/common-questions.md
+++ b/sa-token-doc/more/common-questions.md
@@ -9,7 +9,7 @@
 
 ## 一、常见报错
 
-### Q：报错：非Web上下文无法获取Request。
+### Q：报错：非 web 上下文无法获取 HttpServletRequest。
 
 报错原因解析：
 
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 91247fb3..5159eec5 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -22,9 +22,13 @@ import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * Servlet全局过滤器 
- * @author click33
+ * Servlet 全局鉴权过滤器
+ * <p>
+ *     默认优先级为 -100，尽量保证在其它过滤器之前执行
+ * </p>
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaServletFilter implements SaFilter, Filter {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 10737b66..6fcda9f3 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.strategy.SaStrategy;
 public class SaInterceptor implements HandlerInterceptor {
 
 	/**
-	 * 是否打开注解鉴权 
+	 * 是否打开注解鉴权，配置为 true 时注解鉴权才会生效，配置为 false 时，即使写了注解也不会进行鉴权
 	 */
 	public boolean isAnnotation = true;
 	
@@ -48,9 +48,9 @@ public class SaInterceptor implements HandlerInterceptor {
 	}
 
 	/**
-	 * 设置是否打开注解鉴权 
+	 * 设置是否打开注解鉴权：配置为 true 时注解鉴权才会生效，配置为 false 时，即使写了注解也不会进行鉴权
 	 * @param isAnnotation /
-	 * @return 对象自身 
+	 * @return 对象自身
 	 */
 	public SaInterceptor isAnnotation(boolean isAnnotation) {
 		this.isAnnotation = isAnnotation;
@@ -58,7 +58,7 @@ public class SaInterceptor implements HandlerInterceptor {
 	}
 	
 	/**
-	 * 写入[认证函数]: 每次请求执行 
+	 * 写入 [ 认证函数 ]: 每次请求执行
 	 * @param auth / 
 	 * @return 对象自身 
 	 */
@@ -79,27 +79,32 @@ public class SaInterceptor implements HandlerInterceptor {
 		
 		try {
 
+			// 这里必须确保 handler 是 HandlerMethod 类型时，才能进行注解鉴权
 			if(isAnnotation && handler instanceof HandlerMethod) {
 				
 				// 获取此请求对应的 Method 处理函数 
 				Method method = ((HandlerMethod) handler).getMethod();
 
-				// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权 
+				// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
 				if(SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+					// 注意这里直接就退出整个鉴权了，最底部的 auth.run() 路由拦截鉴权也被跳出了
 					return true;
 				}
 
-				// 注解校验 
+				// 执行注解鉴权
 				SaStrategy.me.checkMethodAnnotation.accept(method);
 			}
 			
-			// Auth 校验  
+			// Auth 路由拦截鉴权校验
 			auth.run(handler);
 			
 		} catch (StopMatchException e) {
-			// 停止匹配，进入Controller 
+			// StopMatchException 异常代表：停止匹配，进入Controller
+
 		} catch (BackResultException e) {
-			// 停止匹配，向前端输出结果 
+			// BackResultException 异常代表：停止匹配，向前端输出结果
+			// 		请注意此处默认 Content-Type 为 text/plain，如果需要返回 JSON 信息，需要在 back 前自行设置 Content-Type 为 application/json
+			// 		例如：SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
 			if(response.getContentType() == null) {
 				response.setContentType("text/plain; charset=utf-8"); 
 			}
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
index 18420f4f..acc688b2 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
@@ -9,15 +9,15 @@ import cn.dev33.satoken.servlet.model.SaResponseForServlet;
 import cn.dev33.satoken.servlet.model.SaStorageForServlet;
 
 /**
- * Sa-Token 上下文处理器 [ SpringMVC版本实现 ] 
+ * Sa-Token 上下文处理器 [ SpringMVC版本实现 ]。在 SpringMVC、SpringBoot 中使用 Sa-Token 时，必须注入此实现类，否则会出现上下文无效异常
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenContextForSpring implements SaTokenContext {
 
 	/**
-	 * 获取当前请求的Request对象
+	 * 获取当前请求的 Request 包装对象
 	 */
 	@Override
 	public SaRequest getRequest() {
@@ -25,7 +25,7 @@ public class SaTokenContextForSpring implements SaTokenContext {
 	}
 
 	/**
-	 * 获取当前请求的Response对象
+	 * 获取当前请求的 Response 包装对象
 	 */
 	@Override
 	public SaResponse getResponse() {
@@ -33,15 +33,15 @@ public class SaTokenContextForSpring implements SaTokenContext {
 	}
 
 	/**
-	 * 获取当前请求的 [存储器] 对象 
+	 * 获取当前请求的 Storage 包装对象
 	 */
 	@Override
 	public SaStorage getStorage() {
 		return new SaStorageForServlet(SpringMVCUtil.getRequest());
 	}
-	
+
 	/**
-	 * 校验指定路由匹配符是否可以匹配成功指定路径 
+	 * 判断：指定路由匹配符是否可以匹配成功指定路径
 	 */
 	@Override
 	public boolean matchPath(String pattern, String path) {
@@ -49,7 +49,7 @@ public class SaTokenContextForSpring implements SaTokenContext {
 	}
 
 	/**
-	 * 此上下文是否有效 
+	 * 判断：在本次请求中，此上下文是否可用。
 	 */
 	@Override
 	public boolean isValid() {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index ff5de17b..09c8c485 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -5,17 +5,17 @@ import org.springframework.context.annotation.Bean;
 import cn.dev33.satoken.context.SaTokenContext;
 
 /**
- * 注册Sa-Token所需要的Bean 
- * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author click33
+ * 注册 Sa-Token 框架所需要的 Bean
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenContextRegister {
 
 	/**
-	 * 获取上下文Bean (Spring版)
+	 * 获取上下文处理器组件 (Spring版)
 	 * 
-	 * @return 容器交互Bean (Spring版)
+	 * @return /
 	 */
 	@Bean
 	public SaTokenContext getSaTokenContextForSpring() {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index be96c7d6..16050d90 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -10,9 +10,10 @@ import cn.dev33.satoken.error.SaSpringBootErrorCode;
 import cn.dev33.satoken.exception.NotWebContextException;
 
 /**
- * SpringMVC相关操作  
- * @author click33
+ * SpringMVC 相关操作工具类，快速获取当前会话的 HttpServletRequest、HttpServletResponse 对象
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SpringMVCUtil {
 	
@@ -20,32 +21,32 @@ public class SpringMVCUtil {
 	}
 	
 	/**
-	 * 获取当前会话的 request 
+	 * 获取当前会话的 request 对象
 	 * @return request
 	 */
 	public static HttpServletRequest getRequest() {
 		ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 		if(servletRequestAttributes == null) {
-			throw new NotWebContextException("非Web上下文无法获取Request").setCode(SaSpringBootErrorCode.CODE_20101);
+			throw new NotWebContextException("非 web 上下文无法获取 HttpServletRequest").setCode(SaSpringBootErrorCode.CODE_20101);
 		}
 		return servletRequestAttributes.getRequest();
 	}
 	
 	/**
-	 * 获取当前会话的 response
+	 * 获取当前会话的 response 对象
 	 * @return response
 	 */
 	public static HttpServletResponse getResponse() {
 		ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 		if(servletRequestAttributes == null) {
-			throw new NotWebContextException("非Web上下文无法获取Response").setCode(SaSpringBootErrorCode.CODE_20101);
+			throw new NotWebContextException("非 web 上下文无法获取 HttpServletResponse").setCode(SaSpringBootErrorCode.CODE_20101);
 		}
 		return servletRequestAttributes.getResponse();
 	}
 
 	/**
 	 * 判断当前是否处于 Web 上下文中  
-	 * @return request
+	 * @return /
 	 */
 	public static boolean isWeb() {
 		return RequestContextHolder.getRequestAttributes() != null;

From f0ed1a37fd87be158b12a2227e3165656aef5c3a Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 15:34:45 +0800
Subject: [PATCH 037/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-spring-bo?=
 =?UTF-8?q?ot3-starter=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/filter/SaServletFilter.java   |  4 +++-
 .../cn/dev33/satoken/filter/SaServletFilter.java   | 12 +++++++++---
 .../dev33/satoken/interceptor/SaInterceptor.java   |  9 +++++++--
 .../SaTokenContextForSpringInJakartaServlet.java   | 14 +++++++-------
 .../satoken/spring/SaTokenContextRegister.java     |  5 ++---
 .../cn/dev33/satoken/spring/SpringMVCUtil.java     |  9 +++++----
 6 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 5159eec5..eb6aa5ac 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -127,7 +127,9 @@ public class SaServletFilter implements SaFilter, Filter {
 			// 1. 获取异常处理策略结果 
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
 			
-			// 2. 写入输出流 
+			// 2. 写入输出流
+			// 		请注意此处默认 Content-Type 为 text/plain，如果需要返回 JSON 信息，需要在 return 前自行设置 Content-Type 为 application/json
+			// 		例如：SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
 			if(response.getContentType() == null) {
 				response.setContentType("text/plain; charset=utf-8"); 
 			}
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 6650ab37..922b2e2d 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -21,9 +21,13 @@ import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 
 /**
- * Servlet全局过滤器 
- * @author click33
+ * Servlet 全局鉴权过滤器
+ * <p>
+ *     默认优先级为 -100，尽量保证在其它过滤器之前执行
+ * </p>
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaServletFilter implements SaFilter, Filter {
@@ -122,7 +126,9 @@ public class SaServletFilter implements SaFilter, Filter {
 			// 1. 获取异常处理策略结果 
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
 			
-			// 2. 写入输出流 
+			// 2. 写入输出流
+			// 		请注意此处默认 Content-Type 为 text/plain，如果需要返回 JSON 信息，需要在 return 前自行设置 Content-Type 为 application/json
+			// 		例如：SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
 			if(response.getContentType() == null) {
 				response.setContentType("text/plain; charset=utf-8"); 
 			}
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 9b5edec2..a8cacdff 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -78,6 +78,7 @@ public class SaInterceptor implements HandlerInterceptor {
 		
 		try {
 
+			// 这里必须确保 handler 是 HandlerMethod 类型时，才能进行注解鉴权
 			if(isAnnotation && handler instanceof HandlerMethod) {
 				
 				// 获取此请求对应的 Method 处理函数 
@@ -85,6 +86,7 @@ public class SaInterceptor implements HandlerInterceptor {
 
 				// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权 
 				if(SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+					// 注意这里直接就退出整个鉴权了，最底部的 auth.run() 路由拦截鉴权也被跳出了
 					return true;
 				}
 
@@ -96,9 +98,12 @@ public class SaInterceptor implements HandlerInterceptor {
 			auth.run(handler);
 			
 		} catch (StopMatchException e) {
-			// 停止匹配，进入Controller 
+			// StopMatchException 异常代表：停止匹配，进入Controller
+
 		} catch (BackResultException e) {
-			// 停止匹配，向前端输出结果 
+			// BackResultException 异常代表：停止匹配，向前端输出结果
+			// 		请注意此处默认 Content-Type 为 text/plain，如果需要返回 JSON 信息，需要在 back 前自行设置 Content-Type 为 application/json
+			// 		例如：SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
 			if(response.getContentType() == null) {
 				response.setContentType("text/plain; charset=utf-8"); 
 			}
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
index 3baa09b5..33cecc53 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
@@ -9,15 +9,15 @@ import cn.dev33.satoken.servlet.model.SaResponseForServlet;
 import cn.dev33.satoken.servlet.model.SaStorageForServlet;
 
 /**
- * Sa-Token 上下文处理器 [ SpringBoot3 Jakarta Servlet 版 ] 
+ * Sa-Token 上下文处理器 [ SpringBoot3 Jakarta Servlet 版 ]，在 SpringBoot3 中使用 Sa-Token 时，必须注入此实现类，否则会出现上下文无效异常
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
 
 	/**
-	 * 获取当前请求的Request对象
+	 * 获取当前请求的 Request 包装对象
 	 */
 	@Override
 	public SaRequest getRequest() {
@@ -25,7 +25,7 @@ public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
 	}
 
 	/**
-	 * 获取当前请求的Response对象
+	 * 获取当前请求的 Response 包装对象
 	 */
 	@Override
 	public SaResponse getResponse() {
@@ -33,7 +33,7 @@ public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
 	}
 
 	/**
-	 * 获取当前请求的 [存储器] 对象 
+	 * 获取当前请求的 Storage 包装对象
 	 */
 	@Override
 	public SaStorage getStorage() {
@@ -41,7 +41,7 @@ public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
 	}
 	
 	/**
-	 * 校验指定路由匹配符是否可以匹配成功指定路径 
+	 * 判断：指定路由匹配符是否可以匹配成功指定路径
 	 */
 	@Override
 	public boolean matchPath(String pattern, String path) {
@@ -49,7 +49,7 @@ public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
 	}
 
 	/**
-	 * 此上下文是否有效 
+	 * 判断：在本次请求中，此上下文是否可用。
 	 */
 	@Override
 	public boolean isValid() {
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index 05c0e251..6858b445 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -5,16 +5,15 @@ import org.springframework.context.annotation.Bean;
 import cn.dev33.satoken.context.SaTokenContext;
 
 /**
- * SaTokenContext 上下文注册 
+ * 注册 Sa-Token 框架所需要的 Bean
  * 
  * @author click33
  * @since 2023年1月1日
- *
  */
 public class SaTokenContextRegister {
 
 	/**
-	 * 获取上下文Bean [ SpringBoot3 Jakarta Servlet 版 ] 
+	 * 获取上下文处理器组件 (SpringBoot3 Jakarta Servlet 版)
 	 * 
 	 * @return / 
 	 */
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index 8fc84a33..52638a43 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -9,9 +9,10 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 
 /**
- * SpringMVC相关操作  
- * @author click33
+ * SpringMVC 相关操作工具类，快速获取当前会话的 HttpServletRequest、HttpServletResponse 对象
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SpringMVCUtil {
 	
@@ -25,7 +26,7 @@ public class SpringMVCUtil {
 	public static HttpServletRequest getRequest() {
 		ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 		if(servletRequestAttributes == null) {
-			throw new NotWebContextException("非Web上下文无法获取Request").setCode(SaSpringBootErrorCode.CODE_20101);
+			throw new NotWebContextException("非 web 上下文无法获取 HttpServletRequest").setCode(SaSpringBootErrorCode.CODE_20101);
 		}
 		return servletRequestAttributes.getRequest();
 	}
@@ -37,7 +38,7 @@ public class SpringMVCUtil {
 	public static HttpServletResponse getResponse() {
 		ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 		if(servletRequestAttributes == null) {
-			throw new NotWebContextException("非Web上下文无法获取Response").setCode(SaSpringBootErrorCode.CODE_20101);
+			throw new NotWebContextException("非 web 上下文无法获取 HttpServletRequest").setCode(SaSpringBootErrorCode.CODE_20101);
 		}
 		return servletRequestAttributes.getResponse();
 	}

From 844ff900e9992f1b04af671f6b31ad2ad59ffce5 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 17:00:46 +0800
Subject: [PATCH 038/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-reactor-s?=
 =?UTF-8?q?pring-boot-starter=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev33/satoken/reactor/context/SaReactorHolder.java |  5 +++--
 .../satoken/reactor/context/SaReactorSyncHolder.java   |  5 +++--
 .../reactor/error/SaReactorSpringBootErrorCode.java    |  8 ++++----
 .../dev33/satoken/reactor/filter/SaReactorFilter.java  | 10 ++++++++--
 .../satoken/reactor/model/SaRequestForReactor.java     |  5 +++--
 .../satoken/reactor/model/SaResponseForReactor.java    |  5 +++--
 .../satoken/reactor/model/SaStorageForReactor.java     |  5 +++--
 .../reactor/spring/SaTokenContextForSpringReactor.java |  4 ++--
 .../satoken/reactor/spring/SaTokenContextRegister.java | 10 +++++-----
 9 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index e110e20c..13fbb1be 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -5,9 +5,10 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 /**
- * Reactor上下文操作 [异步] 
- * @author click33
+ * Reactor 上下文操作（异步），持有当前请求的 ServerWebExchange 全局引用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaReactorHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 69aeff06..105eb7c5 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -13,9 +13,10 @@ import cn.dev33.satoken.reactor.model.SaResponseForReactor;
 import cn.dev33.satoken.reactor.model.SaStorageForReactor;
 
 /**
- * Reactor上下文操作 [同步]
- * @author click33
+ * Reactor上下文操作 [同步]，持有当前请求的 ServerWebExchange 全局引用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaReactorSyncHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index b9cc63ff..f45edd8f 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -4,17 +4,17 @@ package cn.dev33.satoken.reactor.error;
  * 定义 sa-token-reactor-spring-boot-starter 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-30
+ * @since 2022-10-30
  */
 public interface SaReactorSpringBootErrorCode {
 	
 	/** 对象转 JSON 字符串失败 */
-	public static final int CODE_20203 = 20203;
+	int CODE_20203 = 20203;
 
 	/** JSON 字符串转 Map 失败 */
-	public static final int CODE_20204 = 20204;
+	int CODE_20204 = 20204;
 
 	/** 默认的 Filter 异常处理函数 */
-	public static final int CODE_20205 = 20205;
+	int CODE_20205 = 20205;
 
 }
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 29d969e3..af94080a 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -23,9 +23,13 @@ import cn.dev33.satoken.util.SaTokenConsts;
 import reactor.core.publisher.Mono;
 
 /**
- * Reactor全局过滤器 
- * @author click33
+ * Reactor 全局鉴权过滤器
+ * <p>
+ *     默认优先级为 -100，尽量保证在其它过滤器之前执行
+ * </p>
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaReactorFilter implements SaFilter, WebFilter {
@@ -132,6 +136,8 @@ public class SaReactorFilter implements SaFilter, WebFilter {
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
 			
 			// 2. 写入输出流
+			// 		请注意此处默认 Content-Type 为 text/plain，如果需要返回 JSON 信息，需要在 return 前自行设置 Content-Type 为 application/json
+			// 		例如：SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
 			if(exchange.getResponse().getHeaders().getFirst("Content-Type") == null) {
 				exchange.getResponse().getHeaders().set("Content-Type", "text/plain; charset=utf-8");
 			}
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 2c705557..d238eb41 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -15,9 +15,10 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import java.util.*;
 
 /**
- * Request for Reactor 
- * @author click33
+ * 对 SaRequest 包装类的实现（Reactor 响应式编程版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRequestForReactor implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index 46f6f73d..c9bff081 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -8,9 +8,10 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 import cn.dev33.satoken.context.model.SaResponse;
 
 /**
- * Response for Reactor
- * @author click33
+ * 对 SaResponse 包装类的实现（Reactor 响应式编程版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResponseForReactor implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 7bb94205..3724ee42 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -5,9 +5,10 @@ import org.springframework.web.server.ServerWebExchange;
 import cn.dev33.satoken.context.model.SaStorage;
 
 /**
- * Storage for Reactor 
- * @author click33
+ * 对 SaStorage 包装类的实现（Reactor 响应式编程版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaStorageForReactor implements SaStorage {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index fec0ffd6..e96dd709 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -4,10 +4,10 @@ import cn.dev33.satoken.context.SaTokenContextForThreadLocal;
 import cn.dev33.satoken.spring.SaPathMatcherHolder;
 
 /**
- * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] 
+ * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] ，基于 SaTokenContextForThreadLocal 定制
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenContextForSpringReactor extends SaTokenContextForThreadLocal {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index 2684ab0b..35b37db4 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -5,17 +5,17 @@ import org.springframework.context.annotation.Bean;
 import cn.dev33.satoken.context.SaTokenContext;
 
 /**
- * 注册Sa-Token所需要的Bean 
- * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author click33
+ * 注册 Sa-Token 所需要的 Bean
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenContextRegister {
 
 	/**
-	 * 获取容器交互Bean (ThreadLocal版)
+	 * 获取上下文处理器组件 (Spring Reactor 版)
 	 * 
-	 * @return 容器交互Bean (ThreadLocal版)
+	 * @return /
 	 */
 	@Bean
 	public SaTokenContext getSaTokenContextForSpringReactor() {

From b2064c75e6af0c5118b53f9adbf620798d683336 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 17:26:56 +0800
Subject: [PATCH 039/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-reactor-s?=
 =?UTF-8?q?pring-boot-starter3=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/reactor/context/SaReactorSyncHolder.java |  2 +-
 .../satoken/reactor/model/SaStorageForReactor.java   |  2 +-
 .../satoken/reactor/context/SaReactorHolder.java     |  5 +++--
 .../satoken/reactor/context/SaReactorSyncHolder.java |  5 +++--
 .../reactor/error/SaReactorSpringBootErrorCode.java  | 10 +++++-----
 .../satoken/reactor/filter/SaReactorFilter.java      | 10 ++++++++--
 .../satoken/reactor/model/SaRequestForReactor.java   |  5 +++--
 .../satoken/reactor/model/SaResponseForReactor.java  |  5 +++--
 .../satoken/reactor/model/SaStorageForReactor.java   |  7 ++++---
 .../spring/SaTokenContextForSpringReactor.java       |  4 ++--
 .../reactor/spring/SaTokenContextRegister.java       | 12 ++++++------
 11 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 105eb7c5..18baaa9c 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.reactor.model.SaResponseForReactor;
 import cn.dev33.satoken.reactor.model.SaStorageForReactor;
 
 /**
- * Reactor上下文操作 [同步]，持有当前请求的 ServerWebExchange 全局引用
+ * Reactor上下文操作（同步），持有当前请求的 ServerWebExchange 全局引用
  *
  * @author click33
  * @since <= 1.34.0
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 3724ee42..9e667190 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.context.model.SaStorage;
 public class SaStorageForReactor implements SaStorage {
 
 	/**
-	 * 底层Request对象
+	 * 底层 ServerWebExchange 对象
 	 */
 	protected ServerWebExchange exchange;
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index f3211360..55ec30dc 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -5,9 +5,10 @@ import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Mono;
 
 /**
- * Reactor上下文操作 [异步] 
- * @author click33
+ * Reactor 上下文操作（异步），持有当前请求的 ServerWebExchange 全局引用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaReactorHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 69aeff06..18baaa9c 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -13,9 +13,10 @@ import cn.dev33.satoken.reactor.model.SaResponseForReactor;
 import cn.dev33.satoken.reactor.model.SaStorageForReactor;
 
 /**
- * Reactor上下文操作 [同步]
- * @author click33
+ * Reactor上下文操作（同步），持有当前请求的 ServerWebExchange 全局引用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaReactorSyncHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index b9cc63ff..552d39f7 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -1,20 +1,20 @@
 package cn.dev33.satoken.reactor.error;
 
 /**
- * 定义 sa-token-reactor-spring-boot-starter 所有异常细分状态码 
+ * 定义 sa-token-reactor3-spring-boot-starter 所有异常细分状态码
  * 
  * @author click33
- * @since: 2022-10-30
+ * @since <= 1.34.0
  */
 public interface SaReactorSpringBootErrorCode {
 	
 	/** 对象转 JSON 字符串失败 */
-	public static final int CODE_20203 = 20203;
+	int CODE_20203 = 20203;
 
 	/** JSON 字符串转 Map 失败 */
-	public static final int CODE_20204 = 20204;
+	int CODE_20204 = 20204;
 
 	/** 默认的 Filter 异常处理函数 */
-	public static final int CODE_20205 = 20205;
+	int CODE_20205 = 20205;
 
 }
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 1177e3ab..99f88481 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -23,9 +23,13 @@ import cn.dev33.satoken.util.SaTokenConsts;
 import reactor.core.publisher.Mono;
 
 /**
- * Reactor全局过滤器 
- * @author click33
+ * Reactor 全局鉴权过滤器
+ * <p>
+ *     默认优先级为 -100，尽量保证在其它过滤器之前执行
+ * </p>
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaReactorFilter implements SaFilter, WebFilter {
@@ -132,6 +136,8 @@ public class SaReactorFilter implements SaFilter, WebFilter {
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
 			
 			// 2. 写入输出流
+			// 		请注意此处默认 Content-Type 为 text/plain，如果需要返回 JSON 信息，需要在 return 前自行设置 Content-Type 为 application/json
+			// 		例如：SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");
 			if(exchange.getResponse().getHeaders().getFirst("Content-Type") == null) {
 				exchange.getResponse().getHeaders().set("Content-Type", "text/plain; charset=utf-8");
 			}
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 5e8f4ad2..ba3f9812 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -18,9 +18,10 @@ import java.util.Map;
 import java.util.Set;
 
 /**
- * Request for Reactor 
- * @author click33
+ * 对 SaRequest 包装类的实现（Reactor 响应式编程版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRequestForReactor implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index 46f6f73d..c9bff081 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -8,9 +8,10 @@ import org.springframework.http.server.reactive.ServerHttpResponse;
 import cn.dev33.satoken.context.model.SaResponse;
 
 /**
- * Response for Reactor
- * @author click33
+ * 对 SaResponse 包装类的实现（Reactor 响应式编程版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResponseForReactor implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 7bb94205..9e667190 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -5,14 +5,15 @@ import org.springframework.web.server.ServerWebExchange;
 import cn.dev33.satoken.context.model.SaStorage;
 
 /**
- * Storage for Reactor 
- * @author click33
+ * 对 SaStorage 包装类的实现（Reactor 响应式编程版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaStorageForReactor implements SaStorage {
 
 	/**
-	 * 底层Request对象
+	 * 底层 ServerWebExchange 对象
 	 */
 	protected ServerWebExchange exchange;
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index fec0ffd6..e96dd709 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -4,10 +4,10 @@ import cn.dev33.satoken.context.SaTokenContextForThreadLocal;
 import cn.dev33.satoken.spring.SaPathMatcherHolder;
 
 /**
- * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] 
+ * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] ，基于 SaTokenContextForThreadLocal 定制
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenContextForSpringReactor extends SaTokenContextForThreadLocal {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index 2684ab0b..db6ef91d 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -5,17 +5,17 @@ import org.springframework.context.annotation.Bean;
 import cn.dev33.satoken.context.SaTokenContext;
 
 /**
- * 注册Sa-Token所需要的Bean 
- * <p> Bean 的注册与注入应该分开在两个文件中，否则在某些场景下会造成循环依赖 
- * @author click33
+ * 注册 Sa-Token 所需要的 Bean
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenContextRegister {
 
 	/**
-	 * 获取容器交互Bean (ThreadLocal版)
-	 * 
-	 * @return 容器交互Bean (ThreadLocal版)
+	 * 获取上下文处理器组件 (Spring Reactor 版)
+	 *
+	 * @return /
 	 */
 	@Bean
 	public SaTokenContext getSaTokenContextForSpringReactor() {

From e268a7bc81af0973faf86b8f3dddae70d87c41c2 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 22:03:35 +0800
Subject: [PATCH 040/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-servlet?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/reactor/model/SaRequestForReactor.java | 14 ++++++++------
 .../satoken/servlet/error/SaServletErrorCode.java  |  6 +++---
 .../satoken/servlet/model/SaRequestForServlet.java |  5 +++--
 .../servlet/model/SaResponseForServlet.java        |  9 +++++----
 .../satoken/servlet/model/SaStorageForServlet.java |  9 +++++----
 5 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index d238eb41..25bdd2e9 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -1,18 +1,20 @@
 package cn.dev33.satoken.reactor.model;
 
 
-import org.springframework.http.HttpCookie;
-import org.springframework.http.server.reactive.ServerHttpRequest;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilterChain;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.context.model.SaRequest;
 import cn.dev33.satoken.reactor.context.SaReactorHolder;
 import cn.dev33.satoken.reactor.context.SaReactorSyncHolder;
 import cn.dev33.satoken.util.SaFoxUtil;
+import org.springframework.http.HttpCookie;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilterChain;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * 对 SaRequest 包装类的实现（Reactor 响应式编程版）
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 9aa8a325..8cdaae8a 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -4,14 +4,14 @@ package cn.dev33.satoken.servlet.error;
  * 定义 sa-token-servlet 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-30
+ * @since 2022-10-30
  */
 public interface SaServletErrorCode {
 	
 	/** 转发失败 */
-	public static final int CODE_20001 = 20001;
+	int CODE_20001 = 20001;
 
 	/** 重定向失败 */
-	public static final int CODE_20002 = 20002;
+	int CODE_20002 = 20002;
 
 }
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index a8558029..3add2ad5 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -15,9 +15,10 @@ import cn.dev33.satoken.servlet.error.SaServletErrorCode;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Request for Servlet 
- * @author click33
+ * 对 SaRequest 包装类的实现（Servlet 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRequestForServlet implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index 04f7b5be..34613298 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -1,15 +1,16 @@
 package cn.dev33.satoken.servlet.model;
 
-import javax.servlet.http.HttpServletResponse;
-
 import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.servlet.error.SaServletErrorCode;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
- * Response for Servlet
- * @author click33
+ * 对 SaResponse 包装类的实现（Servlet 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResponseForServlet implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index 7e692a56..6511ae5a 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -1,13 +1,14 @@
 package cn.dev33.satoken.servlet.model;
 
-import javax.servlet.http.HttpServletRequest;
-
 import cn.dev33.satoken.context.model.SaStorage;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
- * Storage for Servlet 
- * @author click33
+ * 对 SaStorage 包装类的实现（Servlet 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaStorageForServlet implements SaStorage {
 

From d36e0f1a088a7f2c1f9750a3b26cc13550a29823 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 11 May 2023 22:07:05 +0800
Subject: [PATCH 041/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-jakarta-s?=
 =?UTF-8?q?ervlet=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/servlet/error/SaServletErrorCode.java  | 6 +++---
 .../cn/dev33/satoken/servlet/model/SaRequestForServlet.java | 5 +++--
 .../dev33/satoken/servlet/model/SaResponseForServlet.java   | 5 +++--
 .../cn/dev33/satoken/servlet/model/SaStorageForServlet.java | 5 +++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 9aa8a325..8cdaae8a 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -4,14 +4,14 @@ package cn.dev33.satoken.servlet.error;
  * 定义 sa-token-servlet 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-30
+ * @since 2022-10-30
  */
 public interface SaServletErrorCode {
 	
 	/** 转发失败 */
-	public static final int CODE_20001 = 20001;
+	int CODE_20001 = 20001;
 
 	/** 重定向失败 */
-	public static final int CODE_20002 = 20002;
+	int CODE_20002 = 20002;
 
 }
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index f47ec634..1836e2dc 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -14,9 +14,10 @@ import java.io.IOException;
 import java.util.*;
 
 /**
- * Request for Jakarta Servlet 
- * @author click33
+ * 对 SaRequest 包装类的实现（Jakarta-Servlet 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRequestForServlet implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index ce7e8fe9..f6cbc6cc 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -6,9 +6,10 @@ import cn.dev33.satoken.servlet.error.SaServletErrorCode;
 import jakarta.servlet.http.HttpServletResponse;
 
 /**
- * Response for Jakarta Servlet
- * @author click33
+ * 对 SaResponse 包装类的实现（Jakarta-Servlet 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResponseForServlet implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index 2f1b9ed6..40355529 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -4,9 +4,10 @@ import cn.dev33.satoken.context.model.SaStorage;
 import jakarta.servlet.http.HttpServletRequest;
 
 /**
- * Storage for Jakarta Servlet 
+ * 对 SaStorage 包装类的实现（Jakarta-Servlet 版）
+ *
  * @author click33
- * 
+ * @since <= 1.34.0
  */
 public class SaStorageForServlet implements SaStorage {
 

From 6fc0660540d7fb1c62432c71dbab1a8dff20aef6 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 09:05:51 +0800
Subject: [PATCH 042/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-alone-red?=
 =?UTF-8?q?is=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/dao/alone/SaAloneRedisInject.java | 24 +++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index ff5b1fa5..ff7a6c07 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -20,8 +20,20 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 /**
- * 为 SaTokenDao 单独设置Redis连接信息 
+ * 为 SaToken 单独设置 Redis 连接信息，使权限缓存与业务缓存分离
+ *
+ * <p>
+ *     使用方式：在引入 sa-token redis 集成相关包的前提下，继续引入当前依赖 <br> <br>
+ *     注意事项：目前本依赖仅对以下插件有 Redis 分离效果： <br>
+ *     sa-token-dao-redis  <br>
+ *     sa-token-dao-redis-jackson  <br>
+ *     sa-token-dao-redis-fastjson  <br>
+ *     sa-token-dao-redis-fastjson2 <br>
+ * </p>
+ *
+ *
  * @author click33
+ * @since <= 1.34.0
  */
 @Configuration
 public class SaAloneRedisInject implements EnvironmentAware{
@@ -43,7 +55,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 	@Override
 	public void setEnvironment(Environment environment) {
 		try {
-			// 如果为空或者默认实现，则不进行任何操作 
+			// 如果 saTokenDao 为空或者为默认实现，则不进行任何操作
 			if(saTokenDao == null || saTokenDao instanceof SaTokenDaoDefaultImpl) {
 				return;
 			}
@@ -54,7 +66,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 			
 			// ------------------- 开始注入 
 			
-			// 获取cfg对象
+			// 获取cfg对象，解析开发者配置的 sa-token.alone-redis 相关信息
 			RedisProperties cfg = Binder.get(environment).bind(ALONE_PREFIX, RedisProperties.class).get();
 
 			// 1. Redis配置
@@ -158,7 +170,8 @@ public class SaAloneRedisInject implements EnvironmentAware{
 			LettuceConnectionFactory factory = new LettuceConnectionFactory(redisAloneConfig, clientConfig);
 			factory.afterPropertiesSet();
 			
-			// 3. 开始初始化 SaTokenDao 
+			// 3. 开始初始化 SaTokenDao ，此处需要依次判断开发者引入的是哪个 redis 库
+
 			// 如果开发者引入的是：sa-token-dao-redis
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedis");
@@ -195,6 +208,9 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
+
+			// 至此，说明开发者一个 redis 插件也没引入，或者引入的 redis 插件不在 sa-token-alone-redis 的支持范围内
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

From 93e01042d6839e031192caf52704791c1a58f75f Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 09:42:25 +0800
Subject: [PATCH 043/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20redis=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=9B=86=E6=88=90=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/SaSessionForFastjsonCustomized.java   |  2 +-
 .../satoken/dao/SaTokenDaoRedisFastjson.java  | 14 +++++----
 .../dao/SaSessionForFastjson2Customized.java  |  2 +-
 .../satoken/dao/SaTokenDaoRedisFastjson2.java | 14 +++++----
 .../dao/SaSessionForJacksonCustomized.java    |  4 +--
 .../satoken/dao/SaTokenDaoRedisJackson.java   | 30 +++++++++++++++----
 .../cn/dev33/satoken/dao/SaTokenDaoRedis.java | 16 ++++++----
 .../dao/SaSessionForJacksonCustomized.java    |  2 +-
 .../dao/SaTokenDaoRedissonJackson.java        | 13 ++++++--
 9 files changed, 67 insertions(+), 30 deletions(-)

diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
index 9802fa53..71350777 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
+++ b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Fastjson 定制版 SaSession，重写类型转换API 
+ * Fastjson 定制版 SaSession，重写类型转换API、忽略 timeout 字段的序列化
  * 
  * @author click33
  * @since 2022-10-19
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
index 57729046..396ad7e5 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
+++ b/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
@@ -18,21 +18,21 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 持久层实现 [Redis存储、fastjson序列化]
+ * Sa-Token 持久层实现 [ Redis存储、fastjson序列化 ]
  * 
  * @author sikadai
- *
+ * @since <= 1.34.0
  */
 @Component
 public class SaTokenDaoRedisFastjson implements SaTokenDao {
 
 	/**
-	 * String专用 
+	 * String 读写专用
 	 */
 	public StringRedisTemplate stringRedisTemplate;	
 
 	/**
-	 * Object专用 
+	 * Object 读写专用
 	 */
 	public StringRedisTemplate objectRedisTemplate;
 
@@ -43,7 +43,7 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
 	
 	@Autowired
 	public void init(RedisConnectionFactory connectionFactory) {
-		// 不重复初始化 
+		// 如果已经初始化成功了，就立刻退出，不重复初始化
 		if(this.isInit) {
 			return;
 		}
@@ -54,10 +54,12 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
 		// 指定相应的序列化方案 
 		StringRedisSerializer keySerializer = new StringRedisSerializer();
 		StringRedisSerializer valueSerializer = new StringRedisSerializer();
+
 		// 构建StringRedisTemplate
 		StringRedisTemplate stringTemplate = new StringRedisTemplate();
 		stringTemplate.setConnectionFactory(connectionFactory);
 		stringTemplate.afterPropertiesSet();
+
 		// 构建RedisTemplate
 		StringRedisTemplate template = new StringRedisTemplate();
 		template.setConnectionFactory(connectionFactory);
@@ -70,6 +72,8 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
 		// 开始初始化相关组件 
 		this.stringRedisTemplate = stringTemplate;
 		this.objectRedisTemplate = template;
+
+		// 打上标记，表示已经初始化成功，后续无需再重新初始化
 		this.isInit = true;
 	}
 	
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java b/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
index 73a81591..5970540c 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
+++ b/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
@@ -7,7 +7,7 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Fastjson 定制版 SaSession，重写类型转换API 
+ * Fastjson2 定制版 SaSession，重写类型转换API、忽略 timeout 字段的序列化
  * 
  * @author click33
  * @since 2022-10-19
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
index 921eabef..60c02dff 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
+++ b/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
@@ -18,21 +18,21 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 持久层实现 [Redis存储、fastjson2序列化]
+ * Sa-Token 持久层实现 [ Redis存储、fastjson2序列化 ]
  * 
  * @author sikadai
- *
+ * @since <= 1.34.0
  */
 @Component
 public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
 
 	/**
-	 * String专用 
+	 * String 读写专用
 	 */
 	public StringRedisTemplate stringRedisTemplate;	
 
 	/**
-	 * Object专用 
+	 * Object 读写专用
 	 */
 	public StringRedisTemplate objectRedisTemplate;
 
@@ -43,7 +43,7 @@ public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
 	
 	@Autowired
 	public void init(RedisConnectionFactory connectionFactory) {
-		// 不重复初始化 
+		// 如果已经初始化成功了，就立刻退出，不重复初始化
 		if(this.isInit) {
 			return;
 		}
@@ -54,10 +54,12 @@ public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
 		// 指定相应的序列化方案 
 		StringRedisSerializer keySerializer = new StringRedisSerializer();
 		StringRedisSerializer valueSerializer = new StringRedisSerializer();
+
 		// 构建StringRedisTemplate
 		StringRedisTemplate stringTemplate = new StringRedisTemplate();
 		stringTemplate.setConnectionFactory(connectionFactory);
 		stringTemplate.afterPropertiesSet();
+
 		// 构建RedisTemplate
 		StringRedisTemplate template = new StringRedisTemplate();
 		template.setConnectionFactory(connectionFactory);
@@ -70,6 +72,8 @@ public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
 		// 开始初始化相关组件 
 		this.stringRedisTemplate = stringTemplate;
 		this.objectRedisTemplate = template;
+
+		// 打上标记，表示已经初始化成功，后续无需再重新初始化
 		this.isInit = true;
 	}
 	
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index 8c90b91c..a0b320e4 100644
--- a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -5,10 +5,10 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import cn.dev33.satoken.session.SaSession;
 
 /**
- * Jackson定制版SaSession，忽略 timeout 等属性的序列化 
+ * Jackson 定制版 SaSession，忽略 timeout 等属性的序列化
  *  
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @JsonIgnoreProperties({"timeout"})
 public class SaSessionForJacksonCustomized extends SaSession {
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
index cc8da95f..bdfdc95f 100644
--- a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
+++ b/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
@@ -32,10 +32,10 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 持久层实现 [Redis存储、Jackson序列化]
+ * Sa-Token 持久层实现 [ Redis存储、Jackson序列化 ]
  * 
  * @author click33
- * 
+ * @since <= 1.34.0
  */
 @Component
 public class SaTokenDaoRedisJackson implements SaTokenDao {
@@ -48,17 +48,24 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 	public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_PATTERN);
 
 	/**
-	 * ObjectMapper对象 (以public作用域暴露出此对象，方便开发者二次更改配置)
+	 * ObjectMapper 对象 (以 public 作用域暴露出此对象，方便开发者二次更改配置)
+	 *
+	 * <p> 例如：
+	 * 	<pre>
+	 *      SaTokenDaoRedisJackson redisJackson = (SaTokenDaoRedisJackson) SaManager.getSaTokenDao();
+	 *      redisJackson.objectMapper.xxx = xxx;
+	 * 	</pre>
+	 * </p>
 	 */
 	public ObjectMapper objectMapper;
 	
 	/**
-	 * String专用
+	 * String 读写专用
 	 */
 	public StringRedisTemplate stringRedisTemplate;	
 
 	/**
-	 * Object专用 
+	 * Object 读写专用
 	 */
 	public RedisTemplate<String, Object> objectRedisTemplate;
 	
@@ -69,7 +76,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 	
 	@Autowired
 	public void init(RedisConnectionFactory connectionFactory) {
-		// 不重复初始化 
+		// 如果已经初始化成功了，就立刻退出，不重复初始化
 		if(this.isInit) {
 			return;
 		}
@@ -77,26 +84,34 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 		// 指定相应的序列化方案 
 		StringRedisSerializer keySerializer = new StringRedisSerializer();
 		GenericJackson2JsonRedisSerializer valueSerializer = new GenericJackson2JsonRedisSerializer();
+
 		// 通过反射获取Mapper对象, 增加一些配置, 增强兼容性 
 		try {
 			Field field = GenericJackson2JsonRedisSerializer.class.getDeclaredField("mapper");
 			field.setAccessible(true);
 			ObjectMapper objectMapper = (ObjectMapper) field.get(valueSerializer);
 			this.objectMapper = objectMapper;
+
 			// 配置[忽略未知字段]
 			this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
 			// 配置[时间类型转换]
 			JavaTimeModule timeModule = new JavaTimeModule();
+
 			// LocalDateTime序列化与反序列化
 			timeModule.addSerializer(new LocalDateTimeSerializer(DATE_TIME_FORMATTER));
 			timeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DATE_TIME_FORMATTER));
+
 			// LocalDate序列化与反序列化
 			timeModule.addSerializer(new LocalDateSerializer(DATE_FORMATTER));
 			timeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DATE_FORMATTER));
+
 			// LocalTime序列化与反序列化
 			timeModule.addSerializer(new LocalTimeSerializer(TIME_FORMATTER));
 			timeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(TIME_FORMATTER));
+
 			this.objectMapper.registerModule(timeModule);
+
 			// 重写 SaSession 生成策略 
 			SaStrategy.me.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId);
 		} catch (Exception e) {
@@ -106,6 +121,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 		StringRedisTemplate stringTemplate = new StringRedisTemplate();
 		stringTemplate.setConnectionFactory(connectionFactory);
 		stringTemplate.afterPropertiesSet();
+
 		// 构建RedisTemplate
 		RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
 		template.setConnectionFactory(connectionFactory);
@@ -118,6 +134,8 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 		// 开始初始化相关组件 
 		this.stringRedisTemplate = stringTemplate;
 		this.objectRedisTemplate = template;
+
+		// 打上标记，表示已经初始化成功，后续无需再重新初始化
 		this.isInit = true;
 	}
 	
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
index 5c171dcb..33e513fc 100644
--- a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
+++ b/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
@@ -16,32 +16,32 @@ import org.springframework.stereotype.Component;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 持久层实现 [Redis存储、JDK默认序列化] 
+ * Sa-Token 持久层实现 [ Redis存储、JDK默认序列化 ]
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @Component
 public class SaTokenDaoRedis implements SaTokenDao {
 
 	/**
-	 * String专用 
+	 * String 读写专用
 	 */
 	public StringRedisTemplate stringRedisTemplate;	
 
 	/**
-	 * Object专用 
+	 * Object 读写专用
 	 */
 	public RedisTemplate<String, Object> objectRedisTemplate;
 
 	/**
-	 * 标记：是否已初始化成功
+	 * 标记：当前 redis 连接信息是否已初始化成功
 	 */
 	public boolean isInit;
 	
 	@Autowired
 	public void init(RedisConnectionFactory connectionFactory) {
-		// 不重复初始化 
+		// 如果已经初始化成功了，就立刻退出，不重复初始化
 		if(this.isInit) {
 			return;
 		}
@@ -49,10 +49,12 @@ public class SaTokenDaoRedis implements SaTokenDao {
 		// 指定相应的序列化方案 
 		StringRedisSerializer keySerializer = new StringRedisSerializer();
 		JdkSerializationRedisSerializer valueSerializer = new JdkSerializationRedisSerializer();
+
 		// 构建StringRedisTemplate
 		StringRedisTemplate stringTemplate = new StringRedisTemplate();
 		stringTemplate.setConnectionFactory(connectionFactory);
 		stringTemplate.afterPropertiesSet();
+
 		// 构建RedisTemplate
 		RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
 		template.setConnectionFactory(connectionFactory);
@@ -65,6 +67,8 @@ public class SaTokenDaoRedis implements SaTokenDao {
 		// 开始初始化相关组件 
 		this.stringRedisTemplate = stringTemplate;
 		this.objectRedisTemplate = template;
+
+		// 打上标记，表示已经初始化成功，后续无需再重新初始化
 		this.isInit = true;
 	}
 	
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index bff900c9..c86f5334 100644
--- a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  * Jackson定制版SaSession，忽略 timeout 等属性的序列化 
  *  
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @JsonIgnoreProperties({"timeout"})
 public class SaSessionForJacksonCustomized extends SaSession {
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
index 422ccee6..8f44bce3 100644
--- a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
+++ b/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
@@ -34,10 +34,10 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 持久层实现 [Redisson客户端、Redis存储、Jackson序列化]
+ * Sa-Token 持久层实现  [ Redisson客户端、Redis存储、Jackson序列化 ]
  * 
  * @author 疯狂的狮子Li
- * 
+ * @since <= 1.34.0
  */
 @Component
 public class SaTokenDaoRedissonJackson implements SaTokenDao {
@@ -50,7 +50,14 @@ public class SaTokenDaoRedissonJackson implements SaTokenDao {
 	public static final DateTimeFormatter TIME_FORMATTER = DateTimeFormatter.ofPattern(TIME_PATTERN);
 
 	/**
-	 * ObjectMapper对象 (以public作用域暴露出此对象，方便开发者二次更改配置)
+	 * ObjectMapper 对象 (以 public 作用域暴露出此对象，方便开发者二次更改配置)
+	 *
+	 * <p> 例如：
+	 * 	<pre>
+	 *      SaTokenDaoRedisJackson redisJackson = (SaTokenDaoRedisJackson) SaManager.getSaTokenDao();
+	 *      redisJackson.objectMapper.xxx = xxx;
+	 * 	</pre>
+	 * </p>
 	 */
 	public ObjectMapper objectMapper;
 

From 7377df3408513663134dfd0392a80a95c41c3748 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 10:39:33 +0800
Subject: [PATCH 044/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-context-d?=
 =?UTF-8?q?ubbo=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaTokenSecondContextCreatorForDubbo.java      |  4 ++--
 .../dubbo/SaTokenSecondContextForDubbo.java       |  4 ++--
 .../dubbo/filter/SaTokenDubboConsumerFilter.java  | 15 +++++++--------
 .../dubbo/filter/SaTokenDubboProviderFilter.java  |  8 ++++----
 .../context/dubbo/model/SaRequestForDubbo.java    |  9 ++++-----
 .../context/dubbo/model/SaResponseForDubbo.java   |  8 ++++----
 .../context/dubbo/model/SaStorageForDubbo.java    |  8 ++++----
 7 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
index a80e1ea0..d4e37601 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
@@ -4,10 +4,10 @@ import cn.dev33.satoken.context.second.SaTokenSecondContext;
 import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
 
 /**
- * Sa-Token 二级Context - 创建器 [Dubbo版] 
+ * Sa-Token 二级上下文 - 创建器 [ Dubbo版 ]
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenSecondContextCreatorForDubbo implements SaTokenSecondContextCreator {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
index 0029c967..1ab49834 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
@@ -12,10 +12,10 @@ import cn.dev33.satoken.context.second.SaTokenSecondContext;
 import cn.dev33.satoken.exception.ApiDisabledException;
 
 /**
- * Sa-Token 上下文 [Dubbo版本] 
+ * Sa-Token 二级上下文 [ Dubbo版本 ]
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenSecondContextForDubbo implements SaTokenSecondContext {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
index b2a85afe..520a16ff 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
@@ -16,11 +16,10 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * 
- * Sa-Token 整合 Dubbo Consumer端过滤器 
+ * Sa-Token 整合 Dubbo Consumer 端（调用端）过滤器
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = -30000)
 public class SaTokenDubboConsumerFilter implements Filter {
@@ -28,23 +27,23 @@ public class SaTokenDubboConsumerFilter implements Filter {
 	@Override
 	public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
 		
-		// 追加 Same-Token 参数 
+		// 1、追加 Same-Token 参数
 		if(SaManager.getConfig().getCheckSameToken()) {
 			RpcContext.getContext().setAttachment(SaSameUtil.SAME_TOKEN, SaSameUtil.getToken()); 
 		}
 		
-		// 1. 调用前，向下传递会话Token
+		// 2、调用前，向下传递会话Token
 		if(SaManager.getSaTokenContextOrSecond() != SaTokenContextDefaultImpl.defaultContext) {
 			RpcContext.getContext().setAttachment(SaTokenConsts.JUST_CREATED, StpUtil.getTokenValueNotCut()); 
 		}
 
-		// 2. 开始调用 
+		// 3、开始调用
 		Result invoke = invoker.invoke(invocation);
 		
-		// 3. 调用后，解析回传的Token值 
+		// 4、调用后，解析回传的Token值
 		StpUtil.setTokenValue(invoke.getAttachment(SaTokenConsts.JUST_CREATED_NOT_PREFIX));
 		
-		// note 
+		// 5、返回结果
 		return invoke;
 	}
 
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
index 7c8c1091..ad29df56 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
@@ -12,11 +12,10 @@ import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.same.SaSameUtil;
 
 /**
- * 
- * Sa-Token 整合 Dubbo Provider端过滤器 
+ * Sa-Token 整合 Dubbo Provider端（被调用端）过滤器
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = -30000)
 public class SaTokenDubboProviderFilter implements Filter {
@@ -27,7 +26,8 @@ public class SaTokenDubboProviderFilter implements Filter {
 		// RPC 调用鉴权 
 		if(SaManager.getConfig().getCheckSameToken()) {
 			String idToken = invocation.getAttachment(SaSameUtil.SAME_TOKEN);
-			// dubbo部分协议会将参数变为小写，详细参考：https://gitee.com/dromara/sa-token/issues/I4WXQG
+
+			// dubbo部分协议会将参数变为小写，此处需要额外处理一下，详细参考：https://gitee.com/dromara/sa-token/issues/I4WXQG
 			if(idToken == null) {
 				idToken = invocation.getAttachment(SaSameUtil.SAME_TOKEN.toLowerCase());
 			}
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
index 702319c8..4abf69d4 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
@@ -1,17 +1,16 @@
 package cn.dev33.satoken.context.dubbo.model;
 
-import org.apache.dubbo.rpc.RpcContext;
-
 import cn.dev33.satoken.context.model.SaRequest;
+import org.apache.dubbo.rpc.RpcContext;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * Request for Dubbo 
- * 
- * @author click33
+ * 对 SaRequest 包装类的实现（Dubbo 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRequestForDubbo implements SaRequest {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
index 90986cf4..b36ddac7 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
@@ -1,13 +1,13 @@
 package cn.dev33.satoken.context.dubbo.model;
 
+import cn.dev33.satoken.context.model.SaResponse;
 import org.apache.dubbo.rpc.RpcContext;
 
-import cn.dev33.satoken.context.model.SaResponse;
-
 /**
- * Response for Servlet
- * @author click33
+ * 对 SaResponse 包装类的实现（Dubbo 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResponseForDubbo implements SaResponse {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
index 8a1e9a24..c4a3676f 100644
--- a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
+++ b/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
@@ -1,14 +1,14 @@
 package cn.dev33.satoken.context.dubbo.model;
 
-import org.apache.dubbo.rpc.RpcContext;
-
 import cn.dev33.satoken.context.model.SaStorage;
 import cn.dev33.satoken.util.SaTokenConsts;
+import org.apache.dubbo.rpc.RpcContext;
 
 /**
- * Storage for Servlet 
- * @author click33
+ * 对 SaStorage 包装类的实现（Dubbo 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaStorageForDubbo implements SaStorage {
 

From 353a35957b06a8fe2b39d4fb3589d80ff33193c6 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 15:57:01 +0800
Subject: [PATCH 045/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-context-d?=
 =?UTF-8?q?ubbo3=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dubbo3/SaTokenSecondContextCreatorForDubbo3.java       | 4 ++--
 .../context/dubbo3/SaTokenSecondContextForDubbo3.java      | 4 ++--
 .../context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java | 7 +++----
 .../context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java | 7 +++----
 .../satoken/context/dubbo3/model/SaRequestForDubbo3.java   | 6 +++---
 .../satoken/context/dubbo3/model/SaResponseForDubbo3.java  | 5 +++--
 .../satoken/context/dubbo3/model/SaStorageForDubbo3.java   | 5 +++--
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
index 8f21aa1a..ae5a4179 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
@@ -5,10 +5,10 @@ import cn.dev33.satoken.context.second.SaTokenSecondContext;
 import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
 
 /**
- * Sa-Token 二级Context - 创建器 [Dubbo3版]
+ * Sa-Token 二级上下文 - 创建器 [Dubbo3版]
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenSecondContextCreatorForDubbo3 implements SaTokenSecondContextCreator {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
index e2194027..60922a99 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
@@ -11,10 +11,10 @@ import cn.dev33.satoken.exception.ApiDisabledException;
 import org.apache.dubbo.rpc.RpcContext;
 
 /**
- * Sa-Token 上下文 [Dubbo3版本]
+ * Sa-Token 二级上下文 [ Dubbo3版本 ]
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenSecondContextForDubbo3 implements SaTokenSecondContext {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
index c9ed3921..96ad9579 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
@@ -10,11 +10,10 @@ import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.rpc.*;
 
 /**
- * 
- * Sa-Token 整合 Dubbo3 Consumer端过滤器
- * 
- * @author click33
+ * Sa-Token 整合 Dubbo3 Consumer 端（调用端）过滤器
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = -30000)
 public class SaTokenDubbo3ConsumerFilter implements Filter {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
index a42ff049..287f03ea 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
@@ -7,11 +7,10 @@ import org.apache.dubbo.common.extension.Activate;
 import org.apache.dubbo.rpc.*;
 
 /**
- * 
- * Sa-Token 整合 Dubbo3 Provider端过滤器
- * 
- * @author click33
+ * Sa-Token 整合 Dubbo3 Provider端（被调用端）过滤器
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = -30000)
 public class SaTokenDubbo3ProviderFilter implements Filter {
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
index a1135c29..4b83df24 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
@@ -7,10 +7,10 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * Request for Dubbo3
- * 
- * @author click33
+ * 对 SaRequest 包装类的实现（Dubbo3 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaRequestForDubbo3 implements SaRequest {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
index 5e3fff3f..aaf74dea 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
@@ -5,9 +5,10 @@ import cn.dev33.satoken.context.model.SaResponse;
 import org.apache.dubbo.rpc.RpcContext;
 
 /**
- * Response for Servlet
- * @author click33
+ * 对 SaResponse 包装类的实现（Dubbo3 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaResponseForDubbo3 implements SaResponse {
 
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
index 3b56b4c8..e74b6362 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
+++ b/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
@@ -5,9 +5,10 @@ import cn.dev33.satoken.util.SaTokenConsts;
 import org.apache.dubbo.rpc.RpcContext;
 
 /**
- * Storage for Servlet 
- * @author click33
+ * 对 SaStorage 包装类的实现（Dubbo3 版）
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaStorageForDubbo3 implements SaStorage {
 

From 000b44358676c692b7041801c56831f4b3b46a16 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 17:23:51 +0800
Subject: [PATCH 046/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-dialect-t?=
 =?UTF-8?q?hymeleaf=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java | 5 +++--
 .../satoken/thymeleaf/dialect/SaTokenTagProcessor.java     | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
index d95484a2..0d9c6271 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
@@ -16,7 +16,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 集成 Thymeleaf 标签方言 
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaTokenDialect extends AbstractProcessorDialect {
 	
@@ -33,7 +33,8 @@ public class SaTokenDialect extends AbstractProcessorDialect {
     }
     
     /**
-     * 构造方言对象，使用
+     * 构造方言对象，使用自定义参数
+	 *
      * @param name 方言名称
      * @param recedence 优先级 
      * @param stpLogic 使用的 StpLogic 对象 
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
index ad970276..da1efa91 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
@@ -10,9 +10,10 @@ import org.thymeleaf.processor.element.IElementTagStructureHandler;
 import org.thymeleaf.templatemode.TemplateMode;
 
 /**
- * 封装 Sa-Token 标签方言处理器 
- * @author click33 
- *
+ * 封装 Sa-Token 标签方言处理器
+ * 
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
 

From ffda42ca0cc71c53ede0a08da737874347988c81 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 17:38:02 +0800
Subject: [PATCH 047/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-quick-log?=
 =?UTF-8?q?in=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/quick/SaQuickInject.java |  4 ++--
 .../cn/dev33/satoken/quick/SaQuickManager.java     |  7 ++++---
 .../cn/dev33/satoken/quick/SaQuickRegister.java    | 14 +++++++++++---
 .../dev33/satoken/quick/config/SaQuickConfig.java  |  6 +++---
 .../dev33/satoken/quick/web/SaQuickController.java | 11 ++++++-----
 5 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
index 8e40894c..bb050613 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
@@ -11,14 +11,14 @@ import cn.dev33.satoken.quick.web.SaQuickController;
  * Quick-Bean 注入
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @Configuration
 @Import({ SaQuickController.class, SaQuickRegister.class})
 public class SaQuickInject {
 
 	/**
-	 * 注入quick-login 配置 
+	 * 注入 quick-login 配置
 	 * 
 	 * @param saQuickConfig 配置对象
 	 */
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
index 09f51061..d1f69c76 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
@@ -4,9 +4,10 @@ import cn.dev33.satoken.quick.config.SaQuickConfig;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * SaQuickManager 
- * @author click33
+ * SaQuickManager，持有 SaQuickConfig 配置对象全局引用
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaQuickManager {
 
@@ -16,7 +17,7 @@ public class SaQuickManager {
 	private static SaQuickConfig config;	
 	public static void setConfig(SaQuickConfig config) {
 		SaQuickManager.config = config;
-		// 如果配置了随机密码
+		// 如果配置了 auto=true，则随机生成账号名密码
 		if(config.getAuto()) {
 			config.setName(SaFoxUtil.getRandomString(8));
 			config.setPwd(SaFoxUtil.getRandomString(8));
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
index 07fd12d4..a895bfc4 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
@@ -13,21 +13,26 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * Quick-Bean 注册 
+ * Quick Login 相关 Bean 注册
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 @Configuration
 public class SaQuickRegister {
 
+	/**
+	 * 使用一个比较短的前缀，尽量提高 cmd 命令台启动时指定参数的便利性
+	 */
+	public static final String CONFIG_VERSION = "sa";
+
 	/**
 	 * 注册 Quick-Login 配置
 	 * 
 	 * @return see note
 	 */
 	@Bean
-	@ConfigurationProperties(prefix = "sa")
+	@ConfigurationProperties(prefix = CONFIG_VERSION)
 	SaQuickConfig getSaQuickConfig() {
 		return new SaQuickConfig();
 	}
@@ -41,10 +46,13 @@ public class SaQuickRegister {
 	@Order(SaTokenConsts.ASSEMBLY_ORDER - 1)
 	SaServletFilter getSaServletFilterForQuickLogin() {
 		return new SaServletFilter()
+
 			// 拦截路由 
 			.addInclude("/**")
+
 			// 排除掉登录相关接口，不需要鉴权的
 			.addExclude("/favicon.ico", "/saLogin", "/doLogin", "/sa-res/**").
+
 			// 认证函数: 每次请求执行
 			setAuth(obj -> {
 				SaRouter
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
index 4469df2d..cff3e886 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
@@ -4,11 +4,11 @@ package cn.dev33.satoken.quick.config;
  * sa-quick 配置类 Model
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaQuickConfig {
 
-	/** 是否开启全局认证 */
+	/** 是否开启全局登录校验，如果为 false，则不再拦截请求出现登录页 */
 	private Boolean auth = true;
 
 	/** 用户名 */
@@ -17,7 +17,7 @@ public class SaQuickConfig {
 	/** 密码 */
 	private String pwd = "123456";
 
-	/** 是否自动生成一个账号和密码 */
+	/** 是否自动生成一个账号和密码，此配置项为 true 后，name、pwd 字段将失效 */
 	private Boolean auto = false; 
 	
 	/** 登录页面的标题 */
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
index dd3a2581..591004d8 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
@@ -13,17 +13,18 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
 
 /**
- * 登录Controller
- * @author click33
+ * 登录Controller，处理登录相关请求
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 @Controller
 public class SaQuickController {
 
 	/**
 	 * 进入登录页面
-	 * @param model see note
-	 * @return see note
+	 * @param model /
+	 * @return /
 	 */
 	@GetMapping("/saLogin")
 	public String saLogin(Model model) {
@@ -46,7 +47,7 @@ public class SaQuickController {
 			return SaResult.get(500, "请输入账号和密码", null);
 		}
 		
-		// 密码校验 
+		// 密码校验：将前端提交的 name、pwd 与配置文件中的配置项进行比对
 		SaQuickConfig config = SaQuickManager.getConfig();
 		if(name.equals(config.getName()) && pwd.equals(config.getPwd())) {
 			StpUtil.login(config.getName());

From ea017c04e59c243d3acc455ad48ca6cf0b8540fb Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 17:50:25 +0800
Subject: [PATCH 048/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-spring-ao?=
 =?UTF-8?q?p=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/aop/SaCheckAspect.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index 8e102142..ddcb8e95 100644
--- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -15,9 +15,14 @@ import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaTokenConsts;
 
 /**
- * sa-token 基于 Spring Aop 的注解鉴权
+ * Sa-Token 基于 Spring Aop 的注解鉴权
+ *
+ * <p>
+ *     注意：在打开 注解鉴权 时，AOP 模式与拦截器模式不可同时使用，否则会出现在 Controller 层重复鉴权两次的问题
+ * </p>
  * 
  * @author click33
+ * @since <= 1.34.0
  */
 @Aspect
 @Component
@@ -31,7 +36,7 @@ public class SaCheckAspect {
 	}
 
 	/**
-	 * 定义AOP签名 (切入所有使用sa-token鉴权注解的方法)
+	 * 定义AOP签名 (切入所有使用 Sa-Token 鉴权注解的方法)
 	 */
 	public static final String POINTCUT_SIGN = 
 			"@within(cn.dev33.satoken.annotation.SaCheckLogin) || @annotation(cn.dev33.satoken.annotation.SaCheckLogin) || "

From d06ef1052f7f94a46936c824ae053f9b150bb8d0 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 17:55:54 +0800
Subject: [PATCH 049/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-context-g?=
 =?UTF-8?q?rpc=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../context/grpc/SaTokenSecondContextCreatorForGrpc.java        | 1 +
 .../dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java | 1 +
 .../satoken/context/grpc/constants/GrpcContextConstants.java    | 2 +-
 .../cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java   | 1 +
 .../cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java  | 1 +
 .../cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java   | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
index 52a6fb8c..9265d47e 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Component;
  * Sa-Token 二级Context - 创建器 [Grpc版]
  *
  * @author lym
+ * @since <= 1.34.0
  */
 @Component
 public class SaTokenSecondContextCreatorForGrpc implements SaTokenSecondContextCreator {
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
index 6b156879..db8fbd91 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
@@ -14,6 +14,7 @@ import cn.dev33.satoken.exception.ApiDisabledException;
  * Sa-Token 上下文 [grpc版本]
  *
  * @author lym
+ * @since <= 1.34.0
  */
 public class SaTokenSecondContextForGrpc implements SaTokenSecondContext {
 
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
index 77ad22ad..d67344c6 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
@@ -8,7 +8,7 @@ import io.grpc.Metadata;
  * 常量 
  * 
  * @author lym
- * @since: 2022/8/26 14:27
+ * @since 2022/8/26 14:27
  */
 public class GrpcContextConstants {
     public static final Metadata.Key<String> SA_SAME_TOKEN =
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
index cbff558f..0b88691b 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
@@ -10,6 +10,7 @@ import java.util.Map;
  * Request for grpc
  *
  * @author lym
+ * @since <= 1.34.0
  */
 public class SaRequestForGrpc implements SaRequest {
 
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
index 664b73b9..cb3ee986 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.context.model.SaResponse;
  * Response for grpc
  *
  * @author lym
+ * @since <= 1.34.0
  */
 public class SaResponseForGrpc implements SaResponse {
     /**
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
index e797636c..c17c85dc 100644
--- a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
+++ b/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.context.model.SaStorage;
  * Storage for grpc
  *
  * @author lym
+ * @since <= 1.34.0
  */
 public class SaStorageForGrpc implements SaStorage {
 

From c9711f1eba3e3ddb7c8c52f18844cd8afdce7a3e Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 18:10:09 +0800
Subject: [PATCH 050/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-temp-jwt?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/temp/jwt/SaJwtUtil.java  | 19 +++++++++++++------
 .../dev33/satoken/temp/jwt/SaTempForJwt.java  |  5 +++--
 .../temp/jwt/error/SaTempJwtErrorCode.java    |  8 ++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
index 93c17d5e..25157913 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
@@ -9,9 +9,10 @@ import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 
 /**
- * jwt操作工具类 
- * @author click33
+ * jwt 相关操作工具类，封装一下
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaJwtUtil {
 	
@@ -29,7 +30,8 @@ public class SaJwtUtil {
 	public static final long NEVER_EXPIRE = SaTokenDao.NEVER_EXPIRE;
 	
 	/**
-	 * 根据指定值创建 jwt-token 
+	 * 根据指定值创建 jwt-token
+	 *
 	 * @param key 存储value使用的key 
 	 * @param value 要保存的值
 	 * @param timeout token有效期 (单位 秒)
@@ -37,17 +39,21 @@ public class SaJwtUtil {
 	 * @return jwt-token 
 	 */
     public static String createToken(String key, Object value, long timeout, String keyt) {
-    	// 计算eff有效期 
+    	// 计算eff有效期：
+		// 		如果 timeout 指定为 -1，那么 eff 也为 -1，代表永不过期
+		// 		如果 timeout 指定为一个具体的值，那么 eff 为 13 位时间戳，代表此数据到期的时间
     	long eff = timeout;
     	if(timeout != NEVER_EXPIRE) {
     		eff = timeout * 1000 + System.currentTimeMillis();
     	}
+
     	// 在这里你可以使用官方提供的claim方法构建载荷，也可以使用setPayload自定义载荷，但是两者不可一起使用 
         JwtBuilder builder = Jwts.builder()
         		// .setHeaderParam("typ", "JWT")
         		.claim(KEY_VALUE + key, value)
         		.claim(KEY_EFF, eff)
                 .signWith(SignatureAlgorithm.HS256, keyt.getBytes());
+
         // 生成jwt-token 
         return builder.compact();
     }
@@ -63,6 +69,7 @@ public class SaJwtUtil {
     	Claims claims = Jwts.parser()
         		.setSigningKey(keyt.getBytes())
         		.parseClaimsJws(jwtToken).getBody();
+
         // 返回 
         return claims;
     }
@@ -81,7 +88,7 @@ public class SaJwtUtil {
     	// 验证是否超时 
     	Long eff = claims.get(KEY_EFF, Long.class);
     	if((eff == null || eff < System.currentTimeMillis()) && eff != NEVER_EXPIRE) {
-    		throw new SaTokenException("Token已超时").setCode(SaTempJwtErrorCode.CODE_30303);
+    		throw new SaTokenException("token 已超时，无法解析：" + jwtToken).setCode(SaTempJwtErrorCode.CODE_30303);
     	}
     	
         // 获取数据 
@@ -98,7 +105,7 @@ public class SaJwtUtil {
     	// 取出数据 
     	Claims claims = parseToken(jwtToken, keyt);
     	
-    	// 如果给定的key不对
+    	// 如果给定的 key 不对
     	if(claims.get(KEY_VALUE + key) == null) {
     		return SaTokenDao.NOT_VALUE_EXPIRE;
     	}
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
index 0e8f6222..b57c0375 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
@@ -8,9 +8,10 @@ import cn.dev33.satoken.temp.jwt.error.SaTempJwtErrorCode;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 临时令牌验证模块接口 JWT实现类 
- * @author click33
+ * Sa-Token 临时令牌验证模块接口 JWT实现类，提供以 JWT 为逻辑内核的临时 token 验证功能
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaTempForJwt implements SaTempInterface {
 	
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
index 128815a7..c099560e 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
@@ -6,15 +6,15 @@ package cn.dev33.satoken.temp.jwt.error;
  * @author click33
  * @since 2022-10-31
  */
-public class SaTempJwtErrorCode {
+public interface SaTempJwtErrorCode {
 
 	/** jwt 模式没有提供秘钥 */
-	public static final int CODE_30301 = 30301;
+	int CODE_30301 = 30301;
 
 	/** jwt 模式不可以删除 Token */
-	public static final int CODE_30302 = 30302;
+	int CODE_30302 = 30302;
 
 	/** Token已超时 */
-	public static final int CODE_30303 = 30303;
+	int CODE_30303 = 30303;
 
 }

From 56832986f64178bb47d71e485be61f62f15b8aaa Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 18:27:59 +0800
Subject: [PATCH 051/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-jwt=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/jwt/SaJwtTemplate.java   | 23 +++++++++++++------
 .../java/cn/dev33/satoken/jwt/SaJwtUtil.java  |  5 ++--
 .../satoken/jwt/StpLogicJwtForMixin.java      |  5 ++--
 .../satoken/jwt/StpLogicJwtForSimple.java     |  5 ++--
 .../satoken/jwt/StpLogicJwtForStateless.java  |  5 ++--
 .../satoken/jwt/error/SaJwtErrorCode.java     | 14 +++++------
 .../satoken/jwt/exception/SaJwtException.java |  2 +-
 7 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
index 1243f5d6..b8c71814 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
@@ -12,9 +12,10 @@ import cn.hutool.jwt.JWT;
 import cn.hutool.jwt.JWTException;
 
 /**
- * jwt 操作模板方法封装 
- * @author click33
+ * jwt 操作模板方法封装
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaJwtTemplate {
 	
@@ -57,6 +58,7 @@ public class SaJwtTemplate {
 
 	/**
 	 * 创建 jwt （简单方式）
+	 *
      * @param loginType 登录类型 
 	 * @param loginId 账号id 
 	 * @param extraData 扩展数据
@@ -69,6 +71,7 @@ public class SaJwtTemplate {
     	JWT jwt = JWT.create()
 				.setPayload(LOGIN_TYPE, loginType)
 			    .setPayload(LOGIN_ID, loginId)
+				// 塞入一个随机字符串，防止同账号下每次生成的 token 都一样的
 			    .setPayload(RN_STR, SaFoxUtil.getRandomString(32))
 				.addPayloads(extraData)
 			    ;
@@ -79,6 +82,7 @@ public class SaJwtTemplate {
 
 	/**
 	 * 创建 jwt （全参数方式）
+	 *
 	 * @param loginType 账号类型
 	 * @param loginId 账号id
 	 * @param device 设备类型
@@ -90,7 +94,9 @@ public class SaJwtTemplate {
 	public String createToken(String loginType, Object loginId, String device,
 									 long timeout, Map<String, Object> extraData, String keyt) {
 
-		// 计算有效期
+		// 计算 eff 有效期：
+		// 		如果 timeout 指定为 -1，那么 eff 也为 -1，代表永不过期
+		// 		如果 timeout 指定为一个具体的值，那么 eff 为 13 位时间戳，代表此 token 到期的时间
 		long effTime = timeout;
 		if(timeout != NEVER_EXPIRE) {
 			effTime = timeout * 1000 + System.currentTimeMillis();
@@ -102,6 +108,7 @@ public class SaJwtTemplate {
 				.setPayload(LOGIN_ID, loginId)
 				.setPayload(DEVICE, device)
 				.setPayload(EFF, effTime)
+				// 塞入一个随机字符串，防止同账号同一毫秒下每次生成的 token 都一样的
 			    .setPayload(RN_STR, SaFoxUtil.getRandomString(32))
 				.addPayloads(extraData);
 
@@ -110,7 +117,8 @@ public class SaJwtTemplate {
 	}
 
 	/**
-	 * 为 JWT 对象和 keyt 秘钥，生成 token 字符串 
+	 * 为 JWT 对象和 keyt 秘钥，生成 token 字符串
+	 *
 	 * @param jwt JWT构建对象
 	 * @param keyt 秘钥 
 	 * @return 根据 JWT 对象和 keyt 秘钥，生成的 token 字符串
@@ -122,7 +130,8 @@ public class SaJwtTemplate {
 	// ------ 解析 
 
     /**
-     * jwt 解析 
+     * jwt 解析
+	 *
      * @param token Jwt-Token值 
      * @param loginType 登录类型 
      * @param keyt 秘钥
@@ -132,7 +141,7 @@ public class SaJwtTemplate {
     public JWT parseToken(String token, String loginType, String keyt, boolean isCheckTimeout) {
 
     	// 秘钥不可以为空
-    	if(keyt == null) {
+    	if(SaFoxUtil.isEmpty(keyt)) {
     		throw new SaJwtException("请配置 jwt 秘钥");
     	}
 
@@ -142,7 +151,7 @@ public class SaJwtTemplate {
     	}
     	
     	// 解析 
-    	JWT jwt = null;
+    	JWT jwt;
     	try {
     		jwt = JWT.of(token);
 		} catch (JWTException e) {
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
index b6833f49..b3c124e2 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
@@ -6,9 +6,10 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.jwt.JWT;
 
 /**
- * jwt 操作工具类封装 
- * @author click33
+ * jwt 操作工具类封装
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaJwtUtil {
 	
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index 9bbcf349..4d571168 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -13,9 +13,10 @@ import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 
 /**
- * Sa-Token 整合 jwt -- Mixin 混入模式  
- * @author click33
+ * Sa-Token 整合 jwt -- Mixin 混入模式
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class StpLogicJwtForMixin extends StpLogic {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
index 322d25b9..37466cff 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
@@ -8,9 +8,10 @@ import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 
 /**
- * Sa-Token 整合 jwt -- Simple 简单模式 
- * @author click33
+ * Sa-Token 整合 jwt -- Simple 简单模式
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class StpLogicJwtForSimple extends StpLogic {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index f6c72a37..f17baa1c 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -15,9 +15,10 @@ import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
- * Sa-Token 整合 jwt -- Stateless 无状态模式 
+ * Sa-Token 整合 jwt -- Stateless 无状态模式
+ * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class StpLogicJwtForStateless extends StpLogic {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
index 606c4ee8..73a5fc4d 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
@@ -6,24 +6,24 @@ package cn.dev33.satoken.jwt.error;
  * @author click33
  * @since 2022-10-31
  */
-public class SaJwtErrorCode {
+public interface SaJwtErrorCode {
 
 	/** 对 jwt 字符串解析失败 */
-	public static final int CODE_30201 = 30201;
+	int CODE_30201 = 30201;
 
 	/** 此 jwt 的签名无效 */
-	public static final int CODE_30202 = 30202;
+	int CODE_30202 = 30202;
 
 	/** 此 jwt 的 loginType 字段不符合预期 */
-	public static final int CODE_30203 = 30203;
+	int CODE_30203 = 30203;
 
 	/** 此 jwt 已超时 */
-	public static final int CODE_30204 = 30204;
+	int CODE_30204 = 30204;
 
 	/** 没有配置jwt秘钥 */
-	public static final int CODE_30205 = 30205;
+	int CODE_30205 = 30205;
 
 	/** 登录时提供的账号id为空 */
-	public static final int CODE_30206 = 30206;
+	int CODE_30206 = 30206;
 
 }
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
index 901924c2..d55462c3 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
@@ -5,7 +5,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 
 /**
- * 一个异常：代表 jwt 相关错误  
+ * 一个异常：代表 jwt 模块相关错误
  * 
  * @author click33
  * @since 2022-10-31

From c27cf376e7ef1cb22fdc52dad3b46127860706c1 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 18:36:21 +0800
Subject: [PATCH 052/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-sso=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/config/SaSsoConfig.java  |  5 ++--
 .../cn/dev33/satoken/sso/SaSsoConsts.java     |  5 ++--
 .../cn/dev33/satoken/sso/SaSsoManager.java    |  2 +-
 .../cn/dev33/satoken/sso/SaSsoTemplate.java   |  5 ++--
 .../java/cn/dev33/satoken/sso/SaSsoUtil.java  |  5 ++--
 .../satoken/sso/error/SaSsoErrorCode.java     | 26 +++++++++----------
 .../satoken/sso/exception/SaSsoException.java |  1 +
 7 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index 184dc506..8d981eae 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -12,9 +12,10 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
 
 /**
- * Sa-Token SSO 单点登录模块 配置类 Model 
- * @author click33
+ * Sa-Token SSO 单点登录模块 配置类 Model
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaSsoConfig implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
index 7f9dc7b1..419f5c1a 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.sso;
 
 /**
- * Sa-Token-SSO模块相关常量 
- * @author click33
+ * Sa-Token-SSO模块相关常量
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaSsoConsts {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
index 16dac10b..b05fe3ff 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.config.SaSsoConfig;
  * Sa-Token-SSO 模块 总控类
  *
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaSsoManager {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index 25ea17a9..a74a8dee 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -17,9 +17,10 @@ import cn.dev33.satoken.util.SaResult;
 import java.util.*;
 
 /**
- * Sa-Token-SSO 单点登录模块 
- * @author click33
+ * Sa-Token-SSO 单点登录模块
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaSsoTemplate {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index 1cd602fd..d4ab2323 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -5,9 +5,10 @@ import cn.dev33.satoken.util.SaResult;
 import java.util.Map;
 
 /**
- * Sa-Token-SSO 单点登录模块 工具类 
+ * Sa-Token-SSO 单点登录模块 工具类
+ * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaSsoUtil {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
index 8b0cdfac..3ef1c95f 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
@@ -4,44 +4,44 @@ package cn.dev33.satoken.sso.error;
  * 定义 sa-token-sso 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-31
+ * @since 2022-10-31
  */
 public interface SaSsoErrorCode {
 
 	/** redirect 重定向 url 是一个无效地址 */
-	public static final int CODE_30001 = 30001;
+	int CODE_30001 = 30001;
 
 	/** redirect 重定向 url 不在 allowUrl 允许的范围内 */
-	public static final int CODE_30002 = 30002;
+	int CODE_30002 = 30002;
 
 	/** 接口调用方提供的 secretkey 秘钥无效 */
-	public static final int CODE_30003 = 30003;
+	int CODE_30003 = 30003;
 
 	/** 提供的 ticket 是无效的 */
-	public static final int CODE_30004 = 30004;
+	int CODE_30004 = 30004;
 
 	/** 在模式三下，sso-client 调用 sso-server 端 校验ticket接口 时，得到的响应是校验失败 */
-	public static final int CODE_30005 = 30005;
+	int CODE_30005 = 30005;
 
 	/** 在模式三下，sso-client 调用 sso-server 端 单点注销接口 时，得到的响应是注销失败 */
-	public static final int CODE_30006 = 30006;
+	int CODE_30006 = 30006;
 
 	/** http 请求调用 提供的 timestamp 与当前时间的差距超出允许的范围 */
-	public static final int CODE_30007 = 30007;
+	int CODE_30007 = 30007;
 
 	/** http 请求调用 提供的 sign 无效 */
-	public static final int CODE_30008 = 30008;
+	int CODE_30008 = 30008;
 
 	/** 本地系统没有配置 secretkey 字段 */
-	public static final int CODE_30009 = 30009;
+	int CODE_30009 = 30009;
 
 	/** 本地系统没有配置 http 请求处理器 */
-	public static final int CODE_30010 = 30010;
+	int CODE_30010 = 30010;
 
 	/** 该 ticket 不属于当前 client */
-	public static final int CODE_30011 = 30011;
+	int CODE_30011 = 30011;
 
 	/** 当前缺少配置 server-url 地址 */
-	public static final int CODE_30012 = 30012;
+	int CODE_30012 = 30012;
 
 }
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
index 252da4c7..2268caf6 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.exception.SaTokenException;
  * 一个异常：代表 SSO 认证流程错误 
  * 
  * @author click33
+ * @since <= 1.34.0
  */
 public class SaSsoException extends SaTokenException {
 

From 5173c2637b9874787fc02c723f219fd628e2231d Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 12 May 2023 18:40:08 +0800
Subject: [PATCH 053/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20sa-token-oauth2=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev33/satoken/oauth2/SaOAuth2Manager.java |  2 +-
 .../satoken/oauth2/config/SaOAuth2Config.java |  5 +-
 .../oauth2/error/SaOAuth2ErrorCode.java       | 60 +++++++++----------
 .../oauth2/exception/SaOAuth2Exception.java   |  1 +
 .../satoken/oauth2/logic/SaOAuth2Consts.java  |  5 +-
 .../satoken/oauth2/logic/SaOAuth2Handle.java  |  3 +-
 .../oauth2/logic/SaOAuth2Template.java        |  3 +-
 .../satoken/oauth2/logic/SaOAuth2Util.java    |  5 +-
 .../oauth2/model/AccessTokenModel.java        |  3 +-
 .../oauth2/model/ClientTokenModel.java        |  3 +-
 .../dev33/satoken/oauth2/model/CodeModel.java |  5 +-
 .../oauth2/model/RefreshTokenModel.java       |  5 +-
 .../oauth2/model/RequestAuthModel.java        |  3 +-
 .../satoken/oauth2/model/SaClientModel.java   |  5 +-
 14 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
index 823ff2f8..049a0d41 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
@@ -6,7 +6,7 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
  * Sa-Token-OAuth2 模块 总控类
  * 
  * @author click33
- *
+ * @since <= 1.34.0
  */
 public class SaOAuth2Manager {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
index ca14c581..2f1d6487 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
@@ -7,9 +7,10 @@ import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
 /**
- * Sa-Token-OAuth2 配置类 Model 
- * @author click33
+ * Sa-Token-OAuth2 配置类 Model
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaOAuth2Config implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
index 412a686a..0469098b 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
@@ -4,95 +4,95 @@ package cn.dev33.satoken.oauth2.error;
  * 定义 sa-token-oauth2 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-31
+ * @since 2022-10-31
  */
 public interface SaOAuth2ErrorCode {
 
 	/** client_id 不可为空 */
-	public static final int CODE_30101 = 30101;
+	int CODE_30101 = 30101;
 
 	/** scope 不可为空 */
-	public static final int CODE_30102 = 30102;
+	int CODE_30102 = 30102;
 
 	/** redirect_uri 不可为空 */
-	public static final int CODE_30103 = 30103;
+	int CODE_30103 = 30103;
 
 	/** LoginId 不可为空 */
-	public static final int CODE_30104 = 30104;
+	int CODE_30104 = 30104;
 
 	/** 无效client_id */
-	public static final int CODE_30105 = 30105;
+	int CODE_30105 = 30105;
 
 	/** 无效access_token */
-	public static final int CODE_30106 = 30106;
+	int CODE_30106 = 30106;
 
 	/** 无效 client_token */
-	public static final int CODE_30107 = 30107;
+	int CODE_30107 = 30107;
 
 	/** Access-Token 不具备指定的 Scope */
-	public static final int CODE_30108 = 30108;
+	int CODE_30108 = 30108;
 
 	/** Client-Token 不具备指定的 Scope */
-	public static final int CODE_30109 = 30109;
+	int CODE_30109 = 30109;
 
 	/** 无效 code 码 */
-	public static final int CODE_30110 = 30110;
+	int CODE_30110 = 30110;
 
 	/** 无效 Refresh-Token */
-	public static final int CODE_30111 = 30111;
+	int CODE_30111 = 30111;
 
 	/** 请求的Scope暂未签约 */
-	public static final int CODE_30112 = 30112;
+	int CODE_30112 = 30112;
 
 	/** 无效redirect_url */
-	public static final int CODE_30113 = 30113;
+	int CODE_30113 = 30113;
 
 	/** 非法redirect_url */
-	public static final int CODE_30114 = 30114;
+	int CODE_30114 = 30114;
 	
 	/** 无效client_secret */
-	public static final int CODE_30115 = 30115;
+	int CODE_30115 = 30115;
 
 	/** 请求的Scope暂未签约 */
-	public static final int CODE_30116 = 30116;
+	int CODE_30116 = 30116;
 
 	/** 无效code */
-	public static final int CODE_30117 = 30117;
+	int CODE_30117 = 30117;
 
 	/** 无效client_id */
-	public static final int CODE_30118 = 30118;
+	int CODE_30118 = 30118;
 
 	/** 无效client_secret */
-	public static final int CODE_30119 = 30119;
+	int CODE_30119 = 30119;
 
 	/** 无效redirect_uri */
-	public static final int CODE_30120 = 30120;
+	int CODE_30120 = 30120;
 
 	/** 无效refresh_token */
-	public static final int CODE_30121 = 30121;
+	int CODE_30121 = 30121;
 
 	/** 无效client_id */
-	public static final int CODE_30122 = 30122;
+	int CODE_30122 = 30122;
 
 	/** 无效client_secret */
-	public static final int CODE_30123 = 30123;
+	int CODE_30123 = 30123;
 
 	/** 无效client_id */
-	public static final int CODE_30124 = 30124;
+	int CODE_30124 = 30124;
 
 	/** 无效response_type */
-	public static final int CODE_30125 = 30125;
+	int CODE_30125 = 30125;
 
 	/** 暂未开放授权码模式 */
-	public static final int CODE_30131 = 30131;
+	int CODE_30131 = 30131;
 	
 	/** 暂未开放隐藏式模式 */
-	public static final int CODE_30132 = 30132;
+	int CODE_30132 = 30132;
 	
 	/** 暂未开放密码式模式 */
-	public static final int CODE_30133 = 30133;
+	int CODE_30133 = 30133;
 	
 	/** 暂未开放凭证式模式 */
-	public static final int CODE_30134 = 30134;
+	int CODE_30134 = 30134;
 	
 }
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
index b9483eb2..42c5c4b1 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
@@ -6,6 +6,7 @@ import cn.dev33.satoken.exception.SaTokenException;
  * 一个异常：代表OAuth2认证流程错误 
  * 
  * @author click33
+ * @since <= 1.34.0
  */
 public class SaOAuth2Exception extends SaTokenException {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
index 770e08e2..16644ad4 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
@@ -1,9 +1,10 @@
 package cn.dev33.satoken.oauth2.logic;
 
 /**
- * Sa-Token-OAuth2 所有常量 
- * @author click33
+ * Sa-Token-OAuth2 所有常量
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaOAuth2Consts {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
index 599df878..eb659644 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
@@ -21,8 +21,9 @@ import cn.dev33.satoken.util.SaResult;
 
 /**
  * Sa-Token-OAuth2 请求处理类封装
- * @author click33
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaOAuth2Handle {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
index 1b5d1085..a6316b1f 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
@@ -19,8 +19,9 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * Sa-Token-OAuth2 模块 代码实现
- * @author click33
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaOAuth2Template {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
index 69b27f2b..22004b7f 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
@@ -9,9 +9,10 @@ import cn.dev33.satoken.oauth2.model.RequestAuthModel;
 import cn.dev33.satoken.oauth2.model.SaClientModel;
 
 /**
- * Sa-Token-OAuth2 模块 工具类 
+ * Sa-Token-OAuth2 模块 工具类
+ *
  * @author click33
- * 
+ * @since <= 1.34.0
  */
 public class SaOAuth2Util {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
index 7309c871..e23dd690 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
@@ -6,8 +6,9 @@ import java.util.Map;
 
 /**
  * Model: Access-Token
- * @author click33
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class AccessTokenModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
index 1218c66e..3367606b 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
@@ -6,8 +6,9 @@ import java.util.Map;
 
 /**
  * Model: Client-Token
- * @author click33
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class ClientTokenModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
index 0d87f784..b4417be2 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
@@ -3,9 +3,10 @@ package cn.dev33.satoken.oauth2.model;
 import java.io.Serializable;
 
 /**
- * Model: 授权码 
- * @author click33
+ * Model: 授权码
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class CodeModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
index f68ff848..40a78221 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
@@ -3,9 +3,10 @@ package cn.dev33.satoken.oauth2.model;
 import java.io.Serializable;
 
 /**
- * Model: Refresh-Token 
- * @author click33
+ * Model: Refresh-Token
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class RefreshTokenModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
index 0bc441b5..cd4a1b8d 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
@@ -8,8 +8,9 @@ import cn.dev33.satoken.util.SaFoxUtil;
 
 /**
  * 请求授权参数的Model
- * @author click33
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class RequestAuthModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
index 02f87cfe..044a50d5 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
@@ -6,9 +6,10 @@ import cn.dev33.satoken.oauth2.SaOAuth2Manager;
 import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
 
 /**
- * Client应用信息 Model 
- * @author click33
+ * Client应用信息 Model
  *
+ * @author click33
+ * @since <= 1.34.0
  */
 public class SaClientModel implements Serializable {
 

From 7c290ad24a510e8d3e1e7cc42836d5ecbee7713a Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 13 May 2023 09:26:33 +0800
Subject: [PATCH 054/129] =?UTF-8?q?/sso/getData=20=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E6=94=B9=E4=B8=BA=20SaResult=20?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/pj/sso/SsoServerController.java           | 2 +-
 sa-token-doc/sso/sso-type3.md                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
index 582b4388..c1fb3013 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/src/main/java/com/pj/sso/SsoServerController.java
@@ -66,7 +66,7 @@ public class SsoServerController {
 
 	// 示例：获取数据接口（用于在模式三下，为 client 端开放拉取数据的接口）
 	@RequestMapping("/sso/getData")
-	public Object getData(String apiType, String loginId) {
+	public SaResult getData(String apiType, String loginId) {
 		System.out.println("---------------- 获取数据 ----------------");
 		System.out.println("apiType=" + apiType);
 		System.out.println("loginId=" + loginId);
diff --git a/sa-token-doc/sso/sso-type3.md b/sa-token-doc/sso/sso-type3.md
index 194d6a4d..7f8a941c 100644
--- a/sa-token-doc/sso/sso-type3.md
+++ b/sa-token-doc/sso/sso-type3.md
@@ -115,7 +115,7 @@ forest.log-enabled: false
 ``` java
 // 示例：获取数据接口（用于在模式三下，为 client 端开放拉取数据的接口）
 @RequestMapping("/sso/getData")
-public Object getData(String apiType, String loginId) {
+public SaResult getData(String apiType, String loginId) {
 	System.out.println("---------------- 获取数据 ----------------");
 	System.out.println("apiType=" + apiType);
 	System.out.println("loginId=" + loginId);

From 4d954f12f4fefcd035f36e26d4de656bfc2225c4 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 13 May 2023 14:28:19 +0800
Subject: [PATCH 055/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20`getTokenTimeout(S?=
 =?UTF-8?q?tring=20token)`=20=E6=96=B9=E6=B3=95=EF=BC=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=BB=BB=E6=84=8F=20token=20=E5=89=A9=E4=BD=99=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=9C=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/stp/StpLogic.java | 16 +++++++++++++---
 .../main/java/cn/dev33/satoken/stp/StpUtil.java  | 10 ++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 787a31b6..c4227401 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1355,10 +1355,20 @@ public class StpLogic {
  	 * @return token剩余有效时间
  	 */
  	public long getTokenTimeout() {
- 		return getSaTokenDao().getTimeout(splicingKeyTokenValue(getTokenValue()));
+ 		return getTokenTimeout(getTokenValue());
  	}
- 	
- 	/**
+
+	/**
+	 * 获取指定 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @param token 指定token
+	 * @return token剩余有效时间
+	 */
+	public long getTokenTimeout(String token) {
+		return getSaTokenDao().getTimeout(splicingKeyTokenValue(token));
+	}
+
+	/**
  	 * 获取指定账号 id 的 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
 	 *
  	 * @param loginId 指定loginId 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index da7c5b24..de8cefbd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -510,6 +510,16 @@ public class StpUtil {
  		return stpLogic.getTokenTimeout();
  	}
 
+	/**
+	 * 获取指定 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @param token 指定token
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenTimeout(String token) {
+		return stpLogic.getTokenTimeout(token);
+	}
+
 	/**
 	 * 获取当前登录账号的 Account-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
 	 *

From 387af986c6414f4236ad82b93383011d8f97a2e8 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 14 May 2023 01:31:10 +0800
Subject: [PATCH 056/129] =?UTF-8?q?=E7=AE=80=E5=8C=96=20redis=20=E5=92=8C?=
 =?UTF-8?q?=20rpc=20=E7=9B=B8=E5=85=B3=E9=9B=86=E6=88=90=E5=8C=85=E7=9A=84?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-plugin/pom.xml                        | 18 +++++++++---------
 sa-token-plugin/sa-token-alone-redis/pom.xml   |  8 ++++----
 .../satoken/dao/alone/SaAloneRedisInject.java  | 16 ++++++++--------
 .../.gitignore                                 |  0
 .../pom.xml                                    |  6 +++---
 .../SaTokenSecondContextCreatorForDubbo.java   |  0
 .../dubbo/SaTokenSecondContextForDubbo.java    |  0
 .../filter/SaTokenDubboConsumerFilter.java     |  0
 .../filter/SaTokenDubboProviderFilter.java     |  0
 .../context/dubbo/model/SaRequestForDubbo.java |  0
 .../dubbo/model/SaResponseForDubbo.java        |  0
 .../context/dubbo/model/SaStorageForDubbo.java |  0
 .../META-INF/dubbo/org.apache.dubbo.rpc.Filter |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 sa-token-plugin/sa-token-dubbo3/.gitignore     | 12 ++++++++++++
 .../pom.xml                                    |  6 +++---
 .../SaTokenSecondContextCreatorForDubbo3.java  |  0
 .../dubbo3/SaTokenSecondContextForDubbo3.java  |  0
 .../filter/SaTokenDubbo3ConsumerFilter.java    |  0
 .../filter/SaTokenDubbo3ProviderFilter.java    |  0
 .../dubbo3/model/SaRequestForDubbo3.java       |  0
 .../dubbo3/model/SaResponseForDubbo3.java      |  0
 .../dubbo3/model/SaStorageForDubbo3.java       |  0
 .../META-INF/dubbo/org.apache.dubbo.rpc.Filter |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 sa-token-plugin/sa-token-grpc/.gitignore       | 12 ++++++++++++
 .../pom.xml                                    |  2 +-
 .../SaTokenSecondContextCreatorForGrpc.java    |  0
 .../grpc/SaTokenSecondContextForGrpc.java      |  0
 .../grpc/constants/GrpcContextConstants.java   |  0
 .../grpc/context/SaTokenGrpcContext.java       |  0
 .../SaTokenContextGrpcServerInterceptor.java   |  0
 .../SaTokenGrpcClientInterceptor.java          |  0
 .../SaTokenGrpcServerInterceptor.java          |  0
 .../context/grpc/model/SaRequestForGrpc.java   |  0
 .../context/grpc/model/SaResponseForGrpc.java  |  0
 .../context/grpc/model/SaStorageForGrpc.java   |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  2 +-
 .../dao/SaSessionForFastjsonCustomized.java    |  0
 .../satoken/dao/SaTokenDaoRedisFastjson.java   |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  2 +-
 .../dao/SaSessionForFastjson2Customized.java   |  0
 .../satoken/dao/SaTokenDaoRedisFastjson2.java  |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  4 ++--
 .../dao/SaSessionForJacksonCustomized.java     |  0
 .../satoken/dao/SaTokenDaoRedisJackson.java    |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  4 ++--
 .../cn/dev33/satoken/dao/SaTokenDaoRedis.java  |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../.gitignore                                 |  0
 .../pom.xml                                    |  4 ++--
 .../dao/SaSessionForJacksonCustomized.java     |  0
 .../satoken/dao/SaTokenDaoRedissonJackson.java |  0
 .../main/resources/META-INF/spring.factories   |  0
 ...oot.autoconfigure.AutoConfiguration.imports |  0
 .../README.md                                  |  6 +++---
 .../pom.xml                                    |  4 ++--
 .../cn/dev33/satoken/dao/SaSessionForJson.java |  0
 .../dev33/satoken/dao/SaTokenDaoOfRedis.java   |  0
 .../satoken/dao/SaTokenDaoOfRedisBase64.java   |  0
 .../satoken/dao/SaTokenDaoOfRedisJson.java     |  0
 .../src/test/java/demo/App.java                |  0
 .../src/test/java/demo/Config.java             |  4 ++--
 .../src/test/resources/app.yml                 |  2 +-
 79 files changed, 68 insertions(+), 44 deletions(-)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/pom.xml (87%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-context-dubbo => sa-token-dubbo}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 create mode 100644 sa-token-plugin/sa-token-dubbo3/.gitignore
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/pom.xml (88%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-context-dubbo3 => sa-token-dubbo3}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 create mode 100644 sa-token-plugin/sa-token-grpc/.gitignore
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/pom.xml (94%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-context-grpc => sa-token-grpc}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/pom.xml (94%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson => sa-token-redis-fastjson}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/pom.xml (94%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis-fastjson2 => sa-token-redis-fastjson2}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/pom.xml (93%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis-jackson => sa-token-redis-jackson}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/pom.xml (92%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redis => sa-token-redis}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/.gitignore (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/pom.xml (92%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/resources/META-INF/spring.factories (100%)
 rename sa-token-plugin/{sa-token-dao-redisson-jackson => sa-token-redisson-jackson}/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/README.md (65%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/pom.xml (93%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/test/java/demo/App.java (100%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/test/java/demo/Config.java (73%)
 rename sa-token-plugin/{sa-token-dao-redisx => sa-token-redisx}/src/test/resources/app.yml (71%)

diff --git a/sa-token-plugin/pom.xml b/sa-token-plugin/pom.xml
index 9d9a871a..013c8d74 100644
--- a/sa-token-plugin/pom.xml
+++ b/sa-token-plugin/pom.xml
@@ -18,12 +18,12 @@
 	
 	<!-- 所有子模块 -->
     <modules>
-        <module>sa-token-dao-redis</module>
-        <module>sa-token-dao-redis-jackson</module>
-        <module>sa-token-dao-redis-fastjson</module>
-        <module>sa-token-dao-redis-fastjson2</module>
-        <module>sa-token-dao-redisson-jackson</module>
-        <module>sa-token-dao-redisx</module>
+        <module>sa-token-redis</module>
+        <module>sa-token-redis-jackson</module>
+        <module>sa-token-redis-fastjson</module>
+        <module>sa-token-redis-fastjson2</module>
+        <module>sa-token-redisson-jackson</module>
+        <module>sa-token-redisx</module>
         <module>sa-token-alone-redis</module>
         <module>sa-token-dialect-thymeleaf</module>
        	<module>sa-token-sso</module>
@@ -32,9 +32,9 @@
         <module>sa-token-spring-aop</module>
         <module>sa-token-temp-jwt</module>
         <module>sa-token-jwt</module>
-        <module>sa-token-context-dubbo</module>
-        <module>sa-token-context-dubbo3</module>
-        <module>sa-token-context-grpc</module>
+        <module>sa-token-dubbo</module>
+        <module>sa-token-dubbo3</module>
+        <module>sa-token-grpc</module>
     </modules>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-alone-redis/pom.xml b/sa-token-plugin/sa-token-alone-redis/pom.xml
index f20309de..8f22844a 100644
--- a/sa-token-plugin/sa-token-alone-redis/pom.xml
+++ b/sa-token-plugin/sa-token-alone-redis/pom.xml
@@ -20,22 +20,22 @@
 		<!-- Sa-Token Redis Dependency -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-fastjson</artifactId>
+            <artifactId>sa-token-redis-fastjson</artifactId>
 			<optional>true</optional>
         </dependency>
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-fastjson2</artifactId>
+            <artifactId>sa-token-redis-fastjson2</artifactId>
 			<optional>true</optional>
         </dependency>
         <!-- redis pool -->
diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index ff7a6c07..a313c6f7 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -25,10 +25,10 @@ import java.util.stream.Collectors;
  * <p>
  *     使用方式：在引入 sa-token redis 集成相关包的前提下，继续引入当前依赖 <br> <br>
  *     注意事项：目前本依赖仅对以下插件有 Redis 分离效果： <br>
- *     sa-token-dao-redis  <br>
- *     sa-token-dao-redis-jackson  <br>
- *     sa-token-dao-redis-fastjson  <br>
- *     sa-token-dao-redis-fastjson2 <br>
+ *     sa-token-redis  <br>
+ *     sa-token-redis-jackson  <br>
+ *     sa-token-redis-fastjson  <br>
+ *     sa-token-redis-fastjson2 <br>
  * </p>
  *
  *
@@ -172,7 +172,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 			
 			// 3. 开始初始化 SaTokenDao ，此处需要依次判断开发者引入的是哪个 redis 库
 
-			// 如果开发者引入的是：sa-token-dao-redis
+			// 如果开发者引入的是：sa-token-redis
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedis");
 				SaTokenDaoRedis dao = (SaTokenDaoRedis)saTokenDao;
@@ -181,7 +181,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
-			// 如果开发者引入的是：sa-token-dao-redis-jackson
+			// 如果开发者引入的是：sa-token-redis-jackson
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisJackson");
 				SaTokenDaoRedisJackson dao = (SaTokenDaoRedisJackson)saTokenDao;
@@ -190,7 +190,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
-			// 如果开发者引入的是：sa-token-dao-redis-fastjson
+			// 如果开发者引入的是：sa-token-redis-fastjson
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisFastjson");
 				SaTokenDaoRedisFastjson dao = (SaTokenDaoRedisFastjson)saTokenDao;
@@ -199,7 +199,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				return;
 			} catch (ClassNotFoundException e) {
 			}
-			// 如果开发者引入的是：sa-token-dao-redis-fastjson2
+			// 如果开发者引入的是：sa-token-redis-fastjson2
 			try {
 				Class.forName("cn.dev33.satoken.dao.SaTokenDaoRedisFastjson2");
 				SaTokenDaoRedisFastjson2 dao = (SaTokenDaoRedisFastjson2)saTokenDao;
diff --git a/sa-token-plugin/sa-token-context-dubbo/.gitignore b/sa-token-plugin/sa-token-dubbo/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/.gitignore
rename to sa-token-plugin/sa-token-dubbo/.gitignore
diff --git a/sa-token-plugin/sa-token-context-dubbo/pom.xml b/sa-token-plugin/sa-token-dubbo/pom.xml
similarity index 87%
rename from sa-token-plugin/sa-token-context-dubbo/pom.xml
rename to sa-token-plugin/sa-token-dubbo/pom.xml
index 010d0c71..a7ca941d 100644
--- a/sa-token-plugin/sa-token-context-dubbo/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo/pom.xml
@@ -12,9 +12,9 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-context-dubbo</name>
-    <artifactId>sa-token-context-dubbo</artifactId>
-	<description>sa-token-context-dubbo</description>
+	<name>sa-token-dubbo</name>
+    <artifactId>sa-token-dubbo</artifactId>
+	<description>sa-token-dubbo</description>
 
 	<dependencies>
 		<!-- sa-token-core -->
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
rename to sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
rename to sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-dubbo/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dubbo3/.gitignore b/sa-token-plugin/sa-token-dubbo3/.gitignore
new file mode 100644
index 00000000..f56feec7
--- /dev/null
+++ b/sa-token-plugin/sa-token-dubbo3/.gitignore
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
\ No newline at end of file
diff --git a/sa-token-plugin/sa-token-context-dubbo3/pom.xml b/sa-token-plugin/sa-token-dubbo3/pom.xml
similarity index 88%
rename from sa-token-plugin/sa-token-context-dubbo3/pom.xml
rename to sa-token-plugin/sa-token-dubbo3/pom.xml
index 2820c6c8..a974692a 100644
--- a/sa-token-plugin/sa-token-context-dubbo3/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo3/pom.xml
@@ -10,9 +10,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <name>sa-token-context-dubbo3</name>
-    <artifactId>sa-token-context-dubbo3</artifactId>
-    <description>sa-token-context-dubbo3</description>
+    <name>sa-token-dubbo3</name>
+    <artifactId>sa-token-dubbo3</artifactId>
+    <description>sa-token-dubbo3</description>
 
 
     <properties>
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
rename to sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
rename to sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-context-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-dubbo3/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-grpc/.gitignore b/sa-token-plugin/sa-token-grpc/.gitignore
new file mode 100644
index 00000000..f56feec7
--- /dev/null
+++ b/sa-token-plugin/sa-token-grpc/.gitignore
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
\ No newline at end of file
diff --git a/sa-token-plugin/sa-token-context-grpc/pom.xml b/sa-token-plugin/sa-token-grpc/pom.xml
similarity index 94%
rename from sa-token-plugin/sa-token-context-grpc/pom.xml
rename to sa-token-plugin/sa-token-grpc/pom.xml
index 5ac2dd98..27a7c974 100644
--- a/sa-token-plugin/sa-token-context-grpc/pom.xml
+++ b/sa-token-plugin/sa-token-grpc/pom.xml
@@ -13,7 +13,7 @@
 
     <packaging>jar</packaging>
 
-    <artifactId>sa-token-context-grpc</artifactId>
+    <artifactId>sa-token-grpc</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
rename to sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-context-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/.gitignore b/sa-token-plugin/sa-token-redis-fastjson/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/.gitignore
rename to sa-token-plugin/sa-token-redis-fastjson/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml b/sa-token-plugin/sa-token-redis-fastjson/pom.xml
similarity index 94%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml
rename to sa-token-plugin/sa-token-redis-fastjson/pom.xml
index 6bfa1389..e5cdb72c 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson/pom.xml
+++ b/sa-token-plugin/sa-token-redis-fastjson/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sa-token-dao-redis-fastjson</artifactId>
+    <artifactId>sa-token-redis-fastjson</artifactId>
 
     <dependencies>
         <!-- sa-token-spring-boot-starter -->
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis-fastjson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/.gitignore b/sa-token-plugin/sa-token-redis-fastjson2/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/.gitignore
rename to sa-token-plugin/sa-token-redis-fastjson2/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml b/sa-token-plugin/sa-token-redis-fastjson2/pom.xml
similarity index 94%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml
rename to sa-token-plugin/sa-token-redis-fastjson2/pom.xml
index 99fea3b8..82d43bc1 100644
--- a/sa-token-plugin/sa-token-dao-redis-fastjson2/pom.xml
+++ b/sa-token-plugin/sa-token-redis-fastjson2/pom.xml
@@ -10,7 +10,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>sa-token-dao-redis-fastjson2</artifactId>
+    <artifactId>sa-token-redis-fastjson2</artifactId>
 
     <dependencies>
         <!-- sa-token-spring-boot-starter -->
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis-fastjson2/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/.gitignore b/sa-token-plugin/sa-token-redis-jackson/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/.gitignore
rename to sa-token-plugin/sa-token-redis-jackson/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml b/sa-token-plugin/sa-token-redis-jackson/pom.xml
similarity index 93%
rename from sa-token-plugin/sa-token-dao-redis-jackson/pom.xml
rename to sa-token-plugin/sa-token-redis-jackson/pom.xml
index 675e5862..4384248c 100644
--- a/sa-token-plugin/sa-token-dao-redis-jackson/pom.xml
+++ b/sa-token-plugin/sa-token-redis-jackson/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redis-jackson</name>
-    <artifactId>sa-token-dao-redis-jackson</artifactId>
+	<name>sa-token-redis-jackson</name>
+    <artifactId>sa-token-redis-jackson</artifactId>
 	<description>sa-token integrate redis (to jackson)</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
rename to sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
rename to sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redis/.gitignore b/sa-token-plugin/sa-token-redis/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/.gitignore
rename to sa-token-plugin/sa-token-redis/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redis/pom.xml b/sa-token-plugin/sa-token-redis/pom.xml
similarity index 92%
rename from sa-token-plugin/sa-token-dao-redis/pom.xml
rename to sa-token-plugin/sa-token-redis/pom.xml
index f6e98186..a7603150 100644
--- a/sa-token-plugin/sa-token-dao-redis/pom.xml
+++ b/sa-token-plugin/sa-token-redis/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redis</name>
-    <artifactId>sa-token-dao-redis</artifactId>
+	<name>sa-token-redis</name>
+    <artifactId>sa-token-redis</artifactId>
 	<description>sa-token integrate redis</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
rename to sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/.gitignore b/sa-token-plugin/sa-token-redisson-jackson/.gitignore
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/.gitignore
rename to sa-token-plugin/sa-token-redisson-jackson/.gitignore
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/pom.xml b/sa-token-plugin/sa-token-redisson-jackson/pom.xml
similarity index 92%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/pom.xml
rename to sa-token-plugin/sa-token-redisson-jackson/pom.xml
index 568c020e..882dd41b 100644
--- a/sa-token-plugin/sa-token-dao-redisson-jackson/pom.xml
+++ b/sa-token-plugin/sa-token-redisson-jackson/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redisson-jackson</name>
-    <artifactId>sa-token-dao-redisson-jackson</artifactId>
+	<name>sa-token-redisson-jackson</name>
+    <artifactId>sa-token-redisson-jackson</artifactId>
 	<description>sa-token integrate redisson (to jackson)</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring.factories b/sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring.factories
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring.factories
diff --git a/sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
rename to sa-token-plugin/sa-token-redisson-jackson/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
diff --git a/sa-token-plugin/sa-token-dao-redisx/README.md b/sa-token-plugin/sa-token-redisx/README.md
similarity index 65%
rename from sa-token-plugin/sa-token-dao-redisx/README.md
rename to sa-token-plugin/sa-token-redisx/README.md
index 95ccce2d..eb83983d 100644
--- a/sa-token-plugin/sa-token-dao-redisx/README.md
+++ b/sa-token-plugin/sa-token-redisx/README.md
@@ -1,12 +1,12 @@
 
-sa-token-dao-redisx 是中立的扩展。可任何应用开发框架下使用（springboot, solon, jfinal 等..）
+sa-token-redisx 是中立的扩展。可任何应用开发框架下使用（springboot, solon, jfinal 等..）
 
 ### 使用示例
 
 #### 1.配置
 
 ```yaml
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
   redis:
     server: "localhost:6379"
     password: 123456
@@ -22,7 +22,7 @@ sa-token-dao: #名字可以随意取
 @Configuration
 public class Config {
     @Bean
-    public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         return saTokenDao;
     }
 }
diff --git a/sa-token-plugin/sa-token-dao-redisx/pom.xml b/sa-token-plugin/sa-token-redisx/pom.xml
similarity index 93%
rename from sa-token-plugin/sa-token-dao-redisx/pom.xml
rename to sa-token-plugin/sa-token-redisx/pom.xml
index e7042391..d9e1c784 100644
--- a/sa-token-plugin/sa-token-dao-redisx/pom.xml
+++ b/sa-token-plugin/sa-token-redisx/pom.xml
@@ -12,8 +12,8 @@
     </parent>
     <packaging>jar</packaging>
 
-	<name>sa-token-dao-redisx</name>
-    <artifactId>sa-token-dao-redisx</artifactId>
+	<name>sa-token-redisx</name>
+    <artifactId>sa-token-redisx</artifactId>
 	<description>sa-token integrate redis</description>
 
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
rename to sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/App.java b/sa-token-plugin/sa-token-redisx/src/test/java/demo/App.java
similarity index 100%
rename from sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/App.java
rename to sa-token-plugin/sa-token-redisx/src/test/java/demo/App.java
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/Config.java b/sa-token-plugin/sa-token-redisx/src/test/java/demo/Config.java
similarity index 73%
rename from sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/Config.java
rename to sa-token-plugin/sa-token-redisx/src/test/java/demo/Config.java
index 41f34b5c..4e763fc7 100644
--- a/sa-token-plugin/sa-token-dao-redisx/src/test/java/demo/Config.java
+++ b/sa-token-plugin/sa-token-redisx/src/test/java/demo/Config.java
@@ -13,14 +13,14 @@ import org.noear.solon.annotation.Inject;
 @Configuration
 public class Config {
     @Bean
-    public void saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public void saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         //手动操作，可适用于任何框架
         SaManager.setSaTokenDao(saTokenDao);
     }
 
 
     @Bean
-    public SaTokenDao saTokenDaoInit2(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit2(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         //Solon 项目，可用此案
         return saTokenDao;
     }
diff --git a/sa-token-plugin/sa-token-dao-redisx/src/test/resources/app.yml b/sa-token-plugin/sa-token-redisx/src/test/resources/app.yml
similarity index 71%
rename from sa-token-plugin/sa-token-dao-redisx/src/test/resources/app.yml
rename to sa-token-plugin/sa-token-redisx/src/test/resources/app.yml
index 3e45af02..e71d125c 100644
--- a/sa-token-plugin/sa-token-dao-redisx/src/test/resources/app.yml
+++ b/sa-token-plugin/sa-token-redisx/src/test/resources/app.yml
@@ -2,7 +2,7 @@
 
 
 
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
   redis:
     server: "localhost:6379"
     password: 123456

From 574157cee19a3ff76ab1f35420855d2c4b8888f2 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 14 May 2023 01:32:49 +0800
Subject: [PATCH 057/129] =?UTF-8?q?=E7=AE=80=E5=8C=96=20redis=20=E5=92=8C?=
 =?UTF-8?q?=20rpc=20=E7=9B=B8=E5=85=B3=E9=9B=86=E6=88=90=E5=8C=85=E7=9A=84?=
 =?UTF-8?q?=E5=8C=85=E5=90=8D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  2 +-
 pom.xml                                       |  2 +-
 .../cn/dev33/satoken/util/SaTokenConsts.java  |  2 +-
 .../sa-token-demo-alone-redis-cluster/pom.xml |  4 ++--
 .../sa-token-demo-alone-redis/pom.xml         |  4 ++--
 .../com/pj/SaTokenAloneRedisApplication.java  |  2 +-
 sa-token-demo/sa-token-demo-case/pom.xml      |  4 ++--
 .../sa-token-demo-dubbo-consumer/pom.xml      |  6 +++---
 .../sa-token-demo-dubbo-provider/pom.xml      |  6 +++---
 sa-token-demo/sa-token-demo-grpc/pom.xml      |  6 +++---
 sa-token-demo/sa-token-demo-jwt/pom.xml       |  4 ++--
 .../sa-token-demo-oauth2-client/pom.xml       |  2 +-
 .../sa-token-demo-oauth2-server/pom.xml       |  4 ++--
 .../sa-token-demo-quick-login/pom.xml         |  2 +-
 .../server_project/pom.xml                    |  4 ++--
 sa-token-demo/sa-token-demo-solon/pom.xml     |  4 ++--
 .../sa-token-demo-springboot-redis/pom.xml    |  6 +++---
 .../sa-token-demo-springboot-redisson/pom.xml |  4 ++--
 .../sa-token-demo-springboot/pom.xml          |  2 +-
 .../sa-token-demo-springboot3-redis/pom.xml   |  6 +++---
 .../sa-token-demo-sso-server-solon/pom.xml    |  4 ++--
 .../src/main/java/com/pj/sso/SsoConfig.java   |  2 +-
 .../src/main/resources/app.yml                |  2 +-
 .../sa-token-demo-sso1-client-solon/pom.xml   |  4 ++--
 .../src/main/java/com/pj/SaConfig.java        |  2 +-
 .../src/main/resources/app.yml                |  2 +-
 .../sa-token-demo-sso2-client-solon/pom.xml   |  4 ++--
 .../src/main/java/com/pj/SaConfig.java        |  2 +-
 .../src/main/resources/app.yml                |  2 +-
 .../sa-token-demo-sso3-client-solon/pom.xml   |  4 ++--
 .../src/main/java/com/pj/SaConfig.java        |  2 +-
 .../src/main/resources/app.yml                |  2 +-
 .../sa-token-demo-sso-server/pom.xml          |  4 ++--
 .../sa-token-demo-sso1-client/pom.xml         |  4 ++--
 .../sa-token-demo-sso2-client/pom.xml         |  4 ++--
 .../sa-token-demo-sso3-client/pom.xml         |  4 ++--
 sa-token-demo/sa-token-demo-test/pom.xml      |  6 +++---
 sa-token-demo/sa-token-demo-thymeleaf/pom.xml |  2 +-
 .../sa-token-demo-webflux-springboot3/pom.xml |  6 +++---
 sa-token-demo/sa-token-demo-webflux/pom.xml   |  6 +++---
 .../sa-token-demo-websocket-spring/pom.xml    |  4 ++--
 sa-token-demo/sa-token-demo-websocket/pom.xml |  4 ++--
 sa-token-dependencies/pom.xml                 | 19 ++++++++++---------
 sa-token-doc/README.md                        |  2 +-
 sa-token-doc/doc.html                         |  4 ++--
 sa-token-doc/index.html                       |  4 ++--
 sa-token-doc/plugin/dubbo-extend.md           |  4 ++--
 sa-token-doc/plugin/grpc-extend.md            |  4 ++--
 48 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/README.md b/README.md
index e2223568..e0719421 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<img alt="logo" src="https://sa-token.cc/logo.png" width="150" height="150">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.1</h1>
 <h4 align="center">一个轻量级 Java 权限认证框架，让鉴权变得简单、优雅！</h4>
 <p align="center">
 	<a href="https://gitee.com/dromara/sa-token/stargazers"><img src="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>
diff --git a/pom.xml b/pom.xml
index b36e13de..ed2f2297 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 	
 	<!-- 一些属性 -->
 	<properties>
-        <revision>1.34.0</revision>
+        <revision>1.34.1</revision>
         <jdk.version>1.8</jdk.version>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>utf-8</project.reporting.outputEncoding>
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index b9925c92..5b071bfe 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -21,7 +21,7 @@ public class SaTokenConsts {
 	/**
 	 * Sa-Token 当前版本号 
 	 */
-	public static final String VERSION_NO = "v1.34.0";
+	public static final String VERSION_NO = "v1.34.1";
 
 	/**
 	 * Sa-Token 开源地址 Gitee 
diff --git a/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml b/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml
index 9cbf8e00..1db45182 100644
--- a/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml
+++ b/sa-token-demo/sa-token-demo-alone-redis-cluster/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -41,7 +41,7 @@
 		<!-- Sa-Token 整合Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-alone-redis/pom.xml b/sa-token-demo/sa-token-demo-alone-redis/pom.xml
index d0ff8270..51927ffb 100644
--- a/sa-token-demo/sa-token-demo-alone-redis/pom.xml
+++ b/sa-token-demo/sa-token-demo-alone-redis/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -41,7 +41,7 @@
 		<!-- Sa-Token 整合Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java b/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java
index 1beb6d56..20eccd57 100644
--- a/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java
+++ b/sa-token-demo/sa-token-demo-alone-redis/src/main/java/com/pj/SaTokenAloneRedisApplication.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.SaManager;
 @SpringBootApplication
 public class SaTokenAloneRedisApplication {
 
-	public static void main(String[] args) throws ClassNotFoundException {
+	public static void main(String[] args) {
 		SpringApplication.run(SaTokenAloneRedisApplication.class, args);
 		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
 	}
diff --git a/sa-token-demo/sa-token-demo-case/pom.xml b/sa-token-demo/sa-token-demo-case/pom.xml
index 4761b753..77da474b 100644
--- a/sa-token-demo/sa-token-demo-case/pom.xml
+++ b/sa-token-demo/sa-token-demo-case/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -42,7 +42,7 @@
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
index 4b7f2a84..c912a407 100644
--- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
@@ -17,7 +17,7 @@
 	<properties> 
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 	
 	<dependencies>
@@ -38,7 +38,7 @@
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
@@ -68,7 +68,7 @@
 		<!-- Sa-Token 整合 Dubbo -->
 		<dependency>
 			<groupId>cn.dev33</groupId>
-			<artifactId>sa-token-context-dubbo</artifactId>
+			<artifactId>sa-token-dubbo</artifactId>
             <version>${sa-token.version}</version>
 		</dependency>
 		
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
index 8db1bc6d..58f8ffb8 100644
--- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
@@ -17,7 +17,7 @@
 	<properties> 
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 	
 	<dependencies>
@@ -38,7 +38,7 @@
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
@@ -68,7 +68,7 @@
 		<!-- Sa-Token 整合 Dubbo -->
 		<dependency>
 			<groupId>cn.dev33</groupId>
-			<artifactId>sa-token-context-dubbo</artifactId>
+			<artifactId>sa-token-dubbo</artifactId>
             <version>${sa-token.version}</version>
 		</dependency>
 		
diff --git a/sa-token-demo/sa-token-demo-grpc/pom.xml b/sa-token-demo/sa-token-demo-grpc/pom.xml
index 54def184..07f20769 100644
--- a/sa-token-demo/sa-token-demo-grpc/pom.xml
+++ b/sa-token-demo/sa-token-demo-grpc/pom.xml
@@ -27,7 +27,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <lombok.version>1.18.10</lombok.version>
-        <sa-token.version>1.34.0</sa-token.version>
+        <sa-token.version>1.34.1</sa-token.version>
     </properties>
 
     <dependencies>
@@ -58,12 +58,12 @@
         </dependency>
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-context-grpc</artifactId>
+            <artifactId>sa-token-grpc</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
     </dependencies>
diff --git a/sa-token-demo/sa-token-demo-jwt/pom.xml b/sa-token-demo/sa-token-demo-jwt/pom.xml
index 9e200919..d2c56bbb 100644
--- a/sa-token-demo/sa-token-demo-jwt/pom.xml
+++ b/sa-token-demo/sa-token-demo-jwt/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合 Redis (使用jackson序列化方式) -->
 		 <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml
index b054c662..1b62aa8f 100644
--- a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-oauth2-client/pom.xml
@@ -17,7 +17,7 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<!-- 定义 Sa-Token 版本号 -->
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 	
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml
index 720686b9..f96425a2 100644
--- a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-oauth2-server/pom.xml
@@ -17,7 +17,7 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<!-- 定义 Sa-Token 版本号 -->
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 	
 	<dependencies>
@@ -45,7 +45,7 @@
 		<!-- Sa-Token整合Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
diff --git a/sa-token-demo/sa-token-demo-quick-login/pom.xml b/sa-token-demo/sa-token-demo-quick-login/pom.xml
index 581b4541..250ab83c 100644
--- a/sa-token-demo/sa-token-demo-quick-login/pom.xml
+++ b/sa-token-demo/sa-token-demo-quick-login/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml b/sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml
index af9c50ef..22654e28 100644
--- a/sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml
+++ b/sa-token-demo/sa-token-demo-remember-me/server_project/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <sa-token.version>1.34.0</sa-token.version>
+        <sa-token.version>1.34.1</sa-token.version>
     </properties>
 
     <dependencies>
@@ -37,7 +37,7 @@
         <!-- Sa-Token 插件：整合redis (使用jackson序列化方式) -->
         <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         <dependency>
diff --git a/sa-token-demo/sa-token-demo-solon/pom.xml b/sa-token-demo/sa-token-demo-solon/pom.xml
index 87289c56..9b755fa6 100644
--- a/sa-token-demo/sa-token-demo-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-solon/pom.xml
@@ -16,7 +16,7 @@
 
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 		<solon.version>2.2.3</solon.version>
 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -47,7 +47,7 @@
 		<!-- sa-token整合redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redisx</artifactId>
+            <artifactId>sa-token-redisx</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
 
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml
index 5a8f0284..26f52aad 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/pom.xml
+++ b/sa-token-demo/sa-token-demo-springboot-redis/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -42,14 +42,14 @@
 		<!-- Sa-Token 整合  Redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
 		
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml b/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml
index f5aa6c6f..d56f36cf 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -42,7 +42,7 @@
 		<!-- Sa-Token整合 Redisson (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redisson-jackson</artifactId>
+            <artifactId>sa-token-redisson-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-springboot/pom.xml b/sa-token-demo/sa-token-demo-springboot/pom.xml
index 207370ad..09ee17a3 100644
--- a/sa-token-demo/sa-token-demo-springboot/pom.xml
+++ b/sa-token-demo/sa-token-demo-springboot/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml
index 852d7393..431a9e3c 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -41,14 +41,14 @@
 		<!-- Sa-Token 整合  Redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
 		
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
index 6f66fe1e..7ace1f12 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 		<solon.version>2.2.3</solon.version>
 	</properties>
 
@@ -46,7 +46,7 @@
 		<!-- Sa-Token 插件：整合redis (使用jackson序列化方式) -->
 		<dependency>
 			<groupId>cn.dev33</groupId>
-			<artifactId>sa-token-dao-redisx</artifactId>
+			<artifactId>sa-token-redisx</artifactId>
 			<version>${sa-token.version}</version>
 		</dependency>
         
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
index 645885d8..13691d7d 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/java/com/pj/sso/SsoConfig.java
@@ -21,7 +21,7 @@ public class SsoConfig {
      * 构建建 SaToken redis dao（如果不需要 redis；可以注释掉）
      * */
     @Bean
-    public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         return saTokenDao;
     }
 
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml
index 5a30a242..b8728cb5 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso-server-solon/src/main/resources/app.yml
@@ -25,7 +25,7 @@ sa-token:
         secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
         # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明） 
 
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
     redis:
         server: "localhost:6379"
         password: 123456
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
index 113dc247..99c689a4 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合 redisx -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redisx</artifactId>
+            <artifactId>sa-token-redisx</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java
index d0e9fc48..7bdd8aba 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/java/com/pj/SaConfig.java
@@ -16,7 +16,7 @@ public class SaConfig {
      * 配置 Sa-Token 单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
      * */
     @Bean
-    public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         return saTokenDao;
     }
 }
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/resources/app.yml
index 2d8ca0df..41924a90 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/resources/app.yml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso1-client-solon/src/main/resources/app.yml
@@ -12,7 +12,7 @@ sa-token:
         slo-url: http://sso.stp.com:9000/sso/signout
     
 # 配置 Sa-Token 单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
     redis:
         server: "localhost:6379"
         password: 123456
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
index 009a64c6..659079c4 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合 redisx -->
 		<dependency>
 			<groupId>cn.dev33</groupId>
-			<artifactId>sa-token-dao-redisx</artifactId>
+			<artifactId>sa-token-redisx</artifactId>
 			<version>${sa-token.version}</version>
 		</dependency>
 	</dependencies>
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java
index d0e9fc48..7bdd8aba 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/java/com/pj/SaConfig.java
@@ -16,7 +16,7 @@ public class SaConfig {
      * 配置 Sa-Token 单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
      * */
     @Bean
-    public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         return saTokenDao;
     }
 }
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/resources/app.yml
index 4c06a05c..b2c6ff54 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/resources/app.yml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso2-client-solon/src/main/resources/app.yml
@@ -13,7 +13,7 @@ sa-token:
         is-slo: true
     
 # 配置 Sa-Token 单独使用的Redis连接 （此处需要和SSO-Server端连接同一个Redis）
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
     redis:
         server: "localhost:6379"
         password: 123456
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
index 2c78a6bf..fe635cd4 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合 redisx -->
 		<dependency>
 			<groupId>cn.dev33</groupId>
-			<artifactId>sa-token-dao-redisx</artifactId>
+			<artifactId>sa-token-redisx</artifactId>
 			<version>${sa-token.version}</version>
 		</dependency>
 		
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java
index 8faf05a1..e02d3be5 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/java/com/pj/SaConfig.java
@@ -16,7 +16,7 @@ public class SaConfig {
      * 构建建 SaToken redis dao（如果不需要 redis；可以注释掉）
      * */
     @Bean
-    public SaTokenDao saTokenDaoInit(@Inject("${sa-token-dao.redis}") SaTokenDaoOfRedis saTokenDao) {
+    public SaTokenDao saTokenDaoInit(@Inject("${sa-token.redis}") SaTokenDaoOfRedis saTokenDao) {
         return saTokenDao;
     }
 }
diff --git a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/resources/app.yml
index b1e0ff8c..294a2252 100644
--- a/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/resources/app.yml
+++ b/sa-token-demo/sa-token-demo-sso-for-solon/sa-token-demo-sso3-client-solon/src/main/resources/app.yml
@@ -23,7 +23,7 @@ sa-token:
 
 
 # 配置 Sa-Token Dao（此处与SSO-Server端连接不同的Redis）
-sa-token-dao: #名字可以随意取
+sa-token: #名字可以随意取
     redis:
         server: "localhost:6379"
         password: 123456
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
index befbc2ce..96283484 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 插件：整合redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
index 644f2c0f..46a744ec 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
index 62d2582c..11e670fe 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
index e6784142..f2602cb4 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -44,7 +44,7 @@
 		<!-- Sa-Token 整合redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-test/pom.xml b/sa-token-demo/sa-token-demo-test/pom.xml
index 685a6122..4f4da25d 100644
--- a/sa-token-demo/sa-token-demo-test/pom.xml
+++ b/sa-token-demo/sa-token-demo-test/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 		<java.run.main.class>com.pj.SaTokenApplication</java.run.main.class>
 	</properties>
 
@@ -49,14 +49,14 @@
 		<!-- Sa-Token 整合  Redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
 		
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
         
diff --git a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml
index f0c18822..23921803 100644
--- a/sa-token-demo/sa-token-demo-thymeleaf/pom.xml
+++ b/sa-token-demo/sa-token-demo-thymeleaf/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml b/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml
index 30f134df..e86a7670 100644
--- a/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml
+++ b/sa-token-demo/sa-token-demo-webflux-springboot3/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -41,14 +41,14 @@
 		<!-- sa-token整合redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
 		
 		<!-- sa-token整合redis (使用jackson序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
         
diff --git a/sa-token-demo/sa-token-demo-webflux/pom.xml b/sa-token-demo/sa-token-demo-webflux/pom.xml
index f102a443..e1d9f9a3 100644
--- a/sa-token-demo/sa-token-demo-webflux/pom.xml
+++ b/sa-token-demo/sa-token-demo-webflux/pom.xml
@@ -16,7 +16,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -41,14 +41,14 @@
 		<!-- sa-token整合redis (使用jdk默认序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis</artifactId>
+            <artifactId>sa-token-redis</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
 		
 		<!-- sa-token整合redis (使用jackson序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency> -->
         
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml
index 4f4b5272..788bbccb 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/pom.xml
+++ b/sa-token-demo/sa-token-demo-websocket-spring/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -48,7 +48,7 @@
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
diff --git a/sa-token-demo/sa-token-demo-websocket/pom.xml b/sa-token-demo/sa-token-demo-websocket/pom.xml
index 68f6d8e1..a19998b1 100644
--- a/sa-token-demo/sa-token-demo-websocket/pom.xml
+++ b/sa-token-demo/sa-token-demo-websocket/pom.xml
@@ -17,7 +17,7 @@
 	
 	<!-- 定义 Sa-Token 版本号 -->
 	<properties>
-		<sa-token.version>1.34.0</sa-token.version>
+		<sa-token.version>1.34.1</sa-token.version>
 	</properties>
 
 	<dependencies>
@@ -48,7 +48,7 @@
 		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
 		<!-- <dependency>
             <groupId>cn.dev33</groupId>
-            <artifactId>sa-token-dao-redis-jackson</artifactId>
+            <artifactId>sa-token-redis-jackson</artifactId>
             <version>${sa-token.version}</version>
         </dependency>
 		<dependency>
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 0459feab..4d440706 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -12,7 +12,7 @@
     <description>Sa-Token Dependencies</description>
 
     <properties>
-        <revision>1.34.0</revision>
+        <revision>1.34.1</revision>
 		
 		<!-- 统一定义依赖版本号 -->
 		<springboot.version>2.5.14</springboot.version>
@@ -29,7 +29,8 @@
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
 		<commons-pool2.version>2.5.0</commons-pool2.version>
-		<dubbo.version>2.7.18</dubbo.version>
+		<!--<dubbo.version>2.7.18</dubbo.version>-->
+		<dubbo.version>2.7.11</dubbo.version>
 		<grpc-spring-boot-starter.version>2.10.1.RELEASE</grpc-spring-boot-starter.version>
 		<hutool-jwt.version>5.8.9</hutool-jwt.version>
 		<jjwt.version>0.9.1</jjwt.version>
@@ -318,37 +319,37 @@
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-context-dubbo</artifactId>
+				<artifactId>sa-token-dubbo</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-context-grpc</artifactId>
+				<artifactId>sa-token-grpc</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dao-redis</artifactId>
+				<artifactId>sa-token-redis</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dao-redis-fastjson</artifactId>
+				<artifactId>sa-token-redis-fastjson</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dao-redis-fastjson2</artifactId>
+				<artifactId>sa-token-redis-fastjson2</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dao-redis-jackson</artifactId>
+				<artifactId>sa-token-redis-jackson</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dao-redisx</artifactId>
+				<artifactId>sa-token-redisx</artifactId>
 				<version>${revision}</version>
 			</dependency>
 			<dependency>
diff --git a/sa-token-doc/README.md b/sa-token-doc/README.md
index fa42c77d..5c9b57ac 100644
--- a/sa-token-doc/README.md
+++ b/sa-token-doc/README.md
@@ -1,7 +1,7 @@
 <p align="center">
 	<img alt="logo" src="https://sa-token.cc/logo.png" width="150" height="150">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.0</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">Sa-Token v1.34.1</h1>
 <h5 align="center">一个轻量级 Java 权限认证框架，让鉴权变得简单、优雅！</h5>
 <p align="center" class="badge-box">
 	<a href="https://gitee.com/dromara/sa-token/stargazers"><img src="https://gitee.com/dromara/sa-token/badge/star.svg?theme=gvp"></a>
diff --git a/sa-token-doc/doc.html b/sa-token-doc/doc.html
index addf56e7..d2c05613 100644
--- a/sa-token-doc/doc.html
+++ b/sa-token-doc/doc.html
@@ -18,7 +18,7 @@
 					<div class="logo-box">
 						<img src="logo.png" title="logo" />
 						<h1 class="logo-text">Sa-Token</h1>
-						<sub>v1.34.0</sub>
+						<sub>v1.34.1</sub>
 					</div>
 				</a>
 			</div>
@@ -152,7 +152,7 @@
 		<!--  -->
 		<script src="./static/docsify-plugin.js"></script>
 		<script>
-			var saTokenTopVersion = '1.34.0';	// Sa-Token最新版本 
+			var saTokenTopVersion = '1.34.1';	// Sa-Token最新版本 
 			var name = '<img style="width: 60px; height: 60px; vertical-align: middle;" src="logo.png" alt="logo" /> ';
 			name += '<b style="font-size: 28px; vertical-align: middle;">Sa-Token</b> <sub>v' + saTokenTopVersion + '</sub>';
 			window.$docsify = {
diff --git a/sa-token-doc/index.html b/sa-token-doc/index.html
index 512a9913..af9739ee 100644
--- a/sa-token-doc/index.html
+++ b/sa-token-doc/index.html
@@ -103,7 +103,7 @@
 			<div class="main-box">
 				<div class="content-box">
 					<!-- <div class="fenge"></div> -->
-					<h1>Sa-Token<small>v1.34.0</small></h1>
+					<h1>Sa-Token<small>v1.34.1</small></h1>
 					<div class="sub-title">一个轻量级 java 权限认证框架，让鉴权变得简单、优雅！</div>
 					<div class="btn-box">
 						<a class="abtn" href="https://github.com/dromara/sa-token" target="_blank">GitHub</a>
@@ -761,7 +761,7 @@
 					effectspeed: 1200,  // 动画持续时间
 					skip_invisible: true, // 不加载隐藏的图像
 					// threshold: -180,  // 提前加载：距离屏幕多少px时就显示出来
-					// event: 'click',  // 事件触发时才加载，scroll=滑动，click=点击，mouseover=鼠标划过，sporty=运动的
+					// event: 'click',  // 事件触发时才加载，scroll=滑动，click=点击，mouseover=鼠标划过，sporty=运动的
 					// 未加载时的占位图，此为3x3透明小图片
 					placeholder:"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAADCAYAAABWKLW/AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAhdEVYdENyZWF0aW9uIFRpbWUAMjAyMTowMToyMiAyMjoxNDoxM63SwyUAAAANSURBVBhXYyAGMDAAAAAnAAF2ypRxAAAAAElFTkSuQmCC",
 					load: function(){
diff --git a/sa-token-doc/plugin/dubbo-extend.md b/sa-token-doc/plugin/dubbo-extend.md
index 7f252cfe..defe65e1 100644
--- a/sa-token-doc/plugin/dubbo-extend.md
+++ b/sa-token-doc/plugin/dubbo-extend.md
@@ -31,14 +31,14 @@ RPC 模式的调用，可以让我们像调用本地方法一样完成服务通
 <!-- Sa-Token 整合 Dubbo -->
 <dependency>
 	<groupId>cn.dev33</groupId>
-	<artifactId>sa-token-context-dubbo</artifactId>
+	<artifactId>sa-token-dubbo</artifactId>
 	<version>${sa.top.version}</version>
 </dependency>
 ```
 <!-------- tab:Gradle 方式 -------->
 ``` gradle
 // Sa-Token 整合 Dubbo
-implementation 'cn.dev33:sa-token-context-dubbo:${sa.top.version}'
+implementation 'cn.dev33:sa-token-dubbo:${sa.top.version}'
 ```
 <!---------------------------- tabs:end ---------------------------->
 
diff --git a/sa-token-doc/plugin/grpc-extend.md b/sa-token-doc/plugin/grpc-extend.md
index f2af1fb1..eaaa3992 100644
--- a/sa-token-doc/plugin/grpc-extend.md
+++ b/sa-token-doc/plugin/grpc-extend.md
@@ -25,14 +25,14 @@
 <!-- Sa-Token 整合 grpc -->
 <dependency>
 	<groupId>cn.dev33</groupId>
-	<artifactId>sa-token-context-grpc</artifactId>
+	<artifactId>sa-token-grpc</artifactId>
 	<version>${sa.top.version}</version>
 </dependency>
 ```
 <!-------- tab:Gradle 方式 -------->
 ``` gradle
 // Sa-Token 整合 grpc
-implementation 'cn.dev33:sa-token-context-grpc:${sa.top.version}'
+implementation 'cn.dev33:sa-token-grpc:${sa.top.version}'
 ```
 <!---------------------------- tabs:end ---------------------------->
 

From d4ff8df5b46d5e4f3b6cb1ba4915916e58cfcddd Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 14 May 2023 18:51:13 +0800
Subject: [PATCH 058/129] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86=20?=
 =?UTF-8?q?demo=20=E6=96=87=E4=BB=B6=E5=A4=B9=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa-token-demo-oauth2-client/.gitignore    |  0
 .../sa-token-demo-oauth2-client/pom.xml       |  0
 .../com/pj/SaOAuth2ClientApplication.java     |  0
 .../pj/oauth2/SaOAuthClientController.java    |  0
 .../src/main/java/com/pj/utils/SoMap.java     |  0
 .../src/main/resources/application.yml        |  0
 .../src/main/resources/templates/index.html   |  0
 .../sa-token-demo-oauth2-server/.gitignore    |  0
 .../sa-token-demo-oauth2-server/pom.xml       |  0
 .../com/pj/SaOAuth2ServerApplication.java     |  0
 .../pj/oauth2/SaOAuth2ServerController.java   |  0
 .../com/pj/oauth2/SaOAuth2TemplateImpl.java   |  0
 .../src/main/resources/application.yml        |  0
 .../src/main/resources/templates/confirm.html |  0
 .../src/main/resources/templates/login.html   |  0
 sa-token-doc/oauth2/oauth2-server.md          |  4 +-
 sa-token-doc/sso/readme.md                    |  6 +-
 sa-token-doc/sso/sso-h5.md                    |  6 +-
 sa-token-doc/sso/sso-pro.md                   |  2 +-
 sa-token-doc/sso/sso-questions.md             |  3 +-
 sa-token-doc/sso/sso-server.md                |  4 +-
 sa-token-doc/sso/sso-type1.md                 |  2 +-
 sa-token-doc/sso/sso-type2.md                 |  2 +-
 sa-token-doc/sso/sso-type3.md                 |  2 +-
 sa-token-doc/start/download.md                | 79 +++++++++++++------
 sa-token-doc/start/solon-example.md           |  8 +-
 sa-token-doc/start/webflux-example.md         |  2 +-
 27 files changed, 78 insertions(+), 42 deletions(-)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-client/src/main/resources/templates/index.html (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/pom.xml (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/src/main/resources/templates/confirm.html (100%)
 rename sa-token-demo/{ => sa-token-demo-oauth2}/sa-token-demo-oauth2-server/src/main/resources/templates/login.html (100%)

diff --git a/sa-token-demo/sa-token-demo-oauth2-client/.gitignore b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/.gitignore
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/.gitignore
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/pom.xml b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/pom.xml
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/pom.xml
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/SaOAuth2ClientApplication.java
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/oauth2/SaOAuthClientController.java
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/java/com/pj/utils/SoMap.java
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-oauth2-client/src/main/resources/templates/index.html b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/resources/templates/index.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-client/src/main/resources/templates/index.html
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/src/main/resources/templates/index.html
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/.gitignore b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/.gitignore
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/.gitignore
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/pom.xml b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/pom.xml
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/pom.xml
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/SaOAuth2ServerApplication.java
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2ServerController.java
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/java/com/pj/oauth2/SaOAuth2TemplateImpl.java
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/resources/templates/confirm.html b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/resources/templates/confirm.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/src/main/resources/templates/confirm.html
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/resources/templates/confirm.html
diff --git a/sa-token-demo/sa-token-demo-oauth2-server/src/main/resources/templates/login.html b/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/resources/templates/login.html
similarity index 100%
rename from sa-token-demo/sa-token-demo-oauth2-server/src/main/resources/templates/login.html
rename to sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/src/main/resources/templates/login.html
diff --git a/sa-token-doc/oauth2/oauth2-server.md b/sa-token-doc/oauth2/oauth2-server.md
index dd2f1cee..d7c11800 100644
--- a/sa-token-doc/oauth2/oauth2-server.md
+++ b/sa-token-doc/oauth2/oauth2-server.md
@@ -183,8 +183,8 @@ http://sa-oauth-server.com:8001/oauth2/token?grant_type=authorization_code&clien
 ### 5、运行官方示例 
 以上代码只是简单模拟了一下OAuth2.0的授权流程，现在，我们运行一下官方示例，里面有制作好的UI界面
 
-- OAuth2-Server端： `/sa-token-demo/sa-token-demo-oauth2-server/` [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-oauth2-server) <br/>
-- OAuth2-Client端： `/sa-token-demo/sa-token-demo-oauth2-client/` [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-oauth2-client) <br/>
+- OAuth2-Server端： `/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/` [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server) <br/>
+- OAuth2-Client端： `/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/` [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client) <br/>
 
 依次启动`OAuth2-Server` 与 `OAuth2-Client`，然后从浏览器访问：[http://sa-oauth-client.com:8002](http://sa-oauth-client.com:8002)
 
diff --git a/sa-token-doc/sso/readme.md b/sa-token-doc/sso/readme.md
index 1f2eb104..39ff5a14 100644
--- a/sa-token-doc/sso/readme.md
+++ b/sa-token-doc/sso/readme.md
@@ -19,9 +19,9 @@ Sa-Token-SSO 由简入难划分为三种模式，解决不同架构下的 SSO 
 
 | 系统架构					| 采用模式	| 简介					|  文档链接	|
 | :--------					| :--------	| :--------				| :--------	|
-| 前端同域 + 后端同 Redis		| 模式一		| 共享 Cookie 同步会话	| [文档](/sso/sso-type1)、[示例](https://gitee.com/dromara/sa-token/blob/master/sa-token-demo/sa-token-demo-sso1-client)	|
-| 前端不同域 + 后端同 Redis	| 模式二		| URL重定向传播会话 		| [文档](/sso/sso-type2)、[示例](https://gitee.com/dromara/sa-token/blob/master/sa-token-demo/sa-token-demo-sso2-client)	|
-| 前端不同域 + 后端不同 Redis	| 模式三		| Http请求获取会话		| [文档](/sso/sso-type3)、[示例](https://gitee.com/dromara/sa-token/blob/master/sa-token-demo/sa-token-demo-sso3-client)	|
+| 前端同域 + 后端同 Redis		| 模式一		| 共享 Cookie 同步会话	| [文档](/sso/sso-type1)、[示例](https://gitee.com/dromara/sa-token/blob/master/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client)	|
+| 前端不同域 + 后端同 Redis	| 模式二		| URL重定向传播会话 		| [文档](/sso/sso-type2)、[示例](https://gitee.com/dromara/sa-token/blob/master/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client)	|
+| 前端不同域 + 后端不同 Redis	| 模式三		| Http请求获取会话		| [文档](/sso/sso-type3)、[示例](https://gitee.com/dromara/sa-token/blob/master/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client)	|
 
 
 1. 前端同域：就是指多个系统可以部署在同一个主域名之下，比如：`c1.domain.com`、`c2.domain.com`、`c3.domain.com`。
diff --git a/sa-token-doc/sso/sso-h5.md b/sa-token-doc/sso/sso-h5.md
index 85ee28d9..6f4f2eb6 100644
--- a/sa-token-doc/sso/sso-h5.md
+++ b/sa-token-doc/sso/sso-h5.md
@@ -49,7 +49,7 @@ public class H5Controller {
 ```
 
 ### 2、增加跨域过滤器`CorsFilter.java`
-源码详见：[CorsFilter.java](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java)，
+源码详见：[CorsFilter.java](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/java/com/pj/h5/CorsFilter.java)，
 将其复制到项目中即可 
 
 ### 3、新建前端项目 
@@ -97,7 +97,7 @@ public class H5Controller {
 ```
 
 ### 4、添加登录处理文件`sso-login.html`
-源码详见：[sso-login.html](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso-client-h5/sso-login.html)，
+源码详见：[sso-login.html](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-h5/sso-login.html)，
 将其复制到项目中即可，与`index.html`一样放在根目录下 
 
 
@@ -112,7 +112,7 @@ public class H5Controller {
 
 由于集成代码与 Client 端类似，这里暂不贴详细代码，我们可以下载官方仓库，里面有搭建好的demo
 
-使用前端ide导入项目 `/sa-token-demo/sa-token-demo-sso-server-h5`，浏览器访问 `sso-auth.html` 页面：
+使用前端ide导入项目 `/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server-h5`，浏览器访问 `sso-auth.html` 页面：
 
 ![sso-type2-server-h5-auth.png](https://oss.dev33.cn/sa-token/doc/sso/sso-type2-server-h5-auth.png 's-w-sh')
 
diff --git a/sa-token-doc/sso/sso-pro.md b/sa-token-doc/sso/sso-pro.md
index d64cec21..a6ffffde 100644
--- a/sa-token-doc/sso/sso-pro.md
+++ b/sa-token-doc/sso/sso-pro.md
@@ -10,7 +10,7 @@
 比如：用户账号增删改查维护、登录日志统计、新增用户数据报表、新增 Client 应用接入域名配置……等等，
 仍需要大量的开发时间。
 
-为此，我们特意准备了项目：[[Sa-Sso-Pro 单点登录商业版]](http://sa-pro.dev33.cn/index.html?hmsr=sa-token)，
+为此，我们特意准备了项目：[[ Sa-Sso-Pro 单点登录商业版 ]](http://sa-pro.dev33.cn/index.html?hmsr=sa-token)，
 项目集成了单点登录常见技术点， 绝大多数功能无需二次开发，直接可用，<b style="color: #FF5722;">可大大缩短您的项目接入单点登录的开发周期</b>。
 
 
diff --git a/sa-token-doc/sso/sso-questions.md b/sa-token-doc/sso/sso-questions.md
index 68bcf4be..02c71a04 100644
--- a/sa-token-doc/sso/sso-questions.md
+++ b/sa-token-doc/sso/sso-questions.md
@@ -153,7 +153,8 @@ public class SaTokenConfigure implements WebMvcConfigurer {
 
 
 ### 问：如果 sso-client 端我没有集成 sa-token-sso，如何对接？
-需要手动调用 http 请求来对接 sso-server 开放的接口，参考示例：[sa-token-demo-sso3-client-nosdk](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso3-client-nosdk)
+需要手动调用 http 请求来对接 sso-server 开放的接口，参考示例：
+[sa-token-demo-sso3-client-nosdk](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk)
 
 
 ### 问：如果 sso-client 端不是 java语言，可以对接吗？
diff --git a/sa-token-doc/sso/sso-server.md b/sa-token-doc/sso/sso-server.md
index 06fd6a87..6c0a32ec 100644
--- a/sa-token-doc/sso/sso-server.md
+++ b/sa-token-doc/sso/sso-server.md
@@ -2,7 +2,7 @@
 
 在开始SSO三种模式的对接之前，我们必须先搭建一个 SSO-Server 认证中心 
 
-> 搭建示例在官方仓库的 `/sa-token-demo/sa-token-demo-sso-server/`，如遇到难点可结合源码进行测试学习，demo里有制作好的登录页面 
+> 搭建示例在官方仓库的 `/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/`，如遇到难点可结合源码进行测试学习，demo里有制作好的登录页面 
 
 --- 
 
@@ -268,7 +268,7 @@ public class SaSsoServerApplication {
 
 可以看到这个页面目前非常简陋，这是因为我们以上的代码示例，主要目标是为了带大家从零搭建一个可用的SSO认证服务端，所以就对一些不太必要的步骤做了简化。
 
-大家可以下载运行一下官方仓库里的示例`/sa-token-demo/sa-token-demo-sso-server/`，里面有制作好的登录页面：
+大家可以下载运行一下官方仓库里的示例`/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-server/`，里面有制作好的登录页面：
 
 ![sso-server-init-login2.png](https://oss.dev33.cn/sa-token/doc/sso/sso-server-init-login2.png 's-w-sh')
 
diff --git a/sa-token-doc/sso/sso-type1.md b/sa-token-doc/sso/sso-type1.md
index ad6ccfbf..14dcc442 100644
--- a/sa-token-doc/sso/sso-type1.md
+++ b/sa-token-doc/sso/sso-type1.md
@@ -64,7 +64,7 @@ sa-token.cookie.domain=stp.com
 
 ### 4、搭建 Client 端项目 
 
-> 搭建示例在官方仓库的 `/sa-token-demo/sa-token-demo-sso1-client/`，如遇到难点可结合源码进行测试学习。
+> 搭建示例在官方仓库的 `/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso1-client/`，如遇到难点可结合源码进行测试学习。
 
 
 #### 4.1、引入依赖
diff --git a/sa-token-doc/sso/sso-type2.md b/sa-token-doc/sso/sso-type2.md
index 901cc9e1..664f4be7 100644
--- a/sa-token-doc/sso/sso-type2.md
+++ b/sa-token-doc/sso/sso-type2.md
@@ -45,7 +45,7 @@
 
 ### 3、搭建 Client 端项目 
 
-> 搭建示例在官方仓库的 `/sa-token-demo/sa-token-demo-sso2-client/`，如遇到难点可结合源码进行测试学习
+> 搭建示例在官方仓库的 `/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/`，如遇到难点可结合源码进行测试学习
 
 #### 3.1、去除 SSO-Server 的 Cookie 作用域配置 
 在SSO模式一章节中我们打开了配置：
diff --git a/sa-token-doc/sso/sso-type3.md b/sa-token-doc/sso/sso-type3.md
index 7f8a941c..b26766f5 100644
--- a/sa-token-doc/sso/sso-type3.md
+++ b/sa-token-doc/sso/sso-type3.md
@@ -15,7 +15,7 @@
 所以模式三的主要目标：也就是在 模式二的基础上 解决上述 三个难题 
 
 > 模式三的 Demo 示例地址：`/sa-token-demo/sa-token-demo-sso3-client/` 
-> [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-sso3-client)，如遇难点可参考示例 
+> [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client)，如遇难点可参考示例 
 
 
 ### 2、在Client 端更改 Ticket 校验方式
diff --git a/sa-token-doc/start/download.md b/sa-token-doc/start/download.md
index 05130deb..d7052f53 100644
--- a/sa-token-doc/start/download.md
+++ b/sa-token-doc/start/download.md
@@ -22,7 +22,7 @@
 注：如果你使用的 `SpringBoot 3.x`，只需要将 `sa-token-spring-boot-starter` 修改为 `sa-token-spring-boot3-starter` 即可。
 
 <!------------- tab:WebFlux环境 （Reactor）  ------------->
-注：如果你使用的框架基于 Reactor 模型构建（Netty、WebFlux、ShenYu、SC Gateway等），请引入此包
+注：如果你使用的框架基于 Reactor 模型构建（WebFlux、SpringCloud Gateway 等），请引入此包
 ``` xml
 <!-- Sa-Token 权限认证（Reactor响应式集成）, 在线文档：https://sa-token.cc -->
 <dependency>
@@ -172,52 +172,81 @@ Maven依赖一直无法加载成功？[参考解决方案](https://sa-token.cc/d
 ``` js
 ── sa-token
 	├── sa-token-core                         // [核心] Sa-Token 核心模块
+	├── sa-token-dependencies                 // [依赖] Sa-Token 依赖版本信息
 	├── sa-token-starter                      // [整合] Sa-Token 与其它框架整合
-		├── sa-token-servlet                      // [整合] Sa-Token 整合 Servlet容器实现类包
-		├── sa-token-spring-boot-starter          // [整合] Sa-Token 整合 SpringBoot 快速集成 
-		├── sa-token-reactor-spring-boot-starter  // [整合] Sa-Token 整合 Reactor 响应式编程 快速集成 
+		├── sa-token-servlet                      // [整合] Sa-Token 整合 Servlet 容器实现类包
+		├── sa-token-spring-boot-starter          // [整合] Sa-Token 整合 SpringBoot2 快速集成 
+		├── sa-token-reactor-spring-boot-starter  // [整合] Sa-Token 整合 SpringBoot2 Reactor 响应式编程 快速集成 
+		├── sa-token-jakarta-servlet              // [整合] Sa-Token 整合 Jakarta-Servlet 容器实现类包
+		├── sa-token-spring-boot3-starter         // [整合] Sa-Token 整合 SpringBoot3 快速集成 
+		├── sa-token-reactor-spring-boot3-starter // [整合] Sa-Token 整合 SpringBoot3 Reactor 响应式编程 快速集成 
+		├── sa-token-spring-boot-autoconfig       // [整合] Sa-Token 整合 SpringBoot 自动配置包
 		├── sa-token-solon-plugin                 // [整合] Sa-Token 整合 Solon 快速集成 
 		├── sa-token-jfinal-plugin                // [整合] Sa-Token 整合 JFinal 快速集成 
 		├── sa-token-jboot-plugin                 // [整合] Sa-Token 整合 jboot 快速集成 
 	├── sa-token-plugin                       // [插件] Sa-Token 插件合集
-		├── sa-token-dao-redis                    // [插件] Sa-Token 整合 Redis (使用jdk默认序列化方式)
-		├── sa-token-dao-redis-jackson            // [插件] Sa-Token 整合 Redis (使用jackson序列化方式)
+		├── sa-token-redis                        // [插件] Sa-Token 整合 Redis (使用 jdk 默认序列化方式)
+		├── sa-token-redis-jackson                // [插件] Sa-Token 整合 Redis (使用 jackson 序列化方式)
+		├── sa-token-redis-fastjson               // [插件] Sa-Token 整合 Redis (使用 fastjson 序列化方式)
+		├── sa-token-redis-fastjson2              // [插件] Sa-Token 整合 Redis (使用 fastjson2 序列化方式)
+		├── sa-token-redisson-jackson             // [插件] Sa-Token 整合 Redisson (使用 jackson 序列化方式)
+		├── sa-token-alone-redis                  // [插件] Sa-Token 独立 Redis 插件，实现 [ 权限缓存与业务缓存分离 ]
+		├── sa-token-redisx                       // [插件] Sa-Token 整合 Redis (中立 redisx)
+		├── sa-token-dubbo                        // [插件] Sa-Token 整合 dubbo 状态传递、rpc 鉴权
+		├── sa-token-dubbo3                       // [插件] Sa-Token 整合 dubbo3 状态传递、rpc 鉴权
+		├── sa-token-grpc                         // [插件] Sa-Token 整合 grpc 状态传递、rpc 鉴权
 		├── sa-token-spring-aop                   // [插件] Sa-Token 整合 SpringAOP 注解鉴权
+		├── sa-token-jwt                          // [插件] Sa-Token 整合 jwt 登录认证
 		├── sa-token-temp-jwt                     // [插件] Sa-Token 整合 jwt 临时令牌鉴权 
 		├── sa-token-quick-login                  // [插件] Sa-Token 快速注入登录页插件 
-		├── sa-token-alone-redis                  // [插件] Sa-Token 独立Redis插件，实现[权限缓存与业务缓存分离]
 		├── sa-token-sso                          // [插件] Sa-Token 整合 SSO 单点登录
 		├── sa-token-oauth2                       // [插件] Sa-Token 实现 OAuth2.0 模块 
 		├── sa-token-dialect-thymeleaf            // [插件] Sa-Token 标签方言（Thymeleaf版）
-		├── sa-token-jwt                          // [插件] Sa-Token 整合 jwt 登录认证
 	├── sa-token-demo                         // [示例] Sa-Token 示例合集
-		├── sa-token-demo-cases                   // [示例] Sa-Token 各模块示例
+		├── sa-token-demo-case                    // [示例] Sa-Token 各模块示例
 		├── sa-token-demo-springboot              // [示例] Sa-Token 整合 SpringBoot 
 		├── sa-token-demo-springboot-redis        // [示例] Sa-Token 整合 SpringBoot 整合 Redis 
+		├── sa-token-demo-springboot3-redis       // [示例] Sa-Token 整合 SpringBoot3 整合 Redis 
+		├── sa-token-demo-springboot-redisson     // [示例] Sa-Token 整合 SpringBoot 整合 redisson 
 		├── sa-token-demo-webflux                 // [示例] Sa-Token 整合 WebFlux 
-		├── sa-token-demo-jwt                     // [示例] Sa-Token 集成 jwt 
+		├── sa-token-demo-webflux-springboot3     // [示例] Sa-Token 整合 WebFlux （SpringBoot3）
 		├── sa-token-demo-solon                   // [示例] Sa-Token 集成 Solon 
-		├── sa-token-demo-quick-login             // [示例] Sa-Token 集成 quick-login 模块 
 		├── sa-token-demo-alone-redis             // [示例] Sa-Token 集成 alone-redis 模块
-		├── sa-token-demo-thymeleaf               // [示例] Sa-Token 集成 Thymeleaf 标签方言
+		├── sa-token-demo-alone-redis-cluster     // [示例] Sa-Token 集成 alone-redis 模块、集群模式
+		├── sa-token-demo-quick-login             // [示例] Sa-Token 集成 quick-login 模块 
 		├── sa-token-demo-jwt                     // [示例] Sa-Token 集成 jwt 登录认证 
-		├── sa-token-demo-sso-server              // [示例] Sa-Token 集成 SSO单点登录-Server认证中心
-		├── sa-token-demo-sso1-client             // [示例] Sa-Token 集成 SSO单点登录-模式一 应用端 (同域、同Redis)
-		├── sa-token-demo-sso2-client             // [示例] Sa-Token 集成 SSO单点登录-模式二 应用端 (跨域、同Redis)
-		├── sa-token-demo-sso3-client             // [示例] Sa-Token 集成 SSO单点登录-模式三 应用端 (跨域、跨Redis)
-		├── sa-token-demo-sso3-client-nosdk       // [示例] Sa-Token 集成 SSO单点登录-模式三 应用端 (不使用sdk，纯手动对接)
-		├── sa-token-demo-sso-server-h5           // [示例] Sa-Token 集成 SSO单点登录-Server认证中心 (前后端分离)
-		├── sa-token-demo-sso-client-h5           // [示例] Sa-Token 集成 SSO单点登录-client应用端 (前后端分离-原生h5版本)
-		├── sa-token-demo-sso-server-vue2         // [示例] Sa-Token 集成 SSO单点登录-client应用端 (前后端分离-Vue2版本)
-		├── sa-token-demo-sso-client-vue3         // [示例] Sa-Token 集成 SSO单点登录-client应用端 (前后端分离-Vue3版本)
-		├── sa-token-demo-oauth2-server           // [示例] Sa-Token 集成 OAuth2.0 (服务端)
-		├── sa-token-demo-oauth2-client           // [示例] Sa-Token 集成 OAuth2.0 (客户端)
+		├── sa-token-demo-test                    // [示例] Sa-Token 整合测试项目
 		├── sa-token-demo-websocket               // [示例] Sa-Token 集成 Web-Socket 鉴权示例
 		├── sa-token-demo-websocket-spring        // [示例] Sa-Token 集成 Web-Socket（Spring封装版） 鉴权示例
+		├── sa-token-demo-thymeleaf               // [示例] Sa-Token 集成 Thymeleaf 标签方言
+		├── sa-token-demo-dubbo-consumer          // [示例] Sa-Token 集成 dubbo 鉴权，消费端（调用端）
+		├── sa-token-demo-dubbo-provider          // [示例] Sa-Token 集成 dubbo 鉴权，生产端（被调用端）
+		├── sa-token-demo-sso                     // [示例] Sa-Token 集成 SSO 单点登录
+			├── sa-token-demo-sso-server              // [示例] Sa-Token 集成 SSO单点登录-Server认证中心
+			├── sa-token-demo-sso1-client             // [示例] Sa-Token 集成 SSO单点登录-模式一 应用端 (同域、同Redis)
+			├── sa-token-demo-sso2-client             // [示例] Sa-Token 集成 SSO单点登录-模式二 应用端 (跨域、同Redis)
+			├── sa-token-demo-sso3-client             // [示例] Sa-Token 集成 SSO单点登录-模式三 应用端 (跨域、跨Redis)
+			├── sa-token-demo-sso3-client-nosdk       // [示例] Sa-Token 集成 SSO单点登录-模式三 应用端 (不使用sdk，纯手动对接)
+			├── sa-token-demo-sso-server-h5           // [示例] Sa-Token 集成 SSO单点登录-Server认证中心 (前后端分离)
+			├── sa-token-demo-sso-client-h5           // [示例] Sa-Token 集成 SSO单点登录-client应用端 (前后端分离-原生h5 版本)
+			├── sa-token-demo-sso-server-vue2         // [示例] Sa-Token 集成 SSO单点登录-client应用端 (前后端分离-Vue2 版本)
+			├── sa-token-demo-sso-client-vue3         // [示例] Sa-Token 集成 SSO单点登录-client应用端 (前后端分离-Vue3 版本)
+		├── sa-token-demo-sso-for-solon           // [示例] Sa-Token 集成 SSO 单点登录（Solon 版）
+			├── sa-token-demo-sso-server-solon        // [示例] Sa-Token 集成 SSO单点登录-Server认证中心
+			├── sa-token-demo-sso1-client-solon       // [示例] Sa-Token 集成 SSO单点登录-模式一 应用端 (同域、同Redis)
+			├── sa-token-demo-sso2-client-solon       // [示例] Sa-Token 集成 SSO单点登录-模式二 应用端 (跨域、同Redis)
+			├── sa-token-demo-sso3-client-solon       // [示例] Sa-Token 集成 SSO单点登录-模式三 应用端 (跨域、跨Redis)
+		├── sa-token-demo-oauth2                  // [示例] Sa-Token 集成 OAuth2.0
+			├── sa-token-demo-oauth2-server           // [示例] Sa-Token 集成 OAuth2.0 (服务端)
+			├── sa-token-demo-oauth2-client           // [示例] Sa-Token 集成 OAuth2.0 (客户端)
+		├── sa-token-demo-remember-me             // [示例] Sa-Token 实现 [ 记住我 ] 模式
+			├── page_project                          // [示例] Sa-Token 实现 [ 记住我 ] 模式、前端页面
+			├── server_project                        // [示例] Sa-Token 实现 [ 记住我 ] 模式、后端接口
+		├── sa-token-demo-grpc                    // [示例] Sa-Token 集成 grpc 鉴权
+			├── client                                // [示例] Sa-Token 集成 grpc 鉴权，client 端
+			├── server                                // [示例] Sa-Token 集成 grpc 鉴权，server 端
 	├── sa-token-test                         // [测试] Sa-Token 单元测试合集
-		├── sa-token-core-test                    // [测试] Sa-Token Core核心包单元测试
 		├── sa-token-springboot-test              // [测试] Sa-Token SpringBoot 整合测试
-		├── sa-token-springboot-integrate-test    // [测试] Sa-Token SpringBoot 整合客户端测试
 		├── sa-token-jwt-test                     // [测试] Sa-Token jwt 整合测试
 	├── sa-token-doc                          // [文档] Sa-Token 开发文档 
 	├──pom.xml                                // [依赖] 顶级pom文件 
diff --git a/sa-token-doc/start/solon-example.md b/sa-token-doc/start/solon-example.md
index bc502816..a6a87e41 100644
--- a/sa-token-doc/start/solon-example.md
+++ b/sa-token-doc/start/solon-example.md
@@ -5,7 +5,13 @@
 整合示例在官方仓库的 /sa-token-demo/sa-token-demo-solon 文件夹下，如遇到难点可结合源码进行学习测试。
 
 > Solon 是一个高效的国产应用开发框架：更快、更小、更简单。
-> 启动快 5 ～ 10 倍；qps 高 2～ 3 倍；运行时内存节省 1/3 ~ 1/2；打包可以缩到 1/2 ~ 1/10；同时支持 jdk8, jdk11, jdk17, jdk20。
+> 
+> - 启动快 5 ～ 10 倍；
+> - qps 高 2～ 3 倍；
+> - 运行时内存节省 1/3 ~ 1/2；
+> - 打包可以缩到 1/2 ~ 1/10；
+> - 同时支持 jdk8、jdk11、jdk17、jdk20。
+> 
 > 详情可参考：[https://solon.noear.org/](https://solon.noear.org/)
 
 
diff --git a/sa-token-doc/start/webflux-example.md b/sa-token-doc/start/webflux-example.md
index 8fc4fa42..649f248a 100644
--- a/sa-token-doc/start/webflux-example.md
+++ b/sa-token-doc/start/webflux-example.md
@@ -1,7 +1,7 @@
 # Spring WebFlux 集成 Sa-Token 示例
 
 **Reactor** 是一种非阻塞的响应式模型，本篇将以 **WebFlux** 为例，展示 Sa-Token 与 Reactor 响应式模型框架相整合的示例，
-**你可以用同样方式去对接其它 Reactor 模型框架（Netty、ShenYu、SpringCloud Gateway等）**
+**你可以用同样方式去对接其它 Reactor 模型框架（例如 SpringCloud Gateway）**
 
 整合示例在官方仓库的`/sa-token-demo/sa-token-demo-webflux`文件夹下，如遇到难点可结合源码进行测试学习
 

From 94b1ab29a66776549fcbfc59f092a7cb7c273c32 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 01:26:26 +0800
Subject: [PATCH 059/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20`sa-token.sso.mode?=
 =?UTF-8?q?`=20=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=8C=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E7=BA=A6=E5=AE=9A=E6=AD=A4=E7=B3=BB=E7=BB=9F=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=20SSO=20=E6=A8=A1=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/sso/sso-questions.md             | 34 +++++++++++++++++++
 .../cn/dev33/satoken/config/SaSsoConfig.java  | 34 +++++++++++++++++--
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/sa-token-doc/sso/sso-questions.md b/sa-token-doc/sso/sso-questions.md
index 02c71a04..371ab303 100644
--- a/sa-token-doc/sso/sso-questions.md
+++ b/sa-token-doc/sso/sso-questions.md
@@ -99,6 +99,40 @@ sa-token:
 - 此时框架只以 auth-url 值为准，得到的 auth-url 值是：`http://my-site.com/sso/auth2`，其它三个 url 配置项同理。
 
 
+### 问：我接手了一个项目，里面集成了 Sa-Token SSO ，请问怎么快速分辨它用的模式几？
+
+**方法一：看代码注释。**
+
+如果开发这个项目的人没有写清楚注释那就 gg 了。
+
+**方法二，根据配置项来分析，例如：**
+
+- 先看配置项 `sa-token.cookie.domain`，如果此配置项有值，一般是在使用模式一开发，否则就是模式二或者模式三。
+- 再看配置项 `sa-token.sso.is-http` ，如果有值且为 true，一般是在使用模式三，否则就是模式二。
+
+**方法三，根据配置项 `sa-token.sso.mode` 的提示来判断**
+
+`sa-token.sso.mode` 是框架预留的约定型配置项，此配置项不对代码逻辑产生任何影响，只为系统做一个标记，标注此系统用到了SSO的哪个模式。
+
+例如你可以将其配置为 `sa-token.sso.mode=client-2`，代表当前系统为 sso-client 端，使用 SSO 模式二来对接。
+
+需要注意，这个配置项不是必须的，你不写也不会对代码造成任何影响，只有在你需要为系统做一个明确的标记时才需要去配置它，方便后人阅读代码时快速分析使用的模式。
+
+例如我们可以使用以下约定：
+
+- `sa-token.sso.mode=client-2`：代表当前系统为 sso-client 端，使用 SSO 模式二来对接。
+- `sa-token.sso.mode=client-2,h5`：代表当前系统为 sso-client 端，使用 SSO 模式二来对接，并且是前后端分离模式。
+- `sa-token.sso.mode=server-123`：代表当前系统为 sso-server 端，同时开放了 SSO 模式一、模式二、模式三。
+- `sa-token.sso.mode=server-2,client-2`：代表当前系统既是 sso-server 端，又是 sso-clent 端，使用模式二来对接。
+- 等等等等...
+
+此配置项可以是任意字符串，你也可以自己整理一套合适的表达规则。
+
+
+
+
+
+
 ### 问：SSO模式二或模式三，第一个 client 登录成功之后再访问其它两个 client 不会自动登录，需要点一下登录按钮才会登录上？
 答：这是正常现象，系统 1 登录成功之后，系统 2 与系统 3 需要点击登录按钮，才会登录成功。
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index 8d981eae..e09843bd 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -22,7 +22,12 @@ public class SaSsoConfig implements Serializable {
 	private static final long serialVersionUID = -6541180061782004705L;
 
 	
-	// ----------------- Server端相关配置 
+	// ----------------- Server端相关配置
+
+	/**
+	 * 指定当前系统集成 SSO 时使用的模式（约定型配置项，不对代码逻辑产生任何影响）
+	 */
+	public String mode = "";
 	
 	/**
 	 * Ticket有效期 (单位: 秒) 
@@ -47,6 +52,11 @@ public class SaSsoConfig implements Serializable {
 	
 	// ----------------- Client端相关配置 
 
+//	/**
+//	 * 指定当前系统集成 SSO 时使用的模式（约定型配置项，不对代码逻辑产生任何影响）
+//	 */
+//	public String mode = "";  // 同Server端，不再重复声明
+
 	/**
 	 * 当前 Client 名称标识，用于和 ticket 码的互相锁定 
 	 */
@@ -103,6 +113,24 @@ public class SaSsoConfig implements Serializable {
 	public String serverUrl;
 
 
+	/**
+	 * 获取 指定当前系统集成 SSO 时使用的模式（约定型配置项，不对代码逻辑产生任何影响）
+	 *
+	 * @return /
+	 */
+	public String getMode() {
+		return this.mode;
+	}
+
+	/**
+	 * 设置 指定当前系统集成 SSO 时使用的模式（约定型配置项，不对代码逻辑产生任何影响）
+	 *
+	 * @param mode /
+	 */
+	public void setMode(String mode) {
+		this.mode = mode;
+	}
+
 	/**
 	 * @return Ticket有效期 (单位: 秒)  
 	 */
@@ -297,7 +325,8 @@ public class SaSsoConfig implements Serializable {
 	@Override
 	public String toString() {
 		return "SaSsoConfig ["
-				+ "ticketTimeout=" + ticketTimeout 
+				+ "mode=" + mode
+				+ ", ticketTimeout=" + ticketTimeout
 				+ ", allowUrl=" + allowUrl 
 				+ ", isSlo=" + isSlo
 				+ ", isHttp=" + isHttp
@@ -457,5 +486,4 @@ public class SaSsoConfig implements Serializable {
 		return sendHttp;
 	}
 
-	
 }

From 1a3ce511955ea037b75f4c5cdf96425657309190 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 10:25:03 +0800
Subject: [PATCH 060/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddemo=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/oauth2/oauth2-server.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-doc/oauth2/oauth2-server.md b/sa-token-doc/oauth2/oauth2-server.md
index d7c11800..fc48d79b 100644
--- a/sa-token-doc/oauth2/oauth2-server.md
+++ b/sa-token-doc/oauth2/oauth2-server.md
@@ -183,8 +183,8 @@ http://sa-oauth-server.com:8001/oauth2/token?grant_type=authorization_code&clien
 ### 5、运行官方示例 
 以上代码只是简单模拟了一下OAuth2.0的授权流程，现在，我们运行一下官方示例，里面有制作好的UI界面
 
-- OAuth2-Server端： `/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/` [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server) <br/>
-- OAuth2-Client端： `/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/` [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client) <br/>
+- OAuth2-Server端： `/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server/` [源码链接](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-server) <br/>
+- OAuth2-Client端： `/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client/` [源码链接](https://gitee.com/dromara/sa-token/tree/master/sa-token-demo/sa-token-demo-oauth2/sa-token-demo-oauth2-client) <br/>
 
 依次启动`OAuth2-Server` 与 `OAuth2-Client`，然后从浏览器访问：[http://sa-oauth-client.com:8002](http://sa-oauth-client.com:8002)
 

From d6037878e8c4a4d31ef8ccdbe5b01cf039ea1eaf Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 16:57:19 +0800
Subject: [PATCH 061/129] =?UTF-8?q?add=20=E5=85=A8=E5=B1=80=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=20sa-token-redisson-jackson?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-dependencies/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 4d440706..defc5f24 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -347,6 +347,11 @@
 				<artifactId>sa-token-redis-jackson</artifactId>
 				<version>${revision}</version>
 			</dependency>
+			<dependency>
+				<groupId>cn.dev33</groupId>
+				<artifactId>sa-token-redisson-jackson</artifactId>
+				<version>${revision}</version>
+			</dependency>
 			<dependency>
 				<groupId>cn.dev33</groupId>
 				<artifactId>sa-token-redisx</artifactId>

From aaa26a4c586e63f244f39d4c664471aea6ad1dc2 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 18:23:18 +0800
Subject: [PATCH 062/129] =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=A6=82=E5=BF=B5?=
 =?UTF-8?q?=EF=BC=9AUser-Session=20->=20Account-Session?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/stp/SaTokenInfo.java     |    2 +-
 .../com/pj/cases/use/LoginAuthController.java |    2 +-
 .../main/java/com/pj/satoken/StpUserUtil.java | 1106 +++++++++--------
 .../com/pj/satoken/at/SaUserCheckLogin.java   |    1 +
 .../pj/satoken/at/SaUserCheckPermission.java  |    1 +
 .../com/pj/satoken/at/SaUserCheckRole.java    |    1 +
 .../java/com/pj/satoken/at/StpUserUtil.java   | 1029 ---------------
 .../src/main/java/com/pj/SaTokenDemoApp.java  |    3 +-
 .../main/java/com/pj/satoken/StpUserUtil.java | 1106 +++++++++--------
 sa-token-doc/api/stp-util.md                  |    4 +-
 sa-token-doc/fun/session-model.md             |   20 +-
 sa-token-doc/fun/token-info.md                |    2 +-
 sa-token-doc/more/common-questions.md         |    4 +-
 sa-token-doc/more/noun-intro.md               |    2 +-
 sa-token-doc/up/mock-person.md                |    2 +-
 sa-token-doc/use/config.md                    |    4 +-
 sa-token-doc/use/session.md                   |    6 +-
 .../satoken/springboot/ManyLoginTest.java     |    6 +-
 18 files changed, 1247 insertions(+), 2054 deletions(-)
 delete mode 100644 sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
index 8ac4f0fb..f79a4b86 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
@@ -13,7 +13,7 @@ package cn.dev33.satoken.stp;
  *         "loginId": "10001",               // 此token对应的LoginId，未登录时为null
  *         "loginType": "login",              // 账号类型标识
  *         "tokenTimeout": 2591977,          // token剩余有效期 (单位: 秒)
- *         "sessionTimeout": 2591977,        // User-Session剩余有效时间 (单位: 秒)
+ *         "sessionTimeout": 2591977,        // Account-Session剩余有效时间 (单位: 秒)
  *         "tokenSessionTimeout": -2,        // Token-Session剩余有效时间 (单位: 秒) (-2表示系统中不存在这个缓存)
  *         "tokenActivityTimeout": -1,       // token剩余无操作有效时间 (单位: 秒)
  *         "loginDevice": "default-device"   // 登录设备类型
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
index 263f5665..6860ce75 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
@@ -112,7 +112,7 @@ public class LoginAuthController {
 		System.out.println("当前登录客户端的设备类型：" + info.getLoginDevice());
 		System.out.println("当前 Token 的剩余有效期：" + info.getTokenTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
 		System.out.println("当前 Token 的剩余临时有效期：" + info.getTokenActivityTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
-		System.out.println("当前 User-Session 的剩余有效期" + info.getSessionTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
+		System.out.println("当前 Account-Session 的剩余有效期" + info.getSessionTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
 		System.out.println("当前 Token-Session 的剩余有效期" + info.getTokenSessionTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
 		
 		// 返回给前端 
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
index 7431acec..23640c1c 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -1,9 +1,5 @@
 package com.pj.satoken;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.fun.SaFunction;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
@@ -12,91 +8,111 @@ import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
 
+import java.util.List;
+
 /**
- * Sa-Token 权限认证工具类 （User版）
- * @author click33 
+ * Sa-Token 权限认证工具类 (User版)
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
-@Component
 public class StpUserUtil {
-	
+
 	private StpUserUtil() {}
-	
+
 	/**
-	 * 账号类型标识 
+	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "user";
-	
+	public static final String TYPE = "login";
+
 	/**
-	 * 底层的 StpLogic 对象  
+	 * 底层使用的 StpLogic 对象
 	 */
-	public static StpLogic stpLogic = new StpLogic(TYPE); 
+	public static StpLogic stpLogic = new StpLogic(TYPE);
 
 	/**
 	 * 获取当前 StpLogic 的账号类型
-	 * @return See Note 
+	 *
+	 * @return /
 	 */
 	public static String getLoginType(){
 		return stpLogic.getLoginType();
 	}
 
 	/**
-	 * 重置 StpLogic 对象
-	 * <br> 1、更改此账户的 StpLogic 对象 
-	 * <br> 2、put 到全局 StpLogic 集合中 
-	 * <br> 3、发送日志 
-	 * 
-	 * @param newStpLogic / 
+	 * 安全的重置 StpLogic 对象
+	 *
+	 * <br> 1、更改此账户的 StpLogic 对象
+	 * <br> 2、put 到全局 StpLogic 集合中
+	 * <br> 3、发送日志
+	 *
+	 * @param newStpLogic /
 	 */
 	public static void setStpLogic(StpLogic newStpLogic) {
-		// 重置此账户的 StpLogic 对象 
+		// 1、重置此账户的 StpLogic 对象
 		stpLogic = newStpLogic;
-		
-		// 添加到全局 StpLogic 集合中
-		// 以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic 
+
+		// 2、添加到全局 StpLogic 集合中
+		//    以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic
 		SaManager.putStpLogic(newStpLogic);
-		
-		// $$ 全局事件  
+
+		// 3、$$ 发布事件：更新了 stpLogic 对象
 		SaTokenEventCenter.doSetStpLogic(stpLogic);
 	}
 
 	/**
 	 * 获取 StpLogic 对象
-	 * @return / 
+	 *
+	 * @return /
 	 */
 	public static StpLogic getStpLogic() {
 		return stpLogic;
 	}
-	
-	
-	// ------------------- 获取token 相关 -------------------
+
+
+	// ------------------- 获取 token 相关 -------------------
 
 	/**
-	 * 返回token名称 
-	 * @return 此StpLogic的token名称
+	 * 返回 token 名称，此名称在以下地方体现：Cookie 保存 token 时的名称、提交 token 时参数的名称、存储 token 时的 key 前缀
+	 *
+	 * @return /
 	 */
 	public static String getTokenName() {
- 		return stpLogic.getTokenName();
- 	}
+		return stpLogic.getTokenName();
+	}
 
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 */
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 */
 	public static void setTokenValue(String tokenValue){
 		stpLogic.setTokenValue(tokenValue);
 	}
-	
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 * @param cookieTimeout Cookie存活时间(秒)
- 	 */
+
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 * @param cookieTimeout Cookie存活时间(秒)
+	 */
 	public static void setTokenValue(String tokenValue, int cookieTimeout){
 		stpLogic.setTokenValue(tokenValue, cookieTimeout);
 	}
- 	
+
 	/**
-	 * 获取当前TokenValue
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 * @param loginModel 登录参数
+	 */
+	public static void setTokenValue(String tokenValue, SaLoginModel loginModel){
+		stpLogic.setTokenValue(tokenValue, loginModel);
+	}
+
+	/**
+	 * 获取当前请求的 token 值
+	 *
 	 * @return 当前tokenValue
 	 */
 	public static String getTokenValue() {
@@ -104,28 +120,31 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取当前TokenValue (不裁剪前缀) 
-	 * @return / 
+	 * 获取当前请求的 token 值 （不裁剪前缀）
+	 *
+	 * @return /
 	 */
 	public static String getTokenValueNotCut(){
 		return stpLogic.getTokenValueNotCut();
 	}
 
 	/**
-	 * 获取当前会话的Token信息 
-	 * @return token信息 
+	 * 获取当前会话的 token 参数信息
+	 *
+	 * @return token 参数信息
 	 */
 	public static SaTokenInfo getTokenInfo() {
 		return stpLogic.getTokenInfo();
 	}
 
-	
+
 	// ------------------- 登录相关操作 -------------------
 
-	// --- 登录 
-	
+	// --- 登录
+
 	/**
-	 * 会话登录 
+	 * 会话登录
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 */
 	public static void login(Object id) {
@@ -134,6 +153,7 @@ public class StpUserUtil {
 
 	/**
 	 * 会话登录，并指定登录设备类型
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param device 设备类型
 	 */
@@ -144,27 +164,27 @@ public class StpUserUtil {
 	/**
 	 * 会话登录，并指定是否 [记住我]
 	 *
-	 * @param id              账号id，建议的类型：（long | int | String）
-	 * @param isLastingCookie 是否为持久Cookie
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @param isLastingCookie 是否为持久Cookie，值为 true 时记住我，值为 false 时关闭浏览器需要重新登录
 	 */
 	public static void login(Object id, boolean isLastingCookie) {
 		stpLogic.login(id, isLastingCookie);
 	}
 
 	/**
-	 * 会话登录，并指定此次登录token的有效期, 单位:秒
+	 * 会话登录，并指定此次登录 token 的有效期, 单位:秒
 	 *
 	 * @param id      账号id，建议的类型：（long | int | String）
-	 * @param timeout 此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
+	 * @param timeout 此次登录 token 的有效期, 单位:秒
 	 */
 	public static void login(Object id, long timeout) {
 		stpLogic.login(id, timeout);
 	}
 
 	/**
-	 * 会话登录，并指定所有登录参数Model
+	 * 会话登录，并指定所有登录参数 Model
 	 *
-	 * @param id         登录id，建议的类型：（long | int | String）
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param loginModel 此次登录的参数Model
 	 */
 	public static void login(Object id, SaLoginModel loginModel) {
@@ -172,36 +192,39 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 创建指定账号id的登录会话 
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @return 返回会话令牌 
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @return 返回会话令牌
 	 */
 	public static String createLoginSession(Object id) {
 		return stpLogic.createLoginSession(id);
 	}
-	
+
 	/**
-	 * 创建指定账号id的登录会话
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @param loginModel 此次登录的参数Model 
-	 * @return 返回会话令牌 
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @param loginModel 此次登录的参数Model
+	 * @return 返回会话令牌
 	 */
 	public static String createLoginSession(Object id, SaLoginModel loginModel) {
 		return stpLogic.createLoginSession(id, loginModel);
 	}
-	
-	// --- 注销 
-	
-	/** 
-	 * 会话注销 
+
+	// --- 注销
+
+	/**
+	 * 在当前客户端会话注销
 	 */
 	public static void logout() {
 		stpLogic.logout();
 	}
 
 	/**
-	 * 会话注销，根据账号id 
-	 * @param loginId 账号id 
+	 * 会话注销，根据账号id
+	 *
+	 * @param loginId 账号id
 	 */
 	public static void logout(Object loginId) {
 		stpLogic.logout(loginId);
@@ -209,146 +232,154 @@ public class StpUserUtil {
 
 	/**
 	 * 会话注销，根据账号id 和 设备类型
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表注销所有设备类型) 
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 (填 null 代表注销该账号的所有设备类型)
 	 */
 	public static void logout(Object loginId, String device) {
 		stpLogic.logout(loginId, device);
 	}
-	
+
 	/**
-	 * 会话注销，根据指定 Token 
-	 * 
-	 * @param tokenValue 指定token
+	 * 会话注销，根据指定 Token
+	 *
+	 * @param tokenValue 指定 token
 	 */
 	public static void logoutByTokenValue(String tokenValue) {
 		stpLogic.logoutByTokenValue(tokenValue);
 	}
-	
+
 	/**
-	 * 踢人下线，根据账号id 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
+	 * 踢人下线，根据账号id
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param loginId 账号id
 	 */
 	public static void kickout(Object loginId) {
 		stpLogic.kickout(loginId);
 	}
-	
+
 	/**
 	 * 踢人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表踢出所有设备类型) 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 (填 null 代表踢出该账号的所有设备类型)
 	 */
 	public static void kickout(Object loginId, String device) {
 		stpLogic.kickout(loginId, device);
 	}
 
 	/**
-	 * 踢人下线，根据指定 Token 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param tokenValue 指定token
+	 * 踢人下线，根据指定 token
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param tokenValue 指定 token
 	 */
 	public static void kickoutByTokenValue(String tokenValue) {
 		stpLogic.kickoutByTokenValue(tokenValue);
 	}
-	
+
 	/**
 	 * 顶人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-4 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表顶替所有设备类型) 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-4 </p>
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 （填 null 代表顶替该账号的所有设备类型）
 	 */
 	public static void replaced(Object loginId, String device) {
 		stpLogic.replaced(loginId, device);
 	}
-	
-	
-	// 查询相关
 
-	/** 
- 	 * 当前会话是否已经登录 
- 	 * @return 是否已登录 
- 	 */
+	// 会话查询
+
+	/**
+	 * 判断当前会话是否已经登录
+	 *
+	 * @return 已登录返回 true，未登录返回 false
+	 */
 	public static boolean isLogin() {
 		return stpLogic.isLogin();
 	}
 
-	/** 
- 	 * 检验当前会话是否已经登录，如未登录，则抛出异常 
- 	 */
- 	public static void checkLogin() {
- 		stpLogic.checkLogin();
- 	}
+	/**
+	 * 检验当前会话是否已经登录，如未登录，则抛出异常
+	 */
+	public static void checkLogin() {
+		stpLogic.checkLogin();
+	}
 
- 	/** 
- 	 * 获取当前会话账号id, 如果未登录，则抛出异常 
- 	 * @return 账号id
- 	 */
+	/**
+	 * 获取当前会话账号id，如果未登录，则抛出异常
+	 *
+	 * @return 账号id
+	 */
 	public static Object getLoginId() {
 		return stpLogic.getLoginId();
 	}
 
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回默认值 
-	 * @param <T> 返回类型 
+	/**
+	 * 获取当前会话账号id, 如果未登录，则返回默认值
+	 *
+	 * @param <T> 返回类型
 	 * @param defaultValue 默认值
-	 * @return 登录id 
+	 * @return 登录id
 	 */
 	public static <T> T getLoginId(T defaultValue) {
 		return stpLogic.getLoginId(defaultValue);
 	}
 
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回null 
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 如果未登录，则返回null
+	 *
+	 * @return 账号id
 	 */
 	public static Object getLoginIdDefaultNull() {
 		return stpLogic.getLoginIdDefaultNull();
- 	}
+	}
 
-	/** 
-	 * 获取当前会话账号id, 并转换为String类型
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 并转换为 String 类型
+	 *
+	 * @return 账号id
 	 */
 	public static String getLoginIdAsString() {
 		return stpLogic.getLoginIdAsString();
 	}
 
-	/** 
-	 * 获取当前会话账号id, 并转换为int类型
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 并转换为 int 类型
+	 *
+	 * @return 账号id
 	 */
 	public static int getLoginIdAsInt() {
 		return stpLogic.getLoginIdAsInt();
 	}
 
 	/**
-	 * 获取当前会话账号id, 并转换为long类型 
-	 * @return 账号id 
+	 * 获取当前会话账号id, 并转换为 long 类型
+	 *
+	 * @return 账号id
 	 */
 	public static long getLoginIdAsLong() {
 		return stpLogic.getLoginIdAsLong();
 	}
 
-	/** 
- 	 * 获取指定Token对应的账号id，如果未登录，则返回 null 
- 	 * @param tokenValue token
- 	 * @return 账号id
- 	 */
- 	public static Object getLoginIdByToken(String tokenValue) {
- 		return stpLogic.getLoginIdByToken(tokenValue);
- 	}
+	/**
+	 * 获取指定 token 对应的账号id，如果未登录，则返回 null
+	 *
+	 * @param tokenValue token
+	 * @return 账号id
+	 */
+	public static Object getLoginIdByToken(String tokenValue) {
+		return stpLogic.getLoginIdByToken(tokenValue);
+	}
 
 	/**
 	 * 获取当前 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
+	 *
+	 * @param key 键值
+	 * @return 对应的扩展数据
 	 */
 	public static Object getExtra(String key) {
 		return stpLogic.getExtra(key);
@@ -356,166 +387,194 @@ public class StpUserUtil {
 
 	/**
 	 * 获取指定 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param tokenValue 指定的 Token 值 
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
+	 *
+	 * @param tokenValue 指定的 Token 值
+	 * @param key 键值
+	 * @return 对应的扩展数据
 	 */
 	public static Object getExtra(String tokenValue, String key) {
 		return stpLogic.getExtra(tokenValue, key);
 	}
- 	
- 	
-	// ------------------- User-Session 相关 -------------------
 
- 	/** 
-	 * 获取指定账号id的Session, 如果Session尚未创建，isCreate=是否新建并返回
+
+	// ------------------- Account-Session 相关 -------------------
+
+	/**
+	 * 获取指定账号 id 的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
 	 * @param loginId 账号id
 	 * @param isCreate 是否新建
-	 * @return Session对象
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
 		return stpLogic.getSessionByLoginId(loginId, isCreate);
 	}
 
-	/** 
-	 * 获取指定key的Session, 如果Session尚未创建，则返回null
+	/**
+	 * 获取指定 key 的 SaSession, 如果该 SaSession 尚未创建，则返回 null
+	 *
 	 * @param sessionId SessionId
-	 * @return Session对象 
+	 * @return Session对象
 	 */
 	public static SaSession getSessionBySessionId(String sessionId) {
 		return stpLogic.getSessionBySessionId(sessionId);
 	}
 
-	/** 
-	 * 获取指定账号id的Session，如果Session尚未创建，则新建并返回 
-	 * @param loginId 账号id 
-	 * @return Session对象 
+	/**
+	 * 获取指定账号 id 的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @param loginId 账号id
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionByLoginId(Object loginId) {
 		return stpLogic.getSessionByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取当前会话的Session, 如果Session尚未创建，isCreate=是否新建并返回 
-	 * @param isCreate 是否新建 
-	 * @return Session对象 
+	/**
+	 * 获取当前已登录账号的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
+	 * @param isCreate 是否新建
+	 * @return Session对象
 	 */
 	public static SaSession getSession(boolean isCreate) {
 		return stpLogic.getSession(isCreate);
 	}
 
-	/** 
-	 * 获取当前会话的Session，如果Session尚未创建，则新建并返回 
-	 * @return Session对象 
+	/**
+	 * 获取当前已登录账号的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @return Session对象
 	 */
 	public static SaSession getSession() {
 		return stpLogic.getSession();
 	}
 
-	
-	// ------------------- Token-Session 相关 -------------------  
-	
-	/** 
-	 * 获取指定Token-Session，如果Session尚未创建，则新建并返回 
+
+	// ------------------- Token-Session 相关 -------------------
+
+	/**
+	 * 获取指定 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @param tokenValue Token值
-	 * @return Session对象  
+	 * @return Session对象
 	 */
 	public static SaSession getTokenSessionByToken(String tokenValue) {
 		return stpLogic.getTokenSessionByToken(tokenValue);
 	}
-	
-	/** 
-	 * 获取当前Token-Session，如果Session尚未创建，则新建并返回
-	 * @return Session对象 
+
+	/**
+	 * 获取当前 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @return Session对象
 	 */
 	public static SaSession getTokenSession() {
 		return stpLogic.getTokenSession();
 	}
 
-	/** 
+	/**
 	 * 获取当前匿名 Token-Session （可在未登录情况下使用的Token-Session）
-	 * @return Token-Session 对象 
+	 *
+	 * @return Token-Session 对象
 	 */
 	public static SaSession getAnonTokenSession() {
 		return stpLogic.getAnonTokenSession();
 	}
-	
 
-	// ------------------- [临时有效期] 验证相关 -------------------  
+
+	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
- 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
- 	 */
- 	public static void checkActivityTimeout() {
- 		stpLogic.checkActivityTimeout();
- 	}
-
- 	/**
- 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
- 	 * <h1>请注意: 即使token已经 [临时过期] 也可续签成功，
- 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
- 	 */
- 	public static void updateLastActivityToNow() {
- 		stpLogic.updateLastActivityToNow();
- 	}
- 	
-
-	// ------------------- 过期时间相关 -------------------  
-
- 	/**
- 	 * 获取当前登录者的 token 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getTokenTimeout() {
- 		return stpLogic.getTokenTimeout();
- 	}
- 	
- 	/**
- 	 * 获取当前登录者的 User-Session 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getSessionTimeout() {
- 		return stpLogic.getSessionTimeout();
- 	}
-
- 	/**
- 	 * 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getTokenSessionTimeout() {
- 		return stpLogic.getTokenSessionTimeout();
- 	}
- 	
- 	/**
- 	 * 获取当前 token [临时过期] 剩余有效时间 (单位: 秒)
- 	 * @return token [临时过期] 剩余有效时间
- 	 */
- 	public static long getTokenActivityTimeout() {
- 		return stpLogic.getTokenActivityTimeout();
- 	}
-
- 	/**
- 	 * 对当前 Token 的 timeout 值进行续期 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
- 	public static void renewTimeout(long timeout) {
- 		stpLogic.renewTimeout(timeout);
- 	}
- 	
- 	/**
- 	 * 对指定 Token 的 timeout 值进行续期 
- 	 * @param tokenValue 指定token 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
- 	public static void renewTimeout(String tokenValue, long timeout) {
- 		stpLogic.renewTimeout(tokenValue, timeout);
- 	}
- 	
- 	
-	// ------------------- 角色验证操作 -------------------  
+	 * 检查当前 token 是否已被冻结，如果是则抛出异常
+	 */
+	public static void checkActivityTimeout() {
+		stpLogic.checkActivityTimeout();
+	}
 
 	/**
-	 * 获取：当前账号的角色集合 
+	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
+	 * <h2>
+	 * 		请注意: 即使 token 已被冻结 也可续签成功，
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
+	 * </h2>
+	 */
+	public static void updateLastActivityToNow() {
+		stpLogic.updateLastActivityToNow();
+	}
+
+
+	// ------------------- 过期时间相关 -------------------
+
+	/**
+	 * 获取当前会话 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenTimeout() {
+		return stpLogic.getTokenTimeout();
+	}
+
+	/**
+	 * 获取指定 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @param token 指定token
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenTimeout(String token) {
+		return stpLogic.getTokenTimeout(token);
+	}
+
+	/**
+	 * 获取当前登录账号的 Account-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
+	public static long getSessionTimeout() {
+		return stpLogic.getSessionTimeout();
+	}
+
+	/**
+	 * 获取当前 token 的 Token-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenSessionTimeout() {
+		return stpLogic.getTokenSessionTimeout();
+	}
+
+	/**
+	 * 获取当前 token 剩余活跃有效期：当前 token 距离被冻结还剩多少时间（单位: 秒，返回 -1 代表永不冻结，-2 代表没有这个值或 token 已被冻结了）
+	 *
+	 * @return /
+	 */
+	public static long getTokenActivityTimeout() {
+		return stpLogic.getTokenActivityTimeout();
+	}
+
+	/**
+	 * 对当前 token 的 timeout 值进行续期
+	 *
+	 * @param timeout 要修改成为的有效时间 (单位: 秒)
+	 */
+	public static void renewTimeout(long timeout) {
+		stpLogic.renewTimeout(timeout);
+	}
+
+	/**
+	 * 对指定 token 的 timeout 值进行续期
+	 *
+	 * @param tokenValue 指定 token
+	 * @param timeout 要修改成为的有效时间 (单位: 秒，填 -1 代表要续为永久有效)
+	 */
+	public static void renewTimeout(String tokenValue, long timeout) {
+		stpLogic.renewTimeout(tokenValue, timeout);
+	}
+
+
+	// ------------------- 角色认证操作 -------------------
+
+	/**
+	 * 获取：当前账号的角色集合
+	 *
 	 * @return /
 	 */
 	public static List<String> getRoleList() {
@@ -523,259 +582,288 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取：指定账号的角色集合 
-	 * @param loginId 指定账号id 
+	 * 获取：指定账号的角色集合
+	 *
+	 * @param loginId 指定账号id
 	 * @return /
 	 */
 	public static List<String> getRoleList(Object loginId) {
 		return stpLogic.getRoleList(loginId);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否拥有指定角色, 返回true或false 
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
- 	public static boolean hasRole(String role) {
- 		return stpLogic.hasRole(role);
- 	}
-
- 	/** 
- 	 * 判断：指定账号是否含有指定角色标识, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
- 	public static boolean hasRole(Object loginId, String role) {
- 		return stpLogic.hasRole(loginId, role);
- 	}
- 	
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
- 	public static boolean hasRoleAnd(String... roleArray){
- 		return stpLogic.hasRoleAnd(roleArray);
- 	}
-
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
- 	public static boolean hasRoleOr(String... roleArray){
- 		return stpLogic.hasRoleOr(roleArray);
- 	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException 
- 	 * @param role 角色标识
- 	 */
- 	public static void checkRole(String role) {
- 		stpLogic.checkRole(role);
- 	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 */
- 	public static void checkRoleAnd(String... roleArray){
- 		stpLogic.checkRoleAnd(roleArray);
- 	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 */
- 	public static void checkRoleOr(String... roleArray){
- 		stpLogic.checkRoleOr(roleArray);
- 	}
-
-	
-	// ------------------- 权限验证操作 -------------------
+	/**
+	 * 判断：当前账号是否拥有指定角色, 返回 true 或 false
+	 *
+	 * @param role 角色
+	 * @return /
+	 */
+	public static boolean hasRole(String role) {
+		return stpLogic.hasRole(role);
+	}
 
 	/**
-	 * 获取：当前账号的权限码集合 
-	 * @return / 
+	 * 判断：指定账号是否含有指定角色标识, 返回 true 或 false
+	 *
+	 * @param loginId 账号id
+	 * @param role 角色标识
+	 * @return 是否含有指定角色标识
+	 */
+	public static boolean hasRole(Object loginId, String role) {
+		return stpLogic.hasRole(loginId, role);
+	}
+
+	/**
+	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 * @return true或false
+	 */
+	public static boolean hasRoleAnd(String... roleArray){
+		return stpLogic.hasRoleAnd(roleArray);
+	}
+
+	/**
+	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 * @return true或false
+	 */
+	public static boolean hasRoleOr(String... roleArray){
+		return stpLogic.hasRoleOr(roleArray);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException
+	 *
+	 * @param role 角色标识
+	 */
+	public static void checkRole(String role) {
+		stpLogic.checkRole(role);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 */
+	public static void checkRoleAnd(String... roleArray){
+		stpLogic.checkRoleAnd(roleArray);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 */
+	public static void checkRoleOr(String... roleArray){
+		stpLogic.checkRoleOr(roleArray);
+	}
+
+
+	// ------------------- 权限认证操作 -------------------
+
+	/**
+	 * 获取：当前账号的权限码集合
+	 *
+	 * @return /
 	 */
 	public static List<String> getPermissionList() {
 		return stpLogic.getPermissionList();
 	}
 
 	/**
-	 * 获取：指定账号的权限码集合 
+	 * 获取：指定账号的权限码集合
+	 *
 	 * @param loginId 指定账号id
-	 * @return / 
+	 * @return /
 	 */
 	public static List<String> getPermissionList(Object loginId) {
 		return stpLogic.getPermissionList(loginId);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, 返回true或false 
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限, 返回 true 或 false
+	 *
+	 * @param permission 权限码
+	 * @return 是否含有指定权限
+	 */
 	public static boolean hasPermission(String permission) {
 		return stpLogic.hasPermission(permission);
 	}
 
- 	/** 
- 	 * 判断：指定账号id是否含有指定权限, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
+	/**
+	 * 判断：指定账号 id 是否含有指定权限, 返回 true 或 false
+	 *
+	 * @param loginId 账号 id
+	 * @param permission 权限码
+	 * @return 是否含有指定权限
+	 */
 	public static boolean hasPermission(Object loginId, String permission) {
 		return stpLogic.hasPermission(loginId, permission);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, [指定多个，必须全部具有] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
- 	public static boolean hasPermissionAnd(String... permissionArray){
- 		return stpLogic.hasPermissionAnd(permissionArray);
- 	}
+	/**
+	 * 判断：当前账号是否含有指定权限 [ 指定多个，必须全部具有 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 * @return true 或 false
+	 */
+	public static boolean hasPermissionAnd(String... permissionArray){
+		return stpLogic.hasPermissionAnd(permissionArray);
+	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
- 	public static boolean hasPermissionOr(String... permissionArray){
- 		return stpLogic.hasPermissionOr(permissionArray);
- 	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException 
- 	 * @param permission 权限码
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 * @return true 或 false
+	 */
+	public static boolean hasPermissionOr(String... permissionArray){
+		return stpLogic.hasPermissionOr(permissionArray);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException
+	 *
+	 * @param permission 权限码
+	 */
 	public static void checkPermission(String permission) {
 		stpLogic.checkPermission(permission);
 	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，必须全部验证通过] 
- 	 * @param permissionArray 权限码数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定权限 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 */
 	public static void checkPermissionAnd(String... permissionArray) {
 		stpLogic.checkPermissionAnd(permissionArray);
 	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 */
 	public static void checkPermissionOr(String... permissionArray) {
 		stpLogic.checkPermissionOr(permissionArray);
 	}
 
 
-	// ------------------- id 反查token 相关操作 -------------------  
-	
-	/** 
-	 * 获取指定账号id的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	// ------------------- id 反查 token 相关操作 -------------------
+
+	/**
+	 * 获取指定账号 id 的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @return token值 
+	 * @return token值
 	 */
 	public static String getTokenValueByLoginId(Object loginId) {
 		return stpLogic.getTokenValueByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	/**
+	 * 获取指定账号 id 指定设备类型端的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @param device 设备类型
-	 * @return token值 
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return token值
 	 */
 	public static String getTokenValueByLoginId(Object loginId, String device) {
 		return stpLogic.getTokenValueByLoginId(loginId, device);
 	}
-	
-	/** 
-	 * 获取指定账号id的tokenValue集合 
-	 * @param loginId 账号id 
-	 * @return 此loginId的所有相关token 
- 	 */
+
+	/**
+	 * 获取指定账号 id 的 token 集合
+	 *
+	 * @param loginId 账号id
+	 * @return 此 loginId 的所有相关 token
+	 */
 	public static List<String> getTokenValueListByLoginId(Object loginId) {
 		return stpLogic.getTokenValueListByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 集合 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 
-	 * @return 此loginId的所有相关token 
- 	 */
+	/**
+	 * 获取指定账号 id 指定设备类型端的 token 集合
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 token
+	 */
 	public static List<String> getTokenValueListByLoginId(Object loginId, String device) {
 		return stpLogic.getTokenValueListByLoginId(loginId, device);
 	}
-	
+
 	/**
 	 * 返回当前会话的登录设备类型
+	 *
 	 * @return 当前令牌的登录设备类型
 	 */
 	public static String getLoginDevice() {
-		return stpLogic.getLoginDevice(); 
+		return stpLogic.getLoginDevice();
 	}
 
-	
-	// ------------------- 会话管理 -------------------  
+
+	// ------------------- 会话管理 -------------------
 
 	/**
-	 * 根据条件查询Token 
-	 * @param keyword 关键字 
+	 * 根据条件查询缓存中所有的 token
+	 *
+	 * @param keyword 关键字
 	 * @param start 开始处索引
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * @param size 获取数量 (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return token集合 
+	 *
+	 * @return token集合
 	 */
 	public static List<String> searchTokenValue(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchTokenValue(keyword, start, size, sortType);
 	}
-	
+
 	/**
-	 * 根据条件查询SessionId 
-	 * @param keyword 关键字 
+	 * 根据条件查询缓存中所有的 SessionId
+	 *
+	 * @param keyword 关键字
 	 * @param start 开始处索引
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * @param size 获取数量  (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
+	 *
+	 * @return sessionId集合
 	 */
 	public static List<String> searchSessionId(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchSessionId(keyword, start, size, sortType);
 	}
 
 	/**
-	 * 根据条件查询Token专属Session的Id 
-	 * @param keyword 关键字 
-	 * @param start 开始处索引 
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * 根据条件查询缓存中所有的 Token-Session-Id
+	 *
+	 * @param keyword 关键字
+	 * @param start 开始处索引
+	 * @param size 获取数量 (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
+	 *
+	 * @return sessionId集合
 	 */
 	public static List<String> searchTokenSessionId(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchTokenSessionId(keyword, start, size, sortType);
 	}
 
-	
-	// ------------------- 账号封禁 -------------------  
+
+	// ------------------- 账号封禁 -------------------
 
 	/**
 	 * 封禁：指定账号
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * 
-	 * @param loginId 指定账号id 
+	 *
+	 * @param loginId 指定账号id
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disable(Object loginId, long time) {
@@ -783,17 +871,18 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 判断：指定账号是否已被封禁 (true=已被封禁, false=未被封禁) 
-	 * 
+	 * 判断：指定账号是否已被封禁 (true=已被封禁, false=未被封禁)
+	 *
 	 * @param loginId 账号id
-	 * @return / 
+	 * @return /
 	 */
 	public static boolean isDisable(Object loginId) {
 		return stpLogic.isDisable(loginId);
 	}
 
 	/**
-	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
 	 */
 	public static void checkDisable(Object loginId) {
@@ -802,8 +891,9 @@ public class StpUserUtil {
 
 	/**
 	 * 获取：指定账号剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
-	 * @return / 
+	 * @return /
 	 */
 	public static long getDisableTime(Object loginId) {
 		return stpLogic.getDisableTime(loginId);
@@ -811,20 +901,22 @@ public class StpUserUtil {
 
 	/**
 	 * 解封：指定账号
+	 *
 	 * @param loginId 账号id
 	 */
 	public static void untieDisable(Object loginId) {
 		stpLogic.untieDisable(loginId);
 	}
 
-	
-	// ------------------- 分类封禁 -------------------  
+
+	// ------------------- 分类封禁 -------------------
 
 	/**
-	 * 封禁：指定账号的指定服务 
+	 * 封禁：指定账号的指定服务
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * @param loginId 指定账号id 
-	 * @param service 指定服务 
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定服务
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disable(Object loginId, String service, long time) {
@@ -832,19 +924,21 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 判断：指定账号的指定服务 是否已被封禁 (true=已被封禁, false=未被封禁) 
+	 * 判断：指定账号的指定服务 是否已被封禁（true=已被封禁, false=未被封禁）
+	 *
 	 * @param loginId 账号id
-	 * @param service 指定服务 
-	 * @return / 
+	 * @param service 指定服务
+	 * @return /
 	 */
 	public static boolean isDisable(Object loginId, String service) {
 		return stpLogic.isDisable(loginId, service);
 	}
 
 	/**
-	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
-	 * @param services 指定服务，可以指定多个 
+	 * @param services 指定服务，可以指定多个
 	 */
 	public static void checkDisable(Object loginId, String... services) {
 		stpLogic.checkDisable(loginId, services);
@@ -852,9 +946,10 @@ public class StpUserUtil {
 
 	/**
 	 * 获取：指定账号 指定服务 剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
-	 * @param service 指定服务 
-	 * @return see note 
+	 * @param service 指定服务
+	 * @return see note
 	 */
 	public static long getDisableTime(Object loginId, String service) {
 		return stpLogic.getDisableTime(loginId, service);
@@ -862,20 +957,22 @@ public class StpUserUtil {
 
 	/**
 	 * 解封：指定账号、指定服务
+	 *
 	 * @param loginId 账号id
-	 * @param services 指定服务，可以指定多个 
+	 * @param services 指定服务，可以指定多个
 	 */
 	public static void untieDisable(Object loginId, String... services) {
 		stpLogic.untieDisable(loginId, services);
 	}
 
 
-	// ------------------- 阶梯封禁 -------------------  
+	// ------------------- 阶梯封禁 -------------------
 
 	/**
-	 * 封禁：指定账号，并指定封禁等级 
-	 * @param loginId 指定账号id 
-	 * @param level 指定封禁等级 
+	 * 封禁：指定账号，并指定封禁等级
+	 *
+	 * @param loginId 指定账号id
+	 * @param level 指定封禁等级
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disableLevel(Object loginId, int level, long time) {
@@ -883,10 +980,11 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 封禁：指定账号的指定服务，并指定封禁等级 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 指定封禁等级 
+	 * 封禁：指定账号的指定服务，并指定封禁等级
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
+	 * @param level 指定封禁等级
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disableLevel(Object loginId, String service, int level, long time) {
@@ -895,22 +993,22 @@ public class StpUserUtil {
 
 	/**
 	 * 判断：指定账号是否已被封禁到指定等级
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param level 指定封禁等级 
-	 * @return / 
+	 *
+	 * @param loginId 指定账号id
+	 * @param level 指定封禁等级
+	 * @return /
 	 */
 	public static boolean isDisableLevel(Object loginId, int level) {
 		return stpLogic.isDisableLevel(loginId, level);
 	}
 
 	/**
-	 * 判断：指定账号的指定服务，是否已被封禁到指定等级 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 指定封禁等级 
-	 * @return / 
+	 * 判断：指定账号的指定服务，是否已被封禁到指定等级
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
+	 * @param level 指定封禁等级
+	 * @return /
 	 */
 	public static boolean isDisableLevel(Object loginId, String service, int level) {
 		return stpLogic.isDisableLevel(loginId, service, level);
@@ -918,8 +1016,8 @@ public class StpUserUtil {
 
 	/**
 	 * 校验：指定账号是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
-	 * @param loginId 指定账号id 
+	 *
+	 * @param loginId 指定账号id
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
 	 */
 	public static void checkDisableLevel(Object loginId, int level) {
@@ -928,9 +1026,9 @@ public class StpUserUtil {
 
 	/**
 	 * 校验：指定账号的指定服务，是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
 	 */
 	public static void checkDisableLevel(Object loginId, String service, int level) {
@@ -938,37 +1036,38 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取：指定账号被封禁的等级，如果未被封禁则返回-2 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @return / 
+	 * 获取：指定账号被封禁的等级，如果未被封禁则返回-2
+	 *
+	 * @param loginId 指定账号id
+	 * @return /
 	 */
 	public static int getDisableLevel(Object loginId) {
 		return stpLogic.getDisableLevel(loginId);
 	}
 
 	/**
-	 * 获取：指定账号的 指定服务 被封禁的等级，如果未被封禁则返回-2 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @return / 
+	 * 获取：指定账号的 指定服务 被封禁的等级，如果未被封禁则返回-2
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
+	 * @return /
 	 */
 	public static int getDisableLevel(Object loginId, String service) {
 		return stpLogic.getDisableLevel(loginId, service);
 	}
-	
-	
-	// ------------------- 身份切换 -------------------  
+
+
+	// ------------------- 临时身份切换 -------------------
 
 	/**
-	 * 临时切换身份为指定账号id 
-	 * @param loginId 指定loginId 
+	 * 临时切换身份为指定账号id
+	 *
+	 * @param loginId 指定loginId
 	 */
 	public static void switchTo(Object loginId) {
 		stpLogic.switchTo(loginId);
 	}
-	
+
 	/**
 	 * 结束临时切换身份
 	 */
@@ -977,86 +1076,95 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 当前是否正处于[身份临时切换]中 
-	 * @return 是否正处于[身份临时切换]中 
+	 * 判断当前请求是否正处于 [ 身份临时切换 ] 中
+	 *
+	 * @return /
 	 */
 	public static boolean isSwitch() {
 		return stpLogic.isSwitch();
 	}
 
 	/**
-	 * 在一个代码段里方法内，临时切换身份为指定账号id
-	 * @param loginId 指定账号id 
-	 * @param function 要执行的方法 
+	 * 在一个 lambda 代码段里，临时切换身份为指定账号id，lambda 结束后自动恢复
+	 *
+	 * @param loginId 指定账号id
+	 * @param function 要执行的方法
 	 */
 	public static void switchTo(Object loginId, SaFunction function) {
 		stpLogic.switchTo(loginId, function);
 	}
-	
 
-	// ------------------- 二级认证 -------------------  
-	
+
+	// ------------------- 二级认证 -------------------
+
 	/**
-	 * 在当前会话 开启二级认证 
-	 * @param safeTime 维持时间 (单位: 秒) 
+	 * 在当前会话 开启二级认证
+	 *
+	 * @param safeTime 维持时间 (单位: 秒)
 	 */
 	public static void openSafe(long safeTime) {
 		stpLogic.openSafe(safeTime);
 	}
 
 	/**
-	 * 在当前会话 开启二级认证 
-	 * @param service 业务标识  
-	 * @param safeTime 维持时间 (单位: 秒) 
+	 * 在当前会话 开启二级认证
+	 *
+	 * @param service 业务标识
+	 * @param safeTime 维持时间 (单位: 秒)
 	 */
 	public static void openSafe(String service, long safeTime) {
 		stpLogic.openSafe(service, safeTime);
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
+	 * 判断：当前会话是否处于二级认证时间内
+	 *
+	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时
 	 */
 	public static boolean isSafe() {
 		return stpLogic.isSafe();
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
-	 * @param service 业务标识  
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
+	 * 判断：当前会话 是否处于指定业务的二级认证时间内
+	 *
+	 * @param service 业务标识
+	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时
 	 */
 	public static boolean isSafe(String service) {
 		return stpLogic.isSafe(service);
 	}
 
 	/**
-	 * 指定 Token 是否处于二级认证时间内 
-	 * @param tokenValue Token 值  
-	 * @param service 业务标识  
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
+	 * 判断：指定 token 是否处于二级认证时间内
+	 *
+	 * @param tokenValue Token 值
+	 * @param service 业务标识
+	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时
 	 */
 	public static boolean isSafe(String tokenValue, String service) {
 		return stpLogic.isSafe(tokenValue, service);
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
+	 * 校验：当前会话是否已通过二级认证，如未通过则抛出异常
 	 */
 	public static void checkSafe() {
 		stpLogic.checkSafe();
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
-	 * @param service 业务标识  
+	 * 校验：检查当前会话是否已通过指定业务的二级认证，如未通过则抛出异常
+	 *
+	 * @param service 业务标识
 	 */
 	public static void checkSafe(String service) {
 		stpLogic.checkSafe(service);
 	}
-	
+
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
 	 * @return 剩余有效时间
 	 */
 	public static long getSafeTime() {
@@ -1064,8 +1172,9 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
-	 * @param service 业务标识  
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
+	 * @param service 业务标识
 	 * @return 剩余有效时间
 	 */
 	public static long getSafeTime(String service) {
@@ -1073,14 +1182,15 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 在当前会话 结束二级认证 
+	 * 在当前会话 结束二级认证
 	 */
 	public static void closeSafe() {
 		stpLogic.closeSafe();
 	}
 
 	/**
-	 * 在当前会话 结束二级认证 
+	 * 在当前会话 结束指定业务标识的二级认证
+	 *
 	 * @param service 业务标识  
 	 */
 	public static void closeSafe(String service) {
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java
index 08085bbc..5c623667 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckLogin.java
@@ -6,6 +6,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import com.pj.satoken.StpUserUtil;
 
 /**
  * 登录认证(User版)：只有登录之后才能进入该方法 
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java
index d63fe208..22938622 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckPermission.java
@@ -5,6 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.pj.satoken.StpUserUtil;
 import org.springframework.core.annotation.AliasFor;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java
index e8707280..66e1f6d0 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/SaUserCheckRole.java
@@ -5,6 +5,7 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import com.pj.satoken.StpUserUtil;
 import org.springframework.core.annotation.AliasFor;
 
 import cn.dev33.satoken.annotation.SaCheckRole;
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java
deleted file mode 100644
index 7f817598..00000000
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/at/StpUserUtil.java
+++ /dev/null
@@ -1,1029 +0,0 @@
-package com.pj.satoken.at;
-
-import java.util.List;
-
-import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.fun.SaFunction;
-import cn.dev33.satoken.session.SaSession;
-import cn.dev33.satoken.stp.SaLoginModel;
-import cn.dev33.satoken.stp.SaTokenInfo;
-import cn.dev33.satoken.stp.StpLogic;
-
-/**
- * Sa-Token 权限认证工具类 (User版)
- * @author click33 
- */
-public class StpUserUtil {
-	
-	private StpUserUtil() {}
-	
-	/**
-	 * 账号类型标识 
-	 */
-	public static final String TYPE = "user";
-	
-	/**
-	 * 底层的 StpLogic 对象  
-	 */
-	public static StpLogic stpLogic = new StpLogic(TYPE); 
-
-	/**
-	 * 获取当前 StpLogic 的账号类型
-	 * @return See Note 
-	 */
-	public static String getLoginType(){
-		return stpLogic.getLoginType();
-	}
-
-	/**
-	 * 重置 StpLogic 对象
-	 * <br> 1、更改此账户的 StpLogic 对象 
-	 * <br> 2、put 到全局 StpLogic 集合中 
-	 * 
-	 * @param newStpLogic / 
-	 */
-	public static void setStpLogic(StpLogic newStpLogic) {
-		// 重置此账户的 StpLogic 对象 
-		stpLogic = newStpLogic;
-		
-		// 添加到全局 StpLogic 集合中
-		// 以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic 
-		SaManager.putStpLogic(newStpLogic);
-	}
-
-	/**
-	 * 获取 StpLogic 对象
-	 * @return / 
-	 */
-	public static StpLogic getStpLogic() {
-		return stpLogic;
-	}
-	
-	
-	// ------------------- 获取token 相关 -------------------
-
-	/**
-	 * 返回token名称 
-	 * @return 此StpLogic的token名称
-	 */
-	public static String getTokenName() {
- 		return stpLogic.getTokenName();
- 	}
-
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 */
-	public static void setTokenValue(String tokenValue){
-		stpLogic.setTokenValue(tokenValue);
-	}
-	
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 * @param cookieTimeout Cookie存活时间(秒)
- 	 */
-	public static void setTokenValue(String tokenValue, int cookieTimeout){
-		stpLogic.setTokenValue(tokenValue, cookieTimeout);
-	}
- 	
-	/**
-	 * 获取当前TokenValue
-	 * @return 当前tokenValue
-	 */
-	public static String getTokenValue() {
-		return stpLogic.getTokenValue();
-	}
-
-	/**
-	 * 获取当前TokenValue (不裁剪前缀) 
-	 * @return / 
-	 */
-	public static String getTokenValueNotCut(){
-		return stpLogic.getTokenValueNotCut();
-	}
-
-	/**
-	 * 获取当前会话的Token信息 
-	 * @return token信息 
-	 */
-	public static SaTokenInfo getTokenInfo() {
-		return stpLogic.getTokenInfo();
-	}
-
-	
-	// ------------------- 登录相关操作 -------------------
-
-	// --- 登录 
-	
-	/**
-	 * 会话登录 
-	 * @param id 账号id，建议的类型：（long | int | String）
-	 */
-	public static void login(Object id) {
-		stpLogic.login(id);
-	}
-
-	/**
-	 * 会话登录，并指定登录设备类型
-	 * @param id 账号id，建议的类型：（long | int | String）
-	 * @param device 设备类型
-	 */
-	public static void login(Object id, String device) {
-		stpLogic.login(id, device);
-	}
-
-	/**
-	 * 会话登录，并指定是否 [记住我]
-	 *
-	 * @param id              账号id，建议的类型：（long | int | String）
-	 * @param isLastingCookie 是否为持久Cookie
-	 */
-	public static void login(Object id, boolean isLastingCookie) {
-		stpLogic.login(id, isLastingCookie);
-	}
-
-	/**
-	 * 会话登录，并指定此次登录token的有效期, 单位:秒
-	 *
-	 * @param id      账号id，建议的类型：（long | int | String）
-	 * @param timeout 此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
-	 */
-	public static void login(Object id, long timeout) {
-		stpLogic.login(id, timeout);
-	}
-
-	/**
-	 * 会话登录，并指定所有登录参数Model
-	 *
-	 * @param id         登录id，建议的类型：（long | int | String）
-	 * @param loginModel 此次登录的参数Model
-	 */
-	public static void login(Object id, SaLoginModel loginModel) {
-		stpLogic.login(id, loginModel);
-	}
-
-	/**
-	 * 创建指定账号id的登录会话 
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @return 返回会话令牌 
-	 */
-	public static String createLoginSession(Object id) {
-		return stpLogic.createLoginSession(id);
-	}
-	
-	/**
-	 * 创建指定账号id的登录会话
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @param loginModel 此次登录的参数Model 
-	 * @return 返回会话令牌 
-	 */
-	public static String createLoginSession(Object id, SaLoginModel loginModel) {
-		return stpLogic.createLoginSession(id, loginModel);
-	}
-	
-	// --- 注销 
-	
-	/** 
-	 * 会话注销 
-	 */
-	public static void logout() {
-		stpLogic.logout();
-	}
-
-	/**
-	 * 会话注销，根据账号id 
-	 * @param loginId 账号id 
-	 */
-	public static void logout(Object loginId) {
-		stpLogic.logout(loginId);
-	}
-
-	/**
-	 * 会话注销，根据账号id 和 设备类型
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表注销所有设备类型) 
-	 */
-	public static void logout(Object loginId, String device) {
-		stpLogic.logout(loginId, device);
-	}
-	
-	/**
-	 * 会话注销，根据指定 Token 
-	 * 
-	 * @param tokenValue 指定token
-	 */
-	public static void logoutByTokenValue(String tokenValue) {
-		stpLogic.logoutByTokenValue(tokenValue);
-	}
-	
-	/**
-	 * 踢人下线，根据账号id 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
-	 */
-	public static void kickout(Object loginId) {
-		stpLogic.kickout(loginId);
-	}
-	
-	/**
-	 * 踢人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表踢出所有设备类型) 
-	 */
-	public static void kickout(Object loginId, String device) {
-		stpLogic.kickout(loginId, device);
-	}
-
-	/**
-	 * 踢人下线，根据指定 Token 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param tokenValue 指定token
-	 */
-	public static void kickoutByTokenValue(String tokenValue) {
-		stpLogic.kickoutByTokenValue(tokenValue);
-	}
-	
-	/**
-	 * 顶人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-4 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表顶替所有设备类型) 
-	 */
-	public static void replaced(Object loginId, String device) {
-		stpLogic.replaced(loginId, device);
-	}
-	
-	
-	// 查询相关
-
-	/** 
- 	 * 当前会话是否已经登录 
- 	 * @return 是否已登录 
- 	 */
-	public static boolean isLogin() {
-		return stpLogic.isLogin();
-	}
-
-	/** 
- 	 * 检验当前会话是否已经登录，如未登录，则抛出异常 
- 	 */
- 	public static void checkLogin() {
- 		stpLogic.checkLogin();
- 	}
-
- 	/** 
- 	 * 获取当前会话账号id, 如果未登录，则抛出异常 
- 	 * @return 账号id
- 	 */
-	public static Object getLoginId() {
-		return stpLogic.getLoginId();
-	}
-
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回默认值 
-	 * @param <T> 返回类型 
-	 * @param defaultValue 默认值
-	 * @return 登录id 
-	 */
-	public static <T> T getLoginId(T defaultValue) {
-		return stpLogic.getLoginId(defaultValue);
-	}
-
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回null 
-	 * @return 账号id 
-	 */
-	public static Object getLoginIdDefaultNull() {
-		return stpLogic.getLoginIdDefaultNull();
- 	}
-
-	/** 
-	 * 获取当前会话账号id, 并转换为String类型
-	 * @return 账号id 
-	 */
-	public static String getLoginIdAsString() {
-		return stpLogic.getLoginIdAsString();
-	}
-
-	/** 
-	 * 获取当前会话账号id, 并转换为int类型
-	 * @return 账号id 
-	 */
-	public static int getLoginIdAsInt() {
-		return stpLogic.getLoginIdAsInt();
-	}
-
-	/**
-	 * 获取当前会话账号id, 并转换为long类型 
-	 * @return 账号id 
-	 */
-	public static long getLoginIdAsLong() {
-		return stpLogic.getLoginIdAsLong();
-	}
-
-	/** 
- 	 * 获取指定Token对应的账号id，如果未登录，则返回 null 
- 	 * @param tokenValue token
- 	 * @return 账号id
- 	 */
- 	public static Object getLoginIdByToken(String tokenValue) {
- 		return stpLogic.getLoginIdByToken(tokenValue);
- 	}
-
-	/**
-	 * 获取当前 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
-	 */
-	public static Object getExtra(String key) {
-		return stpLogic.getExtra(key);
-	}
-
-	/**
-	 * 获取指定 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param tokenValue 指定的 Token 值 
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
-	 */
-	public static Object getExtra(String tokenValue, String key) {
-		return stpLogic.getExtra(tokenValue, key);
-	}
- 	
- 	
-	// ------------------- User-Session 相关 -------------------
-
- 	/** 
-	 * 获取指定账号id的Session, 如果Session尚未创建，isCreate=是否新建并返回
-	 * @param loginId 账号id
-	 * @param isCreate 是否新建
-	 * @return Session对象
-	 */
-	public static SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
-		return stpLogic.getSessionByLoginId(loginId, isCreate);
-	}
-
-	/** 
-	 * 获取指定key的Session, 如果Session尚未创建，则返回null
-	 * @param sessionId SessionId
-	 * @return Session对象 
-	 */
-	public static SaSession getSessionBySessionId(String sessionId) {
-		return stpLogic.getSessionBySessionId(sessionId);
-	}
-
-	/** 
-	 * 获取指定账号id的Session，如果Session尚未创建，则新建并返回 
-	 * @param loginId 账号id 
-	 * @return Session对象 
-	 */
-	public static SaSession getSessionByLoginId(Object loginId) {
-		return stpLogic.getSessionByLoginId(loginId);
-	}
-
-	/** 
-	 * 获取当前会话的Session, 如果Session尚未创建，isCreate=是否新建并返回 
-	 * @param isCreate 是否新建 
-	 * @return Session对象 
-	 */
-	public static SaSession getSession(boolean isCreate) {
-		return stpLogic.getSession(isCreate);
-	}
-
-	/** 
-	 * 获取当前会话的Session，如果Session尚未创建，则新建并返回 
-	 * @return Session对象 
-	 */
-	public static SaSession getSession() {
-		return stpLogic.getSession();
-	}
-
-	
-	// ------------------- Token-Session 相关 -------------------  
-	
-	/** 
-	 * 获取指定Token-Session，如果Session尚未创建，则新建并返回 
-	 * @param tokenValue Token值
-	 * @return Session对象  
-	 */
-	public static SaSession getTokenSessionByToken(String tokenValue) {
-		return stpLogic.getTokenSessionByToken(tokenValue);
-	}
-	
-	/** 
-	 * 获取当前Token-Session，如果Session尚未创建，则新建并返回
-	 * @return Session对象 
-	 */
-	public static SaSession getTokenSession() {
-		return stpLogic.getTokenSession();
-	}
-
-	/** 
-	 * 获取当前匿名 Token-Session （可在未登录情况下使用的Token-Session）
-	 * @return Token-Session 对象 
-	 */
-	public static SaSession getAnonTokenSession() {
-		return stpLogic.getAnonTokenSession();
-	}
-	
-
-	// ------------------- [临时有效期] 验证相关 -------------------  
-
-	/**
- 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
- 	 */
- 	public static void checkActivityTimeout() {
- 		stpLogic.checkActivityTimeout();
- 	}
-
- 	/**
- 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
- 	 * <h1>请注意: 即使token已经 [临时过期] 也可续签成功，
- 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
- 	 */
- 	public static void updateLastActivityToNow() {
- 		stpLogic.updateLastActivityToNow();
- 	}
- 	
-
-	// ------------------- 过期时间相关 -------------------  
-
- 	/**
- 	 * 获取当前登录者的 token 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getTokenTimeout() {
- 		return stpLogic.getTokenTimeout();
- 	}
- 	
- 	/**
- 	 * 获取当前登录者的 User-Session 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getSessionTimeout() {
- 		return stpLogic.getSessionTimeout();
- 	}
-
- 	/**
- 	 * 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getTokenSessionTimeout() {
- 		return stpLogic.getTokenSessionTimeout();
- 	}
- 	
- 	/**
- 	 * 获取当前 token [临时过期] 剩余有效时间 (单位: 秒)
- 	 * @return token [临时过期] 剩余有效时间
- 	 */
- 	public static long getTokenActivityTimeout() {
- 		return stpLogic.getTokenActivityTimeout();
- 	}
-
- 	/**
- 	 * 对当前 Token 的 timeout 值进行续期 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
- 	public static void renewTimeout(long timeout) {
- 		stpLogic.renewTimeout(timeout);
- 	}
- 	
- 	/**
- 	 * 对指定 Token 的 timeout 值进行续期 
- 	 * @param tokenValue 指定token 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
- 	public static void renewTimeout(String tokenValue, long timeout) {
- 		stpLogic.renewTimeout(tokenValue, timeout);
- 	}
- 	
- 	
-	// ------------------- 角色验证操作 -------------------  
-
-	/**
-	 * 获取：当前账号的角色集合 
-	 * @return /
-	 */
-	public static List<String> getRoleList() {
-		return stpLogic.getRoleList();
-	}
-
-	/**
-	 * 获取：指定账号的角色集合 
-	 * @param loginId 指定账号id 
-	 * @return /
-	 */
-	public static List<String> getRoleList(Object loginId) {
-		return stpLogic.getRoleList(loginId);
-	}
-
- 	/** 
- 	 * 判断：当前账号是否拥有指定角色, 返回true或false 
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
- 	public static boolean hasRole(String role) {
- 		return stpLogic.hasRole(role);
- 	}
-
- 	/** 
- 	 * 判断：指定账号是否含有指定角色标识, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
- 	public static boolean hasRole(Object loginId, String role) {
- 		return stpLogic.hasRole(loginId, role);
- 	}
- 	
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
- 	public static boolean hasRoleAnd(String... roleArray){
- 		return stpLogic.hasRoleAnd(roleArray);
- 	}
-
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
- 	public static boolean hasRoleOr(String... roleArray){
- 		return stpLogic.hasRoleOr(roleArray);
- 	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException 
- 	 * @param role 角色标识
- 	 */
- 	public static void checkRole(String role) {
- 		stpLogic.checkRole(role);
- 	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 */
- 	public static void checkRoleAnd(String... roleArray){
- 		stpLogic.checkRoleAnd(roleArray);
- 	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 */
- 	public static void checkRoleOr(String... roleArray){
- 		stpLogic.checkRoleOr(roleArray);
- 	}
-
-	
-	// ------------------- 权限验证操作 -------------------
-
-	/**
-	 * 获取：当前账号的权限码集合 
-	 * @return / 
-	 */
-	public static List<String> getPermissionList() {
-		return stpLogic.getPermissionList();
-	}
-
-	/**
-	 * 获取：指定账号的权限码集合 
-	 * @param loginId 指定账号id
-	 * @return / 
-	 */
-	public static List<String> getPermissionList(Object loginId) {
-		return stpLogic.getPermissionList(loginId);
-	}
-
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, 返回true或false 
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
-	public static boolean hasPermission(String permission) {
-		return stpLogic.hasPermission(permission);
-	}
-
- 	/** 
- 	 * 判断：指定账号id是否含有指定权限, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
-	public static boolean hasPermission(Object loginId, String permission) {
-		return stpLogic.hasPermission(loginId, permission);
-	}
-
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, [指定多个，必须全部具有] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
- 	public static boolean hasPermissionAnd(String... permissionArray){
- 		return stpLogic.hasPermissionAnd(permissionArray);
- 	}
-
- 	/** 
- 	 * 判断：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
- 	public static boolean hasPermissionOr(String... permissionArray){
- 		return stpLogic.hasPermissionOr(permissionArray);
- 	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException 
- 	 * @param permission 权限码
- 	 */
-	public static void checkPermission(String permission) {
-		stpLogic.checkPermission(permission);
-	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，必须全部验证通过] 
- 	 * @param permissionArray 权限码数组
- 	 */
-	public static void checkPermissionAnd(String... permissionArray) {
-		stpLogic.checkPermissionAnd(permissionArray);
-	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 */
-	public static void checkPermissionOr(String... permissionArray) {
-		stpLogic.checkPermissionOr(permissionArray);
-	}
-
-
-	// ------------------- id 反查token 相关操作 -------------------  
-	
-	/** 
-	 * 获取指定账号id的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
-	 * @param loginId 账号id
-	 * @return token值 
-	 */
-	public static String getTokenValueByLoginId(Object loginId) {
-		return stpLogic.getTokenValueByLoginId(loginId);
-	}
-
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
-	 * @param loginId 账号id
-	 * @param device 设备类型
-	 * @return token值 
-	 */
-	public static String getTokenValueByLoginId(Object loginId, String device) {
-		return stpLogic.getTokenValueByLoginId(loginId, device);
-	}
-	
-	/** 
-	 * 获取指定账号id的tokenValue集合 
-	 * @param loginId 账号id 
-	 * @return 此loginId的所有相关token 
- 	 */
-	public static List<String> getTokenValueListByLoginId(Object loginId) {
-		return stpLogic.getTokenValueListByLoginId(loginId);
-	}
-
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 集合 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 
-	 * @return 此loginId的所有相关token 
- 	 */
-	public static List<String> getTokenValueListByLoginId(Object loginId, String device) {
-		return stpLogic.getTokenValueListByLoginId(loginId, device);
-	}
-	
-	/**
-	 * 返回当前会话的登录设备类型
-	 * @return 当前令牌的登录设备类型
-	 */
-	public static String getLoginDevice() {
-		return stpLogic.getLoginDevice(); 
-	}
-
-	
-	// ------------------- 会话管理 -------------------  
-
-	/**
-	 * 根据条件查询Token 
-	 * @param keyword 关键字 
-	 * @param start 开始处索引 (-1代表查询所有) 
-	 * @param size 获取数量 
-	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return token集合 
-	 */
-	public static List<String> searchTokenValue(String keyword, int start, int size, boolean sortType) {
-		return stpLogic.searchTokenValue(keyword, start, size, sortType);
-	}
-	
-	/**
-	 * 根据条件查询SessionId 
-	 * @param keyword 关键字 
-	 * @param start 开始处索引 (-1代表查询所有) 
-	 * @param size 获取数量 
-	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
-	 */
-	public static List<String> searchSessionId(String keyword, int start, int size, boolean sortType) {
-		return stpLogic.searchSessionId(keyword, start, size, sortType);
-	}
-
-	/**
-	 * 根据条件查询Token专属Session的Id 
-	 * @param keyword 关键字 
-	 * @param start 开始处索引 (-1代表查询所有) 
-	 * @param size 获取数量 
-	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
-	 */
-	public static List<String> searchTokenSessionId(String keyword, int start, int size, boolean sortType) {
-		return stpLogic.searchTokenSessionId(keyword, start, size, sortType);
-	}
-
-	
-	// ------------------- 账号封禁 -------------------  
-
-	/**
-	 * 封禁：指定账号
-	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
-	 */
-	public static void disable(Object loginId, long time) {
-		stpLogic.disable(loginId, time);
-	}
-
-	/**
-	 * 判断：指定账号是否已被封禁 (true=已被封禁, false=未被封禁) 
-	 * 
-	 * @param loginId 账号id
-	 * @return / 
-	 */
-	public static boolean isDisable(Object loginId) {
-		return stpLogic.isDisable(loginId);
-	}
-
-	/**
-	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常 
-	 * @param loginId 账号id
-	 */
-	public static void checkDisable(Object loginId) {
-		stpLogic.checkDisable(loginId);
-	}
-
-	/**
-	 * 获取：指定账号剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
-	 * @param loginId 账号id
-	 * @return / 
-	 */
-	public static long getDisableTime(Object loginId) {
-		return stpLogic.getDisableTime(loginId);
-	}
-
-	/**
-	 * 解封：指定账号
-	 * @param loginId 账号id
-	 */
-	public static void untieDisable(Object loginId) {
-		stpLogic.untieDisable(loginId);
-	}
-
-	
-	// ------------------- 分类封禁 -------------------  
-
-	/**
-	 * 封禁：指定账号的指定服务 
-	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * @param loginId 指定账号id 
-	 * @param service 指定服务 
-	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
-	 */
-	public static void disable(Object loginId, String service, long time) {
-		stpLogic.disable(loginId, service, time);
-	}
-
-	/**
-	 * 判断：指定账号的指定服务 是否已被封禁 (true=已被封禁, false=未被封禁) 
-	 * @param loginId 账号id
-	 * @param service 指定服务 
-	 * @return / 
-	 */
-	public static boolean isDisable(Object loginId, String service) {
-		return stpLogic.isDisable(loginId, service);
-	}
-
-	/**
-	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常 
-	 * @param loginId 账号id
-	 * @param services 指定服务，可以指定多个 
-	 */
-	public static void checkDisable(Object loginId, String... services) {
-		stpLogic.checkDisable(loginId, services);
-	}
-
-	/**
-	 * 获取：指定账号 指定服务 剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
-	 * @param loginId 账号id
-	 * @param service 指定服务 
-	 * @return see note 
-	 */
-	public static long getDisableTime(Object loginId, String service) {
-		return stpLogic.getDisableTime(loginId, service);
-	}
-
-	/**
-	 * 解封：指定账号、指定服务
-	 * @param loginId 账号id
-	 * @param services 指定服务，可以指定多个 
-	 */
-	public static void untieDisable(Object loginId, String... services) {
-		stpLogic.untieDisable(loginId, services);
-	}
-
-
-	// ------------------- 阶梯封禁 -------------------  
-
-	/**
-	 * 封禁：指定账号，并指定封禁等级 
-	 * @param loginId 指定账号id 
-	 * @param level 指定封禁等级 
-	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
-	 */
-	public static void disableLevel(Object loginId, int level, long time) {
-		stpLogic.disableLevel(loginId, level, time);
-	}
-
-	/**
-	 * 封禁：指定账号的指定服务，并指定封禁等级 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 指定封禁等级 
-	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
-	 */
-	public static void disableLevel(Object loginId, String service, int level, long time) {
-		stpLogic.disableLevel(loginId, service, level, time);
-	}
-
-	/**
-	 * 判断：指定账号是否已被封禁到指定等级
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param level 指定封禁等级 
-	 * @return / 
-	 */
-	public static boolean isDisableLevel(Object loginId, int level) {
-		return stpLogic.isDisableLevel(loginId, level);
-	}
-
-	/**
-	 * 判断：指定账号的指定服务，是否已被封禁到指定等级 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 指定封禁等级 
-	 * @return / 
-	 */
-	public static boolean isDisableLevel(Object loginId, String service, int level) {
-		return stpLogic.isDisableLevel(loginId, service, level);
-	}
-
-	/**
-	 * 校验：指定账号是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
-	 */
-	public static void checkDisableLevel(Object loginId, int level) {
-		stpLogic.checkDisableLevel(loginId, level);
-	}
-
-	/**
-	 * 校验：指定账号的指定服务，是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
-	 */
-	public static void checkDisableLevel(Object loginId, String service, int level) {
-		stpLogic.checkDisableLevel(loginId, service, level);
-	}
-
-	/**
-	 * 获取：指定账号被封禁的等级，如果未被封禁则返回-2 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @return / 
-	 */
-	public static int getDisableLevel(Object loginId) {
-		return stpLogic.getDisableLevel(loginId);
-	}
-
-	/**
-	 * 获取：指定账号的 指定服务 被封禁的等级，如果未被封禁则返回-2 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @return / 
-	 */
-	public static int getDisableLevel(Object loginId, String service) {
-		return stpLogic.getDisableLevel(loginId, service);
-	}
-	
-	
-	// ------------------- 身份切换 -------------------  
-
-	/**
-	 * 临时切换身份为指定账号id 
-	 * @param loginId 指定loginId 
-	 */
-	public static void switchTo(Object loginId) {
-		stpLogic.switchTo(loginId);
-	}
-	
-	/**
-	 * 结束临时切换身份
-	 */
-	public static void endSwitch() {
-		stpLogic.endSwitch();
-	}
-
-	/**
-	 * 当前是否正处于[身份临时切换]中 
-	 * @return 是否正处于[身份临时切换]中 
-	 */
-	public static boolean isSwitch() {
-		return stpLogic.isSwitch();
-	}
-
-	/**
-	 * 在一个代码段里方法内，临时切换身份为指定账号id
-	 * @param loginId 指定账号id 
-	 * @param function 要执行的方法 
-	 */
-	public static void switchTo(Object loginId, SaFunction function) {
-		stpLogic.switchTo(loginId, function);
-	}
-	
-
-	// ------------------- 二级认证 -------------------  
-	
-	/**
-	 * 在当前会话 开启二级认证 
-	 * @param safeTime 维持时间 (单位: 秒) 
-	 */
-	public static void openSafe(long safeTime) {
-		stpLogic.openSafe(safeTime);
-	}
-
-	/**
-	 * 当前会话 是否处于二级认证时间内 
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
-	 */
-	public static boolean isSafe() {
-		return stpLogic.isSafe();
-	}
-
-	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
-	 */
-	public static void checkSafe() {
-		stpLogic.checkSafe();
-	}
-	
-	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
-	 * @return 剩余有效时间
-	 */
-	public static long getSafeTime() {
-		return stpLogic.getSafeTime();
-	}
-
-	/**
-	 * 在当前会话 结束二级认证 
-	 */
-	public static void closeSafe() {
-		stpLogic.closeSafe();
-	}
-
-}
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
index 8173ea54..8bc72dfa 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/SaTokenDemoApp.java
@@ -1,11 +1,10 @@
 package com.pj;
 
 
+import cn.dev33.satoken.SaManager;
 import org.noear.solon.Solon;
 import org.noear.solon.annotation.SolonMain;
 
-import cn.dev33.satoken.SaManager;
-
 /**
  * sa-token整合 solon 示例
  * @author noear
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
index 7431acec..23640c1c 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -1,9 +1,5 @@
 package com.pj.satoken;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.fun.SaFunction;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
@@ -12,91 +8,111 @@ import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
 
+import java.util.List;
+
 /**
- * Sa-Token 权限认证工具类 （User版）
- * @author click33 
+ * Sa-Token 权限认证工具类 (User版)
+ *
+ * @author click33
+ * @since <= 1.34.0
  */
-@Component
 public class StpUserUtil {
-	
+
 	private StpUserUtil() {}
-	
+
 	/**
-	 * 账号类型标识 
+	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "user";
-	
+	public static final String TYPE = "login";
+
 	/**
-	 * 底层的 StpLogic 对象  
+	 * 底层使用的 StpLogic 对象
 	 */
-	public static StpLogic stpLogic = new StpLogic(TYPE); 
+	public static StpLogic stpLogic = new StpLogic(TYPE);
 
 	/**
 	 * 获取当前 StpLogic 的账号类型
-	 * @return See Note 
+	 *
+	 * @return /
 	 */
 	public static String getLoginType(){
 		return stpLogic.getLoginType();
 	}
 
 	/**
-	 * 重置 StpLogic 对象
-	 * <br> 1、更改此账户的 StpLogic 对象 
-	 * <br> 2、put 到全局 StpLogic 集合中 
-	 * <br> 3、发送日志 
-	 * 
-	 * @param newStpLogic / 
+	 * 安全的重置 StpLogic 对象
+	 *
+	 * <br> 1、更改此账户的 StpLogic 对象
+	 * <br> 2、put 到全局 StpLogic 集合中
+	 * <br> 3、发送日志
+	 *
+	 * @param newStpLogic /
 	 */
 	public static void setStpLogic(StpLogic newStpLogic) {
-		// 重置此账户的 StpLogic 对象 
+		// 1、重置此账户的 StpLogic 对象
 		stpLogic = newStpLogic;
-		
-		// 添加到全局 StpLogic 集合中
-		// 以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic 
+
+		// 2、添加到全局 StpLogic 集合中
+		//    以便可以通过 SaManager.getStpLogic(type) 的方式来全局获取到这个 StpLogic
 		SaManager.putStpLogic(newStpLogic);
-		
-		// $$ 全局事件  
+
+		// 3、$$ 发布事件：更新了 stpLogic 对象
 		SaTokenEventCenter.doSetStpLogic(stpLogic);
 	}
 
 	/**
 	 * 获取 StpLogic 对象
-	 * @return / 
+	 *
+	 * @return /
 	 */
 	public static StpLogic getStpLogic() {
 		return stpLogic;
 	}
-	
-	
-	// ------------------- 获取token 相关 -------------------
+
+
+	// ------------------- 获取 token 相关 -------------------
 
 	/**
-	 * 返回token名称 
-	 * @return 此StpLogic的token名称
+	 * 返回 token 名称，此名称在以下地方体现：Cookie 保存 token 时的名称、提交 token 时参数的名称、存储 token 时的 key 前缀
+	 *
+	 * @return /
 	 */
 	public static String getTokenName() {
- 		return stpLogic.getTokenName();
- 	}
+		return stpLogic.getTokenName();
+	}
 
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 */
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 */
 	public static void setTokenValue(String tokenValue){
 		stpLogic.setTokenValue(tokenValue);
 	}
-	
- 	/**
- 	 * 在当前会话写入当前TokenValue 
- 	 * @param tokenValue token值 
- 	 * @param cookieTimeout Cookie存活时间(秒)
- 	 */
+
+	/**
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 * @param cookieTimeout Cookie存活时间(秒)
+	 */
 	public static void setTokenValue(String tokenValue, int cookieTimeout){
 		stpLogic.setTokenValue(tokenValue, cookieTimeout);
 	}
- 	
+
 	/**
-	 * 获取当前TokenValue
+	 * 在当前会话写入指定 token 值
+	 *
+	 * @param tokenValue token 值
+	 * @param loginModel 登录参数
+	 */
+	public static void setTokenValue(String tokenValue, SaLoginModel loginModel){
+		stpLogic.setTokenValue(tokenValue, loginModel);
+	}
+
+	/**
+	 * 获取当前请求的 token 值
+	 *
 	 * @return 当前tokenValue
 	 */
 	public static String getTokenValue() {
@@ -104,28 +120,31 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取当前TokenValue (不裁剪前缀) 
-	 * @return / 
+	 * 获取当前请求的 token 值 （不裁剪前缀）
+	 *
+	 * @return /
 	 */
 	public static String getTokenValueNotCut(){
 		return stpLogic.getTokenValueNotCut();
 	}
 
 	/**
-	 * 获取当前会话的Token信息 
-	 * @return token信息 
+	 * 获取当前会话的 token 参数信息
+	 *
+	 * @return token 参数信息
 	 */
 	public static SaTokenInfo getTokenInfo() {
 		return stpLogic.getTokenInfo();
 	}
 
-	
+
 	// ------------------- 登录相关操作 -------------------
 
-	// --- 登录 
-	
+	// --- 登录
+
 	/**
-	 * 会话登录 
+	 * 会话登录
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 */
 	public static void login(Object id) {
@@ -134,6 +153,7 @@ public class StpUserUtil {
 
 	/**
 	 * 会话登录，并指定登录设备类型
+	 *
 	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param device 设备类型
 	 */
@@ -144,27 +164,27 @@ public class StpUserUtil {
 	/**
 	 * 会话登录，并指定是否 [记住我]
 	 *
-	 * @param id              账号id，建议的类型：（long | int | String）
-	 * @param isLastingCookie 是否为持久Cookie
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @param isLastingCookie 是否为持久Cookie，值为 true 时记住我，值为 false 时关闭浏览器需要重新登录
 	 */
 	public static void login(Object id, boolean isLastingCookie) {
 		stpLogic.login(id, isLastingCookie);
 	}
 
 	/**
-	 * 会话登录，并指定此次登录token的有效期, 单位:秒
+	 * 会话登录，并指定此次登录 token 的有效期, 单位:秒
 	 *
 	 * @param id      账号id，建议的类型：（long | int | String）
-	 * @param timeout 此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
+	 * @param timeout 此次登录 token 的有效期, 单位:秒
 	 */
 	public static void login(Object id, long timeout) {
 		stpLogic.login(id, timeout);
 	}
 
 	/**
-	 * 会话登录，并指定所有登录参数Model
+	 * 会话登录，并指定所有登录参数 Model
 	 *
-	 * @param id         登录id，建议的类型：（long | int | String）
+	 * @param id 账号id，建议的类型：（long | int | String）
 	 * @param loginModel 此次登录的参数Model
 	 */
 	public static void login(Object id, SaLoginModel loginModel) {
@@ -172,36 +192,39 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 创建指定账号id的登录会话 
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @return 返回会话令牌 
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @return 返回会话令牌
 	 */
 	public static String createLoginSession(Object id) {
 		return stpLogic.createLoginSession(id);
 	}
-	
+
 	/**
-	 * 创建指定账号id的登录会话
-	 * @param id 登录id，建议的类型：（long | int | String）
-	 * @param loginModel 此次登录的参数Model 
-	 * @return 返回会话令牌 
+	 * 创建指定账号 id 的登录会话数据
+	 *
+	 * @param id 账号id，建议的类型：（long | int | String）
+	 * @param loginModel 此次登录的参数Model
+	 * @return 返回会话令牌
 	 */
 	public static String createLoginSession(Object id, SaLoginModel loginModel) {
 		return stpLogic.createLoginSession(id, loginModel);
 	}
-	
-	// --- 注销 
-	
-	/** 
-	 * 会话注销 
+
+	// --- 注销
+
+	/**
+	 * 在当前客户端会话注销
 	 */
 	public static void logout() {
 		stpLogic.logout();
 	}
 
 	/**
-	 * 会话注销，根据账号id 
-	 * @param loginId 账号id 
+	 * 会话注销，根据账号id
+	 *
+	 * @param loginId 账号id
 	 */
 	public static void logout(Object loginId) {
 		stpLogic.logout(loginId);
@@ -209,146 +232,154 @@ public class StpUserUtil {
 
 	/**
 	 * 会话注销，根据账号id 和 设备类型
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表注销所有设备类型) 
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 (填 null 代表注销该账号的所有设备类型)
 	 */
 	public static void logout(Object loginId, String device) {
 		stpLogic.logout(loginId, device);
 	}
-	
+
 	/**
-	 * 会话注销，根据指定 Token 
-	 * 
-	 * @param tokenValue 指定token
+	 * 会话注销，根据指定 Token
+	 *
+	 * @param tokenValue 指定 token
 	 */
 	public static void logoutByTokenValue(String tokenValue) {
 		stpLogic.logoutByTokenValue(tokenValue);
 	}
-	
+
 	/**
-	 * 踢人下线，根据账号id 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
+	 * 踢人下线，根据账号id
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param loginId 账号id
 	 */
 	public static void kickout(Object loginId) {
 		stpLogic.kickout(loginId);
 	}
-	
+
 	/**
 	 * 踢人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表踢出所有设备类型) 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 (填 null 代表踢出该账号的所有设备类型)
 	 */
 	public static void kickout(Object loginId, String device) {
 		stpLogic.kickout(loginId, device);
 	}
 
 	/**
-	 * 踢人下线，根据指定 Token 
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-5 </p>
-	 * 
-	 * @param tokenValue 指定token
+	 * 踢人下线，根据指定 token
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-5 </p>
+	 *
+	 * @param tokenValue 指定 token
 	 */
 	public static void kickoutByTokenValue(String tokenValue) {
 		stpLogic.kickoutByTokenValue(tokenValue);
 	}
-	
+
 	/**
 	 * 顶人下线，根据账号id 和 设备类型
-	 * <p> 当对方再次访问系统时，会抛出NotLoginException异常，场景值=-4 </p>
-	 * 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 (填null代表顶替所有设备类型) 
+	 * <p> 当对方再次访问系统时，会抛出 NotLoginException 异常，场景值=-4 </p>
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型 （填 null 代表顶替该账号的所有设备类型）
 	 */
 	public static void replaced(Object loginId, String device) {
 		stpLogic.replaced(loginId, device);
 	}
-	
-	
-	// 查询相关
 
-	/** 
- 	 * 当前会话是否已经登录 
- 	 * @return 是否已登录 
- 	 */
+	// 会话查询
+
+	/**
+	 * 判断当前会话是否已经登录
+	 *
+	 * @return 已登录返回 true，未登录返回 false
+	 */
 	public static boolean isLogin() {
 		return stpLogic.isLogin();
 	}
 
-	/** 
- 	 * 检验当前会话是否已经登录，如未登录，则抛出异常 
- 	 */
- 	public static void checkLogin() {
- 		stpLogic.checkLogin();
- 	}
+	/**
+	 * 检验当前会话是否已经登录，如未登录，则抛出异常
+	 */
+	public static void checkLogin() {
+		stpLogic.checkLogin();
+	}
 
- 	/** 
- 	 * 获取当前会话账号id, 如果未登录，则抛出异常 
- 	 * @return 账号id
- 	 */
+	/**
+	 * 获取当前会话账号id，如果未登录，则抛出异常
+	 *
+	 * @return 账号id
+	 */
 	public static Object getLoginId() {
 		return stpLogic.getLoginId();
 	}
 
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回默认值 
-	 * @param <T> 返回类型 
+	/**
+	 * 获取当前会话账号id, 如果未登录，则返回默认值
+	 *
+	 * @param <T> 返回类型
 	 * @param defaultValue 默认值
-	 * @return 登录id 
+	 * @return 登录id
 	 */
 	public static <T> T getLoginId(T defaultValue) {
 		return stpLogic.getLoginId(defaultValue);
 	}
 
-	/** 
-	 * 获取当前会话账号id, 如果未登录，则返回null 
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 如果未登录，则返回null
+	 *
+	 * @return 账号id
 	 */
 	public static Object getLoginIdDefaultNull() {
 		return stpLogic.getLoginIdDefaultNull();
- 	}
+	}
 
-	/** 
-	 * 获取当前会话账号id, 并转换为String类型
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 并转换为 String 类型
+	 *
+	 * @return 账号id
 	 */
 	public static String getLoginIdAsString() {
 		return stpLogic.getLoginIdAsString();
 	}
 
-	/** 
-	 * 获取当前会话账号id, 并转换为int类型
-	 * @return 账号id 
+	/**
+	 * 获取当前会话账号id, 并转换为 int 类型
+	 *
+	 * @return 账号id
 	 */
 	public static int getLoginIdAsInt() {
 		return stpLogic.getLoginIdAsInt();
 	}
 
 	/**
-	 * 获取当前会话账号id, 并转换为long类型 
-	 * @return 账号id 
+	 * 获取当前会话账号id, 并转换为 long 类型
+	 *
+	 * @return 账号id
 	 */
 	public static long getLoginIdAsLong() {
 		return stpLogic.getLoginIdAsLong();
 	}
 
-	/** 
- 	 * 获取指定Token对应的账号id，如果未登录，则返回 null 
- 	 * @param tokenValue token
- 	 * @return 账号id
- 	 */
- 	public static Object getLoginIdByToken(String tokenValue) {
- 		return stpLogic.getLoginIdByToken(tokenValue);
- 	}
+	/**
+	 * 获取指定 token 对应的账号id，如果未登录，则返回 null
+	 *
+	 * @param tokenValue token
+	 * @return 账号id
+	 */
+	public static Object getLoginIdByToken(String tokenValue) {
+		return stpLogic.getLoginIdByToken(tokenValue);
+	}
 
 	/**
 	 * 获取当前 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
+	 *
+	 * @param key 键值
+	 * @return 对应的扩展数据
 	 */
 	public static Object getExtra(String key) {
 		return stpLogic.getExtra(key);
@@ -356,166 +387,194 @@ public class StpUserUtil {
 
 	/**
 	 * 获取指定 Token 的扩展信息（此函数只在jwt模式下生效）
-	 * @param tokenValue 指定的 Token 值 
-	 * @param key 键值 
-	 * @return 对应的扩展数据 
+	 *
+	 * @param tokenValue 指定的 Token 值
+	 * @param key 键值
+	 * @return 对应的扩展数据
 	 */
 	public static Object getExtra(String tokenValue, String key) {
 		return stpLogic.getExtra(tokenValue, key);
 	}
- 	
- 	
-	// ------------------- User-Session 相关 -------------------
 
- 	/** 
-	 * 获取指定账号id的Session, 如果Session尚未创建，isCreate=是否新建并返回
+
+	// ------------------- Account-Session 相关 -------------------
+
+	/**
+	 * 获取指定账号 id 的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
 	 * @param loginId 账号id
 	 * @param isCreate 是否新建
-	 * @return Session对象
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionByLoginId(Object loginId, boolean isCreate) {
 		return stpLogic.getSessionByLoginId(loginId, isCreate);
 	}
 
-	/** 
-	 * 获取指定key的Session, 如果Session尚未创建，则返回null
+	/**
+	 * 获取指定 key 的 SaSession, 如果该 SaSession 尚未创建，则返回 null
+	 *
 	 * @param sessionId SessionId
-	 * @return Session对象 
+	 * @return Session对象
 	 */
 	public static SaSession getSessionBySessionId(String sessionId) {
 		return stpLogic.getSessionBySessionId(sessionId);
 	}
 
-	/** 
-	 * 获取指定账号id的Session，如果Session尚未创建，则新建并返回 
-	 * @param loginId 账号id 
-	 * @return Session对象 
+	/**
+	 * 获取指定账号 id 的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @param loginId 账号id
+	 * @return SaSession 对象
 	 */
 	public static SaSession getSessionByLoginId(Object loginId) {
 		return stpLogic.getSessionByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取当前会话的Session, 如果Session尚未创建，isCreate=是否新建并返回 
-	 * @param isCreate 是否新建 
-	 * @return Session对象 
+	/**
+	 * 获取当前已登录账号的 Account-Session, 如果该 SaSession 尚未创建，isCreate=是否新建并返回
+	 *
+	 * @param isCreate 是否新建
+	 * @return Session对象
 	 */
 	public static SaSession getSession(boolean isCreate) {
 		return stpLogic.getSession(isCreate);
 	}
 
-	/** 
-	 * 获取当前会话的Session，如果Session尚未创建，则新建并返回 
-	 * @return Session对象 
+	/**
+	 * 获取当前已登录账号的 Account-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @return Session对象
 	 */
 	public static SaSession getSession() {
 		return stpLogic.getSession();
 	}
 
-	
-	// ------------------- Token-Session 相关 -------------------  
-	
-	/** 
-	 * 获取指定Token-Session，如果Session尚未创建，则新建并返回 
+
+	// ------------------- Token-Session 相关 -------------------
+
+	/**
+	 * 获取指定 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
 	 * @param tokenValue Token值
-	 * @return Session对象  
+	 * @return Session对象
 	 */
 	public static SaSession getTokenSessionByToken(String tokenValue) {
 		return stpLogic.getTokenSessionByToken(tokenValue);
 	}
-	
-	/** 
-	 * 获取当前Token-Session，如果Session尚未创建，则新建并返回
-	 * @return Session对象 
+
+	/**
+	 * 获取当前 token 的 Token-Session，如果该 SaSession 尚未创建，则新建并返回
+	 *
+	 * @return Session对象
 	 */
 	public static SaSession getTokenSession() {
 		return stpLogic.getTokenSession();
 	}
 
-	/** 
+	/**
 	 * 获取当前匿名 Token-Session （可在未登录情况下使用的Token-Session）
-	 * @return Token-Session 对象 
+	 *
+	 * @return Token-Session 对象
 	 */
 	public static SaSession getAnonTokenSession() {
 		return stpLogic.getAnonTokenSession();
 	}
-	
 
-	// ------------------- [临时有效期] 验证相关 -------------------  
+
+	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
- 	 * 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
- 	 */
- 	public static void checkActivityTimeout() {
- 		stpLogic.checkActivityTimeout();
- 	}
-
- 	/**
- 	 * 续签当前token：(将 [最后操作时间] 更新为当前时间戳) 
- 	 * <h1>请注意: 即使token已经 [临时过期] 也可续签成功，
- 	 * 如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否过期即可 </h1>
- 	 */
- 	public static void updateLastActivityToNow() {
- 		stpLogic.updateLastActivityToNow();
- 	}
- 	
-
-	// ------------------- 过期时间相关 -------------------  
-
- 	/**
- 	 * 获取当前登录者的 token 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getTokenTimeout() {
- 		return stpLogic.getTokenTimeout();
- 	}
- 	
- 	/**
- 	 * 获取当前登录者的 User-Session 剩余有效时间 (单位: 秒)
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getSessionTimeout() {
- 		return stpLogic.getSessionTimeout();
- 	}
-
- 	/**
- 	 * 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
- 	 * @return token剩余有效时间
- 	 */
- 	public static long getTokenSessionTimeout() {
- 		return stpLogic.getTokenSessionTimeout();
- 	}
- 	
- 	/**
- 	 * 获取当前 token [临时过期] 剩余有效时间 (单位: 秒)
- 	 * @return token [临时过期] 剩余有效时间
- 	 */
- 	public static long getTokenActivityTimeout() {
- 		return stpLogic.getTokenActivityTimeout();
- 	}
-
- 	/**
- 	 * 对当前 Token 的 timeout 值进行续期 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
- 	public static void renewTimeout(long timeout) {
- 		stpLogic.renewTimeout(timeout);
- 	}
- 	
- 	/**
- 	 * 对指定 Token 的 timeout 值进行续期 
- 	 * @param tokenValue 指定token 
- 	 * @param timeout 要修改成为的有效时间 (单位: 秒) 
- 	 */
- 	public static void renewTimeout(String tokenValue, long timeout) {
- 		stpLogic.renewTimeout(tokenValue, timeout);
- 	}
- 	
- 	
-	// ------------------- 角色验证操作 -------------------  
+	 * 检查当前 token 是否已被冻结，如果是则抛出异常
+	 */
+	public static void checkActivityTimeout() {
+		stpLogic.checkActivityTimeout();
+	}
 
 	/**
-	 * 获取：当前账号的角色集合 
+	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
+	 * <h2>
+	 * 		请注意: 即使 token 已被冻结 也可续签成功，
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
+	 * </h2>
+	 */
+	public static void updateLastActivityToNow() {
+		stpLogic.updateLastActivityToNow();
+	}
+
+
+	// ------------------- 过期时间相关 -------------------
+
+	/**
+	 * 获取当前会话 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenTimeout() {
+		return stpLogic.getTokenTimeout();
+	}
+
+	/**
+	 * 获取指定 token 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @param token 指定token
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenTimeout(String token) {
+		return stpLogic.getTokenTimeout(token);
+	}
+
+	/**
+	 * 获取当前登录账号的 Account-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
+	public static long getSessionTimeout() {
+		return stpLogic.getSessionTimeout();
+	}
+
+	/**
+	 * 获取当前 token 的 Token-Session 剩余有效时间（单位: 秒，返回 -1 代表永久有效，-2 代表没有这个值）
+	 *
+	 * @return token剩余有效时间
+	 */
+	public static long getTokenSessionTimeout() {
+		return stpLogic.getTokenSessionTimeout();
+	}
+
+	/**
+	 * 获取当前 token 剩余活跃有效期：当前 token 距离被冻结还剩多少时间（单位: 秒，返回 -1 代表永不冻结，-2 代表没有这个值或 token 已被冻结了）
+	 *
+	 * @return /
+	 */
+	public static long getTokenActivityTimeout() {
+		return stpLogic.getTokenActivityTimeout();
+	}
+
+	/**
+	 * 对当前 token 的 timeout 值进行续期
+	 *
+	 * @param timeout 要修改成为的有效时间 (单位: 秒)
+	 */
+	public static void renewTimeout(long timeout) {
+		stpLogic.renewTimeout(timeout);
+	}
+
+	/**
+	 * 对指定 token 的 timeout 值进行续期
+	 *
+	 * @param tokenValue 指定 token
+	 * @param timeout 要修改成为的有效时间 (单位: 秒，填 -1 代表要续为永久有效)
+	 */
+	public static void renewTimeout(String tokenValue, long timeout) {
+		stpLogic.renewTimeout(tokenValue, timeout);
+	}
+
+
+	// ------------------- 角色认证操作 -------------------
+
+	/**
+	 * 获取：当前账号的角色集合
+	 *
 	 * @return /
 	 */
 	public static List<String> getRoleList() {
@@ -523,259 +582,288 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取：指定账号的角色集合 
-	 * @param loginId 指定账号id 
+	 * 获取：指定账号的角色集合
+	 *
+	 * @param loginId 指定账号id
 	 * @return /
 	 */
 	public static List<String> getRoleList(Object loginId) {
 		return stpLogic.getRoleList(loginId);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否拥有指定角色, 返回true或false 
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
- 	public static boolean hasRole(String role) {
- 		return stpLogic.hasRole(role);
- 	}
-
- 	/** 
- 	 * 判断：指定账号是否含有指定角色标识, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param role 角色标识
- 	 * @return 是否含有指定角色标识
- 	 */
- 	public static boolean hasRole(Object loginId, String role) {
- 		return stpLogic.hasRole(loginId, role);
- 	}
- 	
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
- 	public static boolean hasRoleAnd(String... roleArray){
- 		return stpLogic.hasRoleAnd(roleArray);
- 	}
-
- 	/** 
- 	 * 判断：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 * @return true或false
- 	 */
- 	public static boolean hasRoleOr(String... roleArray){
- 		return stpLogic.hasRoleOr(roleArray);
- 	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException 
- 	 * @param role 角色标识
- 	 */
- 	public static void checkRole(String role) {
- 		stpLogic.checkRole(role);
- 	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，必须全部验证通过] 
- 	 * @param roleArray 角色标识数组
- 	 */
- 	public static void checkRoleAnd(String... roleArray){
- 		stpLogic.checkRoleAnd(roleArray);
- 	}
-
- 	/** 
- 	 * 校验：当前账号是否含有指定角色标识 [指定多个，只要其一验证通过即可] 
- 	 * @param roleArray 角色标识数组
- 	 */
- 	public static void checkRoleOr(String... roleArray){
- 		stpLogic.checkRoleOr(roleArray);
- 	}
-
-	
-	// ------------------- 权限验证操作 -------------------
+	/**
+	 * 判断：当前账号是否拥有指定角色, 返回 true 或 false
+	 *
+	 * @param role 角色
+	 * @return /
+	 */
+	public static boolean hasRole(String role) {
+		return stpLogic.hasRole(role);
+	}
 
 	/**
-	 * 获取：当前账号的权限码集合 
-	 * @return / 
+	 * 判断：指定账号是否含有指定角色标识, 返回 true 或 false
+	 *
+	 * @param loginId 账号id
+	 * @param role 角色标识
+	 * @return 是否含有指定角色标识
+	 */
+	public static boolean hasRole(Object loginId, String role) {
+		return stpLogic.hasRole(loginId, role);
+	}
+
+	/**
+	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 * @return true或false
+	 */
+	public static boolean hasRoleAnd(String... roleArray){
+		return stpLogic.hasRoleAnd(roleArray);
+	}
+
+	/**
+	 * 判断：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 * @return true或false
+	 */
+	public static boolean hasRoleOr(String... roleArray){
+		return stpLogic.hasRoleOr(roleArray);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识, 如果验证未通过，则抛出异常: NotRoleException
+	 *
+	 * @param role 角色标识
+	 */
+	public static void checkRole(String role) {
+		stpLogic.checkRole(role);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 */
+	public static void checkRoleAnd(String... roleArray){
+		stpLogic.checkRoleAnd(roleArray);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定角色标识 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param roleArray 角色标识数组
+	 */
+	public static void checkRoleOr(String... roleArray){
+		stpLogic.checkRoleOr(roleArray);
+	}
+
+
+	// ------------------- 权限认证操作 -------------------
+
+	/**
+	 * 获取：当前账号的权限码集合
+	 *
+	 * @return /
 	 */
 	public static List<String> getPermissionList() {
 		return stpLogic.getPermissionList();
 	}
 
 	/**
-	 * 获取：指定账号的权限码集合 
+	 * 获取：指定账号的权限码集合
+	 *
 	 * @param loginId 指定账号id
-	 * @return / 
+	 * @return /
 	 */
 	public static List<String> getPermissionList(Object loginId) {
 		return stpLogic.getPermissionList(loginId);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, 返回true或false 
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限, 返回 true 或 false
+	 *
+	 * @param permission 权限码
+	 * @return 是否含有指定权限
+	 */
 	public static boolean hasPermission(String permission) {
 		return stpLogic.hasPermission(permission);
 	}
 
- 	/** 
- 	 * 判断：指定账号id是否含有指定权限, 返回true或false 
- 	 * @param loginId 账号id
- 	 * @param permission 权限码
- 	 * @return 是否含有指定权限
- 	 */
+	/**
+	 * 判断：指定账号 id 是否含有指定权限, 返回 true 或 false
+	 *
+	 * @param loginId 账号 id
+	 * @param permission 权限码
+	 * @return 是否含有指定权限
+	 */
 	public static boolean hasPermission(Object loginId, String permission) {
 		return stpLogic.hasPermission(loginId, permission);
 	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限, [指定多个，必须全部具有] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
- 	public static boolean hasPermissionAnd(String... permissionArray){
- 		return stpLogic.hasPermissionAnd(permissionArray);
- 	}
+	/**
+	 * 判断：当前账号是否含有指定权限 [ 指定多个，必须全部具有 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 * @return true 或 false
+	 */
+	public static boolean hasPermissionAnd(String... permissionArray){
+		return stpLogic.hasPermissionAnd(permissionArray);
+	}
 
- 	/** 
- 	 * 判断：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 * @return true 或 false 
- 	 */
- 	public static boolean hasPermissionOr(String... permissionArray){
- 		return stpLogic.hasPermissionOr(permissionArray);
- 	}
- 	
- 	/** 
- 	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException 
- 	 * @param permission 权限码
- 	 */
+	/**
+	 * 判断：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 * @return true 或 false
+	 */
+	public static boolean hasPermissionOr(String... permissionArray){
+		return stpLogic.hasPermissionOr(permissionArray);
+	}
+
+	/**
+	 * 校验：当前账号是否含有指定权限, 如果验证未通过，则抛出异常: NotPermissionException
+	 *
+	 * @param permission 权限码
+	 */
 	public static void checkPermission(String permission) {
 		stpLogic.checkPermission(permission);
 	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，必须全部验证通过] 
- 	 * @param permissionArray 权限码数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定权限 [ 指定多个，必须全部验证通过 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 */
 	public static void checkPermissionAnd(String... permissionArray) {
 		stpLogic.checkPermissionAnd(permissionArray);
 	}
 
- 	/** 
- 	 * 校验：当前账号是否含有指定权限 [指定多个，只要其一验证通过即可] 
- 	 * @param permissionArray 权限码数组
- 	 */
+	/**
+	 * 校验：当前账号是否含有指定权限 [ 指定多个，只要其一验证通过即可 ]
+	 *
+	 * @param permissionArray 权限码数组
+	 */
 	public static void checkPermissionOr(String... permissionArray) {
 		stpLogic.checkPermissionOr(permissionArray);
 	}
 
 
-	// ------------------- id 反查token 相关操作 -------------------  
-	
-	/** 
-	 * 获取指定账号id的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	// ------------------- id 反查 token 相关操作 -------------------
+
+	/**
+	 * 获取指定账号 id 的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @return token值 
+	 * @return token值
 	 */
 	public static String getTokenValueByLoginId(Object loginId) {
 		return stpLogic.getTokenValueByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 
-	 * <p> 在配置为允许并发登录时，此方法只会返回队列的最后一个token，
-	 * 如果你需要返回此账号id的所有token，请调用 getTokenValueListByLoginId 
+	/**
+	 * 获取指定账号 id 指定设备类型端的 token
+	 * <p>
+	 * 		在配置为允许并发登录时，此方法只会返回队列的最后一个 token，
+	 * 		如果你需要返回此账号 id 的所有 token，请调用 getTokenValueListByLoginId
+	 * </p>
+	 *
 	 * @param loginId 账号id
-	 * @param device 设备类型
-	 * @return token值 
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return token值
 	 */
 	public static String getTokenValueByLoginId(Object loginId, String device) {
 		return stpLogic.getTokenValueByLoginId(loginId, device);
 	}
-	
-	/** 
-	 * 获取指定账号id的tokenValue集合 
-	 * @param loginId 账号id 
-	 * @return 此loginId的所有相关token 
- 	 */
+
+	/**
+	 * 获取指定账号 id 的 token 集合
+	 *
+	 * @param loginId 账号id
+	 * @return 此 loginId 的所有相关 token
+	 */
 	public static List<String> getTokenValueListByLoginId(Object loginId) {
 		return stpLogic.getTokenValueListByLoginId(loginId);
 	}
 
-	/** 
-	 * 获取指定账号id指定设备类型端的tokenValue 集合 
-	 * @param loginId 账号id 
-	 * @param device 设备类型 
-	 * @return 此loginId的所有相关token 
- 	 */
+	/**
+	 * 获取指定账号 id 指定设备类型端的 token 集合
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 token
+	 */
 	public static List<String> getTokenValueListByLoginId(Object loginId, String device) {
 		return stpLogic.getTokenValueListByLoginId(loginId, device);
 	}
-	
+
 	/**
 	 * 返回当前会话的登录设备类型
+	 *
 	 * @return 当前令牌的登录设备类型
 	 */
 	public static String getLoginDevice() {
-		return stpLogic.getLoginDevice(); 
+		return stpLogic.getLoginDevice();
 	}
 
-	
-	// ------------------- 会话管理 -------------------  
+
+	// ------------------- 会话管理 -------------------
 
 	/**
-	 * 根据条件查询Token 
-	 * @param keyword 关键字 
+	 * 根据条件查询缓存中所有的 token
+	 *
+	 * @param keyword 关键字
 	 * @param start 开始处索引
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * @param size 获取数量 (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return token集合 
+	 *
+	 * @return token集合
 	 */
 	public static List<String> searchTokenValue(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchTokenValue(keyword, start, size, sortType);
 	}
-	
+
 	/**
-	 * 根据条件查询SessionId 
-	 * @param keyword 关键字 
+	 * 根据条件查询缓存中所有的 SessionId
+	 *
+	 * @param keyword 关键字
 	 * @param start 开始处索引
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * @param size 获取数量  (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
+	 *
+	 * @return sessionId集合
 	 */
 	public static List<String> searchSessionId(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchSessionId(keyword, start, size, sortType);
 	}
 
 	/**
-	 * 根据条件查询Token专属Session的Id 
-	 * @param keyword 关键字 
-	 * @param start 开始处索引 
-	 * @param size 获取数量 (-1代表一直获取到末尾) 
+	 * 根据条件查询缓存中所有的 Token-Session-Id
+	 *
+	 * @param keyword 关键字
+	 * @param start 开始处索引
+	 * @param size 获取数量 (-1代表一直获取到末尾)
 	 * @param sortType 排序类型（true=正序，false=反序）
-	 * 
-	 * @return sessionId集合 
+	 *
+	 * @return sessionId集合
 	 */
 	public static List<String> searchTokenSessionId(String keyword, int start, int size, boolean sortType) {
 		return stpLogic.searchTokenSessionId(keyword, start, size, sortType);
 	}
 
-	
-	// ------------------- 账号封禁 -------------------  
+
+	// ------------------- 账号封禁 -------------------
 
 	/**
 	 * 封禁：指定账号
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * 
-	 * @param loginId 指定账号id 
+	 *
+	 * @param loginId 指定账号id
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disable(Object loginId, long time) {
@@ -783,17 +871,18 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 判断：指定账号是否已被封禁 (true=已被封禁, false=未被封禁) 
-	 * 
+	 * 判断：指定账号是否已被封禁 (true=已被封禁, false=未被封禁)
+	 *
 	 * @param loginId 账号id
-	 * @return / 
+	 * @return /
 	 */
 	public static boolean isDisable(Object loginId) {
 		return stpLogic.isDisable(loginId);
 	}
 
 	/**
-	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
 	 */
 	public static void checkDisable(Object loginId) {
@@ -802,8 +891,9 @@ public class StpUserUtil {
 
 	/**
 	 * 获取：指定账号剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
-	 * @return / 
+	 * @return /
 	 */
 	public static long getDisableTime(Object loginId) {
 		return stpLogic.getDisableTime(loginId);
@@ -811,20 +901,22 @@ public class StpUserUtil {
 
 	/**
 	 * 解封：指定账号
+	 *
 	 * @param loginId 账号id
 	 */
 	public static void untieDisable(Object loginId) {
 		stpLogic.untieDisable(loginId);
 	}
 
-	
-	// ------------------- 分类封禁 -------------------  
+
+	// ------------------- 分类封禁 -------------------
 
 	/**
-	 * 封禁：指定账号的指定服务 
+	 * 封禁：指定账号的指定服务
 	 * <p> 此方法不会直接将此账号id踢下线，如需封禁后立即掉线，请追加调用 StpUtil.logout(id)
-	 * @param loginId 指定账号id 
-	 * @param service 指定服务 
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定服务
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disable(Object loginId, String service, long time) {
@@ -832,19 +924,21 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 判断：指定账号的指定服务 是否已被封禁 (true=已被封禁, false=未被封禁) 
+	 * 判断：指定账号的指定服务 是否已被封禁（true=已被封禁, false=未被封禁）
+	 *
 	 * @param loginId 账号id
-	 * @param service 指定服务 
-	 * @return / 
+	 * @param service 指定服务
+	 * @return /
 	 */
 	public static boolean isDisable(Object loginId, String service) {
 		return stpLogic.isDisable(loginId, service);
 	}
 
 	/**
-	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常 
+	 * 校验：指定账号 指定服务 是否已被封禁，如果被封禁则抛出异常
+	 *
 	 * @param loginId 账号id
-	 * @param services 指定服务，可以指定多个 
+	 * @param services 指定服务，可以指定多个
 	 */
 	public static void checkDisable(Object loginId, String... services) {
 		stpLogic.checkDisable(loginId, services);
@@ -852,9 +946,10 @@ public class StpUserUtil {
 
 	/**
 	 * 获取：指定账号 指定服务 剩余封禁时间，单位：秒（-1=永久封禁，-2=未被封禁）
+	 *
 	 * @param loginId 账号id
-	 * @param service 指定服务 
-	 * @return see note 
+	 * @param service 指定服务
+	 * @return see note
 	 */
 	public static long getDisableTime(Object loginId, String service) {
 		return stpLogic.getDisableTime(loginId, service);
@@ -862,20 +957,22 @@ public class StpUserUtil {
 
 	/**
 	 * 解封：指定账号、指定服务
+	 *
 	 * @param loginId 账号id
-	 * @param services 指定服务，可以指定多个 
+	 * @param services 指定服务，可以指定多个
 	 */
 	public static void untieDisable(Object loginId, String... services) {
 		stpLogic.untieDisable(loginId, services);
 	}
 
 
-	// ------------------- 阶梯封禁 -------------------  
+	// ------------------- 阶梯封禁 -------------------
 
 	/**
-	 * 封禁：指定账号，并指定封禁等级 
-	 * @param loginId 指定账号id 
-	 * @param level 指定封禁等级 
+	 * 封禁：指定账号，并指定封禁等级
+	 *
+	 * @param loginId 指定账号id
+	 * @param level 指定封禁等级
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disableLevel(Object loginId, int level, long time) {
@@ -883,10 +980,11 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 封禁：指定账号的指定服务，并指定封禁等级 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 指定封禁等级 
+	 * 封禁：指定账号的指定服务，并指定封禁等级
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
+	 * @param level 指定封禁等级
 	 * @param time 封禁时间, 单位: 秒 （-1=永久封禁）
 	 */
 	public static void disableLevel(Object loginId, String service, int level, long time) {
@@ -895,22 +993,22 @@ public class StpUserUtil {
 
 	/**
 	 * 判断：指定账号是否已被封禁到指定等级
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param level 指定封禁等级 
-	 * @return / 
+	 *
+	 * @param loginId 指定账号id
+	 * @param level 指定封禁等级
+	 * @return /
 	 */
 	public static boolean isDisableLevel(Object loginId, int level) {
 		return stpLogic.isDisableLevel(loginId, level);
 	}
 
 	/**
-	 * 判断：指定账号的指定服务，是否已被封禁到指定等级 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @param level 指定封禁等级 
-	 * @return / 
+	 * 判断：指定账号的指定服务，是否已被封禁到指定等级
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
+	 * @param level 指定封禁等级
+	 * @return /
 	 */
 	public static boolean isDisableLevel(Object loginId, String service, int level) {
 		return stpLogic.isDisableLevel(loginId, service, level);
@@ -918,8 +1016,8 @@ public class StpUserUtil {
 
 	/**
 	 * 校验：指定账号是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
-	 * @param loginId 指定账号id 
+	 *
+	 * @param loginId 指定账号id
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
 	 */
 	public static void checkDisableLevel(Object loginId, int level) {
@@ -928,9 +1026,9 @@ public class StpUserUtil {
 
 	/**
 	 * 校验：指定账号的指定服务，是否已被封禁到指定等级（如果已经达到，则抛出异常）
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
 	 * @param level 封禁等级 （只有 封禁等级 ≥ 此值 才会抛出异常）
 	 */
 	public static void checkDisableLevel(Object loginId, String service, int level) {
@@ -938,37 +1036,38 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取：指定账号被封禁的等级，如果未被封禁则返回-2 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @return / 
+	 * 获取：指定账号被封禁的等级，如果未被封禁则返回-2
+	 *
+	 * @param loginId 指定账号id
+	 * @return /
 	 */
 	public static int getDisableLevel(Object loginId) {
 		return stpLogic.getDisableLevel(loginId);
 	}
 
 	/**
-	 * 获取：指定账号的 指定服务 被封禁的等级，如果未被封禁则返回-2 
-	 * 
-	 * @param loginId 指定账号id 
-	 * @param service 指定封禁服务 
-	 * @return / 
+	 * 获取：指定账号的 指定服务 被封禁的等级，如果未被封禁则返回-2
+	 *
+	 * @param loginId 指定账号id
+	 * @param service 指定封禁服务
+	 * @return /
 	 */
 	public static int getDisableLevel(Object loginId, String service) {
 		return stpLogic.getDisableLevel(loginId, service);
 	}
-	
-	
-	// ------------------- 身份切换 -------------------  
+
+
+	// ------------------- 临时身份切换 -------------------
 
 	/**
-	 * 临时切换身份为指定账号id 
-	 * @param loginId 指定loginId 
+	 * 临时切换身份为指定账号id
+	 *
+	 * @param loginId 指定loginId
 	 */
 	public static void switchTo(Object loginId) {
 		stpLogic.switchTo(loginId);
 	}
-	
+
 	/**
 	 * 结束临时切换身份
 	 */
@@ -977,86 +1076,95 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 当前是否正处于[身份临时切换]中 
-	 * @return 是否正处于[身份临时切换]中 
+	 * 判断当前请求是否正处于 [ 身份临时切换 ] 中
+	 *
+	 * @return /
 	 */
 	public static boolean isSwitch() {
 		return stpLogic.isSwitch();
 	}
 
 	/**
-	 * 在一个代码段里方法内，临时切换身份为指定账号id
-	 * @param loginId 指定账号id 
-	 * @param function 要执行的方法 
+	 * 在一个 lambda 代码段里，临时切换身份为指定账号id，lambda 结束后自动恢复
+	 *
+	 * @param loginId 指定账号id
+	 * @param function 要执行的方法
 	 */
 	public static void switchTo(Object loginId, SaFunction function) {
 		stpLogic.switchTo(loginId, function);
 	}
-	
 
-	// ------------------- 二级认证 -------------------  
-	
+
+	// ------------------- 二级认证 -------------------
+
 	/**
-	 * 在当前会话 开启二级认证 
-	 * @param safeTime 维持时间 (单位: 秒) 
+	 * 在当前会话 开启二级认证
+	 *
+	 * @param safeTime 维持时间 (单位: 秒)
 	 */
 	public static void openSafe(long safeTime) {
 		stpLogic.openSafe(safeTime);
 	}
 
 	/**
-	 * 在当前会话 开启二级认证 
-	 * @param service 业务标识  
-	 * @param safeTime 维持时间 (单位: 秒) 
+	 * 在当前会话 开启二级认证
+	 *
+	 * @param service 业务标识
+	 * @param safeTime 维持时间 (单位: 秒)
 	 */
 	public static void openSafe(String service, long safeTime) {
 		stpLogic.openSafe(service, safeTime);
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
+	 * 判断：当前会话是否处于二级认证时间内
+	 *
+	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时
 	 */
 	public static boolean isSafe() {
 		return stpLogic.isSafe();
 	}
 
 	/**
-	 * 当前会话 是否处于二级认证时间内 
-	 * @param service 业务标识  
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
+	 * 判断：当前会话 是否处于指定业务的二级认证时间内
+	 *
+	 * @param service 业务标识
+	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时
 	 */
 	public static boolean isSafe(String service) {
 		return stpLogic.isSafe(service);
 	}
 
 	/**
-	 * 指定 Token 是否处于二级认证时间内 
-	 * @param tokenValue Token 值  
-	 * @param service 业务标识  
-	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时 
+	 * 判断：指定 token 是否处于二级认证时间内
+	 *
+	 * @param tokenValue Token 值
+	 * @param service 业务标识
+	 * @return true=二级认证已通过, false=尚未进行二级认证或认证已超时
 	 */
 	public static boolean isSafe(String tokenValue, String service) {
 		return stpLogic.isSafe(tokenValue, service);
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
+	 * 校验：当前会话是否已通过二级认证，如未通过则抛出异常
 	 */
 	public static void checkSafe() {
 		stpLogic.checkSafe();
 	}
 
 	/**
-	 * 检查当前会话是否已通过二级认证，如未通过则抛出异常 
-	 * @param service 业务标识  
+	 * 校验：检查当前会话是否已通过指定业务的二级认证，如未通过则抛出异常
+	 *
+	 * @param service 业务标识
 	 */
 	public static void checkSafe(String service) {
 		stpLogic.checkSafe(service);
 	}
-	
+
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
 	 * @return 剩余有效时间
 	 */
 	public static long getSafeTime() {
@@ -1064,8 +1172,9 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 获取当前会话的二级认证剩余有效时间 (单位: 秒, 返回-2代表尚未通过二级认证)
-	 * @param service 业务标识  
+	 * 获取：当前会话的二级认证剩余有效时间（单位: 秒, 返回-2代表尚未通过二级认证）
+	 *
+	 * @param service 业务标识
 	 * @return 剩余有效时间
 	 */
 	public static long getSafeTime(String service) {
@@ -1073,14 +1182,15 @@ public class StpUserUtil {
 	}
 
 	/**
-	 * 在当前会话 结束二级认证 
+	 * 在当前会话 结束二级认证
 	 */
 	public static void closeSafe() {
 		stpLogic.closeSafe();
 	}
 
 	/**
-	 * 在当前会话 结束二级认证 
+	 * 在当前会话 结束指定业务标识的二级认证
+	 *
 	 * @param service 业务标识  
 	 */
 	public static void closeSafe(String service) {
diff --git a/sa-token-doc/api/stp-util.md b/sa-token-doc/api/stp-util.md
index f9de7f50..1837df09 100644
--- a/sa-token-doc/api/stp-util.md
+++ b/sa-token-doc/api/stp-util.md
@@ -72,7 +72,7 @@ StpUtil.getExtra(token, key);   // 获取指定 Token 的扩展信息（此函
 
 ### 5、Session 相关
 ``` java
-// User-Session 相关 
+// Account-Session 相关 
 StpUtil.getSession();   // 获取当前会话的Session，如果Session尚未创建，则新建并返回 
 StpUtil.getSession(true);   // 获取当前会话的Session, 如果Session尚未创建，isCreate=是否新建并返回
 StpUtil.getSessionByLoginId(10001);   // 获取指定账号id的Session，如果Session尚未创建，则新建并返回
@@ -97,7 +97,7 @@ StpUtil.updateLastActivityToNow();   // 续签当前token：(将 [最后操作
 
 // 长久有效期
 StpUtil.getTokenTimeout();   // 获取当前登录者的 token 剩余有效时间 (单位: 秒)
-StpUtil.getSessionTimeout();   // 获取当前登录者的 User-Session 剩余有效时间 (单位: 秒)
+StpUtil.getSessionTimeout();   // 获取当前登录者的 Account-Session 剩余有效时间 (单位: 秒)
 StpUtil.getTokenSessionTimeout();   // 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
 StpUtil.renewTimeout(timeout);   // 对当前 Token 的 timeout 值进行续期 
 StpUtil.renewTimeout(token, timeout);   // 对指定 Token 的 timeout 值进行续期 
diff --git a/sa-token-doc/fun/session-model.md b/sa-token-doc/fun/session-model.md
index 4d2fd66c..496ab6a4 100644
--- a/sa-token-doc/fun/session-model.md
+++ b/sa-token-doc/fun/session-model.md
@@ -2,7 +2,7 @@
 
 --- 
 
-### 1、User-Session 
+### 1、Account-Session 
 
 提起Session，你脑海中最先浮现的可能就是 JSP 中的 HttpSession，它的工作原理可以大致总结为：
 
@@ -24,17 +24,17 @@ Sa-Token Session可以理解为 HttpSession 的升级版：
 3. Sa-Token支持Cookie、Header、body三个途径提交Token，而不是仅限于Cookie 
 4. 由于不强依赖Cookie，所以只要将Token存储到不同的地方，便可以做到一个客户端同时登录多个账号 
 
-这种为账号id分配的Session，我们给它起一个合适的名字：`User-Session`，你可以通过如下方式操作它：
+这种为账号id分配的Session，我们给它起一个合适的名字：`Account-Session`，你可以通过如下方式操作它：
 ``` java
-// 获取当前会话的 User-Session 
+// 获取当前会话的 Account-Session 
 SaSession session = StpUtil.getSession();
 
-// 从 User-Session 中读取、写入数据 
+// 从 Account-Session 中读取、写入数据 
 session.get("name");
 session.set("name", "张三");
 ```
 
-使用`User-Session`在不同端同步数据是非常方便的，因为只要 PC 和 APP 登录的账号id一致，它们对应的都是同一个Session，
+使用`Account-Session`在不同端同步数据是非常方便的，因为只要 PC 和 APP 登录的账号id一致，它们对应的都是同一个Session，
 举个应用场景：在PC端点赞的帖子列表，在APP端的点赞记录里也要同步显示出来
 
 
@@ -44,13 +44,13 @@ session.set("name", "张三");
 
 > 指定客户端超过两小时无操作就自动下线，如果两小时内有操作，就再续期两小时，直到新的两小时无操作 
 
-那么这种请求访问记录应该存储在哪里呢？放在 User-Session 里吗？
+那么这种请求访问记录应该存储在哪里呢？放在 Account-Session 里吗？
 
-可别忘了，PC端和APP端可是共享的同一个 User-Session ，如果把数据放在这里，
+可别忘了，PC端和APP端可是共享的同一个 Account-Session ，如果把数据放在这里，
 那就意味着，即使用户在PC端一直无操作，只要手机上用户还在不间断的操作，那PC端也不会过期！
 
 解决这个问题的关键在于，虽然两个设备登录的是同一账号，但是两个它们得到的token是不一样的，
-Sa-Token针对会话登录，不仅为账号id分配了`User-Session`，同时还为每个token分配了不同的`Token-Session`
+Sa-Token针对会话登录，不仅为账号id分配了`Account-Session`，同时还为每个token分配了不同的`Token-Session`
 
 不同的设备端，哪怕登录了同一账号，只要它们得到的token不一致，它们对应的 `Token-Session` 就不一致，这就为我们不同端的独立数据读写提供了支持：
 
@@ -91,7 +91,7 @@ session.updateTimeout(1000); // 参数说明和全局有效期保持一致
 
 三种Session创建时机：
 
-- `User-Session`: 指的是框架为每个 账号id 分配的 Session 
+- `Account-Session`: 指的是框架为每个 账号id 分配的 Session 
 - `Token-Session`: 指的是框架为每个 token 分配的 Session  
 - `Custom-Session`: 指的是以一个 特定的值 作为SessionId，来分配的 Session 
 
@@ -101,7 +101,7 @@ session.updateTimeout(1000); // 参数说明和全局有效期保持一致
 ![session-model](https://oss.dev33.cn/sa-token/doc/session-model3.png 's-w')
 
 简而言之：
-- `User-Session`  以UserId为主，只要token指向的UserId一致，那么对应的Session对象就一致
+- `Account-Session`  以账号 id 为主，只要 token 指向的账号 id 一致，那么对应的Session对象就一致
 - `Token-Session` 以token为主，只要token不同，那么对应的Session对象就不同
 - `Custom-Session` 以特定的key为主，不同key对应不同的Session对象，同样的key指向同一个Session对象 
 
diff --git a/sa-token-doc/fun/token-info.md b/sa-token-doc/fun/token-info.md
index 195d5942..ab31874b 100644
--- a/sa-token-doc/fun/token-info.md
+++ b/sa-token-doc/fun/token-info.md
@@ -13,7 +13,7 @@ token信息Model: 用来描述一个token的常用参数
 		"loginId": "10001",               // 此token对应的LoginId，未登录时为null
 		"loginType": "login",              // 账号类型标识
 		"tokenTimeout": 2591977,          // token剩余有效期 (单位: 秒)
-		"sessionTimeout": 2591977,        // User-Session剩余有效时间 (单位: 秒)
+		"sessionTimeout": 2591977,        // Account-Session剩余有效时间 (单位: 秒)
 		"tokenSessionTimeout": -2,        // Token-Session剩余有效时间 (单位: 秒) (-2表示系统中不存在这个缓存)
 		"tokenActivityTimeout": -1,       // token剩余无操作有效时间 (单位: 秒)
 		"loginDevice": "default-device"   // 登录设备类型 
diff --git a/sa-token-doc/more/common-questions.md b/sa-token-doc/more/common-questions.md
index 053979e0..9dcb325e 100644
--- a/sa-token-doc/more/common-questions.md
+++ b/sa-token-doc/more/common-questions.md
@@ -562,8 +562,8 @@ SaRouter.match("/**").notMatch("/login", "/reg").check(r -> StpUtil.checkLogin()
 
 
 ### Q：StpUtil.getSession()必须登录后才能调用吗？如果我想在用户未登录之前存储一些数据应该怎么办？
-`StpUtil.getSession()`获取的是`User-Session`，必须登录后才能使用，如果需要在未登录状态下也使用Session功能，请使用`Token-Session` <br>
-步骤：先在配置文件里将`tokenSessionCheckLogin`配置为`false`，然后通过`StpUtil.getTokenSession()`获取Session 
+`StpUtil.getSession()`获取的是`Account-Session`，必须登录后才能使用，如果需要在未登录状态下也使用Session功能，请使用`Token-Session` <br>
+步骤：先在配置文件里将`tokenSessionCheckLogin`配置为`false`，然后通过`StpUtil.getTokenSession()`获取Session 。或者直接调用 `StpUtil.getAnonTokenSession()` 获取匿名 Token-Session。
 
 
 ### Q：我只使用header来传输token，还需要打开Cookie模式吗？
diff --git a/sa-token-doc/more/noun-intro.md b/sa-token-doc/more/noun-intro.md
index 67766d95..8d85314c 100644
--- a/sa-token-doc/more/noun-intro.md
+++ b/sa-token-doc/more/noun-intro.md
@@ -24,7 +24,7 @@ Sa-Token 无意发明任何晦涩概念提升逼格，但在处理 issue 、Q群
 
 
 #### 三种Session：
-- User-Session：框架为每个账号分配的 Session 对象，也称：账号Session。 
+- Account-Session：框架为每个账号分配的 Session 对象，也称：账号Session。 
 - Token-Session：框架为每个 Token 分配的 Session 对象，也称：令牌Session。 
 - Custom-Session：以一个特定的值作为SessionId，来分配的 Session 对象，也称：自定义Session。
 
diff --git a/sa-token-doc/up/mock-person.md b/sa-token-doc/up/mock-person.md
index 51fbf551..748cd384 100644
--- a/sa-token-doc/up/mock-person.md
+++ b/sa-token-doc/up/mock-person.md
@@ -3,7 +3,7 @@
 
 
 以上介绍的 API 都是操作当前账号，对当前账号进行各种鉴权操作，你可能会问，我能不能对别的账号进行一些操作？<br>
-比如：查看账号 10001 有无某个权限码、获取 账号 id=10002 的 `User-Session`，等等...
+比如：查看账号 10001 有无某个权限码、获取 账号 id=10002 的 `Account-Session`，等等...
 
 Sa-Token 在 API 设计时充分考虑了这一点，暴露出多个api进行此类操作：
 
diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index 5fdb8cd8..a4828da3 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -297,7 +297,7 @@ sa-token.oauth2.is-client=true
 配置含义：同一账号最大登录数量。
 
 在配置 `isConcurrent=true`, `isShare=false` 时，Sa-Token 将允许同一账号并发登录，且每次登录都会产生一个新Token，
-这些 Token 都会以 `TokenSign` 的形式记录在其 `User-Session` 之上，这就造成一个问题：
+这些 Token 都会以 `TokenSign` 的形式记录在其 `Account-Session` 之上，这就造成一个问题：
 
 随着同一账号登录的次数越来越多，TokenSign 的列表也会越来越大，极端情况下，列表长度可能达到成百上千以上，严重拖慢数据处理速度，
 为此 Sa-Token 对这个 TokenSign 列表的大小设定一个上限值，也就是 `maxLoginCount`，默认值=12。
@@ -310,7 +310,7 @@ sa-token.oauth2.is-client=true
 
 在调用 `StpUtil.login(id)` 登录后，
 
-- 调用 `StpUtil.getSession()` 可以获取这个会话的 `User-Session` 对象。
+- 调用 `StpUtil.getSession()` 可以获取这个会话的 `Account-Session` 对象。
 - 调用 `StpUtil.getTokenSession()` 可以获取这个会话 `Token-Session` 对象。
 
 关于两种 Session 有何区别，可以参考这篇：[Session模型详解](/fun/session-model)，此处暂不赘述。
diff --git a/sa-token-doc/use/session.md b/sa-token-doc/use/session.md
index 7b60583d..27e9aad7 100644
--- a/sa-token-doc/use/session.md
+++ b/sa-token-doc/use/session.md
@@ -16,14 +16,14 @@ SysUser user = (SysUser) StpUtil.getSession().get("user");
 
 在 Sa-Token 中，Session 分为三种，分别是：
 
-- `User-Session`: 指的是框架为每个 账号id 分配的 Session 
+- `Account-Session`: 指的是框架为每个 账号id 分配的 Session 
 - `Token-Session`: 指的是框架为每个 token 分配的 Session  
 - `Custom-Session`: 指的是以一个 特定的值 作为SessionId，来分配的 Session 
 
-> 有关User-Session与Token-Session的详细区别，可参考：[Session模型详解](/fun/session-model)
+> 有关Account-Session与Token-Session的详细区别，可参考：[Session模型详解](/fun/session-model)
 
 
-### User-Session
+### Account-Session
 有关账号Session的API如下：
 ``` java
 // 获取当前账号id的Session (必须是登录后才能调用)
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
index e506175b..e1fe211a 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
@@ -99,7 +99,7 @@ public class ManyLoginTest {
     	// token1会被标记为：已被顶下线 
     	Assertions.assertEquals(dao.get("satoken:login:token:" + token1), "-4");
     	
-    	// User-Session里的 token1 签名会被移除 
+    	// Account-Session里的 token1 签名会被移除 
     	List<TokenSign> tokenSignList = StpUtil.getSessionByLoginId(10001).getTokenSignList();
     	for (TokenSign tokenSign : tokenSignList) {
     		Assertions.assertNotEquals(tokenSign.getValue(), token1);
@@ -128,7 +128,7 @@ public class ManyLoginTest {
     	Assertions.assertNull(dao.get("satoken:login:token:" + token2));
     	Assertions.assertNull(dao.get("satoken:login:token:" + token3));
     	
-    	// User-Session也应该被清除掉 
+    	// Account-Session也应该被清除掉 
     	Assertions.assertNull(StpUtil.getSessionByLoginId(10001, false));
     	Assertions.assertNull(dao.getSession("satoken:login:session:" + 10001));
     }
@@ -155,7 +155,7 @@ public class ManyLoginTest {
     	Assertions.assertEquals(dao.get("satoken:login:token:" + token2), "-5");
     	Assertions.assertEquals(dao.get("satoken:login:token:" + token3), "-5");
     	
-    	// User-Session也应该被清除掉 
+    	// Account-Session也应该被清除掉 
     	Assertions.assertNull(StpUtil.getSessionByLoginId(10001, false));
     	Assertions.assertNull(dao.getSession("satoken:login:session:" + 10001));
     }

From 017546bedfa0c01a579e0bf5da8000014486e506 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 19:09:23 +0800
Subject: [PATCH 063/129] add license header

---
 .../main/java/cn/dev33/satoken/SaManager.java   | 15 +++++++++++++++
 .../dev33/satoken/annotation/SaCheckBasic.java  | 15 +++++++++++++++
 .../satoken/annotation/SaCheckDisable.java      | 15 +++++++++++++++
 .../dev33/satoken/annotation/SaCheckLogin.java  | 15 +++++++++++++++
 .../satoken/annotation/SaCheckPermission.java   | 15 +++++++++++++++
 .../dev33/satoken/annotation/SaCheckRole.java   | 17 ++++++++++++++++-
 .../dev33/satoken/annotation/SaCheckSafe.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/annotation/SaIgnore.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/annotation/SaMode.java     | 15 +++++++++++++++
 .../satoken/application/SaApplication.java      | 15 +++++++++++++++
 .../application/SaGetValueInterface.java        | 15 +++++++++++++++
 .../application/SaSetValueInterface.java        | 15 +++++++++++++++
 .../cn/dev33/satoken/basic/SaBasicTemplate.java | 15 +++++++++++++++
 .../cn/dev33/satoken/basic/SaBasicUtil.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/config/SaCookieConfig.java | 15 +++++++++++++++
 .../cn/dev33/satoken/config/SaSignConfig.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/config/SaTokenConfig.java  | 15 +++++++++++++++
 .../satoken/config/SaTokenConfigFactory.java    | 15 +++++++++++++++
 .../java/cn/dev33/satoken/context/SaHolder.java | 15 +++++++++++++++
 .../dev33/satoken/context/SaTokenContext.java   | 15 +++++++++++++++
 .../context/SaTokenContextDefaultImpl.java      | 15 +++++++++++++++
 .../context/SaTokenContextForThreadLocal.java   | 15 +++++++++++++++
 .../SaTokenContextForThreadLocalStorage.java    | 15 +++++++++++++++
 .../dev33/satoken/context/model/SaCookie.java   | 15 +++++++++++++++
 .../dev33/satoken/context/model/SaRequest.java  | 15 +++++++++++++++
 .../dev33/satoken/context/model/SaResponse.java | 15 +++++++++++++++
 .../dev33/satoken/context/model/SaStorage.java  | 15 +++++++++++++++
 .../satoken/context/model/package-info.java     | 15 +++++++++++++++
 .../context/second/SaTokenSecondContext.java    | 15 +++++++++++++++
 .../second/SaTokenSecondContextCreator.java     | 15 +++++++++++++++
 .../java/cn/dev33/satoken/dao/SaTokenDao.java   | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoDefaultImpl.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/error/SaErrorCode.java     | 15 +++++++++++++++
 .../satoken/exception/ApiDisabledException.java | 15 +++++++++++++++
 .../satoken/exception/BackResultException.java  | 15 +++++++++++++++
 .../exception/DisableServiceException.java      | 15 +++++++++++++++
 .../exception/InvalidContextException.java      | 15 +++++++++++++++
 .../exception/NotBasicAuthException.java        | 15 +++++++++++++++
 .../satoken/exception/NotImplException.java     | 15 +++++++++++++++
 .../satoken/exception/NotLoginException.java    | 15 +++++++++++++++
 .../exception/NotPermissionException.java       | 15 +++++++++++++++
 .../satoken/exception/NotRoleException.java     | 15 +++++++++++++++
 .../satoken/exception/NotSafeException.java     | 15 +++++++++++++++
 .../exception/NotWebContextException.java       | 15 +++++++++++++++
 .../exception/SaJsonConvertException.java       | 15 +++++++++++++++
 .../satoken/exception/SaSignException.java      | 15 +++++++++++++++
 .../satoken/exception/SaTokenException.java     | 15 +++++++++++++++
 .../exception/SameTokenInvalidException.java    | 15 +++++++++++++++
 .../satoken/exception/StopMatchException.java   | 15 +++++++++++++++
 .../java/cn/dev33/satoken/filter/SaFilter.java  | 15 +++++++++++++++
 .../satoken/filter/SaFilterAuthStrategy.java    | 15 +++++++++++++++
 .../satoken/filter/SaFilterErrorStrategy.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/fun/IsRunFunction.java     | 15 +++++++++++++++
 .../java/cn/dev33/satoken/fun/SaFunction.java   | 15 +++++++++++++++
 .../fun/SaGenerateUniqueTokenFunction.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/fun/SaParamFunction.java   | 15 +++++++++++++++
 .../dev33/satoken/fun/SaParamRetFunction.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/fun/SaRetFunction.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/fun/SaRouteFunction.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/json/SaJsonTemplate.java   | 15 +++++++++++++++
 .../satoken/json/SaJsonTemplateDefaultImpl.java | 15 +++++++++++++++
 .../satoken/listener/SaTokenEventCenter.java    | 15 +++++++++++++++
 .../dev33/satoken/listener/SaTokenListener.java | 15 +++++++++++++++
 .../satoken/listener/SaTokenListenerForLog.java | 15 +++++++++++++++
 .../listener/SaTokenListenerForSimple.java      | 15 +++++++++++++++
 .../main/java/cn/dev33/satoken/log/SaLog.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/log/SaLogForConsole.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/router/SaHttpMethod.java   | 15 +++++++++++++++
 .../java/cn/dev33/satoken/router/SaRouter.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/router/SaRouterStaff.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/same/SaSameTemplate.java   | 15 +++++++++++++++
 .../java/cn/dev33/satoken/same/SaSameUtil.java  | 15 +++++++++++++++
 .../java/cn/dev33/satoken/secure/BCrypt.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/secure/SaBase64Util.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/secure/SaSecureUtil.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/session/SaSession.java     | 15 +++++++++++++++
 .../satoken/session/SaSessionCustomUtil.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/session/TokenSign.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/sign/SaSignTemplate.java   | 15 +++++++++++++++
 .../java/cn/dev33/satoken/sign/SaSignUtil.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/stp/SaLoginConfig.java     | 15 +++++++++++++++
 .../java/cn/dev33/satoken/stp/SaLoginModel.java | 15 +++++++++++++++
 .../java/cn/dev33/satoken/stp/SaTokenInfo.java  | 15 +++++++++++++++
 .../java/cn/dev33/satoken/stp/StpInterface.java | 15 +++++++++++++++
 .../satoken/stp/StpInterfaceDefaultImpl.java    | 15 +++++++++++++++
 .../java/cn/dev33/satoken/stp/StpLogic.java     | 15 +++++++++++++++
 .../main/java/cn/dev33/satoken/stp/StpUtil.java | 15 +++++++++++++++
 .../cn/dev33/satoken/strategy/SaStrategy.java   | 15 +++++++++++++++
 .../dev33/satoken/temp/SaTempDefaultImpl.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/temp/SaTempInterface.java  | 15 +++++++++++++++
 .../java/cn/dev33/satoken/temp/SaTempUtil.java  | 15 +++++++++++++++
 .../java/cn/dev33/satoken/util/SaFoxUtil.java   | 15 +++++++++++++++
 .../java/cn/dev33/satoken/util/SaResult.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/util/SaTokenConsts.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/util/StrFormatter.java     | 15 +++++++++++++++
 .../satoken/dao/alone/SaAloneRedisInject.java   | 15 +++++++++++++++
 .../thymeleaf/dialect/SaTokenDialect.java       | 15 +++++++++++++++
 .../thymeleaf/dialect/SaTokenTagProcessor.java  | 15 +++++++++++++++
 .../SaTokenSecondContextCreatorForDubbo.java    | 15 +++++++++++++++
 .../dubbo/SaTokenSecondContextForDubbo.java     | 15 +++++++++++++++
 .../filter/SaTokenDubboConsumerFilter.java      | 15 +++++++++++++++
 .../filter/SaTokenDubboProviderFilter.java      | 15 +++++++++++++++
 .../context/dubbo/model/SaRequestForDubbo.java  | 15 +++++++++++++++
 .../context/dubbo/model/SaResponseForDubbo.java | 15 +++++++++++++++
 .../context/dubbo/model/SaStorageForDubbo.java  | 15 +++++++++++++++
 .../SaTokenSecondContextCreatorForDubbo3.java   | 15 +++++++++++++++
 .../dubbo3/SaTokenSecondContextForDubbo3.java   | 15 +++++++++++++++
 .../filter/SaTokenDubbo3ConsumerFilter.java     | 15 +++++++++++++++
 .../filter/SaTokenDubbo3ProviderFilter.java     | 15 +++++++++++++++
 .../dubbo3/model/SaRequestForDubbo3.java        | 15 +++++++++++++++
 .../dubbo3/model/SaResponseForDubbo3.java       | 15 +++++++++++++++
 .../dubbo3/model/SaStorageForDubbo3.java        | 15 +++++++++++++++
 .../SaTokenSecondContextCreatorForGrpc.java     | 15 +++++++++++++++
 .../grpc/SaTokenSecondContextForGrpc.java       | 15 +++++++++++++++
 .../grpc/constants/GrpcContextConstants.java    | 15 +++++++++++++++
 .../grpc/context/SaTokenGrpcContext.java        | 15 +++++++++++++++
 .../SaTokenContextGrpcServerInterceptor.java    | 15 +++++++++++++++
 .../SaTokenGrpcClientInterceptor.java           | 15 +++++++++++++++
 .../SaTokenGrpcServerInterceptor.java           | 15 +++++++++++++++
 .../context/grpc/model/SaRequestForGrpc.java    | 15 +++++++++++++++
 .../context/grpc/model/SaResponseForGrpc.java   | 15 +++++++++++++++
 .../context/grpc/model/SaStorageForGrpc.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/jwt/SaJwtTemplate.java     | 15 +++++++++++++++
 .../java/cn/dev33/satoken/jwt/SaJwtUtil.java    | 15 +++++++++++++++
 .../dev33/satoken/jwt/StpLogicJwtForMixin.java  | 15 +++++++++++++++
 .../dev33/satoken/jwt/StpLogicJwtForSimple.java | 15 +++++++++++++++
 .../satoken/jwt/StpLogicJwtForStateless.java    | 15 +++++++++++++++
 .../dev33/satoken/jwt/error/SaJwtErrorCode.java | 15 +++++++++++++++
 .../satoken/jwt/exception/SaJwtException.java   | 15 +++++++++++++++
 .../dev33/satoken/oauth2/SaOAuth2Manager.java   | 15 +++++++++++++++
 .../satoken/oauth2/config/SaOAuth2Config.java   | 15 +++++++++++++++
 .../satoken/oauth2/error/SaOAuth2ErrorCode.java | 15 +++++++++++++++
 .../oauth2/exception/SaOAuth2Exception.java     | 15 +++++++++++++++
 .../satoken/oauth2/logic/SaOAuth2Consts.java    | 15 +++++++++++++++
 .../satoken/oauth2/logic/SaOAuth2Handle.java    | 15 +++++++++++++++
 .../satoken/oauth2/logic/SaOAuth2Template.java  | 15 +++++++++++++++
 .../satoken/oauth2/logic/SaOAuth2Util.java      | 15 +++++++++++++++
 .../satoken/oauth2/model/AccessTokenModel.java  | 15 +++++++++++++++
 .../satoken/oauth2/model/ClientTokenModel.java  | 15 +++++++++++++++
 .../dev33/satoken/oauth2/model/CodeModel.java   | 15 +++++++++++++++
 .../satoken/oauth2/model/RefreshTokenModel.java | 15 +++++++++++++++
 .../satoken/oauth2/model/RequestAuthModel.java  | 15 +++++++++++++++
 .../satoken/oauth2/model/SaClientModel.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/quick/SaQuickInject.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/quick/SaQuickManager.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/quick/SaQuickRegister.java | 15 +++++++++++++++
 .../satoken/quick/config/SaQuickConfig.java     | 15 +++++++++++++++
 .../satoken/quick/web/SaQuickController.java    | 15 +++++++++++++++
 .../dao/SaSessionForFastjsonCustomized.java     | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoRedisFastjson.java    | 15 +++++++++++++++
 .../dao/SaSessionForFastjson2Customized.java    | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoRedisFastjson2.java   | 15 +++++++++++++++
 .../dao/SaSessionForJacksonCustomized.java      | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoRedisJackson.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/dao/SaTokenDaoRedis.java   | 15 +++++++++++++++
 .../dao/SaSessionForJacksonCustomized.java      | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoRedissonJackson.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/dao/SaSessionForJson.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/dao/SaTokenDaoOfRedis.java | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoOfRedisBase64.java    | 15 +++++++++++++++
 .../satoken/dao/SaTokenDaoOfRedisJson.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/aop/SaCheckAspect.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/config/SaSsoConfig.java    | 15 +++++++++++++++
 .../java/cn/dev33/satoken/sso/SaSsoConsts.java  | 15 +++++++++++++++
 .../java/cn/dev33/satoken/sso/SaSsoManager.java | 15 +++++++++++++++
 .../cn/dev33/satoken/sso/SaSsoProcessor.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/sso/SaSsoTemplate.java     | 15 +++++++++++++++
 .../java/cn/dev33/satoken/sso/SaSsoUtil.java    | 15 +++++++++++++++
 .../dev33/satoken/sso/error/SaSsoErrorCode.java | 15 +++++++++++++++
 .../satoken/sso/exception/SaSsoException.java   | 15 +++++++++++++++
 .../java/cn/dev33/satoken/sso/name/ApiName.java | 15 +++++++++++++++
 .../cn/dev33/satoken/sso/name/ParamName.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/temp/jwt/SaJwtUtil.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/temp/jwt/SaTempForJwt.java | 15 +++++++++++++++
 .../temp/jwt/error/SaTempJwtErrorCode.java      | 15 +++++++++++++++
 .../servlet/error/SaServletErrorCode.java       | 15 +++++++++++++++
 .../servlet/model/SaRequestForServlet.java      | 15 +++++++++++++++
 .../servlet/model/SaResponseForServlet.java     | 15 +++++++++++++++
 .../servlet/model/SaStorageForServlet.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/servlet/package-info.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/jboot/PathAnalyzer.java    | 15 +++++++++++++++
 .../satoken/jboot/SaAnnotationInterceptor.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/jboot/SaJdkSerializer.java | 15 +++++++++++++++
 .../cn/dev33/satoken/jboot/SaRedisCache.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/jboot/SaTokenCacheDao.java | 15 +++++++++++++++
 .../satoken/jboot/SaTokenContextForJboot.java   | 15 +++++++++++++++
 .../dev33/satoken/jboot/SaTokenPathFilter.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/jboot/test/AppRun.java     | 15 +++++++++++++++
 .../satoken/jboot/test/AtteStartListener.java   | 15 +++++++++++++++
 .../satoken/jboot/test/StpInterfaceImpl.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/jfinal/PathAnalyzer.java   | 15 +++++++++++++++
 .../satoken/jfinal/SaAnnotationInterceptor.java | 15 +++++++++++++++
 .../satoken/jfinal/SaControllerContext.java     | 15 +++++++++++++++
 .../dev33/satoken/jfinal/SaJdkSerializer.java   | 15 +++++++++++++++
 .../satoken/jfinal/SaTokenActionHandler.java    | 15 +++++++++++++++
 .../satoken/jfinal/SaTokenContextForJfinal.java | 15 +++++++++++++++
 .../dev33/satoken/jfinal/SaTokenDaoRedis.java   | 15 +++++++++++++++
 .../dev33/satoken/jfinal/SaTokenPathFilter.java | 15 +++++++++++++++
 .../cn/dev33/satoken/jfinal/test/AppRun.java    | 15 +++++++++++++++
 .../cn/dev33/satoken/jfinal/test/Config.java    | 15 +++++++++++++++
 .../satoken/jfinal/test/StpInterfaceImpl.java   | 15 +++++++++++++++
 .../reactor/context/SaReactorHolder.java        | 15 +++++++++++++++
 .../reactor/context/SaReactorSyncHolder.java    | 15 +++++++++++++++
 .../error/SaReactorSpringBootErrorCode.java     | 15 +++++++++++++++
 .../satoken/reactor/filter/SaReactorFilter.java | 15 +++++++++++++++
 .../reactor/model/SaRequestForReactor.java      | 15 +++++++++++++++
 .../reactor/model/SaResponseForReactor.java     | 15 +++++++++++++++
 .../reactor/model/SaStorageForReactor.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/reactor/package-info.java  | 15 +++++++++++++++
 .../spring/SaTokenContextForSpringReactor.java  | 15 +++++++++++++++
 .../reactor/spring/SaTokenContextRegister.java  | 15 +++++++++++++++
 .../reactor/context/SaReactorHolder.java        | 15 +++++++++++++++
 .../reactor/context/SaReactorSyncHolder.java    | 15 +++++++++++++++
 .../error/SaReactorSpringBootErrorCode.java     | 15 +++++++++++++++
 .../satoken/reactor/filter/SaReactorFilter.java | 15 +++++++++++++++
 .../reactor/model/SaRequestForReactor.java      | 15 +++++++++++++++
 .../reactor/model/SaResponseForReactor.java     | 15 +++++++++++++++
 .../reactor/model/SaStorageForReactor.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/reactor/package-info.java  | 15 +++++++++++++++
 .../spring/SaTokenContextForSpringReactor.java  | 15 +++++++++++++++
 .../reactor/spring/SaTokenContextRegister.java  | 15 +++++++++++++++
 .../servlet/error/SaServletErrorCode.java       | 15 +++++++++++++++
 .../servlet/model/SaRequestForServlet.java      | 15 +++++++++++++++
 .../servlet/model/SaResponseForServlet.java     | 15 +++++++++++++++
 .../servlet/model/SaStorageForServlet.java      | 15 +++++++++++++++
 .../cn/dev33/satoken/servlet/package-info.java  | 15 +++++++++++++++
 .../java/cn/dev33/satoken/solon/XPluginImp.java | 15 +++++++++++++++
 .../satoken/solon/dao/SaSessionForJson.java     | 15 +++++++++++++++
 .../satoken/solon/dao/SaTokenDaoOfRedis.java    | 15 +++++++++++++++
 .../solon/dao/SaTokenDaoOfRedisBase64.java      | 15 +++++++++++++++
 .../solon/dao/SaTokenDaoOfRedisJson.java        | 15 +++++++++++++++
 .../satoken/solon/error/SaSolonErrorCode.java   | 15 +++++++++++++++
 .../solon/integration/SaTokenFilter.java        | 15 +++++++++++++++
 .../solon/integration/SaTokenInterceptor.java   | 15 +++++++++++++++
 .../solon/json/SaJsonTemplateForSnack3.java     | 15 +++++++++++++++
 .../satoken/solon/model/SaContextForSolon.java  | 15 +++++++++++++++
 .../satoken/solon/model/SaRequestForSolon.java  | 15 +++++++++++++++
 .../satoken/solon/model/SaResponseForSolon.java | 15 +++++++++++++++
 .../satoken/solon/model/SaStorageForSolon.java  | 15 +++++++++++++++
 .../solon/oauth2/SaOAuth2AutoConfigure.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/solon/package-info.java    | 15 +++++++++++++++
 .../satoken/solon/sso/SaSsoAutoConfigure.java   | 15 +++++++++++++++
 .../satoken/error/SaSpringBootErrorCode.java    | 15 +++++++++++++++
 .../java/cn/dev33/satoken/package-info.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/spring/SaBeanInject.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/spring/SaBeanRegister.java | 15 +++++++++++++++
 .../satoken/spring/SaPathMatcherHolder.java     | 15 +++++++++++++++
 .../spring/json/SaJsonTemplateForJackson.java   | 15 +++++++++++++++
 .../spring/oauth2/SaOAuth2BeanInject.java       | 15 +++++++++++++++
 .../spring/oauth2/SaOAuth2BeanRegister.java     | 15 +++++++++++++++
 .../satoken/spring/oauth2/package-info.java     | 15 +++++++++++++++
 .../satoken/spring/sso/SaSsoBeanInject.java     | 15 +++++++++++++++
 .../satoken/spring/sso/SaSsoBeanRegister.java   | 15 +++++++++++++++
 .../dev33/satoken/spring/sso/package-info.java  | 15 +++++++++++++++
 .../dev33/satoken/filter/SaServletFilter.java   | 15 +++++++++++++++
 .../satoken/interceptor/SaInterceptor.java      | 15 +++++++++++++++
 .../java/cn/dev33/satoken/package-info.java     | 17 ++++++++++++++++-
 .../satoken/spring/SaTokenContextForSpring.java | 15 +++++++++++++++
 .../satoken/spring/SaTokenContextRegister.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/spring/SpringMVCUtil.java  | 15 +++++++++++++++
 .../dev33/satoken/filter/SaServletFilter.java   | 15 +++++++++++++++
 .../satoken/interceptor/SaInterceptor.java      | 15 +++++++++++++++
 .../java/cn/dev33/satoken/package-info.java     | 15 +++++++++++++++
 ...SaTokenContextForSpringInJakartaServlet.java | 15 +++++++++++++++
 .../satoken/spring/SaTokenContextRegister.java  | 15 +++++++++++++++
 .../cn/dev33/satoken/spring/SpringMVCUtil.java  | 15 +++++++++++++++
 .../core/application/SaApplicationTest.java     | 15 +++++++++++++++
 .../satoken/core/config/SaTokenConfigTest.java  | 15 +++++++++++++++
 .../core/context/model/SaCookieTest.java        | 15 +++++++++++++++
 .../model/SaTokenContextDefaultImplTest.java    | 15 +++++++++++++++
 .../dev33/satoken/core/dao/SaTokenDaoTest.java  | 15 +++++++++++++++
 .../satoken/core/fun/IsRunFunctionTest.java     | 15 +++++++++++++++
 .../json/SaJsonTemplateDefaultImplTest.java     | 15 +++++++++++++++
 .../cn/dev33/satoken/core/package-info.java     | 15 +++++++++++++++
 .../dev33/satoken/core/secure/BCryptTest.java   | 15 +++++++++++++++
 .../satoken/core/secure/SaBase64UtilTest.java   | 15 +++++++++++++++
 .../satoken/core/secure/SaSecureUtilTest.java   | 15 +++++++++++++++
 .../core/session/SaSessionCustomUtilTest.java   | 15 +++++++++++++++
 .../satoken/core/session/SaSessionTest.java     | 15 +++++++++++++++
 .../satoken/core/session/TokenSignTest.java     | 15 +++++++++++++++
 .../satoken/core/sign/SaSignTemplateTest.java   | 15 +++++++++++++++
 .../dev33/satoken/core/stp/TokenInfoTest.java   | 15 +++++++++++++++
 .../cn/dev33/satoken/core/temp/SaTempTest.java  | 15 +++++++++++++++
 .../dev33/satoken/core/util/SaFoxUtilTest.java  | 15 +++++++++++++++
 .../dev33/satoken/core/util/SaResultTest.java   | 15 +++++++++++++++
 .../satoken/integrate/StartUpApplication.java   | 15 +++++++++++++++
 .../annotation/SaAnnotationController.java      | 15 +++++++++++++++
 .../annotation/SaAnnotationControllerTest.java  | 15 +++++++++++++++
 .../SaAnnotationIgnoreController.java           | 15 +++++++++++++++
 .../integrate/configure/HandlerException.java   | 15 +++++++++++++++
 .../integrate/configure/SaTokenConfigure.java   | 15 +++++++++++++++
 .../integrate/configure/StpInterfaceImpl.java   | 15 +++++++++++++++
 .../configure/inject/MySaBasicTemplate.java     | 15 +++++++++++++++
 .../configure/inject/MySaOAuth2Template.java    | 15 +++++++++++++++
 .../configure/inject/MySaSameTemplate.java      | 15 +++++++++++++++
 .../configure/inject/MySaSignTemplate.java      | 15 +++++++++++++++
 .../configure/inject/MySaSsoTemplate.java       | 15 +++++++++++++++
 .../integrate/configure/inject/MySaTemp.java    | 15 +++++++++++++++
 .../configure/inject/MySaTokenDao.java          | 15 +++++++++++++++
 .../configure/inject/MySaTokenListener.java     | 15 +++++++++++++++
 .../inject/MySaTokenSecondContextCreator.java   | 15 +++++++++++++++
 .../integrate/configure/inject/MyStpLogic.java  | 15 +++++++++++++++
 .../integrate/login/LoginController.java        | 15 +++++++++++++++
 .../integrate/login/LoginControllerTest.java    | 15 +++++++++++++++
 .../satoken/integrate/more/MoreController.java  | 15 +++++++++++++++
 .../integrate/more/MoreControllerTest.java      | 15 +++++++++++++++
 .../integrate/router/RouterController.java      | 15 +++++++++++++++
 .../integrate/router/RouterControllerTest.java  | 15 +++++++++++++++
 .../integrate/router/SaTokenConfigure2.java     | 15 +++++++++++++++
 .../integrate/same/SaSameTokenController.java   | 15 +++++++++++++++
 .../same/SaSameTokenControllerTest.java         | 15 +++++++++++++++
 .../cn/dev33/satoken/springboot/BasicsTest.java | 15 +++++++++++++++
 .../dev33/satoken/springboot/ManyLoginTest.java | 15 +++++++++++++++
 .../satoken/springboot/SpringMVCUtilTest.java   | 17 ++++++++++++++++-
 .../satoken/springboot/StartUpApplication.java  | 15 +++++++++++++++
 .../springboot/satoken/StpInterfaceImpl.java    | 15 +++++++++++++++
 .../test/java/cn/dev33/satoken/util/SoMap.java  | 15 +++++++++++++++
 317 files changed, 4758 insertions(+), 3 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index 59ccab70..3f187807 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken;
 
 import cn.dev33.satoken.config.SaTokenConfig;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
index f4fde9ff..5b460c9e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 import cn.dev33.satoken.basic.SaBasicTemplate;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
index db9afd7c..4b7585d7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 import cn.dev33.satoken.util.SaTokenConsts;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
index de7430f7..c12f510e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
index 0c5a3574..be8fd499 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
index b57ab221..229618ef 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
@@ -1,4 +1,19 @@
-package cn.dev33.satoken.annotation;
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package cn.dev33.satoken.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
index 34048074..c91fc7fa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
index 454ee0f1..3fd35742 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 import java.lang.annotation.ElementType;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
index 57c5f6c5..41ac2a21 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.annotation;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
index 51f3cb53..171e84cb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.application;
 
 import java.util.ArrayList;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
index 6b6f3faa..6d9eb84e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.application;
 
 import cn.dev33.satoken.util.SaFoxUtil;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
index d268fc2c..befb284f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.application;
 
 import cn.dev33.satoken.fun.SaRetFunction;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
index e6b75427..58091aaf 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.basic;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
index 5361b9b5..fe8ab6d3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.basic;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
index fd16eb2a..09b575c7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.config;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
index 16cbffbf..70a0f1e4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.config;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index 4427a69c..77644af2 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.config;
 
 import cn.dev33.satoken.util.SaFoxUtil;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
index ce769062..5838473d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.config;
 
 import java.io.IOException;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
index 7ab61411..869a1209 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
index b61d4958..367e830d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
index d2c9e0c0..bda49b50 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
index 97d82359..ad79a324 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
index a9e4ae89..177bcc18 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
index 4c2fe6fa..78b68224 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.model;
 
 import java.time.Instant;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
index 697870bf..b660651f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.model;
 
 import cn.dev33.satoken.error.SaErrorCode;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
index e643219d..60681004 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.model;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
index 51157cc1..f5f38298 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.model;
 
 import cn.dev33.satoken.application.SaSetValueInterface;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
index 80d550a6..aa1922a3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
@@ -2,4 +2,19 @@
  * 因为不能确定最终运行的 web 容器属于标准 Servlet 模型还是非 Servlet 模型，特封装此包下的包装类进行对接。
  * 调用路径为：Sa-Token 功能函数 -> SaRequest 封装接口 -> SaRequest 具体实现类。
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.model;
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
index 2df81d07..1115e980 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.second;
 
 import cn.dev33.satoken.context.SaTokenContext;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
index cb5b065f..418af7a0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.second;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
index 3f369b81..3e3ade68 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import cn.dev33.satoken.session.SaSession;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
index cbc339a7..4f2396bf 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
index 100d92fa..a4fa5baa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.error;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
index 83a315e9..1db4e03f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
index 28b1f74c..511d424d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
index e5c062c8..8ab5266b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
index 1c046b85..ab4271cf 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
index b5c5aebb..4297d616 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
index 66cea87d..eb260f12 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
index c8ca5d58..4d2725da 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 import java.util.Arrays;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
index 223134c3..2101bdf0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 import cn.dev33.satoken.stp.StpUtil;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
index fc95022e..747dc756 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 import cn.dev33.satoken.stp.StpUtil;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
index 96ab669e..86fb4360 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
index 9261f785..1b8f9e8a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
index 6102a146..5a88908b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
index 8a120d3a..697d93f0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 import cn.dev33.satoken.util.SaFoxUtil;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
index a18292f4..b64fe094 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 import cn.dev33.satoken.error.SaErrorCode;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
index 791bb1a0..fc950891 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
index f7795cfb..5e0f23a3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.exception;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
index a8cbb239..65a2bae4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.filter;
 
 import java.util.List;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
index f4145f5a..04d017bb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.filter;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
index 76a3b69a..aed52789 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.filter;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
index 8829edcd..61cdc634 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
index 65c0336d..6b14e53a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
index 131a2812..0427c5e9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 import java.util.function.Function;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
index 2197c549..911fc700 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
index b6b9af34..322f11d5 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
index 132cb206..ac8057f6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
index 1e048376..f5727317 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.fun;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
index 9869a66b..7c9f2507 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.json;
 
 import java.util.Map;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
index 1f44e463..72643a68 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.json;
 
 import java.util.Map;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
index ac434e7a..64e87e29 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.listener;
 
 import java.util.ArrayList;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
index fdc9d034..07c7b3de 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.listener;
 
 import cn.dev33.satoken.config.SaTokenConfig;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
index 490f85cb..da487ad0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.listener;
 
 import static cn.dev33.satoken.SaManager.log;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
index ba7507b0..e147af26 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.listener;
 
 import cn.dev33.satoken.stp.SaLoginModel;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
index 820d933f..4f0670f3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.log;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
index 8aae35ae..e34134c4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.log;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
index 6b24c19d..04c8be92 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.router;
 
 import java.util.HashMap;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
index 14228909..57cbfe1a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.router;
 
 import java.util.List;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
index 5f14d09f..eb8289d8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.router;
 
 import java.util.List;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
index 29bcfc6d..1c60106c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.same;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
index 951eecff..489dc819 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.same;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
index 2a62d43d..791bcbf6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.secure;
 
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
index c512e07f..f042ad0b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.secure;
 
 import java.io.UnsupportedEncodingException;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
index 683e4fdc..5d53b994 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.secure;
 
 import java.nio.charset.StandardCharsets;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index 6bf476db..e30185a6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.session;
 
 import java.io.Serializable;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
index b7b843f8..ad62a1a3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.session;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
index a5795405..83237901 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.session;
 
 import java.io.Serializable;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index ada8025e..a2504969 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sign;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
index 1f6a9525..15b6125c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sign;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
index d0da8323..93569727 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 import java.util.Map;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index 48e9093d..a48c9587 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 import java.util.LinkedHashMap;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
index f79a4b86..e7f81f90 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
index 6d953360..9be0abb8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 import java.util.List;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
index 6b191082..76fc1d0d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 import java.util.ArrayList;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index c4227401..e13d39c8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index de8cefbd..2c9d398a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.stp;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index fd3346d6..129cde14 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.strategy;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
index b0af6519..6033f531 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.temp;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
index 42b0c812..ca3cd827 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.temp;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
index 256473f7..49d4dc31 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.temp;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index bd309cea..46ca85cb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.util;
 
 import cn.dev33.satoken.error.SaErrorCode;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
index ff378ca6..9c7ef047 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.util;
 
 import java.io.Serializable;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index 5b071bfe..83057b53 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.util;
 
 /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
index 7f559c10..4e3a5562 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.util;
 
 /**
diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index a313c6f7..e10f2218 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao.alone;
 
 import cn.dev33.satoken.dao.*;
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
index 0d9c6271..73065190 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.thymeleaf.dialect;
 
 import java.util.Arrays;
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
index da1efa91..19bc1859 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.thymeleaf.dialect;
 
 import java.util.function.Function;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
index d4e37601..4fa3235e 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo;
 
 import cn.dev33.satoken.context.second.SaTokenSecondContext;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
index 1ab49834..ce05db5c 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo;
 
 import org.apache.dubbo.rpc.RpcContext;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
index 520a16ff..b3d8e767 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo.filter;
 
 import org.apache.dubbo.common.constants.CommonConstants;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
index ad29df56..b7a12c71 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo.filter;
 
 import org.apache.dubbo.common.constants.CommonConstants;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
index 4abf69d4..4a707be0 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo.model;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
index b36ddac7..0ed4cd01 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo.model;
 
 import cn.dev33.satoken.context.model.SaResponse;
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
index c4a3676f..1f01da6e 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo.model;
 
 import cn.dev33.satoken.context.model.SaStorage;
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
index ae5a4179..7ef653d1 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3;
 
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
index 60922a99..46c29a0b 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3;
 
 import cn.dev33.satoken.context.dubbo3.model.SaRequestForDubbo3;
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
index 96ad9579..cdc4455c 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3.filter;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
index 287f03ea..4d624c03 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3.filter;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
index 4b83df24..35fd3d69 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3.model;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
index aaf74dea..1eefadda 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3.model;
 
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
index e74b6362..adc7b182 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.dubbo3.model;
 
 import cn.dev33.satoken.context.model.SaStorage;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
index 9265d47e..17881896 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc;
 
 import cn.dev33.satoken.context.second.SaTokenSecondContext;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
index db8fbd91..c0e57fbc 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc;
 
 import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
index d67344c6..9d2c51bf 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.constants;
 
 import cn.dev33.satoken.same.SaSameUtil;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
index 41ed7bd5..1425efa4 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.context;
 
 import io.grpc.*;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
index 805a1b29..1d35e862 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.interceptor;
 
 import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
index 0032938d..ec88dd05 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.interceptor;
 
 import org.springframework.core.Ordered;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
index faa00858..0331750d 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.interceptor;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
index 0b88691b..e06d096a 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.model;
 
 import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
index cb3ee986..29f6c51d 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.model;
 
 import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext;
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
index c17c85dc..89063990 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.context.grpc.model;
 
 import cn.dev33.satoken.context.grpc.context.SaTokenGrpcContext;
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
index b8c71814..aac77b7c 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt;
 
 import java.util.Map;
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
index b3c124e2..62c673a1 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt;
 
 import java.util.Map;
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index 4d571168..c024ec66 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt;
 
 import java.util.List;
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
index 37466cff..a5492297 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt;
 
 import java.util.Map;
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index f17baa1c..ce195769 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt;
 
 import java.util.Map;
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
index 73a5fc4d..3f2e4d3f 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt.error;
 
 /**
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
index d55462c3..3eae4a86 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jwt.exception;
 
 import cn.dev33.satoken.exception.SaTokenException;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
index 049a0d41..82edf562 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2;
 
 import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
index 2f1d6487..dfe2b690 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.config;
 
 import cn.dev33.satoken.util.SaResult;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
index 0469098b..257f56c1 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.error;
 
 /**
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
index 42c5c4b1..c7c76aaf 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.exception;
 
 import cn.dev33.satoken.exception.SaTokenException;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
index 16644ad4..0006791d 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.logic;
 
 /**
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
index eb659644..fb0fe152 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.logic;
 
 import cn.dev33.satoken.context.SaHolder;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
index a6316b1f..957bd585 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.logic;
 
 import java.util.List;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
index 22004b7f..ae8c493a 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.logic;
 
 import cn.dev33.satoken.context.model.SaRequest;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
index e23dd690..8e579b17 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.model;
 
 import java.io.Serializable;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
index 3367606b..33b831e7 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.model;
 
 import java.io.Serializable;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
index b4417be2..9461b2a2 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.model;
 
 import java.io.Serializable;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
index 40a78221..a79ccbd4 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.model;
 
 import java.io.Serializable;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
index cd4a1b8d..676626d6 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.model;
 
 import java.io.Serializable;
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
index 044a50d5..57fdcebe 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.oauth2.model;
 
 import java.io.Serializable;
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
index bb050613..36474f96 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.quick;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
index d1f69c76..19704401 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.quick;
 
 import cn.dev33.satoken.quick.config.SaQuickConfig;
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
index a895bfc4..5cb875c3 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.quick;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
index cff3e886..04a51044 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.quick.config;
 
 /**
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
index 591004d8..ed0d664e 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.quick.web;
 
 import org.springframework.stereotype.Controller;
diff --git a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
index 71350777..c63ea73a 100644
--- a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
+++ b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import com.alibaba.fastjson.JSON;
diff --git a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
index 396ad7e5..3b8c55aa 100644
--- a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
+++ b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import java.util.ArrayList;
diff --git a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
index 5970540c..fc2c435c 100644
--- a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
+++ b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import com.alibaba.fastjson2.JSON;
diff --git a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
index 60c02dff..03c92933 100644
--- a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
+++ b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import java.util.ArrayList;
diff --git a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index a0b320e4..41ac4ee5 100644
--- a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
diff --git a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
index bdfdc95f..1df14161 100644
--- a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
+++ b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import java.lang.reflect.Field;
diff --git a/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
index 33e513fc..96acea63 100644
--- a/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
+++ b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import java.util.ArrayList;
diff --git a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index c86f5334..069c4fa1 100644
--- a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import cn.dev33.satoken.session.SaSession;
diff --git a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
index 8f44bce3..66250350 100644
--- a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
+++ b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import java.lang.reflect.Field;
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
index b26a72ae..2db1f9f0 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import cn.dev33.satoken.session.SaSession;
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
index de6f4045..477be730 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import org.noear.redisx.RedisClient;
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
index 2456e1c7..5be4f36b 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import cn.dev33.satoken.util.SaFoxUtil;
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
index 922fb80a..78680eaf 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.dao;
 
 import cn.dev33.satoken.session.SaSession;
diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index ddcb8e95..7f299468 100644
--- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.aop;
 
 import java.lang.reflect.Method;
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index e09843bd..91905e43 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.config;
 
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
index 419f5c1a..ac7d2adc 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso;
 
 /**
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
index b05fe3ff..d920463a 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso;
 
 import cn.dev33.satoken.config.SaSsoConfig;
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index 2023cb41..648f406e 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso;
 
 import cn.dev33.satoken.config.SaSsoConfig;
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index a74a8dee..11b56529 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index d4ab2323..7b4e8452 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso;
 
 import cn.dev33.satoken.util.SaResult;
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
index 3ef1c95f..342ce9b6 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso.error;
 
 /**
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
index 2268caf6..180dcc2d 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso.exception;
 
 import cn.dev33.satoken.exception.SaTokenException;
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
index 3b99e959..49c5782e 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso.name;
 
 /**
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
index bb5e1fc5..a1fc3f04 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.sso.name;
 
 /**
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
index 25157913..36e318d0 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.temp.jwt;
 
 import cn.dev33.satoken.dao.SaTokenDao;
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
index b57c0375..1caaa982 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.temp.jwt;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
index c099560e..854ab523 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.temp.jwt.error;
 
 /**
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 8cdaae8a..78078ba1 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.error;
 
 /**
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 1836e2dc..e22c57a1 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.model;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index f6cbc6cc..ce319766 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.model;
 
 import cn.dev33.satoken.context.model.SaResponse;
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index 40355529..d1818d2d 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.model;
 
 import cn.dev33.satoken.context.model.SaStorage;
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
index 306aeb69..1e68f1c9 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
@@ -1,4 +1,19 @@
 /**
  * Sa-Token对接ServletAPI容器所需要的实现类接口包
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java
index a25f996d..beea4dca 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import java.util.LinkedHashMap;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java
index 28d94e0f..10df8d2a 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import cn.dev33.satoken.strategy.SaStrategy;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java
index 7f8d694d..fb7a5744 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaJdkSerializer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import com.jfinal.log.Log;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java
index fa2e3664..97e4e5b3 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import com.jfinal.plugin.ehcache.IDataLoader;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java
index 65ff67c2..c4d15663 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import cn.dev33.satoken.dao.SaTokenDao;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenContextForJboot.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenContextForJboot.java
index 457a5735..253b8e88 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenContextForJboot.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenContextForJboot.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import cn.dev33.satoken.context.SaTokenContext;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
index e20c03fd..ecbefec2 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenPathFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot;
 
 import cn.dev33.satoken.exception.SaTokenException;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AppRun.java b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AppRun.java
index 684b3b6c..e666c13e 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AppRun.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AppRun.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot.test;
 
 import cn.dev33.satoken.annotation.SaCheckRole;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java
index c3eb5a34..a53bd731 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot.test;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/StpInterfaceImpl.java b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/StpInterfaceImpl.java
index 183b4515..e85ecc7d 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/StpInterfaceImpl.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/StpInterfaceImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jboot.test;
 
 import cn.dev33.satoken.stp.StpInterface;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java
index 0193484e..b10d5118 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import java.util.LinkedHashMap;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java
index ed9b84f5..129e36f4 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import cn.dev33.satoken.strategy.SaStrategy;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaControllerContext.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaControllerContext.java
index 64cdc36c..285c279b 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaControllerContext.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaControllerContext.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import com.jfinal.core.Controller;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaJdkSerializer.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaJdkSerializer.java
index bb1836d6..2258e3be 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaJdkSerializer.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaJdkSerializer.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import com.jfinal.kit.LogKit;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java
index a3553dc4..bbb80194 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import com.jfinal.aop.Invocation;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenContextForJfinal.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenContextForJfinal.java
index 72aadc52..6b5412cb 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenContextForJfinal.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenContextForJfinal.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import cn.dev33.satoken.context.SaTokenContext;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java
index c3d3cc33..128644d3 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import cn.dev33.satoken.dao.SaTokenDao;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
index 078164a4..df5d380d 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenPathFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal;
 
 import cn.dev33.satoken.exception.SaTokenException;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/AppRun.java b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/AppRun.java
index 606f2355..d8418658 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/AppRun.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/AppRun.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal.test;
 
 import cn.dev33.satoken.annotation.SaCheckRole;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java
index edf9d288..8fe79e8e 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal.test;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/StpInterfaceImpl.java b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/StpInterfaceImpl.java
index f4ab4366..14aa8b78 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/StpInterfaceImpl.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/StpInterfaceImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.jfinal.test;
 
 import cn.dev33.satoken.stp.StpInterface;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index 13fbb1be..51b77473 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.context;
 
 import org.springframework.web.server.ServerWebExchange;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 18baaa9c..75a8934f 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.context;
 
 import org.springframework.web.server.ServerWebExchange;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index f45edd8f..d1dd56a1 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.error;
 
 /**
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index af94080a..7b695772 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.filter;
 
 import java.util.ArrayList;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 25bdd2e9..9ef75437 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.model;
 
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index c9bff081..35df5ec5 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.model;
 
 import java.net.URI;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 9e667190..44f40677 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.model;
 
 import org.springframework.web.server.ServerWebExchange;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
index bfccfbad..a3561acf 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
@@ -1,4 +1,19 @@
 /**
  * sa-token集成Reactor响应式编程的各个组件 
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index e96dd709..fe80f1a7 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.spring;
 
 import cn.dev33.satoken.context.SaTokenContextForThreadLocal;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index 35b37db4..59205759 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.spring;
 
 import org.springframework.context.annotation.Bean;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index 55ec30dc..398f6e0c 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.context;
 
 import org.springframework.web.server.ServerWebExchange;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 18baaa9c..75a8934f 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.context;
 
 import org.springframework.web.server.ServerWebExchange;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index 552d39f7..a442cdc2 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.error;
 
 /**
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 99f88481..ad630c05 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.filter;
 
 import java.util.ArrayList;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index ba3f9812..68dd76c4 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.model;
 
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index c9bff081..35df5ec5 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.model;
 
 import java.net.URI;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 9e667190..44f40677 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.model;
 
 import org.springframework.web.server.ServerWebExchange;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
index bfccfbad..a3561acf 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
@@ -1,4 +1,19 @@
 /**
  * sa-token集成Reactor响应式编程的各个组件 
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index e96dd709..fe80f1a7 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.spring;
 
 import cn.dev33.satoken.context.SaTokenContextForThreadLocal;
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index db6ef91d..cd0bc663 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.reactor.spring;
 
 import org.springframework.context.annotation.Bean;
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 8cdaae8a..78078ba1 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.error;
 
 /**
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 3add2ad5..7bb40fdf 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.model;
 
 import java.io.IOException;
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index 34613298..a324d388 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.model;
 
 import cn.dev33.satoken.context.model.SaResponse;
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index 6511ae5a..572f1525 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet.model;
 
 import cn.dev33.satoken.context.model.SaStorage;
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
index 306aeb69..1e68f1c9 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
@@ -1,4 +1,19 @@
 /**
  * Sa-Token对接ServletAPI容器所需要的实现类接口包
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.servlet;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
index fcba0483..1eec299b 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/XPluginImp.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJson.java
index 9e7bc042..4d2aa9ee 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJson.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaSessionForJson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.dao;
 
 import cn.dev33.satoken.session.SaSession;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java
index 805b5f4b..d0cc8694 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.dao;
 
 import org.noear.redisx.RedisClient;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
index 2f6a4a26..40df43f3 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.dao;
 
 import cn.dev33.satoken.dao.SaTokenDao;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
index 2fba0461..1c938010 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.dao;
 
 import cn.dev33.satoken.dao.SaTokenDao;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
index c4b66bc9..557a9792 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.error;
 
 /**
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
index 5331ab03..e51e71f4 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.integration;
 
 import cn.dev33.satoken.annotation.SaIgnore;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
index a9554c76..03fefd8c 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.integration;
 
 import cn.dev33.satoken.annotation.SaIgnore;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java
index 122c055f..0eadd0ad 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/json/SaJsonTemplateForSnack3.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.json;
 
 import cn.dev33.satoken.json.SaJsonTemplate;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaContextForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaContextForSolon.java
index 4121cde5..2194eea8 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaContextForSolon.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaContextForSolon.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.model;
 
 import cn.dev33.satoken.context.SaTokenContext;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
index 7cf25fb1..80bf68fb 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.model;
 
 import cn.dev33.satoken.SaManager;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java
index 76d9dff3..b214d07b 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaResponseForSolon.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.model;
 
 import cn.dev33.satoken.context.model.SaResponse;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java
index 756c0819..90fa90a2 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaStorageForSolon.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.model;
 
 import cn.dev33.satoken.context.model.SaStorage;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java
index 7805e0ed..cdeca069 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/oauth2/SaOAuth2AutoConfigure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.oauth2;
 
 import cn.dev33.satoken.oauth2.SaOAuth2Manager;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/package-info.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/package-info.java
index 4b10a207..dedb776c 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/package-info.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/package-info.java
@@ -1,4 +1,19 @@
 /**
  * sa-token 集成  solon 的各个组件
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
index 56edc176..27d439ee 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/sso/SaSsoAutoConfigure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.solon.sso;
 
 import cn.dev33.satoken.config.SaSsoConfig;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
index 0967cbe1..0962192a 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.error;
 
 /**
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
index b24005ea..d062e536 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,4 +1,19 @@
 /**
  * Sa-Token 集成 SpringBoot 的各个组件
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
index af28592a..cf5fdb04 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import java.util.List;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java
index 02da959c..1c96d687 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
index 5c144a52..4452d1a7 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import org.springframework.util.AntPathMatcher;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
index b1431243..f2c4f4c8 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.json;
 
 import cn.dev33.satoken.error.SaSpringBootErrorCode;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
index fc9fa791..ca3fc728 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.oauth2;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
index 0e87470c..42257420 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.oauth2;
 
 import cn.dev33.satoken.oauth2.SaOAuth2Manager;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java
index 793d87db..945f503a 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java
@@ -1,4 +1,19 @@
 /**
  * Sa-Token-OAuth2 模块自动化配置（只有引入了Sa-Token-OAuth2模块后，此包下的代码才会开始工作）
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.oauth2;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
index 72fc5a4a..797e6747 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.sso;
 
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
index 53a6511c..89201168 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.sso;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java
index feddd29a..4e46afd6 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java
@@ -1,4 +1,19 @@
 /**
  * Sa-Token-SSO 模块自动化配置（只有引入了 sa-token-sso 模块后，此包下的代码才会开始工作）
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring.sso;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index eb6aa5ac..e1109774 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.filter;
 
 import java.io.IOException;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 6fcda9f3..09742f01 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.interceptor;
 
 import java.lang.reflect.Method;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
index 56ef7301..9d0a9d8e 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,4 +1,19 @@
 /**
  * sa-token集成SpringBoot的各个组件 
  */
-package cn.dev33.satoken;
\ No newline at end of file
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package cn.dev33.satoken;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
index acc688b2..8c35156c 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import cn.dev33.satoken.context.SaTokenContext;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index 09c8c485..abafe198 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import org.springframework.context.annotation.Bean;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index 16050d90..b4685abe 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import javax.servlet.http.HttpServletRequest;
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 922b2e2d..83563b90 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.filter;
 
 import java.io.IOException;
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index a8cacdff..0510ffcb 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.interceptor;
 
 import java.lang.reflect.Method;
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java
index 56ef7301..4cae80b8 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,4 +1,19 @@
 /**
  * sa-token集成SpringBoot的各个组件 
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
index 33cecc53..4954a4a7 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import cn.dev33.satoken.context.SaTokenContext;
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index 6858b445..fd460b37 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import org.springframework.context.annotation.Bean;
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index 52638a43..75f24607 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.spring;
 
 import org.springframework.web.context.request.RequestContextHolder;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
index 3cd58037..15b195df 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.application;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
index a7887f47..fd479776 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.config;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
index 547c87bd..2af27089 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.context.model;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
index c9442516..9d426522 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.context.model;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
index 78ab1f56..e6e00be1 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.dao;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
index f839c96b..eb1d8b9b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.fun;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
index e13ed61f..e15905e1 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.json;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/package-info.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/package-info.java
index 32b63dc6..c15918e0 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/package-info.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/package-info.java
@@ -1,4 +1,19 @@
 /**
  * 核心包测试 
  */
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core;
\ No newline at end of file
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/BCryptTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/BCryptTest.java
index fa6c85db..745e5506 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/BCryptTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/BCryptTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.secure;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
index dc17b834..0166135f 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.secure;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
index 5b319cdb..e62aa8b4 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.secure;
 
 import java.util.HashMap;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
index e40995a7..9860f827 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.session;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
index 1c82229e..71c5edd8 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.session;
 
 import java.util.Arrays;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
index ce9e7a6a..a7daea69 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.session;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
index b0995aef..8387dc27 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.sign;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
index 9a5c5bc0..360e8cec 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.stp;
 
 import java.util.HashMap;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
index 7282c110..e23a807f 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.temp;
 
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
index 22fff7a6..ef664115 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.util;
 
 import java.time.Instant;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
index 9e06a514..7f633f12 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.core.util;
 
 import java.util.HashMap;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/StartUpApplication.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/StartUpApplication.java
index d65ee5b9..5e8faa8d 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/StartUpApplication.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/StartUpApplication.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate;
 
 import org.springframework.boot.SpringApplication;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
index b053a45b..802b2666 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.annotation;
 
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationControllerTest.java
index 83821434..53a1fbed 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationControllerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.annotation;
 
 import java.util.Map;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
index 1475c97b..59dfc933 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.annotation;
 
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java
index 75b031f7..a5811e8c 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/HandlerException.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure;
 
 import org.springframework.web.bind.annotation.ExceptionHandler;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
index c1cd10b3..90677e17 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure;
 
 import org.springframework.context.annotation.Configuration;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java
index ea76739e..82043607 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/StpInterfaceImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure;
 
 import java.util.Arrays;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaBasicTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaBasicTemplate.java
index f396eb5e..bf4c3ad0 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaBasicTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaBasicTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
index b9a96875..a8ecbba8 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSameTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSameTemplate.java
index e24da7ef..687da331 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSameTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSameTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java
index a2a17081..f88fec0c 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
index 1f54c781..ad838851 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTemp.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTemp.java
index ed386402..fdf7d477 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTemp.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTemp.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenDao.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenDao.java
index 2cc0bd98..f9fe8471 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenDao.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenDao.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenListener.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenListener.java
index 94ccafbb..a84e6ccc 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenListener.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenListener.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenSecondContextCreator.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenSecondContextCreator.java
index f809a8a3..b7278ac3 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenSecondContextCreator.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaTokenSecondContextCreator.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MyStpLogic.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MyStpLogic.java
index e29a8e1b..d0befa1e 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MyStpLogic.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MyStpLogic.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.configure.inject;
 
 import org.springframework.stereotype.Component;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java
index a69ea33d..0a0827e7 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.login;
 
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java
index d7d665ad..726424a7 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/login/LoginControllerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.login;
 
 import java.util.Map;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java
index eec89d0d..b20d22d6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.more;
 
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java
index 8f0da2b0..309f65ea 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/more/MoreControllerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.more;
 
 import java.util.Map;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java
index 314e91ea..c662a8e6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.router;
 
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java
index 8a0c23a6..9e67759a 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/RouterControllerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.router;
 
 import java.util.Arrays;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
index ce4e9e06..b4bdd491 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.router;
 
 import java.util.Arrays;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java
index c8c27cf9..13747807 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenController.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.same;
 
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java
index dab7b6a6..280ee74a 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/same/SaSameTokenControllerTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.integrate.same;
 
 import java.util.Map;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
index 9b5c90c2..f0bdb8d6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.springboot;
 
 import java.io.IOException;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
index e1fe211a..c1a17ae2 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/ManyLoginTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.springboot;
 
 import java.util.List;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
index ffb915a6..5f37aac7 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
@@ -1,4 +1,19 @@
-package cn.dev33.satoken.springboot;
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ package cn.dev33.satoken.springboot;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/StartUpApplication.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/StartUpApplication.java
index 0c753109..ef97e750 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/StartUpApplication.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/StartUpApplication.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.springboot;
 
 import org.springframework.boot.SpringApplication;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/satoken/StpInterfaceImpl.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/satoken/StpInterfaceImpl.java
index 2d9b65ec..ad5b2179 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/satoken/StpInterfaceImpl.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/satoken/StpInterfaceImpl.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.springboot.satoken;
 
 import java.util.Arrays;
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java
index 3430a67b..e80dd198 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/util/SoMap.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package cn.dev33.satoken.util;
 
 import java.lang.reflect.Field;

From f4dd609d8a1a51c4d45a5e1de58072c05fc6862b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 19:53:57 +0800
Subject: [PATCH 064/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84=20javadoc=20=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/application/SaApplication.java   | 2 +-
 .../java/cn/dev33/satoken/application/SaGetValueInterface.java  | 2 +-
 .../java/cn/dev33/satoken/application/SaSetValueInterface.java  | 2 +-
 .../main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java | 2 +-
 .../cn/dev33/satoken/listener/SaTokenListenerForSimple.java     | 2 +-
 .../src/main/java/com/pj/sso/SsoRequestUtil.java                | 2 +-
 .../src/main/java/com/pj/sso/util/MyHttpSessionHolder.java      | 2 +-
 .../src/main/java/com/pj/ws/MyWebSocketHandler.java             | 2 +-
 .../src/main/java/com/pj/ws/WebSocketConfig.java                | 2 +-
 .../src/main/java/com/pj/ws/WebSocketInterceptor.java           | 2 +-
 .../java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java     | 2 +-
 .../main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java | 2 +-
 .../main/java/cn/dev33/satoken/interceptor/SaInterceptor.java   | 2 +-
 .../main/java/cn/dev33/satoken/interceptor/SaInterceptor.java   | 2 +-
 .../cn/dev33/satoken/core/application/SaApplicationTest.java    | 2 +-
 .../java/cn/dev33/satoken/core/config/SaTokenConfigTest.java    | 2 +-
 .../java/cn/dev33/satoken/core/context/model/SaCookieTest.java  | 2 +-
 .../core/context/model/SaTokenContextDefaultImplTest.java       | 2 +-
 .../src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java | 2 +-
 .../test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java  | 2 +-
 .../dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java  | 2 +-
 .../java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java     | 2 +-
 .../java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java     | 2 +-
 .../cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java  | 2 +-
 .../test/java/cn/dev33/satoken/core/session/SaSessionTest.java  | 2 +-
 .../test/java/cn/dev33/satoken/core/session/TokenSignTest.java  | 2 +-
 .../java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java     | 2 +-
 .../src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java  | 2 +-
 .../src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java    | 2 +-
 .../src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java | 2 +-
 .../src/test/java/cn/dev33/satoken/core/util/SaResultTest.java  | 2 +-
 .../satoken/integrate/annotation/SaAnnotationController.java    | 2 +-
 .../integrate/annotation/SaAnnotationIgnoreController.java      | 2 +-
 .../cn/dev33/satoken/integrate/configure/SaTokenConfigure.java  | 2 +-
 .../satoken/integrate/configure/inject/MySaOAuth2Template.java  | 2 +-
 .../satoken/integrate/configure/inject/MySaSsoTemplate.java     | 2 +-
 .../cn/dev33/satoken/integrate/router/SaTokenConfigure2.java    | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
index 171e84cb..1dfed7db 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.dao.SaTokenDao;
  * <p> 在应用全局范围内: 存值、取值。数据在应用重启后失效，如果集成了 Redis，则在 Redis 重启后失效。
  * 
  * @author click33
- * @since: 2022-8-17
+ * @since 2022-8-17
  */
 public class SaApplication implements SaSetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
index 6d9eb84e..622233c4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * <p> 封装 SaStorage、SaSession、SaApplication 等存取值的一些固定方法，减少重复编码 </p>
  * 
  * @author click33
- * @since: 2022-8-16
+ * @since 2022-8-16
  */
 public interface SaGetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
index befb284f..bf4eb535 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.fun.SaRetFunction;
  * <p> 封装 SaStorage、SaSession、SaApplication 等存取值的一些固定方法，减少重复编码 </p>
  * 
  * @author click33
- * @since: 2022-8-17
+ * @since 2022-8-17
  */
 public interface SaSetValueInterface extends SaGetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
index 64e87e29..5a7b8a75 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.stp.StpLogic;
  * <p> 提供侦听器注册、事件发布能力 </p>
  * 
  * @author click33
- * @since: 2022-8-19
+ * @since 2022-8-19
  */
 public class SaTokenEventCenter {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
index e147af26..dfacc771 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.stp.SaLoginModel;
  * <p> 对所有事件方法提供空实现，方便开发者通过继承此类快速实现一个可用的侦听器 </p>
  * 
  * @author click33
- * @since: 2022-8-20
+ * @since 2022-8-20
  */
 public class SaTokenListenerForSimple implements SaTokenListener {
 
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
index 4365f3f5..3ac8f181 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
@@ -13,7 +13,7 @@ import com.pj.sso.util.AjaxJson;
  * 封装一些 sso 共用方法 
  * 
  * @author click33
- * @since: 2022-4-30
+ * @since 2022-4-30
  */
 public class SsoRequestUtil {
 
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
index dc580d19..cc62f31e 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client-nosdk/src/main/java/com/pj/sso/util/MyHttpSessionHolder.java
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
  * <b> 此种方式有性能问题，仅做demo示例，真实项目中请更换为其它方案记录用户会话数据 </b>
  * 
  * @author click33
- * @since: 2022-4-30
+ * @since 2022-4-30
  */
 @Component
 public class MyHttpSessionHolder implements HttpSessionListener {
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java
index 5619c91f..2318d6b6 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/MyWebSocketHandler.java
@@ -12,7 +12,7 @@ import org.springframework.web.socket.handler.TextWebSocketHandler;
  * 处理 WebSocket 连接 
  * 
  * @author click33
- * @since: 2022-2-11
+ * @since 2022-2-11
  */
 public class MyWebSocketHandler extends TextWebSocketHandler {
 
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java
index 38c70e8f..2ece6935 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketConfig.java
@@ -9,7 +9,7 @@ import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry
  * WebSocket 相关配置 
  * 
  * @author click33
- * @since: 2022-2-11
+ * @since 2022-2-11
  */
 @Configuration
 @EnableWebSocket
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java
index 26a7f68a..41d19b97 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/java/com/pj/ws/WebSocketInterceptor.java
@@ -13,7 +13,7 @@ import cn.dev33.satoken.stp.StpUtil;
  * WebSocket 握手的前置拦截器 
  * 
  * @author click33
- * @since: 2022-2-11
+ * @since 2022-2-11
  */
 public class WebSocketInterceptor implements HandshakeInterceptor {
 
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
index 557a9792..f0602095 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.solon.error;
  * 定义 sa-token-solon-plugin 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-30
+ * @since 2022-10-30
  */
 public interface SaSolonErrorCode {
 
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
index 0962192a..82845fef 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.error;
  * 定义 sa-token-spring-boot-starter 所有异常细分状态码 
  * 
  * @author click33
- * @since: 2022-10-30 
+ * @since 2022-10-30 
  */
 public interface SaSpringBootErrorCode {
 	
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 09742f01..3a599be6 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -33,7 +33,7 @@ import cn.dev33.satoken.strategy.SaStrategy;
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
  * 
  * @author click33
- * @since: 2022-8-21
+ * @since 2022-8-21
  */
 public class SaInterceptor implements HandlerInterceptor {
 
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 0510ffcb..1f5a2a80 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -32,7 +32,7 @@ import jakarta.servlet.http.HttpServletResponse;
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
  * 
  * @author click33
- * @since: 2022-8-21
+ * @since 2022-8-21
  */
 public class SaInterceptor implements HandlerInterceptor {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
index 15b195df..319d57c6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/application/SaApplicationTest.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.context.SaHolder;
  * SaApplication 存取值测试 
  * 
  * @author click33
- * @since: 2022-9-4
+ * @since 2022-9-4
  */
 public class SaApplicationTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
index fd479776..7848a86b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.config.SaTokenConfigFactory;
  * 配置类测试 
  * 
  * @author click33
- * @since: 2022-9-4
+ * @since 2022-9-4
  */
 public class SaTokenConfigTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
index 2af27089..fad622f7 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaCookieTest.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.context.model.SaCookie;
  * SaFoxUtil 工具类测试 
  * 
  * @author click33
- * @since: 2022-2-8 22:14:25
+ * @since 2022-2-8 22:14:25
  */
 public class SaCookieTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
index 9d426522..72a32f08 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/context/model/SaTokenContextDefaultImplTest.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.exception.SaTokenException;
  * 默认上下文测试 
  * 
  * @author click33
- * @since: 2022-9-5
+ * @since 2022-9-5
  */
 public class SaTokenContextDefaultImplTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
index e6e00be1..09c9ca22 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/dao/SaTokenDaoTest.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.session.SaSession;
  * SaTokenDao 持久层 测试 
  * 
  * @author click33
- * @since: 2022-2-9 15:39:38
+ * @since 2022-2-9 15:39:38
  */
 public class SaTokenDaoTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
index eb1d8b9b..ccbf2e2b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/fun/IsRunFunctionTest.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.fun.IsRunFunction;
  * IsRunFunction 测试 
  * 
  * @author click33
- * @since: 2022-2-9 16:11:10
+ * @since 2022-2-9 16:11:10
  */
 public class IsRunFunctionTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
index e15905e1..f3cff0ce 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/json/SaJsonTemplateDefaultImplTest.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.util.SoMap;
  * json默认实现类测试 
  * 
  * @author click33
- * @since: 2022-9-1
+ * @since 2022-9-1
  */
 public class SaJsonTemplateDefaultImplTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
index 0166135f..5799a235 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaBase64UtilTest.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.secure.SaBase64Util;
  * SaBase64Util 测试 
  * 
  * @author click33
- * @since: 2022-2-9
+ * @since 2022-2-9
  */
 public class SaBase64UtilTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
index e62aa8b4..0b188181 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/secure/SaSecureUtilTest.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.secure.SaSecureUtil;
  * SaSecureUtil 加密工具类 测试 
  * 
  * @author click33
- * @since: 2022-2-9
+ * @since 2022-2-9
  */
 public class SaSecureUtilTest {
 	
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
index 9860f827..ee5d5106 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionCustomUtilTest.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.session.SaSessionCustomUtil;
  * SaSession 测试 
  * 
  * @author click33
- * @since: 2022-2-9 
+ * @since 2022-2-9 
  */
 public class SaSessionCustomUtilTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
index 71c5edd8..e39049f1 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.session.TokenSign;
  * SaSession 测试 
  * 
  * @author click33
- * @since: 2022-2-9 
+ * @since 2022-2-9 
  */
 public class SaSessionTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
index a7daea69..8c75d934 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/TokenSignTest.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.session.TokenSign;
  * TokenSign 相关测试 
  * 
  * @author click33
- * @since: 2022-9-4
+ * @since 2022-9-4
  */
 public class TokenSignTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
index 8387dc27..9768eb6f 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.util.SoMap;
  * API 接口签名测试 
  * 
  * @author click33
- * @since: 2022-9-2
+ * @since 2022-9-2
  */
 public class SaSignTemplateTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
index 360e8cec..3a076a11 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * Token 参数扩展 
  * 
  * @author click33
- * @since: 2022-9-5
+ * @since 2022-9-5
  */
 public class TokenInfoTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
index e23a807f..47f9d34a 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/temp/SaTempTest.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * 临时Token模块测试 
  * 
  * @author click33
- * @since: 2022-9-1
+ * @since 2022-9-1
  */
 public class SaTempTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
index ef664115..45f742af 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaFoxUtilTest.java
@@ -32,7 +32,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * SaFoxUtil 工具类测试 
  * 
  * @author click33
- * @since: 2022-2-8 22:14:25
+ * @since 2022-2-8 22:14:25
  */
 public class SaFoxUtilTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
index 7f633f12..22884fd4 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/util/SaResultTest.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.util.SaResult;
  * SaResult 结果集 测试 
  * 
  * @author click33
- * @since: 2022-2-8 22:14:25
+ * @since 2022-2-8 22:14:25
  */
 public class SaResultTest {
 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
index 802b2666..020934b2 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationController.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.util.SaResult;
  * 测试注解用的Controller 
  * 
  * @author click33
- * @since: 2022-9-2
+ * @since 2022-9-2
  */
 @RestController
 @RequestMapping("/at/")
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
index 59dfc933..50732213 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/annotation/SaAnnotationIgnoreController.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.util.SaResult;
  * 测试注解用的Controller 
  * 
  * @author click33
- * @since: 2022-9-2
+ * @since 2022-9-2
  */
 @SaCheckLogin
 @RestController
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
index 90677e17..e0bc2296 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/SaTokenConfigure.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.interceptor.SaInterceptor;
  * Sa-Token 相关配置类
  * 
  * @author click33
- * @since: 2022-9-2
+ * @since 2022-9-2
  */
 @Configuration
 public class SaTokenConfigure implements WebMvcConfigurer {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
index a8ecbba8..a08c90a5 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaOAuth2Template.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.oauth2.logic.SaOAuth2Template;
  * 自定义 Sa-OAuth2 模板方法 
  * 
  * @author click33
- * @since: 2022-9-5
+ * @since 2022-9-5
  */
 @Component
 public class MySaOAuth2Template extends SaOAuth2Template {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
index ad838851..fa82f7d8 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSsoTemplate.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.sso.SaSsoTemplate;
  * 自定义 Sa-SSO 模板方法 
  * 
  * @author click33
- * @since: 2022-9-5
+ * @since 2022-9-5
  */
 @Component
 public class MySaSsoTemplate extends SaSsoTemplate {
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
index b4bdd491..0b72f15d 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/router/SaTokenConfigure2.java
@@ -33,7 +33,7 @@ import cn.dev33.satoken.util.SaResult;
  * Sa-Token 相关配置类
  * 
  * @author click33
- * @since: 2022-9-2
+ * @since 2022-9-2
  */
 @Configuration
 public class SaTokenConfigure2 implements WebMvcConfigurer {

From bc7a3298403ced883eb9315c66e5e3837c6a0d61 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 15 May 2023 19:55:57 +0800
Subject: [PATCH 065/129] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/package-info.java            | 2 +-
 .../java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
index 229618ef..f11190f4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package cn.dev33.satoken.annotation;
+package cn.dev33.satoken.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
index 9d0a9d8e..4cae80b8 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
@@ -16,4 +16,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package cn.dev33.satoken;
\ No newline at end of file
+package cn.dev33.satoken;
\ No newline at end of file
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
index 5f37aac7..0a64dcf9 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/SpringMVCUtilTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- package cn.dev33.satoken.springboot;
+package cn.dev33.satoken.springboot;
 
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Assertions;

From 1819d92318251794a26e6859cbad6af312163b8d Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 01:02:42 +0800
Subject: [PATCH 066/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-core=20?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/SaManager.java |  4 +-
 .../application/SaGetValueInterface.java      |  2 +-
 .../application/SaSetValueInterface.java      | 10 +-
 .../dev33/satoken/basic/SaBasicTemplate.java  |  4 +-
 .../cn/dev33/satoken/config/SaSignConfig.java |  6 +-
 .../dev33/satoken/config/SaTokenConfig.java   | 19 ++--
 .../satoken/config/SaTokenConfigFactory.java  | 10 +-
 .../SaTokenContextForThreadLocalStorage.java  | 14 +--
 .../dev33/satoken/context/model/SaCookie.java | 10 +-
 .../satoken/context/model/SaRequest.java      | 34 +++----
 .../satoken/context/model/SaResponse.java     | 22 ++---
 .../satoken/context/model/SaStorage.java      |  8 +-
 .../satoken/context/model/package-info.java   |  8 +-
 .../second/SaTokenSecondContextCreator.java   |  2 +-
 .../satoken/dao/SaTokenDaoDefaultImpl.java    | 10 +-
 .../exception/DisableServiceException.java    | 12 +--
 .../satoken/exception/NotLoginException.java  |  8 +-
 .../exception/NotPermissionException.java     |  4 +-
 .../satoken/exception/NotRoleException.java   |  4 +-
 .../satoken/exception/NotSafeException.java   |  6 +-
 .../json/SaJsonTemplateDefaultImpl.java       |  2 +-
 .../cn/dev33/satoken/router/SaHttpMethod.java |  2 +-
 .../cn/dev33/satoken/same/SaSameTemplate.java |  4 +-
 .../java/cn/dev33/satoken/secure/BCrypt.java  |  1 +
 .../cn/dev33/satoken/secure/SaBase64Util.java | 21 +----
 .../cn/dev33/satoken/secure/SaSecureUtil.java | 47 ++++------
 .../cn/dev33/satoken/session/SaSession.java   |  2 +-
 .../cn/dev33/satoken/sign/SaSignTemplate.java |  1 +
 .../cn/dev33/satoken/stp/SaLoginModel.java    |  7 +-
 .../cn/dev33/satoken/stp/StpInterface.java    |  4 +-
 .../satoken/stp/StpInterfaceDefaultImpl.java  |  4 +-
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 28 +++---
 .../cn/dev33/satoken/strategy/SaStrategy.java |  1 -
 .../dev33/satoken/temp/SaTempInterface.java   |  4 +-
 .../cn/dev33/satoken/temp/SaTempUtil.java     |  4 +-
 .../java/cn/dev33/satoken/util/SaFoxUtil.java | 91 +++++++++----------
 .../java/cn/dev33/satoken/util/SaResult.java  |  7 +-
 .../cn/dev33/satoken/util/StrFormatter.java   | 22 ++---
 38 files changed, 208 insertions(+), 241 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index 3f187807..dc4c75e6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -79,7 +79,7 @@ public class SaManager {
 
 	/**
 	 * 获取 Sa-Token 的全局配置信息
-	 * @return
+	 * @return 全局配置信息
 	 */
 	public static SaTokenConfig getConfig() {
 		if (config == null) {
@@ -275,7 +275,7 @@ public class SaManager {
 	/**
 	 * StpLogic 集合, 记录框架所有成功初始化的 StpLogic
 	 */
-	public static Map<String, StpLogic> stpLogicMap = new LinkedHashMap<String, StpLogic>();
+	public static Map<String, StpLogic> stpLogicMap = new LinkedHashMap<>();
 	
 	/**
 	 * 向全局集合中 put 一个 StpLogic 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
index 622233c4..d4548acd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
@@ -160,7 +160,7 @@ public interface SaGetValueInterface {
 		
 		// 如果 obj 为 null，则直接返回默认值 
 		if(valueIsNull(value)) {
-			return (T)defaultValue;
+			return defaultValue;
 		}
 		
 		// 开始转换类型
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
index bf4eb535..643f0821 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
@@ -34,14 +34,14 @@ public interface SaSetValueInterface extends SaGetValueInterface {
 	 * @param value 值
 	 * @return 对象自身
 	 */
-	public abstract SaSetValueInterface set(String key, Object value);
+	SaSetValueInterface set(String key, Object value);
 	
 	/**
 	 * 删值 
 	 * @param key 要删除的key
 	 * @return 对象自身
 	 */
-	public abstract SaSetValueInterface delete(String key);
+	SaSetValueInterface delete(String key);
 
 	
 	// --------- 接口提供封装的方法 
@@ -55,7 +55,7 @@ public interface SaSetValueInterface extends SaGetValueInterface {
 	 * @return 值 
 	 */
 	@SuppressWarnings("unchecked")
-	public default <T> T get(String key, SaRetFunction fun) {
+	default <T> T get(String key, SaRetFunction fun) {
 		Object value = get(key);
 		if(value == null) {
 			value = fun.run();
@@ -70,8 +70,8 @@ public interface SaSetValueInterface extends SaGetValueInterface {
 	 * @param value 值
 	 * @return 对象自身
 	 */
-	public default SaSetValueInterface setByNull(String key, Object value) {
-		if(has(key) == false) {
+	default SaSetValueInterface setByNull(String key, Object value) {
+		if( ! has(key)) {
 			set(key, value);
 		}
 		return this;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
index 58091aaf..a633486f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
@@ -54,7 +54,7 @@ public class SaBasicTemplate {
 		String authorization = SaHolder.getRequest().getHeader("Authorization");
 		
 		// 如果不是以 Basic 作为前缀，则视为无效 
-		if(authorization == null || authorization.startsWith("Basic ") == false) {
+		if(authorization == null || ! authorization.startsWith("Basic ")) {
 			return null;
 		}
 		
@@ -87,7 +87,7 @@ public class SaBasicTemplate {
 			account = SaManager.getConfig().getBasic();
 		}
 		String authorization = getAuthorizationValue();
-		if(SaFoxUtil.isEmpty(authorization) || authorization.equals(account) == false) {
+		if(SaFoxUtil.isEmpty(authorization) || ! authorization.equals(account)) {
 			throwNotBasicAuthException(realm);
 		}
 	}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
index 70a0f1e4..ddb6b763 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
@@ -29,7 +29,7 @@ public class SaSignConfig {
     private String secretKey;
 
     /**
-     * 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     * 接口调用时的时间戳允许的差距（单位：ms），-1 代表不校验差距，默认15分钟
      *
      * <p> 比如此处你配置了60秒，当一个请求从 client 发起后，如果 server 端60秒内没有处理，60秒后再想处理就无法校验通过了。</p>
      * <p> timestamp + nonce 有效防止重放攻击。 </p>
@@ -63,7 +63,7 @@ public class SaSignConfig {
     }
 
     /**
-     * 获取 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     * 获取 接口调用时的时间戳允许的差距（单位：ms），-1 代表不校验差距，默认15分钟
      *
      * <p> 比如此处你配置了60秒，当一个请求从 client 发起后，如果 server 端60秒内没有处理，60秒后再想处理就无法校验通过了。</p>
      * <p> timestamp + nonce 有效防止重放攻击。 </p>
@@ -75,7 +75,7 @@ public class SaSignConfig {
     }
 
     /**
-     * 设置 接口调用时的时间戳允许的差距（单位：ms），-1代表不校验差距，默认15分钟
+     * 设置 接口调用时的时间戳允许的差距（单位：ms），-1 代表不校验差距，默认15分钟
      *
      * <p> 比如此处你配置了60秒，当一个请求从 client 发起后，如果 server 端60秒内没有处理，60秒后再想处理就无法校验通过了。</p>
      * <p> timestamp + nonce 有效防止重放攻击。 </p>
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index 77644af2..9dcf0f8a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -22,8 +22,11 @@ import java.io.Serializable;
 /**
  * Sa-Token 配置类 Model
  *
- * <p> 你可以通过yml、properties、java代码等形式配置本类参数，具体请查阅官方文档: https://sa-token.cc/ </p>
- * 
+ * <p>
+ *     你可以通过yml、properties、java代码等形式配置本类参数，具体请查阅官方文档:
+ *     <a href="https://sa-token.cc">https://sa-token.cc</a>
+ * </p>
+ *
  * @author click33
  * @since <= 1.34.0
  */
@@ -34,7 +37,7 @@ public class SaTokenConfig implements Serializable {
 	/** token 名称 （同时也是： cookie 名称、提交 token 时参数的名称、存储 token 时的 key 前缀） */
 	private String tokenName = "satoken";
 
-	/** token 有效期（单位：秒） 默认30天，-1代表永久 */
+	/** token 有效期（单位：秒） 默认30天，-1 代表永久 */
 	private long timeout = 60 * 60 * 24 * 30;
 
 	/**
@@ -89,7 +92,7 @@ public class SaTokenConfig implements Serializable {
 	private String tokenStyle = "uuid";
 
 	/**
-	 * 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为-1代表不启动定时清理
+	 * 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为 -1 代表不启动定时清理
 	 */
 	private int dataRefreshPeriod = 30;
 
@@ -186,14 +189,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token 有效期（单位：秒） 默认30天，-1代表永久
+	 * @return token 有效期（单位：秒） 默认30天，-1 代表永久
 	 */
 	public long getTimeout() {
 		return timeout;
 	}
 
 	/**
-	 * @param timeout token 有效期（单位：秒） 默认30天，-1代表永久
+	 * @param timeout token 有效期（单位：秒） 默认30天，-1 代表永久
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTimeout(long timeout) {
@@ -364,14 +367,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为-1代表不启动定时清理
+	 * @return 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为 -1 代表不启动定时清理
 	 */
 	public int getDataRefreshPeriod() {
 		return dataRefreshPeriod;
 	}
 
 	/**
-	 * @param dataRefreshPeriod 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为-1代表不启动定时清理
+	 * @param dataRefreshPeriod 默认 SaTokenDao 实现类中，每次清理过期数据间隔的时间（单位: 秒），默认值30秒，设置为 -1 代表不启动定时清理
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setDataRefreshPeriod(int dataRefreshPeriod) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
index 5838473d..1c919fbb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
@@ -61,9 +61,9 @@ public class SaTokenConfigFactory {
 	 */
 	public static SaTokenConfig createConfig(String path) {
 		Map<String, String> map = readPropToMap(path);
-		if (map == null) {
+		// if (map == null) {
 			// throw new RuntimeException("找不到配置文件：" + configPath, null);
-		}
+		// }
 		return (SaTokenConfig) initPropByMap(map, new SaTokenConfig());
 	}
 
@@ -74,7 +74,7 @@ public class SaTokenConfigFactory {
 	 * @return 一个Map
 	 */
 	private static Map<String, String> readPropToMap(String propertiesPath) {
-		Map<String, String> map = new HashMap<String, String>(16);
+		Map<String, String> map = new HashMap<>(16);
 		try {
 			InputStream is = SaTokenConfigFactory.class.getClassLoader().getResourceAsStream(propertiesPath);
 			if (is == null) {
@@ -101,11 +101,11 @@ public class SaTokenConfigFactory {
 	private static Object initPropByMap(Map<String, String> map, Object obj) {
 
 		if (map == null) {
-			map = new HashMap<String, String>(16);
+			map = new HashMap<>(16);
 		}
 
 		// 1、取出类型
-		Class<?> cs = null;
+		Class<?> cs;
 		if (obj instanceof Class) {
 			// 如果是一个类型，则将obj=null，以便完成静态属性反射赋值
 			cs = (Class<?>) obj;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
index 177bcc18..5ecb25ae 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
@@ -34,7 +34,7 @@ public class SaTokenContextForThreadLocalStorage {
 	/**
 	 * 基于 ThreadLocal 的 [ Box 存储器 ]
 	 */
-	public static ThreadLocal<Box> boxThreadLocal = new InheritableThreadLocal<Box>();
+	public static ThreadLocal<Box> boxThreadLocal = new InheritableThreadLocal<>();
 	
 	/**
 	 * 初始化当前线程的 [ Box 存储器 ]
@@ -45,14 +45,14 @@ public class SaTokenContextForThreadLocalStorage {
 	public static void setBox(SaRequest request, SaResponse response, SaStorage storage) {
 		Box bok = new Box(request, response, storage);
 		boxThreadLocal.set(bok);
-	};
+	}
 
 	/**
 	 * 清除当前线程的 [ Box 存储器 ]
 	 */
 	public static void clearBox() {
 		boxThreadLocal.remove();
-	};
+	}
 
 	/**
 	 * 获取当前线程的 [ Box 存储器 ]
@@ -60,7 +60,7 @@ public class SaTokenContextForThreadLocalStorage {
 	 */
 	public static Box getBox() {
 		return boxThreadLocal.get();
-	};
+	}
 	
 	/**
 	 * 获取当前线程的 [ Box 存储器 ], 如果为空则抛出异常
@@ -72,7 +72,7 @@ public class SaTokenContextForThreadLocalStorage {
 			throw new InvalidContextException("未能获取有效的上下文").setCode(SaErrorCode.CODE_10002);
 		}
 		return box;
-	};
+	}
 
 	/**
 	 * 在当前线程的 SaRequest 包装对象
@@ -108,10 +108,6 @@ public class SaTokenContextForThreadLocalStorage {
 	 * @author click33
 	 * @since <= 1.34.0
 	 */
-	/**
-	 * @author click33
-	 *
-	 */
 	public static class Box {
 		
 		public SaRequest request;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
index 78b68224..ac483174 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
@@ -48,7 +48,7 @@ public class SaCookie {
     private String value;
 
     /**
-     * 有效时长 （单位：秒），-1代表为临时Cookie 浏览器关闭后自动删除
+     * 有效时长 （单位：秒），-1 代表为临时Cookie 浏览器关闭后自动删除
      */
     private int maxAge = -1;
 
@@ -129,14 +129,14 @@ public class SaCookie {
 	}
 
 	/**
-	 * @return 有效时长 （单位：秒），-1代表为临时Cookie 浏览器关闭后自动删除
+	 * @return 有效时长 （单位：秒），-1 代表为临时Cookie 浏览器关闭后自动删除
 	 */
 	public int getMaxAge() {
 		return maxAge;
 	}
 
 	/**
-	 * @param maxAge 有效时长 （单位：秒），-1代表为临时Cookie 浏览器关闭后自动删除
+	 * @param maxAge 有效时长 （单位：秒），-1 代表为临时Cookie 浏览器关闭后自动删除
 	 * @return 对象自身
 	 */
 	public SaCookie setMaxAge(int maxAge) {
@@ -236,7 +236,7 @@ public class SaCookie {
 	/**
 	 * 构建一下
 	 */
-	public void builde() {
+	public void builder() {
 		if(path == null) {
 			path = "/";
 		}
@@ -247,7 +247,7 @@ public class SaCookie {
 	 * @return /
 	 */
 	public String toHeaderValue() {
-		this.builde();
+		this.builder();
 
 		if(SaFoxUtil.isEmpty(name)) {
 			throw new SaTokenException("name不能为空").setCode(SaErrorCode.CODE_12002);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
index b660651f..cf955abc 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
@@ -34,14 +34,14 @@ public interface SaRequest {
 	 * 获取底层被包装的源对象
 	 * @return /
 	 */
-	public Object getSource();
+	Object getSource();
 	
 	/**
 	 * 在 [ 请求体 ] 里获取一个参数值
 	 * @param name 键 
 	 * @return 值 
 	 */
-	public String getParam(String name);
+	String getParam(String name);
 
 	/**
 	 * 在 [ 请求体 ] 里获取一个参数值，值为空时返回默认值
@@ -49,7 +49,7 @@ public interface SaRequest {
 	 * @param defaultValue 值为空时的默认值  
 	 * @return 值 
 	 */
-	public default String getParam(String name, String defaultValue) {
+	default String getParam(String name, String defaultValue) {
 		String value = getParam(name);
 		if(SaFoxUtil.isEmpty(value)) {
 			return defaultValue;
@@ -63,7 +63,7 @@ public interface SaRequest {
 	 * @param value 值 
 	 * @return 是否相等 
 	 */
-	public default boolean isParam(String name, String value) {
+	default boolean isParam(String name, String value) {
 		 String paramValue = getParam(name);
 		 return SaFoxUtil.isNotEmpty(paramValue) && paramValue.equals(value);
 	}
@@ -73,7 +73,7 @@ public interface SaRequest {
 	 * @param name 参数名称 
 	 * @return 是否提供 
 	 */
-	public default boolean hasParam(String name) {
+	default boolean hasParam(String name) {
 		 return SaFoxUtil.isNotEmpty(getParam(name));
 	}
 	
@@ -82,7 +82,7 @@ public interface SaRequest {
 	 * @param name 键
 	 * @return 参数值 
 	 */
-	public default String getParamNotNull(String name) {
+	default String getParamNotNull(String name) {
 		String paramValue = getParam(name);
 		if(SaFoxUtil.isEmpty(paramValue)) {
 			throw new SaTokenException("缺少参数：" + name).setCode(SaErrorCode.CODE_12001);
@@ -94,20 +94,20 @@ public interface SaRequest {
 	 * 获取 [ 请求体 ] 里提交的所有参数名称
 	 * @return 参数名称列表
 	 */
-	public List<String> getParamNames();
+	List<String> getParamNames();
 
 	/**
 	 * 获取 [ 请求体 ] 里提交的所有参数
 	 * @return 参数列表
 	 */
-	public Map<String, String> getParamMap();
+	Map<String, String> getParamMap();
 
 	/**
 	 * 在 [ 请求头 ] 里获取一个值 
 	 * @param name 键 
 	 * @return 值 
 	 */
-	public String getHeader(String name);
+	String getHeader(String name);
 
 	/**
 	 * 在 [ 请求头 ] 里获取一个值 
@@ -115,7 +115,7 @@ public interface SaRequest {
 	 * @param defaultValue 值为空时的默认值  
 	 * @return 值 
 	 */
-	public default String getHeader(String name, String defaultValue) {
+	default String getHeader(String name, String defaultValue) {
 		String value = getHeader(name);
 		if(SaFoxUtil.isEmpty(value)) {
 			return defaultValue;
@@ -128,20 +128,20 @@ public interface SaRequest {
 	 * @param name 键 
 	 * @return 值 
 	 */
-	public String getCookieValue(String name);
+	String getCookieValue(String name);
 
 	/**
 	 * 返回当前请求path (不包括上下文名称) 
 	 * @return /
 	 */
-	public String getRequestPath();
+	String getRequestPath();
 
 	/**
 	 * 返回当前请求 path 是否为指定值
 	 * @param path path 
 	 * @return /
 	 */
-	public default boolean isPath(String path) {
+	default boolean isPath(String path) {
 		return getRequestPath().equals(path);
 	}
 
@@ -149,19 +149,19 @@ public interface SaRequest {
 	 * 返回当前请求的url，不带query参数，例：http://xxx.com/test
 	 * @return /
 	 */
-	public String getUrl();
+	String getUrl();
 	
 	/**
 	 * 返回当前请求的类型 
 	 * @return /
 	 */
-	public String getMethod();
+	String getMethod();
 	
 	/**
 	 * 判断此请求是否为 Ajax 异步请求
 	 * @return /
 	 */
-	public default boolean isAjax() {
+	default boolean isAjax() {
 		return getHeader("X-Requested-With") != null;
 	}
 
@@ -170,6 +170,6 @@ public interface SaRequest {
 	 * @param path 转发地址 
 	 * @return 任意值 
 	 */
-	public Object forward(String path);
+	Object forward(String path);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
index 60681004..fd60fecd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
@@ -26,19 +26,19 @@ public interface SaResponse {
 	/**
 	 * 指定前端可以获取到哪些响应头时使用的参数名 
 	 */
-	public static final String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers";
+	String ACCESS_CONTROL_EXPOSE_HEADERS = "Access-Control-Expose-Headers";
 	
 	/**
 	 * 获取底层被包装的源对象
 	 * @return /
 	 */
-	public Object getSource();
+	Object getSource();
 	
 	/**
 	 * 删除指定Cookie 
 	 * @param name Cookie名称
 	 */
-	public default void deleteCookie(String name) {
+	default void deleteCookie(String name) {
 		addCookie(name, null, null, null, 0);
 	}
 
@@ -48,7 +48,7 @@ public interface SaResponse {
 	 * @param path Cookie 路径
 	 * @param domain Cookie 作用域
 	 */
-	public default void deleteCookie(String name, String path, String domain) {
+	default void deleteCookie(String name, String path, String domain) {
 		addCookie(name, null, path, domain, 0);
 	}
 
@@ -60,7 +60,7 @@ public interface SaResponse {
 	 * @param domain   Cookie的作用域
 	 * @param timeout  过期时间 （秒）
 	 */
-	public default void addCookie(String name, String value, String path, String domain, int timeout) {
+	default void addCookie(String name, String value, String path, String domain, int timeout) {
 		this.addCookie(new SaCookie(name, value).setPath(path).setDomain(domain).setMaxAge(timeout)); 
 	}
 	
@@ -68,7 +68,7 @@ public interface SaResponse {
 	 * 写入指定Cookie
 	 * @param cookie Cookie-Model
 	 */
-	public default void addCookie(SaCookie cookie) {
+	default void addCookie(SaCookie cookie) {
 		this.addHeader(SaCookie.HEADER_NAME, cookie.toHeaderValue());
 	}
 	
@@ -77,7 +77,7 @@ public interface SaResponse {
 	 * @param sc 响应状态码
 	 * @return 对象自身
 	 */
-	public SaResponse setStatus(int sc);
+	SaResponse setStatus(int sc);
 	
 	/**
 	 * 在响应头里写入一个值 
@@ -85,7 +85,7 @@ public interface SaResponse {
 	 * @param value 值 
 	 * @return 对象自身 
 	 */
-	public SaResponse setHeader(String name, String value);
+	SaResponse setHeader(String name, String value);
 
 	/**
 	 * 在响应头里添加一个值 
@@ -93,14 +93,14 @@ public interface SaResponse {
 	 * @param value 值 
 	 * @return 对象自身 
 	 */
-	public SaResponse addHeader(String name, String value);
+	SaResponse addHeader(String name, String value);
 	
 	/**
 	 * 在响应头写入 [Server] 服务器名称 
 	 * @param value 服务器名称  
 	 * @return 对象自身 
 	 */
-	public default SaResponse setServer(String value) {
+	default SaResponse setServer(String value) {
 		return this.setHeader("Server", value);
 	}
 
@@ -109,6 +109,6 @@ public interface SaResponse {
 	 * @param url 重定向地址 
 	 * @return 任意值 
 	 */
-	public Object redirect(String url);
+	Object redirect(String url);
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
index f5f38298..da295f54 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
@@ -31,20 +31,20 @@ public interface SaStorage extends SaSetValueInterface {
 	 * 获取底层被包装的源对象
 	 * @return /
 	 */
-	public Object getSource();
+	Object getSource();
 
 	// ---- 实现接口存取值方法 
 
 	/** 取值 */
 	@Override
-	public Object get(String key);
+	Object get(String key);
 
 	/** 写值 */
 	@Override
-	public SaStorage set(String key, Object value);
+	SaStorage set(String key, Object value);
 
 	/** 删值 */
 	@Override
-	public SaStorage delete(String key);
+	SaStorage delete(String key);
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
index aa1922a3..db3555fa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/package-info.java
@@ -1,7 +1,3 @@
-/**
- * 因为不能确定最终运行的 web 容器属于标准 Servlet 模型还是非 Servlet 模型，特封装此包下的包装类进行对接。
- * 调用路径为：Sa-Token 功能函数 -> SaRequest 封装接口 -> SaRequest 具体实现类。
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -17,4 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * 因为不能确定最终运行的 web 容器属于标准 Servlet 模型还是非 Servlet 模型，特封装此包下的包装类进行对接。
+ * 调用路径为：Sa-Token 功能函数 -> SaRequest 封装接口 -> SaRequest 具体实现类。
+ */
 package cn.dev33.satoken.context.model;
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
index 418af7a0..a5109d34 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
@@ -28,6 +28,6 @@ public interface SaTokenSecondContextCreator {
 	 * 创建一个二级 Context 处理器
 	 * @return / 
 	 */
-	public SaTokenSecondContext create();
+	SaTokenSecondContext create();
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
index 4f2396bf..097e2b15 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
@@ -19,7 +19,6 @@ package cn.dev33.satoken.dao;
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.util.SaFoxUtil;
 
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
@@ -218,9 +217,8 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 	 * 清理所有已经过期的 key
 	 */
 	public void refreshDataMap() {
-		Iterator<String> keys = expireMap.keySet().iterator();
-		while (keys.hasNext()) {
-			clearKeyByTimeout(keys.next());
+		for (String s : expireMap.keySet()) {
+			clearKeyByTimeout(s);
 		}
 	}
 	
@@ -241,7 +239,7 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 				try {
 					try {
 						// 如果已经被标记为结束
-						if(refreshFlag == false) {
+						if( ! refreshFlag) {
 							return;
 						}
 						// 执行清理
@@ -254,7 +252,7 @@ public class SaTokenDaoDefaultImpl implements SaTokenDao {
 					if(dataRefreshPeriod <= 0) {
 						dataRefreshPeriod = 1;
 					}
-					Thread.sleep(dataRefreshPeriod * 1000);
+					Thread.sleep(dataRefreshPeriod * 1000L);
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
index 8ab5266b..f391fe7d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
@@ -38,32 +38,32 @@ public class DisableServiceException extends SaTokenException {
 	/**
 	 * 账号类型 
 	 */
-	private String loginType;
+	private final String loginType;
 
 	/**
 	 * 被封禁的账号id 
 	 */
-	private Object loginId;
+	private final Object loginId;
 
 	/**
 	 * 具体被封禁的服务 
 	 */
-	private String service;
+	private final String service;
 
 	/**
 	 * 具体被封禁的等级 
 	 */
-	private int level;
+	private final int level;
 
 	/**
 	 * 校验时要求低于的等级 
 	 */
-	private int limitLevel;
+	private final int limitLevel;
 	
 	/**
 	 * 封禁剩余时间，单位：秒 
 	 */
-	private long disableTime;
+	private final long disableTime;
 
 	/**
 	 * 获取：账号类型 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
index 4d2725da..ba9bae39 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
@@ -74,7 +74,7 @@ public class NotLoginException extends SaTokenException {
 	/**
 	 * 异常类型 
 	 */
-	private String type;
+	private final String type;
 	
 	/**
 	 * 获取异常类型 
@@ -88,7 +88,7 @@ public class NotLoginException extends SaTokenException {
 	/**
 	 * 账号类型 
 	 */
-	private String loginType;
+	private final String loginType;
 	
 	/** 
 	 * 获得账号类型 
@@ -129,7 +129,7 @@ public class NotLoginException extends SaTokenException {
 	 * @return 构建完毕的异常对象 
 	 */
 	public static NotLoginException newInstance(String loginType, String type, String token) {
-		String message = null;
+		String message;
 		if(NOT_TOKEN.equals(type)) {
 			message = NOT_TOKEN_MESSAGE;
 		}
@@ -148,7 +148,7 @@ public class NotLoginException extends SaTokenException {
 		else {
 			message = DEFAULT_MESSAGE;
 		}
-		if(SaFoxUtil.isEmpty(token) == false) {
+		if( ! SaFoxUtil.isEmpty(token)) {
 			message = message + "：" + token;
 		}
 		return new NotLoginException(message, loginType, type);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
index 2101bdf0..d976e8b3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
@@ -31,7 +31,7 @@ public class NotPermissionException extends SaTokenException {
 	private static final long serialVersionUID = 6806129545290130141L;
 
 	/** 权限码 */
-	private String permission;
+	private final String permission;
 
 	/**
 	 * @return 获得具体缺少的权限码
@@ -43,7 +43,7 @@ public class NotPermissionException extends SaTokenException {
 	/**
 	 * 账号类型
 	 */
-	private String loginType;
+	private final String loginType;
 
 	/**
 	 * 获得账号类型
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
index 747dc756..04bf3ac1 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
@@ -31,7 +31,7 @@ public class NotRoleException extends SaTokenException {
 	private static final long serialVersionUID = 8243974276159004739L;
 
 	/** 角色标识 */
-	private String role;
+	private final String role;
 
 	/**
 	 * @return 获得角色标识
@@ -43,7 +43,7 @@ public class NotRoleException extends SaTokenException {
 	/**
 	 * 账号类型
 	 */
-	private String loginType;
+	private final String loginType;
 
 	/**
 	 * 获得账号类型
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
index 86fb4360..187bfa72 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
@@ -34,17 +34,17 @@ public class NotSafeException extends SaTokenException {
 	/**
 	 * 账号类型 
 	 */
-	private String loginType;
+	private final String loginType;
 
 	/**
 	 * 未通过校验的 Token 值 
 	 */
-	private Object tokenValue;
+	private final Object tokenValue;
 
 	/**
 	 * 未通过校验的服务 
 	 */
-	private String service;
+	private final String service;
 
 	/**
 	 * 获取：账号类型 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
index 72643a68..c1e48f2d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
@@ -40,6 +40,6 @@ public class SaJsonTemplateDefaultImpl implements SaJsonTemplate {
 	@Override
 	public Map<String, Object> parseJsonToMap(String jsonStr) {
 		throw new NotImplException(ERROR_MESSAGE).setCode(SaErrorCode.CODE_10003);
-	};
+	}
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
index 04c8be92..0c148760 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
@@ -53,7 +53,7 @@ public enum SaHttpMethod {
 	 */
 	public static SaHttpMethod toEnum(String method) {
 		if(method == null) {
-			throw new SaTokenException("无效Method：" + method).setCode(SaErrorCode.CODE_10321);
+			throw new SaTokenException("Method 不可以是 null").setCode(SaErrorCode.CODE_10321);
 		}
 		SaHttpMethod reqMethod = map.get(method.toUpperCase());
 		if(reqMethod == null) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
index 1c60106c..814529d0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
@@ -71,7 +71,7 @@ public class SaSameTemplate {
 	 * @param token / 
 	 */
 	public void checkToken(String token) {
-		if(isValid(token) == false) {
+		if( ! isValid(token)) {
 			token = (token == null ? "" : token);
 			throw new SameTokenInvalidException("无效Same-Token：" + token).setCode(SaErrorCode.CODE_10301);
 		}
@@ -92,7 +92,7 @@ public class SaSameTemplate {
 		
 		// 1. 先将当前 Same-Token 写入到 Past-Same-Token 中 
 		String sameToken = getTokenNh(); 
-		if(SaFoxUtil.isEmpty(sameToken) == false) {
+		if( ! SaFoxUtil.isEmpty(sameToken)) {
 			savePastToken(sameToken, getTokenTimeout());
 		}
 		
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
index 791bcbf6..84ef0319 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
@@ -46,6 +46,7 @@ import java.security.SecureRandom;
  * @author Damien Miller
  * @since 4.1.1
  */
+@SuppressWarnings("all")
 public class BCrypt {
     // BCrypt parameters
     private static final int GENSALT_DEFAULT_LOG2_ROUNDS = 10;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
index f042ad0b..9692c638 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
@@ -15,12 +15,9 @@
  */
 package cn.dev33.satoken.secure;
 
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
-import cn.dev33.satoken.error.SaErrorCode;
-import cn.dev33.satoken.exception.SaTokenException;
-
 /**
  * Sa-Token Base64 工具类
  *
@@ -29,8 +26,8 @@ import cn.dev33.satoken.exception.SaTokenException;
  */
 public class SaBase64Util {
 
-	private static Base64.Encoder encoder = Base64.getEncoder();
-	private static Base64.Decoder decoder = Base64.getDecoder();
+	private static final Base64.Encoder encoder = Base64.getEncoder();
+	private static final Base64.Decoder decoder = Base64.getDecoder();
 	
 	/**
 	 * Base64编码，byte[] 转 String
@@ -56,11 +53,7 @@ public class SaBase64Util {
 	 * @return Base64格式字符串
 	 */
 	public static String encode(String text){
-		try {
-			return encoder.encodeToString(text.getBytes("UTF-8"));
-		} catch (UnsupportedEncodingException e) {
-			throw new SaTokenException(e).setCode(SaErrorCode.CODE_12101);
-		}
+		return encoder.encodeToString(text.getBytes(StandardCharsets.UTF_8));
 	}
 
 	/**
@@ -69,11 +62,7 @@ public class SaBase64Util {
 	 * @return 字符串
 	 */
 	public static String decode(String base64Text){
-		try {
-			return new String(decoder.decode(base64Text), "UTF-8"); 
-		} catch (UnsupportedEncodingException e) {
-			throw new SaTokenException(e).setCode(SaErrorCode.CODE_12101);
-		}
+		return new String(decoder.decode(base64Text), StandardCharsets.UTF_8);
 	}
 	
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
index 5d53b994..a1c97b67 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
@@ -15,15 +15,15 @@
  */
 package cn.dev33.satoken.secure;
 
+import cn.dev33.satoken.error.SaErrorCode;
+import cn.dev33.satoken.exception.SaTokenException;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
 import java.nio.charset.StandardCharsets;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
+import java.security.*;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
 import java.security.spec.InvalidKeySpecException;
@@ -33,14 +33,6 @@ import java.util.Base64;
 import java.util.HashMap;
 import java.util.UUID;
 
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import cn.dev33.satoken.error.SaErrorCode;
-import cn.dev33.satoken.exception.SaTokenException;
-
 /**
  * Sa-Token 常见加密算法工具类
  *
@@ -55,12 +47,12 @@ public class SaSecureUtil {
 	/**
 	 * Base64编码
 	 */
-	private static Base64.Encoder encoder = Base64.getEncoder();
+	private static final Base64.Encoder encoder = Base64.getEncoder();
 
 	/**
 	 * Base64解码
 	 */
-	private static Base64.Decoder decoder = Base64.getDecoder();
+	private static final Base64.Decoder decoder = Base64.getDecoder();
 
 	// ----------------------- 摘要加密 -----------------------
 
@@ -133,8 +125,8 @@ public class SaSecureUtil {
 			byte[] bytes = messageDigest.digest();
 			StringBuilder builder = new StringBuilder();
 			String temp;
-			for (int i = 0; i < bytes.length; i++) {
-				temp = Integer.toHexString(bytes[i] & 0xFF);
+			for (byte aByte : bytes) {
+				temp = Integer.toHexString(aByte & 0xFF);
 				if (temp.length() == 1) {
 					builder.append("0");
 				}
@@ -205,8 +197,7 @@ public class SaSecureUtil {
      * 生成加密秘钥
      * @param password 秘钥
      * @return SecretKeySpec
-     * @throws NoSuchAlgorithmException
-     */
+	 */
     private static SecretKeySpec getSecretKey(final String password) throws NoSuchAlgorithmException {
         KeyGenerator kg = KeyGenerator.getInstance("AES");
         SecureRandom random = SecureRandom.getInstance("SHA1PRNG");
@@ -243,7 +234,7 @@ public class SaSecureUtil {
 		RSAPublicKey rsaPublicKey = (RSAPublicKey) keyPair.getPublic();
 		RSAPrivateKey rsaPrivateKey = (RSAPrivateKey) keyPair.getPrivate();
 
-		HashMap<String, String> map = new HashMap<String, String>(16);
+		HashMap<String, String> map = new HashMap<>(16);
 		map.put("private", encoder.encodeToString(rsaPrivateKey.getEncoded()));
 		map.put("public", encoder.encodeToString(rsaPublicKey.getEncoded()));
 		return map;
@@ -397,7 +388,7 @@ public class SaSecureUtil {
 		// 数据拆分后的组数，余数不为0时加1
 		int quotient = remainder != 0 ? bytes.length / splitLength + 1 : bytes.length / splitLength;
 		byte[][] arrays = new byte[quotient][];
-		byte[] array = null;
+		byte[] array;
 		for (int i = 0; i < quotient; i++) {
 			// 如果是最后一组（quotient-1）,同时余数不等于0，就将最后一组设置为remainder的长度
 			if (i == quotient - 1 && remainder != 0) {
@@ -415,10 +406,10 @@ public class SaSecureUtil {
 	/** 将字节数组转换成16进制字符串 */
 	private static String bytesToHexString(byte[] bytes) {
 
-		StringBuffer sb = new StringBuffer(bytes.length);
-		String temp = null;
-		for (int i = 0; i < bytes.length; i++) {
-			temp = Integer.toHexString(0xFF & bytes[i]);
+		StringBuilder sb = new StringBuilder(bytes.length);
+		String temp;
+		for (byte aByte : bytes) {
+			temp = Integer.toHexString(0xFF & aByte);
 			if (temp.length() < 2) {
 				sb.append(0);
 			}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index e30185a6..19f2dd68 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -453,7 +453,7 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	 */
 	@Override
 	public SaSession setByNull(String key, Object value) {
-		if(has(key) == false) {
+		if( ! has(key)) {
 			dataMap.put(key, value);
 			update();
 		}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index a2504969..4b753ab3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -287,6 +287,7 @@ public class SaSignTemplate {
 	 * @param paramMap 待校验的请求参数集合
 	 * @return 是否合法
 	 */
+	@SuppressWarnings("all")
 	public boolean isValidParamMap(Map<String, String> paramMap) {
 		// 获取必须的三个参数
 		String timestampValue = paramMap.get(timestamp);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index a48c9587..fab0fa48 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -240,17 +240,14 @@ public class SaLoginModel {
 	 * @return / 
 	 */
 	public boolean isSetExtraData() {
-		if(extraData == null || extraData.size() == 0) {
-			return false;
-		}
-		return true;
+		return extraData != null && extraData.size() != 0;
 	}
 
 	/**
 	 * @return Cookie时长
 	 */
 	public int getCookieTimeout() {
-		if(getIsLastingCookieOrFalse() == false) {
+		if( ! getIsLastingCookieOrFalse()) {
 			return -1;
 		}
 		if(getTimeoutOrGlobalConfig() == SaTokenDao.NEVER_EXPIRE) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
index 9be0abb8..67189c7a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
@@ -37,7 +37,7 @@ public interface StpInterface {
 	 * @param loginType 账号类型
 	 * @return 该账号id具有的权限码集合
 	 */
-	public List<String> getPermissionList(Object loginId, String loginType);
+	List<String> getPermissionList(Object loginId, String loginType);
 
 	/**
 	 * 返回指定账号id所拥有的角色标识集合 
@@ -46,6 +46,6 @@ public interface StpInterface {
 	 * @param loginType 账号类型
 	 * @return 该账号id具有的角色标识集合
 	 */
-	public List<String> getRoleList(Object loginId, String loginType);
+	List<String> getRoleList(Object loginId, String loginType);
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
index 76fc1d0d..b7b5360d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
@@ -30,12 +30,12 @@ public class StpInterfaceDefaultImpl implements StpInterface {
 
 	@Override
 	public List<String> getPermissionList(Object loginId, String loginType) {
-		return new ArrayList<String>();
+		return new ArrayList<>();
 	}
 
 	@Override
 	public List<String> getRoleList(Object loginId, String loginType) {
-		return new ArrayList<String>();
+		return new ArrayList<>();
 	}
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index e13d39c8..62b6cf5e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -235,9 +235,9 @@ public class StpLogic {
 		
 		// 2. 如果打开了前缀模式，则裁剪掉它
 		String tokenPrefix = getConfig().getTokenPrefix();
-		if(SaFoxUtil.isEmpty(tokenPrefix) == false) {
+		if(SaFoxUtil.isNotEmpty(tokenPrefix)) {
 			// 如果 token 并没有按照指定的前缀开头，则视为未提供token
-			if(SaFoxUtil.isEmpty(tokenValue) || tokenValue.startsWith(tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT) == false) {
+			if(SaFoxUtil.isEmpty(tokenValue) || ! tokenValue.startsWith(tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT)) {
 				tokenValue = null;
 			} else {
 				// 裁剪掉前缀
@@ -443,7 +443,7 @@ public class StpLogic {
 		// 1、获取全局配置的 isConcurrent 参数
 		//    如果配置为：不允许一个账号多地同时登录，则需要先将这个账号的历史登录会话标记为：被顶下线
 		Boolean isConcurrent = getConfig().getIsConcurrent();
-		if(isConcurrent == false) {
+		if( ! isConcurrent) {
 			replaced(id, loginModel.getDevice());
 		}
 		
@@ -452,7 +452,7 @@ public class StpLogic {
 			return loginModel.getToken();
 		} 
 
-		// 3、只有在配置了 [ 允许一个账号多地同时登录 ] 时，才尝试复用旧 token，这样可以避免不必须的查询，节省开销
+		// 3、只有在配置了 [ 允许一个账号多地同时登录 ] 时，才尝试复用旧 token，这样可以避免不必要地查询，节省开销
 		if(isConcurrent) {
 
 			// 3.1、看看全局配置的 IsShare 参数，配置为 true 才是允许复用旧 token
@@ -1625,7 +1625,7 @@ public class StpLogic {
  	 * @param role 角色标识
  	 */
  	public void checkRole(String role) {
- 		if(hasRole(role) == false) {
+ 		if( ! hasRole(role)) {
 			throw new NotRoleException(role, this.loginType).setCode(SaErrorCode.CODE_11041);
 		}
  	}
@@ -1763,7 +1763,7 @@ public class StpLogic {
  	 * @param permission 权限码
  	 */
  	public void checkPermission(String permission) {
- 		if(hasPermission(permission) == false) {
+ 		if( ! hasPermission(permission)) {
 			throw new NotPermissionException(permission, this.loginType).setCode(SaErrorCode.CODE_11051);
 		}
  	}
@@ -2010,13 +2010,11 @@ public class StpLogic {
 			}
 		} catch (NotPermissionException e) {
 			// 权限认证校验未通过，再开始角色认证校验
-			if(at.orRole().length > 0) {
-				for (String role : at.orRole()) {
-					String[] rArr = SaFoxUtil.convertStringToArray(role);
-					// 某一项 role 认证通过，则可以提前退出了，代表通过
-					if(hasRoleAnd(rArr)) {
-						return;
-					}
+			for (String role : at.orRole()) {
+				String[] rArr = SaFoxUtil.convertStringToArray(role);
+				// 某一项 role 认证通过，则可以提前退出了，代表通过
+				if (hasRoleAnd(rArr)) {
+					return;
 				}
 			}
 			throw e;
@@ -2351,8 +2349,6 @@ public class StpLogic {
 		try {
 			switchTo(loginId);
 			function.run();
-		} catch (Exception e) {
-			throw e;
 		} finally {
 			endSwitch();
 		}
@@ -2439,7 +2435,7 @@ public class StpLogic {
 	 */
 	public void checkSafe(String service) {
 		String tokenValue = getTokenValue();
-		if (isSafe(tokenValue, service) == false) {
+		if ( ! isSafe(tokenValue, service)) {
 			throw new NotSafeException(loginType, tokenValue, service).setCode(SaErrorCode.CODE_11071);
 		}
 	}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 129cde14..708c0c8e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -32,7 +32,6 @@ import java.util.UUID;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * Sa-Token 策略对象 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
index ca3cd827..201a7eba 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
@@ -37,7 +37,7 @@ public interface SaTempInterface {
 	/**
 	 * 为指定 value 创建一个临时 Token
 	 * @param value 指定值
-	 * @param timeout 有效时间，单位：秒，-1代表永久有效
+	 * @param timeout 有效时间，单位：秒，-1 代表永久有效
 	 * @return 生成的 token
 	 */
 	default String createToken(Object value, long timeout) {
@@ -48,7 +48,7 @@ public interface SaTempInterface {
 	 * 为指定 业务标识、指定 value 创建一个 Token
 	 * @param service 业务标识
 	 * @param value 指定值
-	 * @param timeout 有效期，单位：秒，-1代表永久有效
+	 * @param timeout 有效期，单位：秒，-1 代表永久有效
 	 * @return 生成的token
 	 */
 	default String createToken(String service, Object value, long timeout) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
index 49d4dc31..198ffabf 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
@@ -37,7 +37,7 @@ public class SaTempUtil {
 	/**
 	 * 为指定 value 创建一个临时 Token
 	 * @param value 指定值
-	 * @param timeout 有效期，单位：秒，-1代表永久有效
+	 * @param timeout 有效期，单位：秒，-1 代表永久有效
 	 * @return 生成的token
 	 */
 	public static String createToken(Object value, long timeout) {
@@ -48,7 +48,7 @@ public class SaTempUtil {
 	 * 为指定 业务标识、指定 value 创建一个 Token
 	 * @param service 业务标识
 	 * @param value 指定值
-	 * @param timeout 有效期，单位：秒，-1代表永久有效
+	 * @param timeout 有效期，单位：秒，-1 代表永久有效
 	 * @return 生成的token
 	 */
 	public static String createToken(String service, Object value, long timeout) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index 46ca85cb..dc7fe816 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -181,11 +181,9 @@ public class SaFoxUtil {
 			keyword = "";
 		}
 		// 挑选出所有符合条件的
-		List<String> list = new ArrayList<String>();
-		Iterator<String> keys = dataList.iterator();
-		while (keys.hasNext()) {
-			String key = keys.next();
-			if (key.startsWith(prefix) && key.indexOf(keyword) > -1) {
+		List<String> list = new ArrayList<>();
+		for (String key : dataList) {
+			if (key.startsWith(prefix) && key.contains(keyword)) {
 				list.add(key);
 			}
 		}
@@ -205,7 +203,7 @@ public class SaFoxUtil {
 	 */
 	public static List<String> searchList(List<String> list, int start, int size, boolean sortType) {
 		// 如果是反序的话
-		if(sortType == false) {
+		if( ! sortType) {
 			Collections.reverse(list);
 		}
 		// start 至少为0
@@ -220,7 +218,7 @@ public class SaFoxUtil {
 			end = start + size;
 		}
 		// 取出的数据放到新集合中
-		List<String> list2 = new ArrayList<String>();
+		List<String> list2 = new ArrayList<>();
 		for (int i = start; i < end; i++) {
 			// 如果已经取到list的末尾，则直接退出
 			if (i >= list.size()) {
@@ -250,7 +248,7 @@ public class SaFoxUtil {
 			return false;
 		}
 		// 如果表达式不带有*号，则只需简单equals即可 (这样可以使速度提升200倍左右)
-		if(patt.indexOf("*") == -1) {
+		if( ! patt.contains("*")) {
 			return patt.equals(str);
 		}
 		// 正则匹配
@@ -291,7 +289,7 @@ public class SaFoxUtil {
 		}
 		// 开始转换
 		String obj2 = String.valueOf(obj);
-		Object obj3 = null;
+		Object obj3;
 		if (cs.equals(String.class)) {
 			obj3 = obj2;
 		} else if (cs.equals(int.class) || cs.equals(Integer.class)) {
@@ -311,7 +309,7 @@ public class SaFoxUtil {
 		} else if (cs.equals(char.class) || cs.equals(Character.class)) {
 			obj3 = obj2.charAt(0);
 		} else {
-			obj3 = (T)obj;
+			obj3 = obj;
 		}
 		return (T)obj3;
 	}
@@ -319,12 +317,12 @@ public class SaFoxUtil {
 	/**
 	 * 在url上拼接上kv参数并返回
 	 * @param url url
-	 * @param parameStr 参数, 例如 id=1001
+	 * @param paramStr 参数, 例如 id=1001
 	 * @return 拼接后的url字符串
 	 */
-	public static String joinParam(String url, String parameStr) {
+	public static String joinParam(String url, String paramStr) {
 		// 如果参数为空, 直接返回
-		if(parameStr == null || parameStr.length() == 0) {
+		if(paramStr == null || paramStr.length() == 0) {
 			return url;
 		}
 		if(url == null) {
@@ -333,20 +331,20 @@ public class SaFoxUtil {
 		int index = url.lastIndexOf('?');
 		// ? 不存在
 		if(index == -1) {
-			return url + '?' + parameStr;
+			return url + '?' + paramStr;
 		}
 		// ? 是最后一位
 		if(index == url.length() - 1) {
-			return url + parameStr;
+			return url + paramStr;
 		}
 		// ? 是其中一位
-		if(index > -1 && index < url.length() - 1) {
+		if(index < url.length() - 1) {
 			String separatorChar = "&";
-			// 如果最后一位是 不是&, 且 parameStr 第一位不是 &, 就增送一个 &
-			if(url.lastIndexOf(separatorChar) != url.length() - 1 && parameStr.indexOf(separatorChar) != 0) {
-				return url + separatorChar + parameStr;
+			// 如果最后一位是 不是&, 且 paramStr 第一位不是 &, 就赠送一个 &
+			if(url.lastIndexOf(separatorChar) != url.length() - 1 && paramStr.indexOf(separatorChar) != 0) {
+				return url + separatorChar + paramStr;
 			} else {
-				return url + parameStr;
+				return url + paramStr;
 			}
 		}
 		// 正常情况下, 代码不可能执行到此
@@ -371,12 +369,12 @@ public class SaFoxUtil {
 	/**
 	 * 在url上拼接锚参数
 	 * @param url url
-	 * @param parameStr 参数, 例如 id=1001
+	 * @param paramStr 参数, 例如 id=1001
 	 * @return 拼接后的url字符串
 	 */
-	public static String joinSharpParam(String url, String parameStr) {
+	public static String joinSharpParam(String url, String paramStr) {
 		// 如果参数为空, 直接返回
-		if(parameStr == null || parameStr.length() == 0) {
+		if(paramStr == null || paramStr.length() == 0) {
 			return url;
 		}
 		if(url == null) {
@@ -385,20 +383,20 @@ public class SaFoxUtil {
 		int index = url.lastIndexOf('#');
 		// ? 不存在
 		if(index == -1) {
-			return url + '#' + parameStr;
+			return url + '#' + paramStr;
 		}
 		// ? 是最后一位
 		if(index == url.length() - 1) {
-			return url + parameStr;
+			return url + paramStr;
 		}
 		// ? 是其中一位
-		if(index > -1 && index < url.length() - 1) {
+		if(index < url.length() - 1) {
 			String separatorChar = "&";
-			// 如果最后一位是 不是&, 且 parameStr 第一位不是 &, 就增送一个 &
-			if(url.lastIndexOf(separatorChar) != url.length() - 1 && parameStr.indexOf(separatorChar) != 0) {
-				return url + separatorChar + parameStr;
+			// 如果最后一位是 不是&, 且 paramStr 第一位不是 &, 就赠送一个 &
+			if(url.lastIndexOf(separatorChar) != url.length() - 1 && paramStr.indexOf(separatorChar) != 0) {
+				return url + separatorChar + paramStr;
 			} else {
-				return url + parameStr;
+				return url + paramStr;
 			}
 		}
 		// 正常情况下, 代码不可能执行到此
@@ -455,14 +453,14 @@ public class SaFoxUtil {
 		if(arr == null) {
 			return "";
 		}
-		String str = "";
+		StringBuilder str = new StringBuilder();
 		for (int i = 0; i < arr.length; i++) {
-			str += arr[i];
+			str.append(arr[i]);
 			if(i != arr.length - 1) {
-				str += ",";
+				str.append(",");
 			}
 		}
-		return str;
+		return str.toString();
 	}
 
 	/**
@@ -514,14 +512,14 @@ public class SaFoxUtil {
 	 * @return 分割后的字符串集合
 	 */
 	public static List<String> convertStringToList(String str) {
-		List<String> list = new ArrayList<String>();
+		List<String> list = new ArrayList<>();
 		if(isEmpty(str)) {
 			return list;
 		}
 		String[] arr = str.split(",");
 		for (String s : arr) {
 			s = s.trim();
-			if(isEmpty(s) == false) {
+			if(!isEmpty(s)) {
 				list.add(s);
 			}
 		}
@@ -537,14 +535,14 @@ public class SaFoxUtil {
 		if(list == null || list.size() == 0) {
 			return "";
 		}
-		String str = "";
+		StringBuilder str = new StringBuilder();
 		for (int i = 0; i < list.size(); i++) {
-			str += list.get(i);
+			str.append(list.get(i));
 			if(i != list.size() - 1) {
-				str += ",";
+				str.append(",");
 			}
 		}
-		return str;
+		return str.toString();
 	}
 
     /**
@@ -554,7 +552,7 @@ public class SaFoxUtil {
      */
     public static String[] convertStringToArray(String str) {
     	List<String> list = convertStringToList(str);
-    	return list.toArray(new String[list.size()]);
+    	return list.toArray(new String[0]);
     }
 
     /**
@@ -580,15 +578,11 @@ public class SaFoxUtil {
 
     /**
      * String数组转集合
-     * @param strs String数组
+     * @param str String数组
      * @return 集合
      */
-    public static List<String> toList(String... strs) {
-    	List<String> list = new ArrayList<>();
-    	for (String str : strs) {
-    		list.add(str);
-		}
-    	return list;
+    public static List<String> toList(String... str) {
+		return new ArrayList<>(Arrays.asList(str));
     }
 
     public static List<String> logLevelList = Arrays.asList("", "trace", "debug", "info", "warn", "error", "fatal");
@@ -622,6 +616,7 @@ public class SaFoxUtil {
 	 * 判断当前系统是否可以打印彩色日志，判断准确率并非100%，但基本可以满足大部分场景
 	 * @return /
 	 */
+	@SuppressWarnings("all")
 	public static boolean isCanColorLog() {
 
 		// 获取当前环境相关信息
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
index 9c7ef047..96432fc2 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
@@ -86,7 +86,7 @@ public class SaResult extends LinkedHashMap<String, Object> implements Serializa
 	 * @return data 
 	 */
 	public Object getData() {
-		return (Object)this.get("data");
+		return this.get("data");
 	}
 	
 	/**
@@ -198,8 +198,9 @@ public class SaResult extends LinkedHashMap<String, Object> implements Serializa
 	 * 转换 value 值：
 	 * 	如果 value 值属于 String 类型，则在前后补上引号
 	 * 	如果 value 值属于其它类型，则原样返回
-	 * @param value
-	 * @return
+	 *
+	 * @param value 具体要操作的值
+	 * @return 转换后的值
 	 */
 	private String transValue(Object value) {
 		if(value == null) {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
index 4e3a5562..0a540f2a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
@@ -74,7 +74,7 @@ public class StrFormatter {
 		final int placeHolderLength = placeHolder.length();
 
 		// 初始化定义好的长度以获得更好的性能
-		final StringBuilder sbuf = new StringBuilder(strPatternLength + 50);
+		final StringBuilder sbu = new StringBuilder(strPatternLength + 50);
 
 		int handledPosition = 0;// 记录已经处理到的位置
 		int delimIndex;// 占位符所在位置
@@ -85,35 +85,35 @@ public class StrFormatter {
 					return strPattern;
 				}
 				// 字符串模板剩余部分不再包含占位符，加入剩余部分后返回结果
-				sbuf.append(strPattern, handledPosition, strPatternLength);
-				return sbuf.toString();
+				sbu.append(strPattern, handledPosition, strPatternLength);
+				return sbu.toString();
 			}
 
 			// 转义符
 			if (delimIndex > 0 && strPattern.charAt(delimIndex - 1) == C_BACKSLASH) {// 转义符
 				if (delimIndex > 1 && strPattern.charAt(delimIndex - 2) == C_BACKSLASH) {// 双转义符
 					// 转义符之前还有一个转义符，占位符依旧有效
-					sbuf.append(strPattern, handledPosition, delimIndex - 1);
-					sbuf.append(String.valueOf(argArray[argIndex]));
+					sbu.append(strPattern, handledPosition, delimIndex - 1);
+					sbu.append(argArray[argIndex]);
 					handledPosition = delimIndex + placeHolderLength;
 				} else {
 					// 占位符被转义
 					argIndex--;
-					sbuf.append(strPattern, handledPosition, delimIndex - 1);
-					sbuf.append(placeHolder.charAt(0));
+					sbu.append(strPattern, handledPosition, delimIndex - 1);
+					sbu.append(placeHolder.charAt(0));
 					handledPosition = delimIndex + 1;
 				}
 			} else {// 正常占位符
-				sbuf.append(strPattern, handledPosition, delimIndex);
-				sbuf.append(String.valueOf(argArray[argIndex]));
+				sbu.append(strPattern, handledPosition, delimIndex);
+				sbu.append(argArray[argIndex]);
 				handledPosition = delimIndex + placeHolderLength;
 			}
 		}
 
 		// 加入最后一个占位符后所有的字符
-		sbuf.append(strPattern, handledPosition, strPatternLength);
+		sbu.append(strPattern, handledPosition, strPatternLength);
 
-		return sbuf.toString();
+		return sbu.toString();
 	}
 
 }

From 14131bdaf2fd5617f21f6f08fb64fcb149ee0735 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 02:17:40 +0800
Subject: [PATCH 067/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-servlet?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/servlet/model/SaRequestForServlet.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 7bb40fdf..27198d1c 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -134,7 +134,7 @@ public class SaRequestForServlet implements SaRequest {
 	 */
 	public String getUrl() {
 		String currDomain = SaManager.getConfig().getCurrDomain();
-		if(SaFoxUtil.isEmpty(currDomain) == false) {
+		if( ! SaFoxUtil.isEmpty(currDomain)) {
 			return currDomain + this.getRequestPath();
 		}
 		return request.getRequestURL().toString();

From 9a8917f88e954fe483cfdedc48ef45e720ea9f0b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 02:28:15 +0800
Subject: [PATCH 068/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-jakarta-s?=
 =?UTF-8?q?ervlet=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/servlet/model/SaRequestForServlet.java | 2 +-
 .../main/java/cn/dev33/satoken/servlet/package-info.java    | 6 +++---
 .../main/java/cn/dev33/satoken/servlet/package-info.java    | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index e22c57a1..1152dcfb 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -134,7 +134,7 @@ public class SaRequestForServlet implements SaRequest {
 	@Override
 	public String getUrl() {
 		String currDomain = SaManager.getConfig().getCurrDomain();
-		if(SaFoxUtil.isEmpty(currDomain) == false) {
+		if( ! SaFoxUtil.isEmpty(currDomain)) {
 			return currDomain + this.getRequestPath();
 		}
 		return request.getRequestURL().toString();
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
index 1e68f1c9..3cc63f0e 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
@@ -1,6 +1,3 @@
-/**
- * Sa-Token对接ServletAPI容器所需要的实现类接口包
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token对接 Jakarta-Servlet API 容器所需要的实现类接口包
+ */
 package cn.dev33.satoken.servlet;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
index 1e68f1c9..4a91ce4f 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/package-info.java
@@ -1,6 +1,3 @@
-/**
- * Sa-Token对接ServletAPI容器所需要的实现类接口包
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token对接 Servlet API 容器所需要的实现类接口包
+ */
 package cn.dev33.satoken.servlet;
\ No newline at end of file

From 19bdb6cc66b10e389d39c6b85eed5517730f3d67 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 12:40:43 +0800
Subject: [PATCH 069/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-spring-bo?=
 =?UTF-8?q?ot-autoconfig=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/error/SaSpringBootErrorCode.java     | 8 ++++----
 .../src/main/java/cn/dev33/satoken/package-info.java      | 6 +++---
 .../java/cn/dev33/satoken/spring/oauth2/package-info.java | 6 +++---
 .../java/cn/dev33/satoken/spring/sso/package-info.java    | 6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
index 82845fef..f6a9f76c 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
@@ -24,15 +24,15 @@ package cn.dev33.satoken.error;
 public interface SaSpringBootErrorCode {
 	
 	/** 企图在非 Web 上下文获取 Request、Response 等对象 */
-	public static final int CODE_20101 = 20101;
+	int CODE_20101 = 20101;
 
 	/** 对象转 JSON 字符串失败 */
-	public static final int CODE_20103 = 20103;
+	int CODE_20103 = 20103;
 
 	/** JSON 字符串转 Map 失败 */
-	public static final int CODE_20104 = 20104;
+	int CODE_20104 = 20104;
 
 	/** 默认的 Filter 异常处理函数 */
-	public static final int CODE_20105 = 20105;
+	int CODE_20105 = 20105;
 
 }
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
index d062e536..3b171337 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,6 +1,3 @@
-/**
- * Sa-Token 集成 SpringBoot 的各个组件
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token 集成 SpringBoot 的各个组件
+ */
 package cn.dev33.satoken;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java
index 945f503a..d4f2d942 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/package-info.java
@@ -1,6 +1,3 @@
-/**
- * Sa-Token-OAuth2 模块自动化配置（只有引入了Sa-Token-OAuth2模块后，此包下的代码才会开始工作）
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token-OAuth2 模块自动化配置（只有引入了Sa-Token-OAuth2模块后，此包下的代码才会开始工作）
+ */
 package cn.dev33.satoken.spring.oauth2;
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java
index 4e46afd6..bc022e56 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/package-info.java
@@ -1,6 +1,3 @@
-/**
- * Sa-Token-SSO 模块自动化配置（只有引入了 sa-token-sso 模块后，此包下的代码才会开始工作）
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token-SSO 模块自动化配置（只有引入了 sa-token-sso 模块后，此包下的代码才会开始工作）
+ */
 package cn.dev33.satoken.spring.sso;
\ No newline at end of file

From dadcc93c1dea55f656bfdf3d42f00b3fcdc9d3bb Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 12:50:52 +0800
Subject: [PATCH 070/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-spring-bo?=
 =?UTF-8?q?ot-starter=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev33/satoken/filter/SaServletFilter.java   |  5 +++--
 .../satoken/interceptor/SaInterceptor.java      | 17 ++++++++---------
 .../java/cn/dev33/satoken/package-info.java     |  6 +++---
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index e1109774..bf01c436 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -137,7 +137,8 @@ public class SaServletFilter implements SaFilter, Filter {
 			});
 			
 		} catch (StopMatchException e) {
-			
+			// StopMatchException 异常代表：停止匹配，进入Controller
+
 		} catch (Throwable e) {
 			// 1. 获取异常处理策略结果 
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
@@ -157,7 +158,7 @@ public class SaServletFilter implements SaFilter, Filter {
 	}
 
 	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
+	public void init(FilterConfig filterConfig) {
 	}
 	
 	@Override
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 3a599be6..05b02d9b 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -15,19 +15,17 @@
  */
 package cn.dev33.satoken.interceptor;
 
-import java.lang.reflect.Method;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.HandlerInterceptor;
-
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.dev33.satoken.exception.BackResultException;
 import cn.dev33.satoken.exception.StopMatchException;
 import cn.dev33.satoken.fun.SaParamFunction;
 import cn.dev33.satoken.strategy.SaStrategy;
+import org.springframework.web.method.HandlerMethod;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 
 /**
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
@@ -89,9 +87,10 @@ public class SaInterceptor implements HandlerInterceptor {
 	 * 每次请求之前触发的方法 
 	 */
 	@Override
+	@SuppressWarnings("all")
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
-		
+
 		try {
 
 			// 这里必须确保 handler 是 HandlerMethod 类型时，才能进行注解鉴权
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
index 4cae80b8..963c21c3 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,6 +1,3 @@
-/**
- * sa-token集成SpringBoot的各个组件 
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token 集成 SpringBoot 的各个组件 
+ */
 package cn.dev33.satoken;
\ No newline at end of file

From 5ace621170747f525d9ffcd6dce623a3a5e60492 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 15:26:03 +0800
Subject: [PATCH 071/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-spring-bo?=
 =?UTF-8?q?ot3-starter=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/filter/SaServletFilter.java  | 3 ++-
 .../java/cn/dev33/satoken/interceptor/SaInterceptor.java    | 1 +
 .../src/main/java/cn/dev33/satoken/package-info.java        | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 83563b90..57e1460a 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -136,7 +136,8 @@ public class SaServletFilter implements SaFilter, Filter {
 			});
 			
 		} catch (StopMatchException e) {
-			
+			// StopMatchException 异常代表：停止匹配，进入Controller
+
 		} catch (Throwable e) {
 			// 1. 获取异常处理策略结果 
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 1f5a2a80..12cc7320 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -88,6 +88,7 @@ public class SaInterceptor implements HandlerInterceptor {
 	 * 每次请求之前触发的方法 
 	 */
 	@Override
+	@SuppressWarnings("all")
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
 			throws Exception {
 		
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java
index 4cae80b8..285d459e 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/package-info.java
@@ -1,6 +1,3 @@
-/**
- * sa-token集成SpringBoot的各个组件 
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token 集成 SpringBoot3 的各个组件 
+ */
 package cn.dev33.satoken;
\ No newline at end of file

From 27b4e31061c25a63855aefef0b939f2717b056e5 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 15:32:03 +0800
Subject: [PATCH 072/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-spring-bo?=
 =?UTF-8?q?ot3-starter=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reactor/filter/SaReactorFilter.java       | 22 +++++++++----------
 .../reactor/model/SaRequestForReactor.java    |  2 +-
 .../dev33/satoken/reactor/package-info.java   |  6 ++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 7b695772..103dd412 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -15,19 +15,10 @@
  */
 package cn.dev33.satoken.reactor.filter;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import cn.dev33.satoken.filter.SaFilter;
-import org.springframework.core.annotation.Order;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-
 import cn.dev33.satoken.exception.BackResultException;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.exception.StopMatchException;
+import cn.dev33.satoken.filter.SaFilter;
 import cn.dev33.satoken.filter.SaFilterAuthStrategy;
 import cn.dev33.satoken.filter.SaFilterErrorStrategy;
 import cn.dev33.satoken.reactor.context.SaReactorHolder;
@@ -35,8 +26,16 @@ import cn.dev33.satoken.reactor.context.SaReactorSyncHolder;
 import cn.dev33.satoken.reactor.error.SaReactorSpringBootErrorCode;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.util.SaTokenConsts;
+import org.springframework.core.annotation.Order;
+import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebFilter;
+import org.springframework.web.server.WebFilterChain;
 import reactor.core.publisher.Mono;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * Reactor 全局鉴权过滤器
  * <p>
@@ -145,7 +144,8 @@ public class SaReactorFilter implements SaFilter, WebFilter {
 			});
 			
 		} catch (StopMatchException e) {
-			
+			// StopMatchException 异常代表：停止匹配，进入Controller
+
 		} catch (Throwable e) {
 			// 1. 获取异常处理策略结果 
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 9ef75437..c3c936e9 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -121,7 +121,7 @@ public class SaRequestForReactor implements SaRequest {
 	 */
 	public String getUrl() {
 		String currDomain = SaManager.getConfig().getCurrDomain();
-		if(SaFoxUtil.isEmpty(currDomain) == false) {
+		if( ! SaFoxUtil.isEmpty(currDomain)) {
 			return currDomain + this.getRequestPath();
 		}
 		return request.getURI().toString();
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
index a3561acf..df78335d 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
@@ -1,6 +1,3 @@
-/**
- * sa-token集成Reactor响应式编程的各个组件 
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token 集成 Reactor 响应式编程的各个组件
+ */
 package cn.dev33.satoken.reactor;
\ No newline at end of file

From b1e7f8471e0643727bdcd175ac6b7d88f078f094 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 15:33:43 +0800
Subject: [PATCH 073/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-reactor-s?=
 =?UTF-8?q?pring-boot3-starter=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/reactor/filter/SaReactorFilter.java    | 3 ++-
 .../cn/dev33/satoken/reactor/model/SaRequestForReactor.java | 2 +-
 .../main/java/cn/dev33/satoken/reactor/package-info.java    | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index ad630c05..23f29914 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -145,7 +145,8 @@ public class SaReactorFilter implements SaFilter, WebFilter {
 			});
 			
 		} catch (StopMatchException e) {
-			
+			// StopMatchException 异常代表：停止匹配，进入Controller
+
 		} catch (Throwable e) {
 			// 1. 获取异常处理策略结果 
 			String result = (e instanceof BackResultException) ? e.getMessage() : String.valueOf(error.run(e));
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 68dd76c4..9f5f0002 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -122,7 +122,7 @@ public class SaRequestForReactor implements SaRequest {
 	 */
 	public String getUrl() {
 		String currDomain = SaManager.getConfig().getCurrDomain();
-		if(SaFoxUtil.isEmpty(currDomain) == false) {
+		if( ! SaFoxUtil.isEmpty(currDomain)) {
 			return currDomain + this.getRequestPath();
 		}
 		return request.getURI().toString();
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
index a3561acf..df78335d 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/package-info.java
@@ -1,6 +1,3 @@
-/**
- * sa-token集成Reactor响应式编程的各个组件 
- */
 /*
  * Copyright 2020-2099 sa-token.cc
  *
@@ -16,4 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/**
+ * Sa-Token 集成 Reactor 响应式编程的各个组件
+ */
 package cn.dev33.satoken.reactor;
\ No newline at end of file

From 3b52c09b01ce845c7a394e1a1d0d61c2c9bf5c98 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 15:38:01 +0800
Subject: [PATCH 074/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-solon-plu?=
 =?UTF-8?q?gin=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java   | 2 +-
 .../cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java  | 2 +-
 .../cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java    | 2 +-
 .../java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java  | 4 ++--
 .../cn/dev33/satoken/solon/integration/SaTokenFilter.java    | 5 +++--
 .../dev33/satoken/solon/integration/SaTokenInterceptor.java  | 5 +++--
 .../java/cn/dev33/satoken/solon/model/SaRequestForSolon.java | 2 +-
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java
index d0cc8694..0d39ff60 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedis.java
@@ -16,7 +16,6 @@
 package cn.dev33.satoken.solon.dao;
 
 import org.noear.redisx.RedisClient;
-import org.noear.solon.annotation.Note;
 
 import java.util.Properties;
 
@@ -35,4 +34,5 @@ public class SaTokenDaoOfRedis extends SaTokenDaoOfRedisBase64 {
     public SaTokenDaoOfRedis(RedisClient redisClient) {
         super(redisClient);
     }
+
 }
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
index 40df43f3..5a2f2114 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisBase64.java
@@ -157,7 +157,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*");
-        List<String> list = new ArrayList<String>(keys);
+        List<String> list = new ArrayList<>(keys);
         return SaFoxUtil.searchList(list, start, size, sortType);
     }
 }
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
index 1c938010..771ddb9c 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
@@ -174,7 +174,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*");
-        List<String> list = new ArrayList<String>(keys);
+        List<String> list = new ArrayList<>(keys);
         return SaFoxUtil.searchList(list, start, size, sortType);
     }
 }
\ No newline at end of file
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
index f0602095..14fca066 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/error/SaSolonErrorCode.java
@@ -24,9 +24,9 @@ package cn.dev33.satoken.solon.error;
 public interface SaSolonErrorCode {
 
 	/** 默认的拦截器异常处理函数 */
-	public static final int CODE_20301 = 20301;
+	int CODE_20301 = 20301;
 
 	/** 默认的 Filter 异常处理函数 */
-	public static final int CODE_20302 = 20302;
+	int CODE_20302 = 20302;
 
 }
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
index e51e71f4..1b811220 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -34,9 +34,9 @@ import java.util.List;
 
 /**
  * sa-token 基于路由的过滤式鉴权（增加了注解的处理）；使用优先级要低些
- *
+ * <p>
  * 对静态文件有处理效果
- *
+ * <p>
  * order: -100 (SaTokenInterceptor 和 SaTokenFilter 二选一；不要同时用)
  *
  * @author noear
@@ -152,6 +152,7 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为
 				}
 			});
 		} catch (StopMatchException e) {
+			// StopMatchException 异常代表：停止匹配，进入Controller
 
 		} catch (SaTokenException e) {
 			// 1. 获取异常处理策略结果
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
index 03fefd8c..7b170ac5 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
@@ -34,9 +34,9 @@ import java.util.List;
 
 /**
  * sa-token 基于路由的过滤式鉴权（增加了注解的处理）；使用优先级要低些
- *
+ * <p>
  * 对静态文件无处理效果
- *
+ * <p>
  * order: -100 (SaTokenInterceptor 和 SaTokenFilter 二选一；不要同时用)
  *
  * @author noear
@@ -201,6 +201,7 @@ public class SaTokenInterceptor implements RouterInterceptor {
 				}
 			});
 		} catch (StopMatchException e) {
+			// StopMatchException 异常代表：停止匹配，进入Controller
 
 		} catch (SaTokenException e) {
 			// 1. 获取异常处理策略结果
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
index 80bf68fb..3de3469a 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/model/SaRequestForSolon.java
@@ -80,7 +80,7 @@ public class SaRequestForSolon implements SaRequest {
     @Override
     public String getUrl() {
         String currDomain = SaManager.getConfig().getCurrDomain();
-        if(SaFoxUtil.isEmpty(currDomain) == false) {
+        if( ! SaFoxUtil.isEmpty(currDomain)) {
             return currDomain + this.getRequestPath();
         }
         return ctx.url();

From b1d2306b7d44512b76ee73fa7ad28e930ca803a8 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 15:43:51 +0800
Subject: [PATCH 075/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-jfinal-pl?=
 =?UTF-8?q?ugin=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/jfinal/PathAnalyzer.java     | 10 +++++-----
 .../cn/dev33/satoken/jfinal/SaTokenActionHandler.java  |  2 +-
 .../java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java  |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java
index b10d5118..0227f589 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/PathAnalyzer.java
@@ -22,14 +22,14 @@ import java.util.regex.Pattern;
 
 public class PathAnalyzer {
 
-    private static Map<String, PathAnalyzer> cached = new LinkedHashMap<>();
-    private Pattern pattern;
+    private static final Map<String, PathAnalyzer> cached = new LinkedHashMap<>();
+    private final Pattern pattern;
 
     public static PathAnalyzer get(String expr) {
-        PathAnalyzer pa = (PathAnalyzer)cached.get(expr);
+        PathAnalyzer pa = cached.get(expr);
         if (pa == null) {
             synchronized(expr.intern()) {
-                pa = (PathAnalyzer)cached.get(expr);
+                pa = cached.get(expr);
                 if (pa == null) {
                     pa = new PathAnalyzer(expr);
                     cached.put(expr, pa);
@@ -41,7 +41,7 @@ public class PathAnalyzer {
     }
 
     private PathAnalyzer(String expr) {
-        this.pattern = Pattern.compile(exprCompile(expr), 2);
+        this.pattern = Pattern.compile(exprCompile(expr), Pattern.CASE_INSENSITIVE);
     }
 
     public Matcher matcher(String uri) {
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java
index bbb80194..61fe3623 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenActionHandler.java
@@ -132,7 +132,7 @@ public class SaTokenActionHandler extends ActionHandler {
     /**
      * 抽取出该方法是为了缩短 handle 方法中的代码量，确保获得 JIT 优化，
      * 方法长度超过 8000 个字节码时，将不会被 JIT 编译成二进制码
-     *
+     * <p>
      * 通过开启 java 的 -XX:+PrintCompilation 启动参数得知，handle(...)
      * 方法(73 行代码)已被 JIT 优化，优化后的字节码长度为 593 个字节，相当于
      * 每行代码产生 8.123 个字节
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java
index 128644d3..0043005a 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaTokenDaoRedis.java
@@ -235,7 +235,7 @@ public class SaTokenDaoRedis implements SaTokenDao {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         Set<String> keys = redis.keys(prefix + "*" + keyword + "*");
-        List<String> list = new ArrayList<String>(keys);
+        List<String> list = new ArrayList<>(keys);
         return SaFoxUtil.searchList(list, start, size, sortType);
     }
 

From 5699977f622c7e2c7bdcd7115cc8598a48f99bfc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 15:48:44 +0800
Subject: [PATCH 076/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-jboot-plu?=
 =?UTF-8?q?gin=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/jboot/PathAnalyzer.java   | 12 ++++++------
 .../cn/dev33/satoken/jboot/SaRedisCache.java   |  4 ++--
 .../dev33/satoken/jboot/SaTokenCacheDao.java   | 18 ++++++++----------
 3 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java
index beea4dca..6a2bb254 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/PathAnalyzer.java
@@ -22,14 +22,14 @@ import java.util.regex.Pattern;
 
 public class PathAnalyzer {
 
-    private static Map<String, PathAnalyzer> cached = new LinkedHashMap<>();
-    private Pattern pattern;
+    private static final Map<String, PathAnalyzer> cached = new LinkedHashMap<>();
+    private final Pattern pattern;
 
     public static PathAnalyzer get(String expr) {
-        PathAnalyzer pa = (PathAnalyzer)cached.get(expr);
+        PathAnalyzer pa = cached.get(expr);
         if (pa == null) {
             synchronized(expr.intern()) {
-                pa = (PathAnalyzer)cached.get(expr);
+                pa = cached.get(expr);
                 if (pa == null) {
                     pa = new PathAnalyzer(expr);
                     cached.put(expr, pa);
@@ -41,7 +41,7 @@ public class PathAnalyzer {
     }
 
     private PathAnalyzer(String expr) {
-        this.pattern = Pattern.compile(exprCompile(expr), 2);
+        this.pattern = Pattern.compile(exprCompile(expr), Pattern.CASE_INSENSITIVE);
     }
 
     public Matcher matcher(String uri) {
@@ -57,7 +57,7 @@ public class PathAnalyzer {
         p = p.replace("$", "\\$");
         p = p.replace("**", ".[]");
         p = p.replace("*", "[^/]*");
-        if (p.indexOf("{") >= 0) {
+        if (p.contains("{")) {
             if (p.indexOf("_}") > 0) {
                 p = p.replaceAll("\\{[^\\}]+?\\_\\}", "(.+?)");
             }
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java
index 97e4e5b3..0f169566 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaRedisCache.java
@@ -37,7 +37,7 @@ import java.util.List;
 public class SaRedisCache implements JbootCache {
     protected JbootRedisConfig config;
     protected JedisPool jedisPool;
-    private ThreadLocal<String> CACHE_NAME_PREFIX_TL = new ThreadLocal<>();
+    private final ThreadLocal<String> CACHE_NAME_PREFIX_TL = new ThreadLocal<>();
 
 	public SaRedisCache(JbootRedisConfig config) {
         this.config = config;
@@ -247,7 +247,7 @@ public class SaRedisCache implements JbootCache {
             return jedisPool.getResource();
         } catch (JedisConnectionException e) {
             throw new JbootIllegalConfigException("can not connect to redis host  " + config.getHost() + ":" + config.getPort() + " ," +
-                    " cause : " + e.toString(), e);
+                    " cause : " + e, e);
         }
     }
 
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java
index c4d15663..ccb65884 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaTokenCacheDao.java
@@ -34,19 +34,19 @@ import java.util.concurrent.ConcurrentHashMap;
 /**
  * 使用Jboot的缓存方法存取Token数据
  */
-@SuppressWarnings({"deprecation", "unchecked", "rawtypes"})
+@SuppressWarnings({"unchecked", "rawtypes"})
 public class SaTokenCacheDao implements SaTokenDao {
 
     protected SaRedisCache saRedisCache;
     protected JbootSerializer serializer;
 
-    private Map<String, SaRedisCache> saRedisMap = new ConcurrentHashMap();
+    private final Map<String, SaRedisCache> saRedisMap = new ConcurrentHashMap();
 
     /**
      * 使用默认redis配置
      */
     public SaTokenCacheDao() {
-        JbootRedisConfig config = (JbootRedisConfig) Jboot.config(JbootRedisConfig.class);
+        JbootRedisConfig config = Jboot.config(JbootRedisConfig.class);
         this.saRedisCache = new SaRedisCache(config);
         this.serializer = new SaJdkSerializer();
     }
@@ -57,21 +57,19 @@ public class SaTokenCacheDao implements SaTokenDao {
      * @param cacheName 使用的缓存配置名，默认为 default
      */
     public SaTokenCacheDao(String cacheName) {
-        SaRedisCache saCache = (SaRedisCache) this.saRedisMap.get(cacheName);
+        SaRedisCache saCache = this.saRedisMap.get(cacheName);
         if (saCache == null) {
             synchronized (this) {
-                saCache = (SaRedisCache) this.saRedisMap.get(cacheName);
+                saCache = this.saRedisMap.get(cacheName);
                 if (saCache == null) {
                     Map<String, JbootRedisConfig> configModels = ConfigUtil.getConfigModels(JbootRedisConfig.class);
                     if (!configModels.containsKey(cacheName)) {
                         throw new JbootIllegalConfigException("Please config \"jboot.redis." + cacheName + ".host\" in your jboot.properties.");
                     }
 
-                    JbootRedisConfig jbootRedisConfig = (JbootRedisConfig) configModels.get(cacheName);
+                    JbootRedisConfig jbootRedisConfig = configModels.get(cacheName);
                     saCache = new SaRedisCache(jbootRedisConfig);
-                    if (saCache != null) {
-                        this.saRedisMap.put(cacheName, saCache);
-                    }
+                    this.saRedisMap.put(cacheName, saCache);
                 }
             }
         }
@@ -271,7 +269,7 @@ public class SaTokenCacheDao implements SaTokenDao {
         Jedis jedis = saRedisCache.getJedis();
         try {
             Set<String> keys = jedis.keys(prefix + "*" + keyword + "*");
-            List<String> list = new ArrayList<String>(keys);
+            List<String> list = new ArrayList<>(keys);
             return SaFoxUtil.searchList(list, start, size, sortType);
         } finally {
             saRedisCache.returnResource(jedis);

From e00900f4eadd93ee031d95d2a53a830c15341637 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:06:24 +0800
Subject: [PATCH 077/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-alone-red?=
 =?UTF-8?q?is=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/dao/alone/SaAloneRedisInject.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index e10f2218..0fb61092 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -194,7 +194,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				dao.isInit = false;
 				dao.init(factory);
 				return;
-			} catch (ClassNotFoundException e) {
+			} catch (ClassNotFoundException ignored) {
 			}
 			// 如果开发者引入的是：sa-token-redis-jackson
 			try {
@@ -203,7 +203,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				dao.isInit = false;
 				dao.init(factory);
 				return;
-			} catch (ClassNotFoundException e) {
+			} catch (ClassNotFoundException ignored) {
 			}
 			// 如果开发者引入的是：sa-token-redis-fastjson
 			try {
@@ -212,7 +212,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				dao.isInit = false;
 				dao.init(factory);
 				return;
-			} catch (ClassNotFoundException e) {
+			} catch (ClassNotFoundException ignored) {
 			}
 			// 如果开发者引入的是：sa-token-redis-fastjson2
 			try {
@@ -221,7 +221,7 @@ public class SaAloneRedisInject implements EnvironmentAware{
 				dao.isInit = false;
 				dao.init(factory);
 				return;
-			} catch (ClassNotFoundException e) {
+			} catch (ClassNotFoundException ignored) {
 			}
 
 			// 至此，说明开发者一个 redis 插件也没引入，或者引入的 redis 插件不在 sa-token-alone-redis 的支持范围内

From 4a14408e4e1c12e0277717e55ad680afffbd74e2 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:08:36 +0800
Subject: [PATCH 078/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-dialect-t?=
 =?UTF-8?q?hymeleaf=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thymeleaf/dialect/SaTokenDialect.java     | 44 +++++++++----------
 .../dialect/SaTokenTagProcessor.java          |  8 ++--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
index 73065190..4ff09fc6 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
@@ -51,12 +51,12 @@ public class SaTokenDialect extends AbstractProcessorDialect {
      * 构造方言对象，使用自定义参数
 	 *
      * @param name 方言名称
-     * @param recedence 优先级 
+     * @param precedence 优先级
      * @param stpLogic 使用的 StpLogic 对象 
      */
-    public SaTokenDialect(String name, int recedence, StpLogic stpLogic) {
+    public SaTokenDialect(String name, int precedence, StpLogic stpLogic) {
     	// 名称、前缀、优先级 
-        super(name, name, recedence);
+        super(name, name, precedence);
         this.stpLogic = stpLogic;
     }
     
@@ -65,24 +65,24 @@ public class SaTokenDialect extends AbstractProcessorDialect {
      */
     @Override
     public Set<IProcessor> getProcessors(String prefix) {
-    	return new HashSet<IProcessor>(Arrays.asList(
-    			// 登录判断 
-    			new SaTokenTagProcessor(prefix, "login", value -> stpLogic.isLogin()),
-    			new SaTokenTagProcessor(prefix, "notLogin", value -> stpLogic.isLogin() == false),
-    			
-    			// 角色判断 
-    			new SaTokenTagProcessor(prefix, "hasRole", value -> stpLogic.hasRole(value)),
-    			new SaTokenTagProcessor(prefix, "hasRoleOr", value -> stpLogic.hasRoleOr(toArray(value))),
-    			new SaTokenTagProcessor(prefix, "hasRoleAnd", value -> stpLogic.hasRoleAnd(toArray(value))),
-    			new SaTokenTagProcessor(prefix, "lackRole", value -> stpLogic.hasRole(value) == false),
-    			
-    			// 权限判断 
-    			new SaTokenTagProcessor(prefix, "hasPermission", value -> stpLogic.hasPermission(value)),
-    			new SaTokenTagProcessor(prefix, "hasPermissionOr", value -> stpLogic.hasPermissionOr(toArray(value))),
-    			new SaTokenTagProcessor(prefix, "hasPermissionAnd", value -> stpLogic.hasPermissionAnd(toArray(value))),
-    			new SaTokenTagProcessor(prefix, "lackPermission", value -> stpLogic.hasPermission(value) == false)
-    			
-    		));
+    	return new HashSet<>(Arrays.asList(
+				// 登录判断
+				new SaTokenTagProcessor(prefix, "login", value -> stpLogic.isLogin()),
+				new SaTokenTagProcessor(prefix, "notLogin", value -> ! stpLogic.isLogin()),
+
+				// 角色判断
+				new SaTokenTagProcessor(prefix, "hasRole", value -> stpLogic.hasRole(value)),
+				new SaTokenTagProcessor(prefix, "hasRoleOr", value -> stpLogic.hasRoleOr(toArray(value))),
+				new SaTokenTagProcessor(prefix, "hasRoleAnd", value -> stpLogic.hasRoleAnd(toArray(value))),
+				new SaTokenTagProcessor(prefix, "lackRole", value -> ! stpLogic.hasRole(value)),
+
+				// 权限判断
+				new SaTokenTagProcessor(prefix, "hasPermission", value -> stpLogic.hasPermission(value)),
+				new SaTokenTagProcessor(prefix, "hasPermissionOr", value -> stpLogic.hasPermissionOr(toArray(value))),
+				new SaTokenTagProcessor(prefix, "hasPermissionAnd", value -> stpLogic.hasPermissionAnd(toArray(value))),
+				new SaTokenTagProcessor(prefix, "lackPermission", value -> ! stpLogic.hasPermission(value))
+
+		));
     }
 
     /**
@@ -92,7 +92,7 @@ public class SaTokenDialect extends AbstractProcessorDialect {
      */
     public String[] toArray(String str) {
     	List<String> list = SaFoxUtil.convertStringToList(str);
-    	return list.toArray(new String[list.size()]);
+    	return list.toArray(new String[0]);
     }
     
 }
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
index 19bc1859..fe6660c3 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
@@ -34,13 +34,13 @@ public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
 
     Function <String, Boolean> fun;
 
-    public SaTokenTagProcessor(final String dialectPrefix, String arrtName, Function <String, Boolean> fun) { 
+    public SaTokenTagProcessor(final String dialectPrefix, String attrName, Function <String, Boolean> fun) {
         super(
             TemplateMode.HTML, // This processor will apply only to HTML mode
             dialectPrefix,     // Prefix to be applied to name for matching
             null,              // No tag name: match any tag name
             false,             // No prefix to be applied to tag name
-            arrtName,         // Name of the attribute that will be matched
+            attrName,         // Name of the attribute that will be matched
             true,              // Apply dialect prefix to attribute name
             10000,        		// Precedence (inside dialect's own precedence)
             true);             // Remove the matched attribute afterwards
@@ -53,9 +53,9 @@ public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
             final AttributeName attributeName, final String attributeValue,
             final IElementTagStructureHandler structureHandler) {
     	// 执行表达式返回值为false，则删除这个标签 
-    	if(this.fun.apply(attributeValue) == false) {
+    	if( ! this.fun.apply(attributeValue)) {
     		structureHandler.removeElement();
-    	};
+    	}
     }
     
 }
\ No newline at end of file

From cbde6c830e7e50288b8e4d6eee8ffe68cfa690e7 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:16:43 +0800
Subject: [PATCH 079/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-jwt=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/jwt/SaJwtTemplate.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
index aac77b7c..7dbca1a2 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
@@ -176,12 +176,12 @@ public class SaJwtTemplate {
     	
     	// 校验 Token 签名 
     	boolean verify = jwt.setKey(keyt.getBytes()).verify();
-    	if(verify == false) {
+    	if( ! verify) {
     		throw new SaJwtException("jwt 签名无效：" + token).setCode(SaJwtErrorCode.CODE_30202);
-    	};
+    	}
 
     	// 校验 loginType 
-    	if(Objects.equals(loginType, payloads.getStr(LOGIN_TYPE)) == false) {
+    	if( ! Objects.equals(loginType, payloads.getStr(LOGIN_TYPE))) {
     		throw new SaJwtException("jwt loginType 无效：" + token).setCode(SaJwtErrorCode.CODE_30203);
     	}
     	
@@ -262,7 +262,7 @@ public class SaJwtTemplate {
     	}
     	
     	// 取出数据 
-    	JWT jwt = null;
+    	JWT jwt;
     	try {
     		jwt = JWT.of(token);
 		} catch (JWTException e) {
@@ -273,12 +273,12 @@ public class SaJwtTemplate {
     	
     	// 如果签名无效 
     	boolean verify = jwt.setKey(keyt.getBytes()).verify();
-    	if(verify == false) {
+    	if( ! verify) {
     		return NOT_VALUE_EXPIRE;
-    	};
+    	}
 
     	// 如果 loginType  无效 
-    	if(Objects.equals(loginType, payloads.getStr(LOGIN_TYPE)) == false) {
+    	if( ! Objects.equals(loginType, payloads.getStr(LOGIN_TYPE))) {
     		return NOT_VALUE_EXPIRE;
     	}
     	

From 3b19111f12661b9f5ce645ebe2686ab46c0fc7e6 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:26:26 +0800
Subject: [PATCH 080/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-oauth2=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dev33/satoken/oauth2/SaOAuth2Manager.java |  2 +-
 .../satoken/oauth2/logic/SaOAuth2Handle.java  |  6 +--
 .../oauth2/logic/SaOAuth2Template.java        | 42 +++++++++----------
 .../oauth2/model/AccessTokenModel.java        |  2 +-
 .../oauth2/model/ClientTokenModel.java        |  2 +-
 .../satoken/oauth2/model/SaClientModel.java   |  1 -
 6 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
index 82edf562..0e6316ff 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
@@ -28,7 +28,7 @@ public class SaOAuth2Manager {
 	/**
 	 * OAuth2 配置 Bean 
 	 */
-	private static SaOAuth2Config config;
+	private static volatile SaOAuth2Config config;
 	public static SaOAuth2Config getConfig() {
 		if (config == null) {
 			// 初始化默认值
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
index fb0fe152..2da8c0dd 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
@@ -130,7 +130,7 @@ public class SaOAuth2Handle {
 	public static Object authorize(SaRequest req, SaResponse res, SaOAuth2Config cfg) {
 		
 		// 1、如果尚未登录, 则先去登录
-		if(StpUtil.isLogin() == false) {
+		if( ! StpUtil.isLogin()) {
 			return cfg.getNotLoginView().get();
 		}
 
@@ -145,7 +145,7 @@ public class SaOAuth2Handle {
 
 		// 5、判断：如果此次申请的Scope，该用户尚未授权，则转到授权页面
 		boolean isGrant = SaOAuth2Util.isGrant(ra.loginId, ra.clientId, ra.scope);
-		if(isGrant == false) {
+		if( ! isGrant) {
 			return cfg.getConfirmView().apply(ra.clientId, ra.scope);
 		}
 
@@ -283,7 +283,7 @@ public class SaOAuth2Handle {
 
 		// 3、调用API 开始登录，如果没能成功登录，则直接退出
 		Object retObj = cfg.getDoLoginHandle().apply(username, password);
-		if(StpUtil.isLogin() == false) {
+		if( ! StpUtil.isLogin()) {
 			return retObj;
 		}
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
index 957bd585..f835a4c1 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
@@ -112,7 +112,7 @@ public class SaOAuth2Template {
 		AccessTokenModel at = checkAccessToken(accessToken);
 		List<String> scopeList = SaFoxUtil.convertStringToList(at.scope);
 		for (String scope : scopes) {
-			SaOAuth2Exception.throwBy(scopeList.contains(scope) == false, "该 Access-Token 不具备 Scope：" + scope, SaOAuth2ErrorCode.CODE_30108);
+			SaOAuth2Exception.throwBy( ! scopeList.contains(scope), "该 Access-Token 不具备 Scope：" + scope, SaOAuth2ErrorCode.CODE_30108);
 		}
 	}
 	/**
@@ -127,7 +127,7 @@ public class SaOAuth2Template {
 		ClientTokenModel ct = checkClientToken(clientToken);
 		List<String> scopeList = SaFoxUtil.convertStringToList(ct.scope);
 		for (String scope : scopes) {
-			SaOAuth2Exception.throwBy(scopeList.contains(scope) == false, "该 Client-Token 不具备 Scope：" + scope, SaOAuth2ErrorCode.CODE_30109);
+			SaOAuth2Exception.throwBy( ! scopeList.contains(scope), "该 Client-Token 不具备 Scope：" + scope, SaOAuth2ErrorCode.CODE_30109);
 		}
 	}
 
@@ -313,7 +313,7 @@ public class SaOAuth2Template {
 	 */
 	public String buildRedirectUri(String redirectUri, String code, String state) {
 		String url = SaFoxUtil.joinParam(redirectUri, Param.code, code);
-		if(SaFoxUtil.isEmpty(state) == false) {
+		if( ! SaFoxUtil.isEmpty(state)) {
 			url = SaFoxUtil.joinParam(url, Param.state, state);
 		}
 		return url;
@@ -327,7 +327,7 @@ public class SaOAuth2Template {
 	 */
 	public String buildImplicitRedirectUri(String redirectUri, String token, String state) {
 		String url = SaFoxUtil.joinSharpParam(redirectUri, Param.token, token);
-		if(SaFoxUtil.isEmpty(state) == false) {
+		if( ! SaFoxUtil.isEmpty(state)) {
 			url = SaFoxUtil.joinSharpParam(url, Param.state, state);
 		}
 		return url;
@@ -375,7 +375,7 @@ public class SaOAuth2Template {
 	public void checkContract(String clientId, String scope) {
 		List<String> clientScopeList = SaFoxUtil.convertStringToList(checkClientModel(clientId).contractScope);
 		List<String> scopelist = SaFoxUtil.convertStringToList(scope);
-		if(clientScopeList.containsAll(scopelist) == false) {
+		if( ! clientScopeList.containsAll(scopelist)) {
 			throw new SaOAuth2Exception("请求的Scope暂未签约").setCode(SaOAuth2ErrorCode.CODE_30112);
 		}
 	}
@@ -386,7 +386,7 @@ public class SaOAuth2Template {
 	 */
 	public void checkRightUrl(String clientId, String url) {
 		// 1、是否是一个有效的url
-		if(SaFoxUtil.isUrl(url) == false) {
+		if( ! SaFoxUtil.isUrl(url)) {
 			throw new SaOAuth2Exception("无效redirect_url：" + url).setCode(SaOAuth2ErrorCode.CODE_30113);
 		}
 
@@ -398,7 +398,7 @@ public class SaOAuth2Template {
 
 		// 3、是否在[允许地址列表]之中
 		List<String> allowList = SaFoxUtil.convertStringToList(checkClientModel(clientId).allowUrl);
-		if(SaStrategy.me.hasElement.apply(allowList, url) == false) {
+		if( ! SaStrategy.me.hasElement.apply(allowList, url)) {
 			throw new SaOAuth2Exception("非法redirect_url：" + url).setCode(SaOAuth2ErrorCode.CODE_30114);
 		}
 	}
@@ -410,7 +410,7 @@ public class SaOAuth2Template {
 	 */
 	public SaClientModel checkClientSecret(String clientId, String clientSecret) {
 		SaClientModel cm = checkClientModel(clientId);
-		SaOAuth2Exception.throwBy(cm.clientSecret == null || cm.clientSecret.equals(clientSecret) == false, 
+		SaOAuth2Exception.throwBy(cm.clientSecret == null || ! cm.clientSecret.equals(clientSecret),
 				"无效client_secret: " + clientSecret, SaOAuth2ErrorCode.CODE_30115);
 		return cm;
 	}
@@ -427,7 +427,7 @@ public class SaOAuth2Template {
 		// 再校验 是否签约 
 		List<String> clientScopeList = SaFoxUtil.convertStringToList(cm.contractScope);
 		List<String> scopelist = SaFoxUtil.convertStringToList(scopes);
-		if(clientScopeList.containsAll(scopelist) == false) {
+		if( ! clientScopeList.containsAll(scopelist)) {
 			throw new SaOAuth2Exception("请求的Scope暂未签约").setCode(SaOAuth2ErrorCode.CODE_30116);
 		}
 		// 返回数据
@@ -448,18 +448,18 @@ public class SaOAuth2Template {
 		SaOAuth2Exception.throwBy(cm == null, "无效code: " + code, SaOAuth2ErrorCode.CODE_30117);
 
 		// 校验：ClientId是否一致
-		SaOAuth2Exception.throwBy(cm.clientId.equals(clientId) == false, "无效client_id: " + clientId, SaOAuth2ErrorCode.CODE_30118);
+		SaOAuth2Exception.throwBy( ! cm.clientId.equals(clientId), "无效client_id: " + clientId, SaOAuth2ErrorCode.CODE_30118);
 
 		// 校验：Secret是否正确
 		String dbSecret = checkClientModel(clientId).clientSecret;
-		SaOAuth2Exception.throwBy(dbSecret == null || dbSecret.equals(clientSecret) == false, "无效client_secret: " + clientSecret, SaOAuth2ErrorCode.CODE_30119);
+		SaOAuth2Exception.throwBy(dbSecret == null || ! dbSecret.equals(clientSecret), "无效client_secret: " + clientSecret, SaOAuth2ErrorCode.CODE_30119);
 
 		// 如果提供了redirectUri，则校验其是否与请求Code时提供的一致
-		if(SaFoxUtil.isEmpty(redirectUri) == false) {
-			SaOAuth2Exception.throwBy(redirectUri.equals(cm.redirectUri) == false, "无效redirect_uri: " + redirectUri, SaOAuth2ErrorCode.CODE_30120);
+		if( ! SaFoxUtil.isEmpty(redirectUri)) {
+			SaOAuth2Exception.throwBy( ! redirectUri.equals(cm.redirectUri), "无效redirect_uri: " + redirectUri, SaOAuth2ErrorCode.CODE_30120);
 		}
 
-		// 返回CodeMdoel
+		// 返回CodeModel
 		return cm;
 	}
 	/**
@@ -476,11 +476,11 @@ public class SaOAuth2Template {
 		SaOAuth2Exception.throwBy(rt == null, "无效refresh_token: " + refreshToken, SaOAuth2ErrorCode.CODE_30121);
 
 		// 校验：ClientId是否一致
-		SaOAuth2Exception.throwBy(rt.clientId.equals(clientId) == false, "无效client_id: " + clientId, SaOAuth2ErrorCode.CODE_30122);
+		SaOAuth2Exception.throwBy( ! rt.clientId.equals(clientId), "无效client_id: " + clientId, SaOAuth2ErrorCode.CODE_30122);
 
 		// 校验：Secret是否正确
 		String dbSecret = checkClientModel(clientId).clientSecret;
-		SaOAuth2Exception.throwBy(dbSecret == null || dbSecret.equals(clientSecret) == false, "无效client_secret: " + clientSecret, SaOAuth2ErrorCode.CODE_30123);
+		SaOAuth2Exception.throwBy(dbSecret == null || ! dbSecret.equals(clientSecret), "无效client_secret: " + clientSecret, SaOAuth2ErrorCode.CODE_30123);
 
 		// 返回Refresh-Token
 		return rt;
@@ -494,7 +494,7 @@ public class SaOAuth2Template {
 	 */
 	public AccessTokenModel checkAccessTokenParam(String clientId, String clientSecret, String accessToken) {
 		AccessTokenModel at = checkAccessToken(accessToken);
-		SaOAuth2Exception.throwBy(at.clientId.equals(clientId) == false, "无效client_id：" + clientId, SaOAuth2ErrorCode.CODE_30124);
+		SaOAuth2Exception.throwBy( ! at.clientId.equals(clientId), "无效client_id：" + clientId, SaOAuth2ErrorCode.CODE_30124);
 		checkClientSecret(clientId, clientSecret);
 		return at;
 	}
@@ -657,7 +657,7 @@ public class SaOAuth2Template {
 		if(ct == null) {
 			return;
 		}
-		Long ttl = ct.getExpiresIn();
+		long ttl = ct.getExpiresIn();
 		SaClientModel cm = checkClientModel(ct.clientId);
 		if (cm.getPastClientTokenTimeout() != -1) {
 			ttl = cm.getPastClientTokenTimeout();
@@ -671,7 +671,7 @@ public class SaOAuth2Template {
 	 * @param scope 权限列表(多个逗号隔开)
 	 */
 	public void saveGrantScope(String clientId, Object loginId, String scope) {
-		if(SaFoxUtil.isEmpty(scope) == false) {
+		if( ! SaFoxUtil.isEmpty(scope)) {
 			long ttl = checkClientModel(clientId).getAccessTokenTimeout();
 			SaManager.getSaTokenDao().set(splicingGrantScopeKey(clientId, loginId), scope, ttl);
 		}
@@ -966,7 +966,7 @@ public class SaOAuth2Template {
 	 * @return key
 	 */
 	public String splicingClientTokenIndexKey(String clientId) {
-		return SaManager.getConfig().getTokenName() + ":oauth2:client-token-indedx:" + clientId;
+		return SaManager.getConfig().getTokenName() + ":oauth2:client-token-index:" + clientId;
 	}
 	/**
 	 * 拼接key：Past-Token 索引
@@ -974,7 +974,7 @@ public class SaOAuth2Template {
 	 * @return key
 	 */
 	public String splicingPastTokenIndexKey(String clientId) {
-		return SaManager.getConfig().getTokenName() + ":oauth2:past-token-indedx:" + clientId;
+		return SaManager.getConfig().getTokenName() + ":oauth2:past-token-index:" + clientId;
 	}
 	/**
 	 * 拼接key：用户授权记录
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
index 8e579b17..95524c19 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
@@ -116,7 +116,7 @@ public class AccessTokenModel implements Serializable {
 	 * @return 属性转Map
 	 */
 	public Map<String, Object> toLineMap() {
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		map.put("access_token", accessToken);
 		map.put("refresh_token", refreshToken);
 		map.put("expires_in", getExpiresIn());
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
index 33b831e7..fdf9e338 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
@@ -84,7 +84,7 @@ public class ClientTokenModel implements Serializable {
 	 * @return 属性转Map 
 	 */
 	public Map<String, Object> toLineMap() {
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		map.put("client_token", clientToken);
 		map.put("expires_in", getExpiresIn());
 		map.put("client_id", clientId);
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
index 57fdcebe..65ee26c2 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
@@ -215,7 +215,6 @@ public class SaClientModel implements Serializable {
 	
 	/**
 	 * @return 此 Client 是否打开模式：凭证式（Client Credentials）
-	 * @return 对象自身 
 	 */
 	public Boolean getIsClient() {
 		return isClient;

From 915c438a01ccd744db10e7687c925d3d43eec781 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:28:18 +0800
Subject: [PATCH 081/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-quick-log?=
 =?UTF-8?q?in=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/quick/SaQuickManager.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
index 19704401..bd3e300c 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
@@ -29,7 +29,7 @@ public class SaQuickManager {
 	/**
 	 * 配置文件 Bean 
 	 */
-	private static SaQuickConfig config;	
+	private static volatile SaQuickConfig config;
 	public static void setConfig(SaQuickConfig config) {
 		SaQuickManager.config = config;
 		// 如果配置了 auto=true，则随机生成账号名密码
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
index 5cb875c3..66291edf 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
@@ -75,7 +75,7 @@ public class SaQuickRegister {
 					.notMatch(SaQuickManager.getConfig().getExclude().split(","))
 					.check(r -> {
 						// 未登录时直接转发到login.html页面 
-						if (SaQuickManager.getConfig().getAuth() && StpUtil.isLogin() == false) {
+						if (SaQuickManager.getConfig().getAuth() && ! StpUtil.isLogin()) {
 							SaHolder.getRequest().forward("/saLogin");
 							SaRouter.back();
 						}

From 1ac5da4114d7c2dde295caba87bfbb81356ca81d Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:33:50 +0800
Subject: [PATCH 082/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redis=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
index 96acea63..479e7636 100644
--- a/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
+++ b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
@@ -71,7 +71,7 @@ public class SaTokenDaoRedis implements SaTokenDao {
 		stringTemplate.afterPropertiesSet();
 
 		// 构建RedisTemplate
-		RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+		RedisTemplate<String, Object> template = new RedisTemplate<>();
 		template.setConnectionFactory(connectionFactory);
 		template.setKeySerializer(keySerializer);
 		template.setHashKeySerializer(keySerializer);
@@ -241,7 +241,7 @@ public class SaTokenDaoRedis implements SaTokenDao {
 	@Override
 	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
 		Set<String> keys = stringRedisTemplate.keys(prefix + "*" + keyword + "*");
-		List<String> list = new ArrayList<String>(keys);
+		List<String> list = new ArrayList<>(keys);
 		return SaFoxUtil.searchList(list, start, size, sortType);
 	}
 	

From 4119cf8384e7240601396a15fb738dbd04722655 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:34:23 +0800
Subject: [PATCH 083/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redis-fas?=
 =?UTF-8?q?tjson=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
index 3b8c55aa..0d63f49d 100644
--- a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
+++ b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
@@ -256,7 +256,7 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
 	@Override
 	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
 		Set<String> keys = stringRedisTemplate.keys(prefix + "*" + keyword + "*");
-		List<String> list = new ArrayList<String>(keys);
+		List<String> list = new ArrayList<>(keys);
 		return SaFoxUtil.searchList(list, start, size, sortType);
 	}
 	

From 8bbae3eb32382503bc1de029f8756af8faa27f09 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:34:57 +0800
Subject: [PATCH 084/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redis-fas?=
 =?UTF-8?q?tjson2=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
index 03c92933..bfd859ab 100644
--- a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
+++ b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
@@ -256,7 +256,7 @@ public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
 	@Override
 	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
 		Set<String> keys = stringRedisTemplate.keys(prefix + "*" + keyword + "*");
-		List<String> list = new ArrayList<String>(keys);
+		List<String> list = new ArrayList<>(keys);
 		return SaFoxUtil.searchList(list, start, size, sortType);
 	}
 	

From db2dfcf32f25e607a0c2f351031d3fff8bf93dcc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:35:57 +0800
Subject: [PATCH 085/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redis-jac?=
 =?UTF-8?q?kson=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
index 1df14161..418a5809 100644
--- a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
+++ b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
@@ -104,8 +104,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 		try {
 			Field field = GenericJackson2JsonRedisSerializer.class.getDeclaredField("mapper");
 			field.setAccessible(true);
-			ObjectMapper objectMapper = (ObjectMapper) field.get(valueSerializer);
-			this.objectMapper = objectMapper;
+			this.objectMapper = (ObjectMapper) field.get(valueSerializer);
 
 			// 配置[忽略未知字段]
 			this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -138,7 +137,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 		stringTemplate.afterPropertiesSet();
 
 		// 构建RedisTemplate
-		RedisTemplate<String, Object> template = new RedisTemplate<String, Object>();
+		RedisTemplate<String, Object> template = new RedisTemplate<>();
 		template.setConnectionFactory(connectionFactory);
 		template.setKeySerializer(keySerializer);
 		template.setHashKeySerializer(keySerializer);
@@ -308,7 +307,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 	@Override
 	public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
 		Set<String> keys = stringRedisTemplate.keys(prefix + "*" + keyword + "*");
-		List<String> list = new ArrayList<String>(keys);
+		List<String> list = new ArrayList<>(keys);
 		return SaFoxUtil.searchList(list, start, size, sortType);
 	}
 	

From 1426529670ec58b072d5f00226382f93c39e70ba Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:36:34 +0800
Subject: [PATCH 086/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redis-jac?=
 =?UTF-8?q?kson=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
index 66250350..53528926 100644
--- a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
+++ b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
@@ -104,8 +104,7 @@ public class SaTokenDaoRedissonJackson implements SaTokenDao {
 		try {
 			Field field = GenericJackson2JsonRedisSerializer.class.getDeclaredField("mapper");
 			field.setAccessible(true);
-			ObjectMapper objectMapper = (ObjectMapper) field.get(valueSerializer);
-			this.objectMapper = objectMapper;
+			this.objectMapper = (ObjectMapper) field.get(valueSerializer);
 			// 配置[忽略未知字段]
 			this.objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 			// 配置[时间类型转换]

From 530ff0e803152f018d24493d85ddc772b4cf874c Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:37:27 +0800
Subject: [PATCH 087/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redisx=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java | 2 +-
 .../main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
index 5be4f36b..db0c18c9 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
@@ -156,7 +156,7 @@ public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*");
-        List<String> list = new ArrayList<String>(keys);
+        List<String> list = new ArrayList<>(keys);
         return SaFoxUtil.searchList(list, start, size, sortType);
     }
 }
\ No newline at end of file
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
index 78680eaf..ae9a686f 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
@@ -173,7 +173,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
     @Override
     public List<String> searchData(String prefix, String keyword, int start, int size, boolean sortType) {
         Set<String> keys = redisBucket.keys(prefix + "*" + keyword + "*");
-        List<String> list = new ArrayList<String>(keys);
+        List<String> list = new ArrayList<>(keys);
         return SaFoxUtil.searchList(list, start, size, sortType);
     }
 }
\ No newline at end of file

From 7a057cf8edec663bd38228f7d37cf3fb1115fc2e Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:38:28 +0800
Subject: [PATCH 088/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-redisx=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/aop/SaCheckAspect.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index 7f299468..209db475 100644
--- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -89,14 +89,9 @@ public class SaCheckAspect {
 			// 注解鉴权 
 			SaStrategy.me.checkMethodAnnotation.accept(method);
 		}
-		
-		try {
-			// 执行原有逻辑
-			Object obj = joinPoint.proceed();
-			return obj;
-		} catch (Throwable e) {
-			throw e;
-		}
+
+		// 执行原有逻辑
+		return joinPoint.proceed();
 	}
 
 }

From 18d2628967ded1b696b29bff185a9d8304f7ed19 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:39:48 +0800
Subject: [PATCH 089/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-sso=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/sso/SaSsoProcessor.java    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index 648f406e..3bc93a70 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -94,7 +94,7 @@ public class SaSsoProcessor {
 		
 		// ---------- 此处有两种情况分开处理：
 		// ---- 情况1：在SSO认证中心尚未登录，需要先去登录 
-		if(stpLogic.isLogin() == false) {
+		if( ! stpLogic.isLogin()) {
 			return cfg.getNotLoginView().get();
 		}
 		// ---- 情况2：在SSO认证中心已经登录，需要重定向回 Client 端，而这又分为两种方式：
@@ -164,7 +164,7 @@ public class SaSsoProcessor {
 		ParamName paramName = ssoTemplate.paramName;
 		
 		// SSO-Server端：单点注销 [用户访问式]   (不带loginId参数) 
-		if(cfg.getIsSlo() && req.hasParam(paramName.loginId) == false) {
+		if(cfg.getIsSlo() && ! req.hasParam(paramName.loginId)) {
 			return ssoSignoutByUserVisit();
 		}
 		
@@ -310,7 +310,7 @@ public class SaSsoProcessor {
 		SaSsoConfig cfg = SaSsoManager.getConfig();
 		
 		// ---------- SSO-Client端：单点注销 [模式二]
-		if(cfg.getIsSlo() && cfg.getIsHttp() == false) {
+		if(cfg.getIsSlo() && ! cfg.getIsHttp()) {
 			return ssoLogoutType2();
 		}
 
@@ -353,7 +353,7 @@ public class SaSsoProcessor {
 		StpLogic stpLogic = ssoTemplate.getStpLogic();
 		
 		// 如果未登录，则无需注销 
-        if(stpLogic.isLogin() == false) {
+        if( ! stpLogic.isLogin()) {
         	return ssoLogoutBack(req, res);
         }
         

From 5bae8504da38e1a16ce2e87af7c3b4cfe86ac552 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 16 May 2023 16:40:48 +0800
Subject: [PATCH 090/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20sa-token-temp-jwt?=
 =?UTF-8?q?=20=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java     | 11 ++++-------
 .../java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java  |  9 +++------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
index 36e318d0..9bb66317 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
@@ -80,13 +80,10 @@ public class SaJwtUtil {
      * @return Claims对象 
      */
     public static Claims parseToken(String jwtToken, String keyt) {
-    	// 解析出载荷 
-    	Claims claims = Jwts.parser()
-        		.setSigningKey(keyt.getBytes())
-        		.parseClaimsJws(jwtToken).getBody();
-
-        // 返回 
-        return claims;
+    	// 解析出载荷
+        return Jwts.parser()
+				.setSigningKey(keyt.getBytes())
+				.parseClaimsJws(jwtToken).getBody();
     }
 
     /**
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
index 1caaa982..e928ee92 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
@@ -35,8 +35,7 @@ public class SaTempForJwt implements SaTempInterface {
 	 */
 	@Override
 	public String createToken(String service, Object value, long timeout) {
-		String token = SaJwtUtil.createToken(service, value, timeout, getJwtSecretKey());
-		return token;
+		return SaJwtUtil.createToken(service, value, timeout, getJwtSecretKey());
 	}
 	
 	/**
@@ -44,8 +43,7 @@ public class SaTempForJwt implements SaTempInterface {
 	 */
 	@Override
 	public Object parseToken(String service, String token) {
-		Object value = SaJwtUtil.getValue(service, token, getJwtSecretKey());
-		return value;
+		return SaJwtUtil.getValue(service, token, getJwtSecretKey());
 	}
 	
 	/**
@@ -53,8 +51,7 @@ public class SaTempForJwt implements SaTempInterface {
 	 */
 	@Override
 	public long getTimeout(String service, String token) {
-		long timeout = SaJwtUtil.getTimeout(service, token, getJwtSecretKey());
-		return timeout;
+		return SaJwtUtil.getTimeout(service, token, getJwtSecretKey());
 	}
 
 	/**

From 73e84decde9335eec1f5ee29720600f076a81c53 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 17 May 2023 20:04:59 +0800
Subject: [PATCH 091/129] =?UTF-8?q?=E5=9C=A8=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D=20StpLog?=
 =?UTF-8?q?ic=20=E6=98=AF=E5=90=A6=E6=94=AF=E6=8C=81=20extra=20=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95=E5=8F=82=E6=95=B0=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 51 ++++++++++++++++---
 .../java/com/pj/test/TestJwtController.java   | 22 ++++----
 .../src/main/resources/application.yml        |  2 +
 .../main/java/com/pj/test/TestController.java |  1 +
 .../satoken/jwt/StpLogicJwtForMixin.java      |  8 +++
 .../satoken/jwt/StpLogicJwtForSimple.java     | 12 ++++-
 .../satoken/jwt/StpLogicJwtForStateless.java  | 30 +++++++----
 7 files changed, 94 insertions(+), 32 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 62b6cf5e..33754d2c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -394,10 +394,8 @@ public class StpLogic {
 	 */
 	public String createLoginSession(Object id, SaLoginModel loginModel) {
 
-		// 1、先检查一下，传入的账号id是否可用
-		if(SaFoxUtil.isEmpty(id)) {
-			throw new SaTokenException("账号 id 不能为空").setCode(SaErrorCode.CODE_11002);
-		}
+		// 1、先检查一下，传入的参数是否有效
+		checkLoginArgs(id, loginModel);
 		
 		// 2、初始化 loginModel ，给一些参数补上默认值
 		SaTokenConfig config = getConfig();
@@ -483,7 +481,36 @@ public class StpLogic {
 				}
 		);
 	}
-	
+
+	/**
+	 * 校验登录时的参数有效性，如果有问题会打印警告或抛出异常
+	 *
+	 * @param id 账号id
+	 * @param loginModel 此次登录的参数Model
+	 */
+	protected void checkLoginArgs(Object id, SaLoginModel loginModel) {
+
+		// 1、先检查一下，传入的账号id是否可用
+		if(SaFoxUtil.isEmpty(id)) {
+			throw new SaTokenException("loginId 不能为空").setCode(SaErrorCode.CODE_11002);
+		}
+
+		// 2、判断账号id是否为简单类型
+		if( ! SaFoxUtil.isBasicType(id.getClass())) {
+			SaManager.log.warn("loginId 应该为简单类型，例如：String | int | long，不推荐使用复杂类型：" + id.getClass());
+		}
+
+		// 3、判断当前 StpLogic 是否支持 extra 扩展参数
+		if( ! isSupportExtra()) {
+			// 如果不支持，开发者却传入了 extra 扩展参数，那么就打印警告信息
+			Map<String, Object> extraData = loginModel.getExtraData();
+			if(extraData != null && extraData.size() > 0) {
+				SaManager.log.warn("当前 StpLogic 不支持 extra 扩展参数模式，传入的 extra 数据将被忽略");
+			}
+		}
+
+	}
+
 	// --- 注销 
 	
 	/** 
@@ -959,7 +986,7 @@ public class StpLogic {
 	 * @return 对应的扩展数据 
 	 */
 	public Object getExtra(String key) {
-		throw new ApiDisabledException().setCode(SaErrorCode.CODE_11031);
+		throw new ApiDisabledException("只有在集成 sa-token-jwt 插件后才可以使用 extra 扩展参数").setCode(SaErrorCode.CODE_11031);
 	}
 
 	/**
@@ -970,7 +997,7 @@ public class StpLogic {
 	 * @return 对应的扩展数据
 	 */
 	public Object getExtra(String tokenValue, String key) {
-		throw new ApiDisabledException().setCode(SaErrorCode.CODE_11031);
+		throw new ApiDisabledException("只有在集成 sa-token-jwt 插件后才可以使用 extra 扩展参数").setCode(SaErrorCode.CODE_11031);
 	}
 
 	// ---- 其它操作
@@ -2640,7 +2667,6 @@ public class StpLogic {
 		return getConfig().getMaxTryTimes();
 	}
 
-
 	/**
 	 * 返回持久化对象
 	 *
@@ -2661,4 +2687,13 @@ public class StpLogic {
 		return SaStrategy.me.hasElement.apply(list, element);
 	}
 
+	/**
+	 * 当前 StpLogic 对象是否支持 token 扩展参数
+	 *
+	 * @return /
+	 */
+	public boolean isSupportExtra() {
+		return false;
+	}
+
 }
diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
index 218ae733..4a64dae5 100644
--- a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
+++ b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/test/TestJwtController.java
@@ -1,18 +1,16 @@
 package com.pj.test;
 
-import java.util.Date;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.pj.util.AjaxJson;
-
 import cn.dev33.satoken.annotation.SaCheckLogin;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpUtil;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.pj.util.AjaxJson;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
 
 /**
  * 测试专用Controller 
@@ -30,8 +28,8 @@ public class TestJwtController {
 		System.out.println("当前会话的token：" + StpUtil.getTokenValue());
 		System.out.println("当前是否登录：" + StpUtil.isLogin());
 		System.out.println("当前登录账号：" + StpUtil.getLoginIdDefaultNull());
-		
-		StpUtil.login(id);			// 在当前会话登录此账号 	
+
+		StpUtil.login(id);			// 在当前会话登录此账号
 		System.out.println("登录成功");
 		System.out.println("当前是否登录：" + StpUtil.isLogin());
 		System.out.println("当前登录账号：" + StpUtil.getLoginId());
diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml
index 0f148e62..f0cf4189 100644
--- a/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml
@@ -16,6 +16,8 @@ sa-token:
     is-share: true
     # token风格
     token-style: uuid
+    # 是否打印操作日志
+    is-log: true
     # jwt秘钥 
     jwt-secret-key: asdasdasifhueuiwyurfewbfjsdafjk
     
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index 39433de4..9c682c0e 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -26,6 +26,7 @@ public class TestController {
 	@RequestMapping("test")
 	public SaResult test() {
 		System.out.println("------------进来了");
+		StpUtil.getExtra("name");
 		// 返回
 		return SaResult.data("");
 	}
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index c024ec66..adad63a3 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -245,4 +245,12 @@ public class StpLogicJwtForMixin extends StpLogic {
 		return -1;
 	}
 
+	/**
+	 * 重写返回：支持 extra 扩展参数
+	 */
+	@Override
+	public boolean isSupportExtra() {
+		return true;
+	}
+
 }
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
index a5492297..91f26d82 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
@@ -81,12 +81,20 @@ public class StpLogicJwtForSimple extends StpLogic {
 		return SaJwtUtil.getPayloadsNotCheck(tokenValue, loginType, jwtSecretKey()).get(key);
 	}
 
-	
+
 	@Override
 	public boolean getConfigOfIsShare() {
 		// 为确保 jwt-simple 模式的 token Extra 数据生成不受旧token影响，这里必须让 is-share 恒为 false 
 		// 即：在使用 jwt-simple 模式后，即使配置了 is-share=true 也不能复用旧 Token，必须每次创建新 Token 
 		return false;
 	}
-	
+
+	/**
+	 * 重写返回：支持 extra 扩展参数
+	 */
+	@Override
+	public boolean isSupportExtra() {
+		return true;
+	}
+
 }
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index ce195769..a21ebcab 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -15,8 +15,6 @@
  */
 package cn.dev33.satoken.jwt;
 
-import java.util.Map;
-
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.exception.ApiDisabledException;
@@ -29,6 +27,8 @@ import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.util.Map;
+
 /**
  * Sa-Token 整合 jwt -- Stateless 无状态模式
  * 
@@ -106,17 +106,20 @@ public class StpLogicJwtForStateless extends StpLogic {
 	 */
 	@Override
 	public String createLoginSession(Object id, SaLoginModel loginModel) {
-		SaJwtException.throwByNull(id, "账号id不能为空", SaJwtErrorCode.CODE_30206);
-		
-		// ------ 1、初始化 loginModel 
+
+		// 1、先检查一下，传入的参数是否有效
+		checkLoginArgs(id, loginModel);
+
+		// 2、初始化 loginModel ，给一些参数补上默认值
 		loginModel.build(getConfig());
 		
-		// ------ 2、生成一个token  
+		// 3、生成一个token
 		String tokenValue = createTokenValue(id, loginModel.getDeviceOrDefault(), loginModel.getTimeout(), loginModel.getExtraData());
 		
-		// $$ 发布事件：账号xxx 登录成功 
+		// 4、$$ 发布事件：账号xxx 登录成功
 		SaTokenEventCenter.doLogin(loginType, id, tokenValue, loginModel);
-		
+
+		// 5、返回
 		return tokenValue;
 	}
 
@@ -212,6 +215,13 @@ public class StpLogicJwtForStateless extends StpLogic {
 	public SaTokenDao getSaTokenDao() {
 		throw new ApiDisabledException();
 	}
-	
-	
+
+	/**
+	 * 重写返回：支持 extra 扩展参数
+	 */
+	@Override
+	public boolean isSupportExtra() {
+		return true;
+	}
+
 }

From 46dd4be560b4088ea82cd12cf1bb7e39dea02b7b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 18 May 2023 13:14:09 +0800
Subject: [PATCH 092/129] =?UTF-8?q?NotLoginException=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E5=9C=BA=E6=99=AF=E5=80=BC=20-6=EF=BC=9A=20token=20?=
 =?UTF-8?q?=E5=B7=B2=E8=A2=AB=E5=86=BB=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/exception/NotLoginException.java  | 21 +++++++++-----
 .../java/cn/dev33/satoken/stp/StpLogic.java   |  2 +-
 .../java/com/pj/current/GlobalException.java  |  3 +-
 .../java/com/pj/test/LoginController.java     | 12 ++++++--
 sa-token-doc/fun/not-login-scene.md           | 28 +++++++++++--------
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
index ba9bae39..1da36f52 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
@@ -41,34 +41,38 @@ public class NotLoginException extends SaTokenException {
 	 * 因为loginId刚取出的时候类型为String，为了避免两者相比较时不必要的类型转换带来的性能消耗，故在此直接将常量类型设计为String 
 	 */
 	
-	/** 表示未提供token */
+	/** 表示未能读取到有效 token */
 	public static final String NOT_TOKEN = "-1";
 	public static final String NOT_TOKEN_MESSAGE = "未能读取到有效 token";
 	
-	/** 表示token无效 */
+	/** 表示 token 无效 */
 	public static final String INVALID_TOKEN = "-2";
 	public static final String INVALID_TOKEN_MESSAGE = "token 无效";
 	
-	/** 表示token已过期 */
+	/** 表示 token 已过期 */
 	public static final String TOKEN_TIMEOUT = "-3";
 	public static final String TOKEN_TIMEOUT_MESSAGE = "token 已过期";
 	
-	/** 表示token已被顶下线 */
+	/** 表示 token 已被顶下线 */
 	public static final String BE_REPLACED = "-4";
 	public static final String BE_REPLACED_MESSAGE = "token 已被顶下线";
 	
-	/** 表示token已被踢下线 */
+	/** 表示 token 已被踢下线 */
 	public static final String KICK_OUT = "-5";
 	public static final String KICK_OUT_MESSAGE = "token 已被踢下线";
 
+	/** 表示 token 已被冻结 */
+	public static final String TOKEN_FREEZE = "-6";
+	public static final String TOKEN_FREEZE_MESSAGE = "token 已被冻结";
+
 	/** 默认的提示语 */
 	public static final String DEFAULT_MESSAGE = "当前会话未登录";
 	
 	
 	/** 
-	 * 代表异常token的标志集合 
+	 * 代表异常 token 的标志集合
 	 */
-	public static final List<String> ABNORMAL_LIST = Arrays.asList(NOT_TOKEN, INVALID_TOKEN, TOKEN_TIMEOUT, BE_REPLACED, KICK_OUT); 
+	public static final List<String> ABNORMAL_LIST = Arrays.asList(NOT_TOKEN, INVALID_TOKEN, TOKEN_TIMEOUT, BE_REPLACED, KICK_OUT, TOKEN_FREEZE);
 	
 
 	/**
@@ -145,6 +149,9 @@ public class NotLoginException extends SaTokenException {
 		else if(KICK_OUT.equals(type)) {
 			message = KICK_OUT_MESSAGE;
 		}
+		else if(TOKEN_FREEZE.equals(type)) {
+			message = TOKEN_FREEZE_MESSAGE;
+		}
 		else {
 			message = DEFAULT_MESSAGE;
 		}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 33754d2c..025ea007 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1347,7 +1347,7 @@ public class StpLogic {
 
 		// 3、值为 -2 代表已被冻结，此时需要抛出异常
 		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
-			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_TIMEOUT, tokenValue).setCode(SaErrorCode.CODE_11016);
+			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_FREEZE, tokenValue).setCode(SaErrorCode.CODE_11016);
 		}
  		// --- 至此，验证已通过 
 
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java
index 7ee67369..a2e1fae8 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java
@@ -21,8 +21,7 @@ public class GlobalException {
 
 	// 全局异常拦截（拦截项目中的所有异常）
 	@ExceptionHandler
-	public AjaxJson handlerException(Exception e, HttpServletRequest request, HttpServletResponse response)
-			throws Exception {
+	public AjaxJson handlerException(Exception e, HttpServletRequest request, HttpServletResponse response) {
 
 		// 打印堆栈，以供调试
 		System.out.println("全局异常---------------");
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java
index 34eea9a1..36176d48 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/LoginController.java
@@ -1,10 +1,9 @@
 package com.pj.test;
 
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 登录测试 
@@ -32,6 +31,13 @@ public class LoginController {
 		return SaResult.ok("是否登录：" + StpUtil.isLogin());
 	}
 
+	// 校验登录  ---- http://localhost:8081/acc/checkLogin
+	@RequestMapping("checkLogin")
+	public SaResult checkLogin() {
+		StpUtil.checkLogin();
+		return SaResult.ok();
+	}
+
 	// 查询 Token 信息  ---- http://localhost:8081/acc/tokenInfo
 	@RequestMapping("tokenInfo")
 	public SaResult tokenInfo() {
diff --git a/sa-token-doc/fun/not-login-scene.md b/sa-token-doc/fun/not-login-scene.md
index 0a371446..c9b0678c 100644
--- a/sa-token-doc/fun/not-login-scene.md
+++ b/sa-token-doc/fun/not-login-scene.md
@@ -7,13 +7,14 @@
 ## 何为场景值
 在前面的章节中，我们了解到，在会话未登录的情况下尝试获取`loginId`会使框架抛出`NotLoginException`异常，而同为未登录异常却有五种抛出场景的区分 
 
-| 场景值  | 对应常量  |  含义说明                         |
-|---     |---        |---                            |
-| -1      | NotLoginException.NOT_TOKEN  |  未能从请求中读取到token         |
-| -2      | NotLoginException.INVALID_TOKEN|  已读取到token，但是token无效  |
-| -3      | NotLoginException.TOKEN_TIMEOUT|  已读取到token，但是token已经过期  |
-| -4      | NotLoginException.BE_REPLACED| 已读取到token，但是token已被顶下线  |
-| -5      | NotLoginException.KICK_OUT| 已读取到token，但是token已被踢下线  |
+| 场景值   | 对应常量  |  含义说明                         |
+|---   	  |---        |---                            |
+| -1      | NotLoginException.NOT_TOKEN  	| 未能从请求中读取到有效 token         |
+| -2      | NotLoginException.INVALID_TOKEN	| 已读取到 token，但是 token 无效  |
+| -3      | NotLoginException.TOKEN_TIMEOUT	| 已读取到 token，但是 token 已经过期  |
+| -4      | NotLoginException.BE_REPLACED	| 已读取到 token，但是 token 已被顶下线  |
+| -5      | NotLoginException.KICK_OUT		| 已读取到 token，但是 token 已被踢下线  |
+| -6      | NotLoginException.TOKEN_FREEZE	| 已读取到 token，但是 token 已被冻结  |
 
 
 
@@ -32,19 +33,22 @@ public SaResult handlerNotLoginException(NotLoginException nle)
 	// 判断场景值，定制化异常信息 
 	String message = "";
 	if(nle.getType().equals(NotLoginException.NOT_TOKEN)) {
-		message = "未提供token";
+		message = "未能读取到有效 token";
 	}
 	else if(nle.getType().equals(NotLoginException.INVALID_TOKEN)) {
-		message = "token无效";
+		message = "token 无效";
 	}
 	else if(nle.getType().equals(NotLoginException.TOKEN_TIMEOUT)) {
-		message = "token已过期";
+		message = "token 已过期";
 	}
 	else if(nle.getType().equals(NotLoginException.BE_REPLACED)) {
-		message = "token已被顶下线";
+		message = "token 已被顶下线";
 	}
 	else if(nle.getType().equals(NotLoginException.KICK_OUT)) {
-		message = "token已被踢下线";
+		message = "token 已被踢下线";
+	}
+	else if(nle.getType().equals(NotLoginException.TOKEN_FREEZE)) {
+		message = "token 已被冻结";
 	}
 	else {
 		message = "当前会话未登录";

From 8cb8016fb4a66d743b5c1dd583871f2d26856b35 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 18 May 2023 18:08:33 +0800
Subject: [PATCH 093/129] =?UTF-8?q?NotLoginException=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=96=B0=E5=9C=BA=E6=99=AF=E5=80=BC=20-7=EF=BC=9A=20=E6=9C=AA?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7=E6=8C=87=E5=AE=9A=E5=89=8D=E7=BC=80=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=20token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/error/SaErrorCode.java   |  5 +-
 .../satoken/exception/NotLoginException.java  | 67 ++++++-------------
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 64 ++++++++++++------
 .../java/com/pj/current/GlobalException.java  |  2 +-
 4 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
index a4fa5baa..dd4ac529 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
@@ -91,7 +91,10 @@ public interface SaErrorCode {
 
 	/** Token已被冻结 */
 	int CODE_11016 = 11016;
-	
+
+	/** 前端未按照指定的前缀提交 token */
+	int CODE_11017 = 11017;
+
 	/** 在未集成 sa-token-jwt 插件时调用 getExtra() 抛出异常 */
 	int CODE_11031 = 11031;
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
index 1da36f52..244805de 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
@@ -15,11 +15,11 @@
  */
 package cn.dev33.satoken.exception;
 
+import cn.dev33.satoken.util.SaFoxUtil;
+
 import java.util.Arrays;
 import java.util.List;
 
-import cn.dev33.satoken.util.SaFoxUtil;
-
 /**
  * 一个异常：代表会话未能通过登录认证校验
  *
@@ -65,6 +65,10 @@ public class NotLoginException extends SaTokenException {
 	public static final String TOKEN_FREEZE = "-6";
 	public static final String TOKEN_FREEZE_MESSAGE = "token 已被冻结";
 
+	/** 表示 未按照指定前缀提交 token */
+	public static final String NO_PREFIX = "-7";
+	public static final String NO_PREFIX_MESSAGE = "未按照指定前缀提交 token";
+
 	/** 默认的提示语 */
 	public static final String DEFAULT_MESSAGE = "当前会话未登录";
 	
@@ -72,7 +76,8 @@ public class NotLoginException extends SaTokenException {
 	/** 
 	 * 代表异常 token 的标志集合
 	 */
-	public static final List<String> ABNORMAL_LIST = Arrays.asList(NOT_TOKEN, INVALID_TOKEN, TOKEN_TIMEOUT, BE_REPLACED, KICK_OUT, TOKEN_FREEZE);
+	public static final List<String> ABNORMAL_LIST =
+			Arrays.asList(NOT_TOKEN, INVALID_TOKEN, TOKEN_TIMEOUT, BE_REPLACED, KICK_OUT, TOKEN_FREEZE, NO_PREFIX);
 	
 
 	/**
@@ -101,61 +106,29 @@ public class NotLoginException extends SaTokenException {
 	public String getLoginType() {
 		return loginType;
 	}
-	
-	
+
 	/**
-	 * 构造方法创建一个 
-	 * @param message 异常消息 
+	 * 构造方法创建一个
+	 * @param message 异常消息
 	 * @param loginType 账号类型
-	 * @param type 类型 
+	 * @param type 类型
 	 */
 	public NotLoginException(String message, String loginType, String type) {
-		super(message);	
+		super(message);
         this.loginType = loginType;
         this.type = type;
     }
-	
-	/**
-	 * 静态方法构建一个NotLoginException 
-	 * @param loginType 账号类型
-	 * @param type 账号类型 
-	 * @return 构建完毕的异常对象 
-	 */
-	public static NotLoginException newInstance(String loginType, String type) {
-		return newInstance(loginType, type, null);
-    }
 
 	/**
-	 * 静态方法构建一个NotLoginException 
+	 * 静态方法构建一个 NotLoginException
 	 * @param loginType 账号类型
-	 * @param type 账号类型 
-	 * @param token 引起异常的Token值 
-	 * @return 构建完毕的异常对象 
+	 * @param type 未登录场景值
+	 * @param message 异常描述信息
+	 * @param token 引起异常的 token 值，可不填，如果填了会拼接到异常描述信息后面
+	 * @return 构建完毕的异常对象
 	 */
-	public static NotLoginException newInstance(String loginType, String type, String token) {
-		String message;
-		if(NOT_TOKEN.equals(type)) {
-			message = NOT_TOKEN_MESSAGE;
-		}
-		else if(INVALID_TOKEN.equals(type)) {
-			message = INVALID_TOKEN_MESSAGE;
-		}
-		else if(TOKEN_TIMEOUT.equals(type)) {
-			message = TOKEN_TIMEOUT_MESSAGE;
-		}
-		else if(BE_REPLACED.equals(type)) {
-			message = BE_REPLACED_MESSAGE;
-		}
-		else if(KICK_OUT.equals(type)) {
-			message = KICK_OUT_MESSAGE;
-		}
-		else if(TOKEN_FREEZE.equals(type)) {
-			message = TOKEN_FREEZE_MESSAGE;
-		}
-		else {
-			message = DEFAULT_MESSAGE;
-		}
-		if( ! SaFoxUtil.isEmpty(token)) {
+	public static NotLoginException newInstance(String loginType, String type, String message, String token) {
+		if(SaFoxUtil.isNotEmpty(token)) {
 			message = message + "：" + token;
 		}
 		return new NotLoginException(message, loginType, type);
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 025ea007..fffe3107 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -41,6 +41,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
 
+import static cn.dev33.satoken.exception.NotLoginException.*;
+
+
 /**
  * Sa-Token 权限认证，逻辑实现类
  *
@@ -230,25 +233,48 @@ public class StpLogic {
 	 * @return 当前tokenValue
 	 */
 	public String getTokenValue(){
-		// 1. 获取
+		return getTokenValue(false);
+	}
+
+	/**
+	 * 获取当前请求的 token 值
+	 *
+	 * @param noPrefixThrowException 如果提交的 token 不带有指定的前缀，是否抛出异常
+	 * @return 当前tokenValue
+	 */
+	public String getTokenValue(boolean noPrefixThrowException){
+
+		// 1、获取前端提交的 token （包含前缀值）
 		String tokenValue = getTokenValueNotCut();
-		
-		// 2. 如果打开了前缀模式，则裁剪掉它
+
+		// 2、如果全局配置打开了前缀模式，则二次处理一下
 		String tokenPrefix = getConfig().getTokenPrefix();
 		if(SaFoxUtil.isNotEmpty(tokenPrefix)) {
-			// 如果 token 并没有按照指定的前缀开头，则视为未提供token
-			if(SaFoxUtil.isEmpty(tokenValue) || ! tokenValue.startsWith(tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT)) {
+
+			// 情况2.1：如果提交的 token 为空，则转为 null
+			if(SaFoxUtil.isEmpty(tokenValue)) {
 				tokenValue = null;
-			} else {
-				// 裁剪掉前缀
+			}
+
+			// 情况2.2：如果 token 有值，但是并不是以指定的前缀开头
+			else if(! tokenValue.startsWith(tokenPrefix + SaTokenConsts.TOKEN_CONNECTOR_CHAT)) {
+				if(noPrefixThrowException) {
+					throw NotLoginException.newInstance(loginType, NO_PREFIX, NO_PREFIX_MESSAGE + "，prefix=" + tokenPrefix, null).setCode(SaErrorCode.CODE_11017);
+				} else {
+					tokenValue = null;
+				}
+			}
+
+			// 情况2.3：代码至此，说明 token 有值，且是以指定的前缀开头的，现在裁剪掉前缀
+			else {
 				tokenValue = tokenValue.substring(tokenPrefix.length() + SaTokenConsts.TOKEN_CONNECTOR_CHAT.length());
 			}
 		}
-		
-		// 3. 返回 
+
+		// 3、返回
 		return tokenValue;
 	}
-	
+
 	/**
 	 * 获取当前请求的 token 值 （不裁剪前缀）
 	 *
@@ -290,9 +316,9 @@ public class StpLogic {
 	 * @return / 
 	 */
 	public String getTokenValueNotNull(){
-		String tokenValue = getTokenValue();
+		String tokenValue = getTokenValue(true);
 		if(SaFoxUtil.isEmpty(tokenValue)) {
-			throw new SaTokenException("未能读取到有效Token").setCode(SaErrorCode.CODE_11001);
+			throw NotLoginException.newInstance(loginType, NOT_TOKEN, NOT_TOKEN_MESSAGE, null).setCode(SaErrorCode.CODE_11001);
 		}
 		return tokenValue;
 	}
@@ -824,30 +850,30 @@ public class StpLogic {
 		}
 
  		// 2、如果前端没有提交 token，则抛出异常: 未能读取到有效 token
- 		String tokenValue = getTokenValue();
+ 		String tokenValue = getTokenValue(true);
  		if(SaFoxUtil.isEmpty(tokenValue)) {
- 			throw NotLoginException.newInstance(loginType, NotLoginException.NOT_TOKEN).setCode(SaErrorCode.CODE_11011);
+			throw NotLoginException.newInstance(loginType, NOT_TOKEN, NOT_TOKEN_MESSAGE, null).setCode(SaErrorCode.CODE_11011);
  		}
 
  		// 3、查找此 token 对应的 loginId，如果找不到则抛出：token 无效
  		String loginId = getLoginIdNotHandle(tokenValue);
  		if(SaFoxUtil.isEmpty(loginId)) {
- 			throw NotLoginException.newInstance(loginType, NotLoginException.INVALID_TOKEN, tokenValue).setCode(SaErrorCode.CODE_11012);
+			throw NotLoginException.newInstance(loginType, INVALID_TOKEN, INVALID_TOKEN_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11012);
  		}
 
  		// 4、如果这个 token 指向的是值是：过期标记，则抛出：token 已过期
  		if(loginId.equals(NotLoginException.TOKEN_TIMEOUT)) {
- 			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_TIMEOUT, tokenValue).setCode(SaErrorCode.CODE_11013);
+			throw NotLoginException.newInstance(loginType, TOKEN_TIMEOUT, TOKEN_TIMEOUT_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11013);
  		}
 
  		// 5、如果这个 token 指向的是值是：被顶替标记，则抛出：token 已被顶下线
  		if(loginId.equals(NotLoginException.BE_REPLACED)) {
- 			throw NotLoginException.newInstance(loginType, NotLoginException.BE_REPLACED, tokenValue).setCode(SaErrorCode.CODE_11014);
+			throw NotLoginException.newInstance(loginType, BE_REPLACED, BE_REPLACED_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11014);
  		}
 
  		// 6、如果这个 token 指向的是值是：被踢下线标记，则抛出：token 已被踢下线
  		if(loginId.equals(NotLoginException.KICK_OUT)) {
- 			throw NotLoginException.newInstance(loginType, NotLoginException.KICK_OUT, tokenValue).setCode(SaErrorCode.CODE_11015);
+			throw NotLoginException.newInstance(loginType, KICK_OUT, KICK_OUT_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11015);
  		}
 
  		// 7、检查此 token 的最后活跃时间是否已经超过了 activity-timeout 的限制，
@@ -1347,7 +1373,7 @@ public class StpLogic {
 
 		// 3、值为 -2 代表已被冻结，此时需要抛出异常
 		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
-			throw NotLoginException.newInstance(loginType, NotLoginException.TOKEN_FREEZE, tokenValue).setCode(SaErrorCode.CODE_11016);
+			throw NotLoginException.newInstance(loginType, TOKEN_FREEZE, TOKEN_FREEZE_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11016);
 		}
  		// --- 至此，验证已通过 
 
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java
index a2e1fae8..04baeede 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/current/GlobalException.java
@@ -25,7 +25,7 @@ public class GlobalException {
 
 		// 打印堆栈，以供调试
 		System.out.println("全局异常---------------");
-		e.printStackTrace(); 
+		e.printStackTrace();
 
 		// 不同异常返回不同状态码 
 		AjaxJson aj = null;

From b38f1e06eba0b0afe06e08ece16a53aa3290b4dc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 18 May 2023 18:32:01 +0800
Subject: [PATCH 094/129] =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=20SaFoxUtil.isUrl=20=E6=96=B9=E6=B3=95=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/util/SaFoxUtil.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index dc7fe816..4879207a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -466,7 +466,7 @@ public class SaFoxUtil {
 	/**
 	 * 验证URL的正则表达式
 	 */
-	public static final String URL_REGEX = "(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
+	public static String URL_REGEX = "(https?|ftp|file)://[-A-Za-z0-9+&@#/%?=~_|!:,.;]+[-A-Za-z0-9+&@#/%=~_|]";
 
 	/**
 	 * 使用正则表达式判断一个字符串是否为URL

From fa16d9c5e15c7cd1c609473098450f40a8b01253 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 18 May 2023 18:47:20 +0800
Subject: [PATCH 095/129] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/fun/not-login-scene.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sa-token-doc/fun/not-login-scene.md b/sa-token-doc/fun/not-login-scene.md
index c9b0678c..dca95679 100644
--- a/sa-token-doc/fun/not-login-scene.md
+++ b/sa-token-doc/fun/not-login-scene.md
@@ -15,6 +15,7 @@
 | -4      | NotLoginException.BE_REPLACED	| 已读取到 token，但是 token 已被顶下线  |
 | -5      | NotLoginException.KICK_OUT		| 已读取到 token，但是 token 已被踢下线  |
 | -6      | NotLoginException.TOKEN_FREEZE	| 已读取到 token，但是 token 已被冻结  |
+| -7      | NotLoginException.NO_PREFIX		| 未按照指定前缀提交 token		  |
 
 
 
@@ -50,6 +51,9 @@ public SaResult handlerNotLoginException(NotLoginException nle)
 	else if(nle.getType().equals(NotLoginException.TOKEN_FREEZE)) {
 		message = "token 已被冻结";
 	}
+	else if(nle.getType().equals(NotLoginException.NO_PREFIX)) {
+		message = "未按照指定前缀提交 token";
+	}
 	else {
 		message = "当前会话未登录";
 	}

From c5caad7a64bb844ab062a431da737793d888230c Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 18 May 2023 21:03:43 +0800
Subject: [PATCH 096/129] =?UTF-8?q?TokenSign=20=E6=96=B0=E5=A2=9E=20tag=20?=
 =?UTF-8?q?=E6=8C=82=E8=BD=BD=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/session/SaSession.java   |  3 +-
 .../cn/dev33/satoken/session/TokenSign.java   | 31 +++++++++++++++++--
 .../cn/dev33/satoken/stp/SaLoginConfig.java   | 10 ++++++
 .../cn/dev33/satoken/stp/SaLoginModel.java    | 27 ++++++++++++++--
 .../java/cn/dev33/satoken/stp/StpLogic.java   |  3 +-
 sa-token-doc/sso/readme.md                    |  2 +-
 6 files changed, 69 insertions(+), 7 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index 19f2dd68..c10f765c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -328,8 +328,9 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	 * @param tokenValue token值
 	 * @param device 设备类型
 	 */
+	@Deprecated
 	public void addTokenSign(String tokenValue, String device) {
-		addTokenSign(new TokenSign(tokenValue, device));
+		addTokenSign(new TokenSign(tokenValue, device, null));
 	}
 
 	/**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
index 83237901..343248b3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
@@ -42,6 +42,11 @@ public class TokenSign implements Serializable {
 	 */
 	private String device;
 
+	/**
+	 * 此客户端登录的挂载数据
+	 */
+	private Object tag;
+
 	/**
 	 * 构建一个
 	 */
@@ -53,10 +58,12 @@ public class TokenSign implements Serializable {
 	 *
 	 * @param value  Token 值
 	 * @param device 所属设备类型
+	 * @param tag 此客户端登录的挂载数据
 	 */
-	public TokenSign(String value, String device) {
+	public TokenSign(String value, String device, Object tag) {
 		this.value = value;
 		this.device = device;
+		this.tag = tag;
 	}
 
 	/**
@@ -95,10 +102,30 @@ public class TokenSign implements Serializable {
 		return this;
 	}
 
+	/**
+	 * 获取 此客户端登录的挂载数据
+	 *
+	 * @return /
+	 */
+	public Object getTag() {
+		return this.tag;
+	}
+
+	/**
+	 * 设置 此客户端登录的挂载数据
+	 *
+	 * @param tag /
+	 * @return 对象自身
+	 */
+	public TokenSign setTag(Object tag) {
+		this.tag = tag;
+		return this;
+	}
+
 	//
 	@Override
 	public String toString() {
-		return "TokenSign [value=" + value + ", device=" + device + "]";
+		return "TokenSign [value=" + value + ", device=" + device + ", tag=" + tag + "]";
 	}
 
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
index 93569727..551ac10f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
@@ -94,6 +94,16 @@ public class SaLoginConfig {
 		return create().setIsWriteHeader(isWriteHeader);
 	}
 
+	/**
+	 * 设置 本次登录挂载到 TokenSign 的数据
+	 *
+	 * @param tokenSignTag /
+	 * @return 登录参数 Model
+	 */
+	public static SaLoginModel setTokenSignTag(Object tokenSignTag) {
+		return create().setTokenSignTag(tokenSignTag);
+	}
+
 	/**
 	 * 静态方法获取一个 SaLoginModel 对象
 	 * @return SaLoginModel 对象 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index fab0fa48..7e55166a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -63,8 +63,11 @@ public class SaLoginModel {
 
 	/** 是否在登录后将 Token 写入到响应头 */
 	private Boolean isWriteHeader;
-	
-	
+
+	/** 本次登录挂载到 TokenSign 的数据 */
+	private Object tokenSignTag;
+
+
 	/**
 	 * @return 此次登录的客户端设备类型
 	 */
@@ -191,6 +194,25 @@ public class SaLoginModel {
 		return this;
 	}
 
+	/**
+	 * 获取 本次登录挂载到 TokenSign 的数据
+	 *
+	 * @return tokenSignTag 本次登录挂载到 TokenSign 的数据
+	 */
+	public Object getTokenSignTag() {
+		return this.tokenSignTag;
+	}
+
+	/**
+	 * 设置 本次登录挂载到 TokenSign 的数据
+	 *
+	 * @param tokenSignTag 本次登录挂载到 TokenSign 的数据
+	 * @return 对象自身
+	 */
+	public SaLoginModel setTokenSignTag(Object tokenSignTag) {
+		this.tokenSignTag = tokenSignTag;
+		return this;
+	}
 	/*
 	 * toString 
 	 */
@@ -203,6 +225,7 @@ public class SaLoginModel {
 				+ ", extraData=" + extraData
 				+ ", token=" + token
 				+ ", isWriteHeader=" + isWriteHeader
+				+ ", tokenSignTag=" + tokenSignTag
 				+ "]";
 	}
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index fffe3107..c66c1043 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -435,7 +435,8 @@ public class StpLogic {
 		session.updateMinTimeout(loginModel.getTimeout());
 		
 		// 5、在 Account-Session 上记录本次登录的 token 签名
-		session.addTokenSign(tokenValue, loginModel.getDeviceOrDefault());
+		TokenSign tokenSign = new TokenSign(tokenValue, loginModel.getDeviceOrDefault(), loginModel.getTokenSignTag());
+		session.addTokenSign(tokenSign);
 
 		// 6、保存 token -> id 的映射关系，方便日后根据 token 找账号 id
 		saveTokenToIdMapping(tokenValue, id, loginModel.getTimeout());
diff --git a/sa-token-doc/sso/readme.md b/sa-token-doc/sso/readme.md
index 39ff5a14..86b61d34 100644
--- a/sa-token-doc/sso/readme.md
+++ b/sa-token-doc/sso/readme.md
@@ -11,7 +11,7 @@
 
 单点登录——就是为了解决这个问题而生！
 
-简而言之，单点登录可以做到：**`在多个互相信任的系统中，用户只需登录一次，就可以访问所有系统。`**
+简而言之，单点登录可以做到： **`在多个互相信任的系统中，用户只需登录一次，就可以访问所有系统。`**
 
 
 ### 架构选型

From d52fe33bfaa5fdbd990bdb46fedaa158bd2a90a5 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Fri, 19 May 2023 19:50:05 +0800
Subject: [PATCH 097/129] =?UTF-8?q?solon=20=E4=BE=9D=E8=B5=96=EF=BC=8C?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=20scope:provided?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-starter/sa-token-solon-plugin/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sa-token-starter/sa-token-solon-plugin/pom.xml b/sa-token-starter/sa-token-solon-plugin/pom.xml
index 01471578..009aa3a9 100644
--- a/sa-token-starter/sa-token-solon-plugin/pom.xml
+++ b/sa-token-starter/sa-token-solon-plugin/pom.xml
@@ -20,6 +20,7 @@
         <dependency>
             <groupId>org.noear</groupId>
             <artifactId>solon</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

From bbfdc8bce8d77d361c0323857175e62fd534db8d Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 19 May 2023 22:15:29 +0800
Subject: [PATCH 098/129] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20api-sign=20?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/sign/SaSignTemplate.java |   2 +-
 sa-token-doc/_sidebar.md                      |   3 +-
 sa-token-doc/plugin/api-sign.md               | 487 ++++++++++++++++++
 .../satoken/core/session/SaSessionTest.java   |  10 +-
 .../satoken/core/sign/SaSignTemplateTest.java |  11 +-
 .../configure/inject/MySaSignTemplate.java    |   5 +-
 6 files changed, 503 insertions(+), 15 deletions(-)
 create mode 100644 sa-token-doc/plugin/api-sign.md

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index 4b753ab3..a6c0a825 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -257,7 +257,7 @@ public class SaSignTemplate {
 		}
 
 		// 校验通过后，将此 nonce 保存在缓存中，保证下次校验无法通过
-		SaManager.getSaTokenDao().set(key, nonce, getSignConfigOrGlobal().getSaveNonceExpire());
+		SaManager.getSaTokenDao().set(key, nonce, getSignConfigOrGlobal().getSaveNonceExpire() * 2 + 2);
 	}
 
 	/**
diff --git a/sa-token-doc/_sidebar.md b/sa-token-doc/_sidebar.md
index 76c501d1..9a575347 100644
--- a/sa-token-doc/_sidebar.md
+++ b/sa-token-doc/_sidebar.md
@@ -72,6 +72,7 @@
 	- [和 jwt 集成](/plugin/jwt-extend)
 	- [和 Dubbo 集成](/plugin/dubbo-extend)
 	- [和 gRPC 集成](/plugin/grpc-extend)
+	- [API 接口参数签名](/plugin/api-sign)
 	- [Sa-Token 插件开发指南](/fun/plugin-dev)
 	- [自定义 SaTokenContext 指南](/fun/sa-token-context)
 
@@ -108,7 +109,7 @@
 	- [解决反向代理 uri 丢失的问题](/fun/curr-domain)
 	- [解决跨域问题](/fun/cors-filter)
 	- [技术选型：SSO 与 OAuth2 对比](/fun/sso-vs-oauth2)
-	- [框架源码所有技术栈](/fun/tech-stack)
+	<!-- - [框架源码所有技术栈](/fun/tech-stack) -->
 	- [issue 提问模板](/fun/issue-template)
 	- [为Sa-Token贡献代码](/fun/git-pr)
 	- [Sa-Token开源大事记](/fun/timeline)
diff --git a/sa-token-doc/plugin/api-sign.md b/sa-token-doc/plugin/api-sign.md
new file mode 100644
index 00000000..21cfd42c
--- /dev/null
+++ b/sa-token-doc/plugin/api-sign.md
@@ -0,0 +1,487 @@
+# API 接口参数签名
+
+在涉及跨系统接口调用时，我们容易碰到以下安全问题：
+
+- 请求身份被伪造。
+- 请求参数被篡改。
+- 请求被抓包，然后重放攻击。
+
+sa-token api-sign 模块将帮你轻松解决以上难题。*（此插件是内嵌到 sa-token-core 核心包中的模块，开发者无需再次引入其它依赖，插件直接可用）*
+
+本篇将根据假设的需求场景，循序渐进讲明白跨系统接口调用时必做的几个步骤，以及为什么要有这些步骤的原因。
+
+
+### 1、需求场景
+
+假设我们有如下业务需求：
+
+> 用户在 A 系统参与活动成功后，活动奖励以余额的形式下发到 B 系统。
+
+
+### 2、初始方案：直接裸奔
+
+在不考虑安全问题的情况下，我们很容易完成这个需求：
+
+1、在 B 系统开放一个接口。
+
+``` java
+/**
+ * 为指定用户添加指定余额
+ * 
+ * @param userId 用户 id
+ * @param money 要添加的余额，单位：分
+ * @return / 
+ */
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money) {
+	// 处理业务 
+	// ...
+	
+	// 返回 
+	return SaResult.ok();
+}
+```
+
+2、在 A 系统使用 http 工具类调用这个接口。
+
+``` java
+long userId = 10001;
+long money = 1000;
+String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money);
+```
+
+上述代码简单的完成了需求，但是很明显它有一个安全问题：
+
+B 系统开放的接口不仅可以被 A 系统调用，还可以被其它任何人调用，甚至别人可以本地跑一个 for 循环调用这个接口，为自己无限充值金额。
+
+
+### 3、方案升级：增加 secretKey 校验
+
+为防止 B 系统开放的接口被陌生人任意调用，我们增加一个 secretKey 参数
+
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money, String secretKey) {
+	// 1、先校验 secretKey 参数是否正确，如果不正确直接拒绝响应请求
+	if( ! check(secretKey) ) {
+		return SaResult.error("无效 secretKey，无法响应请求");
+	}
+	
+	// 2、业务代码 
+	// ...
+	
+	// 3、返回
+	return SaResult.ok();
+}
+```
+
+由于 A 系统是我们 “自己人”，所以它可以拿着 `secretKey` 进行合法请求：
+
+``` java
+long userId = 10001;
+long money = 1000;
+String secretKey = "xxxxxxxxxxxxxxxxxxxx";
+String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money + "&secretKey=" + secretKey);
+```
+
+现在，即使 B 系统的接口被暴露了，也不会被陌生人任意调用了，安全性得到了一定的保证，但是仍然存在一些问题：
+
+- 如果请求被抓包，secretKey 就会泄露，因为每次请求都在 url 中明文传输了 secretKey 参数。
+- 如果请求被抓包，请求的其它参数就可以被任意修改，例如可以将 money 参数修改为 9999999，B系统无法确定参数是否被修改过。
+
+
+
+### 4、方案再升级：使用摘要算法生成参数签名
+
+首先，在 A 系统不要直接发起请求，而是先计算一个 sign 参数：
+
+``` java
+// 声明变量
+long userId = 10001;
+long money = 1000;
+String secretKey = "xxxxxxxxxxxxxxxxxxxx";
+
+// 计算 sign 参数
+String sign = md5("userId=" + userId + "&money=" + money + "&key=" + secretKey);
+
+// 将 sign 拼接在请求地址后面
+String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money + "&sign=" + sign);
+```
+
+**注意此处计算签名时，需要将所有参数按照字典顺序依次排列（key除外，挂在最后面）。**以下所有计算签名时同理，不再赘述。
+
+然后在 B 系统接收请求时，使用同样的算法、同样的秘钥，生成 sign 字符串，与参数中 sign 值进行比较：
+
+
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money, String sign) {
+
+	// 在 B 系统，使用同样的算法、同样的密钥，计算出 sign2，与传入的 sign 进行比对
+	String sign2 = md5("userId=" + userId + "&money=" + money + "&key=" + secretKey);
+	if( ! sign2.equals(sign)) {
+		return SaResult.error("无效 sign，无法响应请求");
+	}
+
+	// 2、业务代码 
+	// ...
+	
+	// 3、返回
+	return SaResult.ok();
+}
+```
+
+因为 sign 的值是由 userId、money、secretKey 三个参数共同决定的，所以只要有一个参数不一致，就会造成最终生成 sign 也是不一致的，所以，根据比对结果：
+
+- 如果 sign 一致，说明这是个合法请求。
+- 如果 sign 不一致，说明发起请求的客户端秘钥不正确，或者请求参数被篡改过，是个不合法请求。
+
+此方案优点：
+- 不在 url 中直接传递 secretKey 参数了，避免了泄露风险。
+- 由于 sign 参数的限制，请求中的参数也不可被篡改，B 系统可放心的使用这些参数。
+
+此方案仍然存在以下缺陷：
+- 被抓包后，请求可以被无限重放，B 系统无法判断请求是真正来自于 A 系统发出的，还是被抓包后重放的。
+
+
+
+### 5、方案再再升级：追加 nonce 随机字符串
+
+首先，在 A 系统发起调用前，追加一个 nonce 参数，一起参与到签名中：
+
+``` java
+// 声明变量
+long userId = 10001;
+long money = 1000;
+String nonce = SaFoxUtil.getRandomString(32); // 随机32位字符串
+String secretKey = "xxxxxxxxxxxxxxxxxxxx";
+
+// 计算 sign 参数
+String sign = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&key=" + secretKey);
+
+// 将 sign 拼接在请求地址后面
+String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money + "nonce=" + nonce + "&sign=" + sign);
+```
+
+然后在 B 系统接收请求时，也把 nonce 参数加进去生成 sign 字符串，进行比较：
+
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money, String nonce, String sign) {
+
+	// 1、检查此 nonce 是否已被使用过了
+	if(CacheUtil.get("nonce_" + nonce) != null) {
+		return SaResult.error("此 nonce 已被使用过了，请求无效");
+	}
+
+	// 2、验证签名
+	String sign2 = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&key=" + secretKey);
+	if( ! sign2.equals(sign)) {
+		return SaResult.error("无效 sign，无法响应请求");
+	}
+
+	// 3、将 nonce 记入缓存，防止重复使用
+	CacheUtil.set("nonce_" + nonce, "1");
+
+	// 4、业务代码 
+	// ...
+
+	// 5、返回
+	return SaResult.ok();
+}
+```
+
+代码分析：
+ 
+- 为方便理解，我们先看第 3 步：此处在校验签名成功后，将 nonce 随机字符串记入缓存中。
+- 再看第 1 步：每次请求进来，先查看一下缓存中是否已经记录了这个随机字符串，如果是，则立即返回：无效请求。
+
+这两步的组合，保证了一个 nonce 随机字符串只能被使用一次，如果请求被抓包后重放，是无法通过 nonce 校验的。
+
+至此，问题似乎已被解决了 …… 吗？
+
+别急，我们还有一个问题没有考虑：这个 nonce 在字符串在缓存应该被保存多久呢？
+
+- 保存 15 分钟？那抓包的人只需要等待 15 分钟，你的 nonce 记录在缓存中消失，请求就可以被重放了。
+- 那保存 24 小时？保存一周？保存半个月？好像无论保存多久，都无法从根本上解决这个问题。
+
+你可能会想到，那我永久保存吧。这样确实能解决问题，但显然服务器承载不了这么做，即使再微小的数据量，在时间的累加下，也总一天会超出服务器能够承载的上限。
+
+
+### 6、方案再再再升级：追加 timestamp 时间戳
+
+我们可以再追加一个 timestamp 时间戳参数，将请求的有效性限定在一个有限时间范围内，例如 15分钟。
+
+首先，在 A 系统追加 timestamp 参数：
+
+``` java
+// 声明变量
+long userId = 10001;
+long money = 1000;
+String nonce = SaFoxUtil.getRandomString(32); // 随机32位字符串
+long timestamp = System.currentTimeMillis(); // 随机32位字符串
+String secretKey = "xxxxxxxxxxxxxxxxxxxx";
+
+// 计算 sign 参数
+String sign = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&key=" + secretKey);
+
+// 将 sign 拼接在请求地址后面
+String res = HttpUtil.request("http://a.com/api/addMoney" +
+		"?userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&sign=" + sign);
+```
+
+在 B 系统检测这个 timestamp 是否超出了允许的范围 
+
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money, long timestamp, String nonce, String sign) {
+
+	// 1、检查 timestamp 是否超出允许的范围（此处假定最大允许15分钟差距）
+	long timestampDisparity = System.currentTimeMillis() - timestamp; // 实际的时间差
+	if(timestampDisparity > 1000 * 60 * 15) {
+		return SaResult.error("timestamp 时间差超出允许的范围，请求无效");
+	}
+
+	// 2、检查此 nonce 是否已被使用过了
+	// 代码同上，不再赘述
+
+	// 3、验证签名
+	// 代码同上，不再赘述
+
+	// 4、将 nonce 记入缓存，ttl 有效期和 allowDisparity 允许时间差一致 
+	CacheUtil.set("nonce_" + nonce, "1", 1000 * 60 * 15);
+
+	// 5、业务代码 ...
+
+	// 6、返回
+	return SaResult.ok();
+}
+```
+
+至此，抓包者：
+
+- 如果在 15 分钟内重放攻击，nonce 参数不答应：缓存中可以查出 nonce 值，直接拒绝响应请求。
+- 如果在 15 分钟后重放攻击，timestamp 参数不答应：超出了允许的 timestamp 时间差，直接拒绝响应请求。
+
+
+### 7、服务器的时钟差异造成安全问题
+
+以上的代码，均假设 A 系统服务器与 B 系统服务器的时钟一致，才可以正常完成安全校验，但在实际的开发场景中，有些服务器会存在时钟不准确的问题。
+
+假设 A 服务器与 B 服务器的时钟差异为 10 分钟，即：在 A 服务器为 8:00 的时候，B 服务器为 7:50。
+
+1. A 系统发起请求，其生成的时间戳也是代表 8:00。
+2. B 系统接受到请求后，完成业务处理，此时 nonce 的 ttl 为 15分钟，到期时间为 7:50 + 15分 = 8:05。
+3. 8.05 后，nonce 缓存消失，抓包者重放请求攻击：
+	- timestamp 校验通过：因为时间戳差距仅有 8.05 - 8.00 = 5分钟，小于 15 分钟，校验通过。
+	- nonce 校验通过：因为此时 nonce 缓存已经消失，可以通过校验。
+	- sign 校验通过：因为这本来就是由 A 系统构建的一个合法签名。
+	- 攻击完成。
+
+要解决上述问题，有两种方案：
+- 方案一：修改服务器时钟，使两个服务器时钟保持一致。
+- 方案二：在代码层面兼容时钟不一致的场景。
+
+要采用方案一的同学可自行搜索一下同步时钟的方法，在此暂不赘述，此处详细阐述一下方案二。
+
+我们只需简单修改一下，B 系统校验参数的代码即可：
+
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money, long timestamp, String nonce, String sign) {
+
+	// 1、检查 timestamp 是否超出允许的范围 （重点一：此处需要取绝对值）
+	long timestampDisparity = Math.abs(System.currentTimeMillis() - timestamp);
+	if(timestampDisparity > 1000 * 60 * 15) {
+		return SaResult.error("timestamp 时间差超出允许的范围，请求无效");
+	}
+
+	// 2、检查此 nonce 是否已被使用过了
+	// 代码同上，不再赘述 
+
+	// 3、验证签名
+	// 代码同上，不再赘述 
+
+	// 4、将 nonce 记入缓存，防止重复使用（重点二：此处需要将 ttl 设定为允许 timestamp 时间差的值 x 2 ）
+	CacheUtil.set("nonce_" + nonce, "1", (1000 * 60 * 15) * 2);
+
+	// 5、业务代码 ...
+
+	// 6、返回
+	return SaResult.ok();
+}
+```
+
+
+### 8、最终版方案
+
+此处再贴一下完整的代码。
+
+A 系统（发起请求端）：
+
+``` java
+// 声明变量
+long userId = 10001;
+long money = 1000;
+String nonce = SaFoxUtil.getRandomString(32); // 随机32位字符串
+long timestamp = System.currentTimeMillis(); // 当前时间戳
+String secretKey = "xxxxxxxxxxxxxxxxxxxx";
+
+// 计算 sign 参数
+String sign = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&key=" + secretKey);
+
+// 将 sign 拼接在请求地址后面
+String res = HttpUtil.request("http://a.com/api/addMoney" +
+		"?userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&sign=" + sign);
+```
+
+B 系统（接收请求端）：
+
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money, long timestamp, String nonce, String sign) {
+
+	// 1、检查 timestamp 是否超出允许的范围
+	long allowDisparity = 1000 * 60 * 15;	// 允许的时间差：15分钟
+	long timestampDisparity = Math.abs(System.currentTimeMillis() - timestamp); // 实际的时间差
+	if(timestampDisparity > allowDisparity) {
+		return SaResult.error("timestamp 时间差超出允许的范围，请求无效");
+	}
+
+	// 2、检查此 nonce 是否已被使用过了
+	if(CacheUtil.get("nonce_" + nonce) != null) {
+		return SaResult.error("此 nonce 已被使用过了，请求无效");
+	}
+
+	// 3、验证签名
+	String sign2 = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&key=" + secretKey);
+	if( ! sign2.equals(sign)) {
+		return SaResult.error("无效 sign，无法响应请求");
+	}
+
+	// 4、将 nonce 记入缓存，防止重复使用，注意此处需要将 ttl 设定为允许 timestamp 时间差的值 x 2  
+	CacheUtil.set("nonce_" + nonce, "1", allowDisparity * 2);
+
+	// 5、业务代码 ...
+
+	// 6、返回
+	return SaResult.ok();
+}
+```
+
+
+### 9、使用 Sa-Token 框架完成 API 参数签名
+
+接下来步入正题，使用 Sa-Token 内置的 sign 模块，方便的完成 API 签名创建、校验等步骤：
+- 不限制请求的参数数量，方便组织业务需求代码。
+- 自动补全 nonce、timestamp 参数，省时省力。
+- 自动构建签名，并序列化参数为字符串。
+- 一句代码完成 nonce、timestamp、sign 的校验，防伪造请求调用、防参数篡改、防重放攻击。
+
+
+#### 9.1、引入依赖
+api-sign 模块已内嵌到核心包，只需要引入 sa-token 本身依赖即可：（请求发起端和接收端都需要引入）
+
+<!---------------------------- tabs:start ---------------------------->
+<!-------- tab:Maven 方式 -------->
+
+``` xml 
+<!-- Sa-Token 权限认证，在线文档：https://sa-token.cc -->
+<dependency>
+	<groupId>cn.dev33</groupId>
+	<artifactId>sa-token-spring-boot-starter</artifactId>
+	<version>${sa.top.version}</version>
+</dependency>
+```
+
+<!-------- tab:Gradle 方式 -------->
+
+``` gradle
+// Sa-Token 权限认证，在线文档：https://sa-token.cc
+implementation 'cn.dev33:sa-token-spring-boot-starter:${sa.top.version}'
+```
+<!---------------------------- tabs:end ---------------------------->
+
+
+#### 9.2、配置秘钥
+请求发起端和接收端需要配置一个相同的秘钥，在 `application.yml` 中配置：
+
+``` yml
+sa-token: 
+    sign:
+        # API 接口签名秘钥 （随便乱摁几个字母即可）
+        secret-key: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+```
+
+#### 9.3、请求发起端构建签名
+
+``` java
+// 请求地址
+String url = "http://a.com/api/addMoney";
+
+// 请求参数
+Map<String, Object> paramMap = new LinkedHashMap<>();
+paramMap.put("userId", 10001);
+paramMap.put("money", 1000);
+// 更多参数，不限制数量...
+
+// 补全 timestamp、nonce、sign 参数，并序列化为 kv 字符串
+String paramStr = SaSignUtil.addSignParamsAndJoin(paramMap);
+
+// 将参数字符串拼接在请求地址后面
+url += "?" + paramStr;
+
+// 发送请求
+String res = HttpUtil.request(url);
+
+// 根据返回值做后续处理
+System.out.println("server 端返回信息：" + res);
+```
+
+
+#### 9.4、请求接受端校验签名
+``` java
+// 为指定用户添加指定余额
+@RequestMapping("addMoney")
+public SaResult addMoney(long userId, long money) {
+
+	// 1、校验请求中的签名
+	SaSignUtil.checkRequest(SaHolder.getRequest());
+	
+	// 2、校验通过，处理业务
+	System.out.println("userId=" + userId);
+	System.out.println("money=" + money);
+	
+	// 3、返回
+	return SaResult.ok();
+}
+```
+
+如上代码便可简单方便的完成 API 接口参数签名校验，当请求端的秘钥不对，或者请求参数被篡改、请求被重放时，均无法通过 `SaSignUtil.checkRequest` 校验。
+
+``` js
+{
+  "code": 500,
+  "msg": "无效签名：9c3e3e98c7d543fb599766c9d3f3b5ff",
+  "data": null
+}
+```
+
+完。
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
index e39049f1..c7096941 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/session/SaSessionTest.java
@@ -112,8 +112,8 @@ public class SaSessionTest {
     	SaSession session = new SaSession("session-1002");
     	
     	// 添加 Token 签名 
-    	session.addTokenSign("xxxx-xxxx-xxxx-xxxx-1", "PC");
-    	session.addTokenSign("xxxx-xxxx-xxxx-xxxx-2", "APP");
+    	session.addTokenSign(new TokenSign("xxxx-xxxx-xxxx-xxxx-1", "PC", null));
+    	session.addTokenSign(new TokenSign("xxxx-xxxx-xxxx-xxxx-2", "APP", null));
 
     	// 查询 
     	Assertions.assertEquals(session.getTokenSignList().size(), 2);
@@ -130,9 +130,9 @@ public class SaSessionTest {
     	
     	// 重置整个签名列表 
     	List<TokenSign> list = Arrays.asList(
-    			new TokenSign("xxxx-xxxx-xxxx-xxxx-1", "WEB"),
-    			new TokenSign("xxxx-xxxx-xxxx-xxxx-2", "phone"),
-    			new TokenSign("xxxx-xxxx-xxxx-xxxx-3", "ipad")
+    			new TokenSign("xxxx-xxxx-xxxx-xxxx-1", "WEB", null),
+    			new TokenSign("xxxx-xxxx-xxxx-xxxx-2", "phone", null),
+    			new TokenSign("xxxx-xxxx-xxxx-xxxx-3", "ipad", null)
     			);
     	session.setTokenSignList(list);
     	Assertions.assertEquals(session.getTokenSignList().size(), 3);
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
index 9768eb6f..c1acf473 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/sign/SaSignTemplateTest.java
@@ -15,12 +15,12 @@
  */
 package cn.dev33.satoken.core.sign;
 
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.config.SaSignConfig;
+import cn.dev33.satoken.util.SoMap;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.util.SoMap;
-
 /**
  * API 接口签名测试 
  * 
@@ -51,11 +51,12 @@ public class SaSignTemplateTest {
 				.set("name", "zhang")
 				.set("age", 18)
 				.set("sex", "女");
-		String sign = SaManager.getSaSignTemplate().createSign(map, key);
+		SaManager.getSaSignTemplate().setSignConfig(new SaSignConfig().setSecretKey(key));
+		String sign = SaManager.getSaSignTemplate().createSign(map);
 		Assertions.assertEquals(sign, "6f5e844a53e74363c2f6b24f64c4f0ff");
 		
 		// 多次签名，结果一致  
-		String sign2 = SaManager.getSaSignTemplate().createSign(map, key);
+		String sign2 = SaManager.getSaSignTemplate().createSign(map);
 		Assertions.assertEquals(sign, sign2);
 	}
 	
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java
index f88fec0c..d32be935 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/integrate/configure/inject/MySaSignTemplate.java
@@ -15,11 +15,10 @@
  */
 package cn.dev33.satoken.integrate.configure.inject;
 
+import cn.dev33.satoken.sign.SaSignTemplate;
 import org.springframework.stereotype.Component;
 
-import cn.dev33.satoken.sign.SaSignTemplateDefaultImpl;
-
 @Component
-public class MySaSignTemplate extends SaSignTemplateDefaultImpl {
+public class MySaSignTemplate extends SaSignTemplate {
 	
 }

From 9c6bc57a51cdddacaf9a33217e061e3895755182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E5=85=88=E7=94=9F?= <emailtome123456@163.com>
Date: Sat, 20 May 2023 17:40:24 +0800
Subject: [PATCH 099/129] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=8F=90=E7=A4=BA,=E8=BF=98=E5=B7=AEparent?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95,=E6=8E=92=E9=99=A4solon=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java   | 2 +-
 .../main/java/cn/dev33/satoken/annotation/SaCheckBasic.java   | 2 +-
 .../main/java/cn/dev33/satoken/annotation/SaCheckDisable.java | 2 +-
 .../main/java/cn/dev33/satoken/annotation/SaCheckLogin.java   | 2 +-
 .../java/cn/dev33/satoken/annotation/SaCheckPermission.java   | 2 +-
 .../main/java/cn/dev33/satoken/annotation/SaCheckRole.java    | 2 +-
 .../main/java/cn/dev33/satoken/annotation/SaCheckSafe.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/annotation/SaIgnore.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/annotation/SaMode.java     | 2 +-
 .../main/java/cn/dev33/satoken/application/SaApplication.java | 2 +-
 .../cn/dev33/satoken/application/SaGetValueInterface.java     | 2 +-
 .../cn/dev33/satoken/application/SaSetValueInterface.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java | 2 +-
 .../src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/config/SaCookieConfig.java | 2 +-
 .../src/main/java/cn/dev33/satoken/config/SaSignConfig.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/config/SaTokenConfig.java  | 2 +-
 .../java/cn/dev33/satoken/config/SaTokenConfigFactory.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/context/SaHolder.java      | 2 +-
 .../main/java/cn/dev33/satoken/context/SaTokenContext.java    | 2 +-
 .../cn/dev33/satoken/context/SaTokenContextDefaultImpl.java   | 2 +-
 .../dev33/satoken/context/SaTokenContextForThreadLocal.java   | 2 +-
 .../satoken/context/SaTokenContextForThreadLocalStorage.java  | 4 ++--
 .../main/java/cn/dev33/satoken/context/model/SaCookie.java    | 2 +-
 .../main/java/cn/dev33/satoken/context/model/SaRequest.java   | 2 +-
 .../main/java/cn/dev33/satoken/context/model/SaResponse.java  | 2 +-
 .../main/java/cn/dev33/satoken/context/model/SaStorage.java   | 2 +-
 .../cn/dev33/satoken/context/second/SaTokenSecondContext.java | 2 +-
 .../satoken/context/second/SaTokenSecondContextCreator.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/dao/SaTokenDao.java        | 2 +-
 .../main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java | 2 +-
 .../src/main/java/cn/dev33/satoken/error/SaErrorCode.java     | 2 +-
 .../java/cn/dev33/satoken/exception/ApiDisabledException.java | 2 +-
 .../java/cn/dev33/satoken/exception/BackResultException.java  | 2 +-
 .../cn/dev33/satoken/exception/DisableServiceException.java   | 2 +-
 .../cn/dev33/satoken/exception/InvalidContextException.java   | 2 +-
 .../cn/dev33/satoken/exception/NotBasicAuthException.java     | 2 +-
 .../java/cn/dev33/satoken/exception/NotImplException.java     | 2 +-
 .../java/cn/dev33/satoken/exception/NotLoginException.java    | 2 +-
 .../cn/dev33/satoken/exception/NotPermissionException.java    | 2 +-
 .../java/cn/dev33/satoken/exception/NotRoleException.java     | 2 +-
 .../java/cn/dev33/satoken/exception/NotSafeException.java     | 2 +-
 .../cn/dev33/satoken/exception/NotWebContextException.java    | 2 +-
 .../cn/dev33/satoken/exception/SaJsonConvertException.java    | 2 +-
 .../main/java/cn/dev33/satoken/exception/SaSignException.java | 2 +-
 .../java/cn/dev33/satoken/exception/SaTokenException.java     | 2 +-
 .../cn/dev33/satoken/exception/SameTokenInvalidException.java | 2 +-
 .../java/cn/dev33/satoken/exception/StopMatchException.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/filter/SaFilter.java       | 2 +-
 .../java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java    | 2 +-
 .../java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/fun/IsRunFunction.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/fun/SaFunction.java        | 2 +-
 .../cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/fun/SaParamFunction.java   | 2 +-
 .../main/java/cn/dev33/satoken/fun/SaParamRetFunction.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/fun/SaRetFunction.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java   | 2 +-
 .../java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java | 2 +-
 .../java/cn/dev33/satoken/listener/SaTokenEventCenter.java    | 2 +-
 .../main/java/cn/dev33/satoken/listener/SaTokenListener.java  | 2 +-
 .../java/cn/dev33/satoken/listener/SaTokenListenerForLog.java | 2 +-
 .../cn/dev33/satoken/listener/SaTokenListenerForSimple.java   | 2 +-
 sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/log/SaLogForConsole.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/router/SaHttpMethod.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/router/SaRouter.java       | 2 +-
 .../src/main/java/cn/dev33/satoken/router/SaRouterStaff.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/same/SaSameTemplate.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/same/SaSameUtil.java       | 2 +-
 .../src/main/java/cn/dev33/satoken/secure/BCrypt.java         | 2 +-
 .../src/main/java/cn/dev33/satoken/secure/SaBase64Util.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/session/SaSession.java     | 2 +-
 .../java/cn/dev33/satoken/session/SaSessionCustomUtil.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/session/TokenSign.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/sign/SaSignUtil.java       | 2 +-
 .../src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/stp/SaLoginModel.java      | 2 +-
 .../src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java       | 2 +-
 .../src/main/java/cn/dev33/satoken/stp/StpInterface.java      | 2 +-
 .../java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/stp/StpLogic.java          | 2 +-
 sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java | 2 +-
 .../src/main/java/cn/dev33/satoken/strategy/SaStrategy.java   | 2 +-
 .../main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/temp/SaTempInterface.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/temp/SaTempUtil.java       | 2 +-
 .../src/main/java/cn/dev33/satoken/util/SaFoxUtil.java        | 2 +-
 .../src/main/java/cn/dev33/satoken/util/SaResult.java         | 2 +-
 .../src/main/java/cn/dev33/satoken/util/SaTokenConsts.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/util/StrFormatter.java     | 4 ++--
 .../java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java   | 2 +-
 .../cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java    | 2 +-
 .../dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java  | 2 +-
 .../context/dubbo/SaTokenSecondContextCreatorForDubbo.java    | 2 +-
 .../satoken/context/dubbo/SaTokenSecondContextForDubbo.java   | 2 +-
 .../context/dubbo/filter/SaTokenDubboConsumerFilter.java      | 2 +-
 .../context/dubbo/filter/SaTokenDubboProviderFilter.java      | 2 +-
 .../dev33/satoken/context/dubbo/model/SaRequestForDubbo.java  | 2 +-
 .../dev33/satoken/context/dubbo/model/SaResponseForDubbo.java | 2 +-
 .../dev33/satoken/context/dubbo/model/SaStorageForDubbo.java  | 2 +-
 .../context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java  | 2 +-
 .../satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java | 2 +-
 .../context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java    | 2 +-
 .../context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java    | 2 +-
 .../satoken/context/dubbo3/model/SaRequestForDubbo3.java      | 2 +-
 .../satoken/context/dubbo3/model/SaResponseForDubbo3.java     | 2 +-
 .../satoken/context/dubbo3/model/SaStorageForDubbo3.java      | 2 +-
 .../context/grpc/SaTokenSecondContextCreatorForGrpc.java      | 2 +-
 .../satoken/context/grpc/SaTokenSecondContextForGrpc.java     | 2 +-
 .../satoken/context/grpc/constants/GrpcContextConstants.java  | 2 +-
 .../satoken/context/grpc/context/SaTokenGrpcContext.java      | 2 +-
 .../grpc/interceptor/SaTokenContextGrpcServerInterceptor.java | 2 +-
 .../grpc/interceptor/SaTokenGrpcClientInterceptor.java        | 2 +-
 .../grpc/interceptor/SaTokenGrpcServerInterceptor.java        | 2 +-
 .../cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java | 2 +-
 .../dev33/satoken/context/grpc/model/SaResponseForGrpc.java   | 2 +-
 .../cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java | 2 +-
 .../src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java         | 2 +-
 .../main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java   | 2 +-
 .../main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java  | 2 +-
 .../java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java    | 2 +-
 .../main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java  | 2 +-
 .../java/cn/dev33/satoken/jwt/exception/SaJwtException.java   | 2 +-
 .../main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java    | 2 +-
 .../java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java   | 2 +-
 .../java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java | 2 +-
 .../cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java  | 2 +-
 .../java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java    | 2 +-
 .../java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java    | 2 +-
 .../java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java  | 2 +-
 .../main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java | 2 +-
 .../java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java  | 2 +-
 .../java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java  | 2 +-
 .../main/java/cn/dev33/satoken/oauth2/model/CodeModel.java    | 2 +-
 .../java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java | 2 +-
 .../java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java  | 2 +-
 .../java/cn/dev33/satoken/oauth2/model/SaClientModel.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/quick/SaQuickInject.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/quick/SaQuickManager.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java | 2 +-
 .../java/cn/dev33/satoken/quick/config/SaQuickConfig.java     | 2 +-
 .../java/cn/dev33/satoken/quick/web/SaQuickController.java    | 2 +-
 .../cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java  | 2 +-
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java    | 2 +-
 .../cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java | 2 +-
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java   | 2 +-
 .../cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java   | 2 +-
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java   | 2 +-
 .../cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java   | 2 +-
 .../java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java | 2 +-
 .../java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java    | 2 +-
 .../main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java | 2 +-
 .../src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/config/SaSsoConfig.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java       | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/SaSsoManager.java      | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java     | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java         | 2 +-
 .../main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java  | 2 +-
 .../java/cn/dev33/satoken/sso/exception/SaSsoException.java   | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/name/ApiName.java      | 2 +-
 .../src/main/java/cn/dev33/satoken/sso/name/ParamName.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java | 2 +-
 .../cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java   | 2 +-
 .../cn/dev33/satoken/servlet/error/SaServletErrorCode.java    | 2 +-
 .../cn/dev33/satoken/servlet/model/SaRequestForServlet.java   | 2 +-
 .../cn/dev33/satoken/servlet/model/SaResponseForServlet.java  | 2 +-
 .../cn/dev33/satoken/servlet/model/SaStorageForServlet.java   | 2 +-
 .../cn/dev33/satoken/reactor/context/SaReactorHolder.java     | 2 +-
 .../cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java | 2 +-
 .../satoken/reactor/error/SaReactorSpringBootErrorCode.java   | 2 +-
 .../java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java | 2 +-
 .../cn/dev33/satoken/reactor/model/SaRequestForReactor.java   | 2 +-
 .../cn/dev33/satoken/reactor/model/SaResponseForReactor.java  | 2 +-
 .../cn/dev33/satoken/reactor/model/SaStorageForReactor.java   | 2 +-
 .../reactor/spring/SaTokenContextForSpringReactor.java        | 2 +-
 .../dev33/satoken/reactor/spring/SaTokenContextRegister.java  | 2 +-
 .../cn/dev33/satoken/reactor/context/SaReactorHolder.java     | 2 +-
 .../cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java | 2 +-
 .../satoken/reactor/error/SaReactorSpringBootErrorCode.java   | 2 +-
 .../java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java | 2 +-
 .../cn/dev33/satoken/reactor/model/SaRequestForReactor.java   | 2 +-
 .../cn/dev33/satoken/reactor/model/SaResponseForReactor.java  | 2 +-
 .../cn/dev33/satoken/reactor/model/SaStorageForReactor.java   | 2 +-
 .../reactor/spring/SaTokenContextForSpringReactor.java        | 2 +-
 .../dev33/satoken/reactor/spring/SaTokenContextRegister.java  | 2 +-
 .../cn/dev33/satoken/servlet/error/SaServletErrorCode.java    | 2 +-
 .../cn/dev33/satoken/servlet/model/SaRequestForServlet.java   | 2 +-
 .../cn/dev33/satoken/servlet/model/SaResponseForServlet.java  | 2 +-
 .../cn/dev33/satoken/servlet/model/SaStorageForServlet.java   | 2 +-
 .../java/cn/dev33/satoken/error/SaSpringBootErrorCode.java    | 2 +-
 .../src/main/java/cn/dev33/satoken/spring/SaBeanInject.java   | 2 +-
 .../java/cn/dev33/satoken/spring/SaPathMatcherHolder.java     | 2 +-
 .../dev33/satoken/spring/json/SaJsonTemplateForJackson.java   | 2 +-
 .../cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java    | 2 +-
 .../cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java  | 2 +-
 .../java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java     | 2 +-
 .../java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java   | 2 +-
 .../main/java/cn/dev33/satoken/filter/SaServletFilter.java    | 2 +-
 .../main/java/cn/dev33/satoken/interceptor/SaInterceptor.java | 2 +-
 .../java/cn/dev33/satoken/spring/SaTokenContextForSpring.java | 2 +-
 .../java/cn/dev33/satoken/spring/SaTokenContextRegister.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java  | 2 +-
 .../main/java/cn/dev33/satoken/filter/SaServletFilter.java    | 2 +-
 .../main/java/cn/dev33/satoken/interceptor/SaInterceptor.java | 2 +-
 .../spring/SaTokenContextForSpringInJakartaServlet.java       | 2 +-
 .../java/cn/dev33/satoken/spring/SaTokenContextRegister.java  | 2 +-
 .../src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java  | 2 +-
 218 files changed, 220 insertions(+), 220 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index dc4c75e6..1814bb23 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -46,7 +46,7 @@ import java.util.Map;
  * 管理 Sa-Token 所有全局组件，可通过此类快速获取、写入各种全局组件对象
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.18.0
  */
 public class SaManager {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
index 5b460c9e..e2a8ceea 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckBasic.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.26.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
index 4b7585d7..2c7c8bd3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckDisable.java
@@ -28,7 +28,7 @@ import java.lang.annotation.Target;
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
  * @author videomonster
- * @since <= 1.34.0
+ * @since 1.31.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
index c12f510e..a9b6d715 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
  * @author kong
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
index be8fd499..80a9a4fe 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckPermission.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD,ElementType.TYPE})
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
index f11190f4..d6f1b710 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckRole.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD,ElementType.TYPE})
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
index c91fc7fa..6227745e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckSafe.java
@@ -28,7 +28,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）。
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.21.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
index 3fd35742..8d66c6f4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaIgnore.java
@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
  * <h3> 请注意：此注解的忽略效果只针对 SaInterceptor拦截器 和 AOP注解鉴权 生效，对自定义拦截器与过滤器不生效。 </h3>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.31.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.TYPE })
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
index 41ac2a21..b8de74ad 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaMode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.annotation;
  * 注解鉴权的验证模式
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public enum SaMode {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
index 1dfed7db..e52b284f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaApplication.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.dao.SaTokenDao;
  * <p> 在应用全局范围内: 存值、取值。数据在应用重启后失效，如果集成了 Redis，则在 Redis 重启后失效。
  * 
  * @author click33
- * @since 2022-8-17
+ * @since 1.31.0
  */
 public class SaApplication implements SaSetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
index d4548acd..7bd20cdc 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaGetValueInterface.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * <p> 封装 SaStorage、SaSession、SaApplication 等存取值的一些固定方法，减少重复编码 </p>
  * 
  * @author click33
- * @since 2022-8-16
+ * @since 1.31.0
  */
 public interface SaGetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
index 643f0821..2e458f3c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/application/SaSetValueInterface.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.fun.SaRetFunction;
  * <p> 封装 SaStorage、SaSession、SaApplication 等存取值的一些固定方法，减少重复编码 </p>
  * 
  * @author click33
- * @since 2022-8-17
+ * @since 1.31.0
  */
 public interface SaSetValueInterface extends SaGetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
index a633486f..d95e6733 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicTemplate.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token Http Basic 认证模块
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.26.0
  */
 public class SaBasicTemplate {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
index fe8ab6d3..e5a327d2 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/basic/SaBasicUtil.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.basic;
  * Sa-Token Http Basic 认证模块，Util 工具类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.26.0
  */
 public class SaBasicUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
index 09b575c7..1adf5fa0 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaCookieConfig.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.config;
  * Sa-Token Cookie写入 相关配置
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public class SaCookieConfig {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
index ddb6b763..01a9065b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaSignConfig.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.config;
  * Sa-Token API 接口签名/验签 相关配置类
  *
  * @author click33
- * @since 2023/5/2
+ * @since 1.34.0
  */
 public class SaSignConfig {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index 9dcf0f8a..4cff2cb2 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -28,7 +28,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class SaTokenConfig implements Serializable {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
index 1c919fbb..7018a917 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfigFactory.java
@@ -32,7 +32,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * <p> 用于手动读取配置文件初始化 SaTokenConfig 对象，只有在非IOC环境下你才会用到此类 </p>
  * 
  * @author click33
- * @since 2022-10-30
+ * @since 1.10.0
  */
 public class SaTokenConfigFactory {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
index 869a1209..3bec3cbc 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaHolder.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.context.model.SaStorage;
  * Sa-Token 上下文持有类，你可以通过此类快速获取当前环境下的 SaRequest、SaResponse、SaStorage、SaApplication 对象。
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.18.0
  */
 public class SaHolder {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
index 367e830d..3682a0bc 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContext.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.context.model.SaResponse;
  * <p> 上下文处理器封装了当前应用环境的底层操作，是 Sa-Token 对接不同 web 框架的关键，详细可参考在线文档 “自定义 SaTokenContext 指南”章节 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public interface SaTokenContext {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
index bda49b50..d94a409e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextDefaultImpl.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.exception.InvalidContextException;
  * </p>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public class SaTokenContextDefaultImpl implements SaTokenContext {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
index ad79a324..7a9c3bc6 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocal.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.context.model.SaStorage;
  * <p> 一般情况下你不需要直接操作此类，因为框架的 starter 集成包里已经封装了完整的上下文操作 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public class SaTokenContextForThreadLocal implements SaTokenContext {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
index 5ecb25ae..177244db 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/SaTokenContextForThreadLocalStorage.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.exception.InvalidContextException;
  * <p> 一般情况下你不需要直接操作此类，因为框架的 starter 集成包里已经封装了完整的上下文操作 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public class SaTokenContextForThreadLocalStorage {
 	
@@ -106,7 +106,7 @@ public class SaTokenContextForThreadLocalStorage {
 	 * Box 临时内部类，用于存储 [ SaRequest、SaResponse、SaStorage ] 三个包装对象
 	 *
 	 * @author click33
-	 * @since <= 1.34.0
+	 * @since 1.16.0
 	 */
 	public static class Box {
 		
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
index ac483174..7c944dca 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaCookie.java
@@ -28,7 +28,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Cookie Model，代表一个 Cookie 应该具有的所有参数
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public class SaCookie {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
index cf955abc..7c0c0fa9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaRequest.java
@@ -26,7 +26,7 @@ import java.util.Map;
  * Request 请求对象 包装类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public interface SaRequest {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
index fd60fecd..dfa3259e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaResponse.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.context.model;
  * Response 响应对象 包装类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public interface SaResponse {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
index da295f54..c444aad8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/model/SaStorage.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.application.SaSetValueInterface;
  * <p> 在一次请求范围内: 存值、取值。数据在请求结束后失效。
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 public interface SaStorage extends SaSetValueInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
index 1115e980..e0bcba15 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContext.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.context.SaTokenContext;
  * @see SaTokenContext SaTokenContext 上下文处理器
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.28.0
  */
 public interface SaTokenSecondContext extends SaTokenContext {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
index a5109d34..7a823dfb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/context/second/SaTokenSecondContextCreator.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.context.second;
  * Sa-Token 二级Context - 创建器  
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.28.0
  */
 @FunctionalInterface
 public interface SaTokenSecondContextCreator {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
index 3e3ade68..48682c74 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDao.java
@@ -28,7 +28,7 @@ import java.util.List;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public interface SaTokenDao {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
index 097e2b15..dc9cbae7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/dao/SaTokenDaoDefaultImpl.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * Sa-Token 持久层接口，默认实现类（基于内存 Map，系统重启后数据丢失）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class SaTokenDaoDefaultImpl implements SaTokenDao {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
index dd4ac529..4ba440d7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/error/SaErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.error;
  * 定义所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-30
+ * @since 1.33.0
  */
 public interface SaErrorCode {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
index 1db4e03f..b86558fa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/ApiDisabledException.java
@@ -21,7 +21,7 @@ package cn.dev33.satoken.exception;
  * <p> 一般在 API 不合适调用的时候抛出，例如在集成 jwt 模块后调用数据持久化相关方法 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.28.0
  */
 public class ApiDisabledException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
index 511d424d..60c1420f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/BackResultException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表停止匹配，直接退出，向前端输出结果 （框架内部专属异常，一般情况下开发者无需关注）
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.21.0
  */
 public class BackResultException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
index f391fe7d..14e21357 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/DisableServiceException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表指定账号的指定服务已被封禁
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.31.0
  */
 public class DisableServiceException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
index ab4271cf..50a44df8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/InvalidContextException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表框架未能获取有效的上下文
  * 
  * @author click33
- * @since 2022-10-29
+ * @since 1.33.0
  */
 public class InvalidContextException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
index 4297d616..862c8986 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotBasicAuthException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表会话未能通过 Http Basic 认证校验
  *
  * @author click33
- * @since 2022-10-29
+ * @since 1.26.0
  */
 public class NotBasicAuthException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
index eb260f12..d040528e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotImplException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表组件或方法未被提供有效的实现
  * 
  * @author click33
- * @since 2022-10-30
+ * @since 1.33.0
  */
 public class NotImplException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
index 244805de..a6039ddb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotLoginException.java
@@ -24,7 +24,7 @@ import java.util.List;
  * 一个异常：代表会话未能通过登录认证校验
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class NotLoginException extends SaTokenException {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
index d976e8b3..f0299fa3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotPermissionException.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.stp.StpUtil;
  * 一个异常：代表会话未能通过权限认证校验
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class NotPermissionException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
index 04bf3ac1..70f391d5 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotRoleException.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.stp.StpUtil;
  * 一个异常：代表会话未能通过角色认证校验
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class NotRoleException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
index 187bfa72..b1ef6249 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotSafeException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表会话未能通过二级认证校验 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.21.0
  */
 public class NotSafeException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
index 1b8f9e8a..a2f70dbb 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/NotWebContextException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表当前不是 Web 上下文，无法调用某个 API
  * 
  * @author click33
- * @since 2022-10-29
+ * @since 1.33.0
  */
 public class NotWebContextException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
index 5a88908b..a6dd91da 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaJsonConvertException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表 JSON 转换失败 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaJsonConvertException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
index 697d93f0..4242bd78 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaSignException.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * 一个异常：代表 API 参数签名校验失败
  * 
  * @author click33
- * @since 2023-5-3
+ * @since 1.34.0
  */
 public class SaSignException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
index b64fe094..db1099da 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaTokenException.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * <p> 框架其它异常均继承自此类，开发者可通过捕获此异常来捕获框架内部抛出的所有异常 </p>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class SaTokenException extends RuntimeException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
index fc950891..599108d5 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SameTokenInvalidException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表 Same-Token 校验未通过
  * 
  * @author click33
- * @since 2022-10-24
+ * @since 1.32.0
  */
 public class SameTokenInvalidException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java b/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
index 5e0f23a3..1b7d53de 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/StopMatchException.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.exception;
  * 一个异常：代表停止路由匹配，进入 Controller （框架内部专属异常，一般情况下开发者无需关注）
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 public class StopMatchException extends SaTokenException {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
index 65a2bae4..bd5370dd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilter.java
@@ -23,7 +23,7 @@ import java.util.List;
  *  2、定义统一的行为接口。
  *
  * @author click33
- * @since 2023/4/29
+ * @since 1.34.0
  */
 public interface SaFilter {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
index 04d017bb..c9560f04 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterAuthStrategy.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.filter;
  * Sa-Token 全局过滤器 - 认证策略封装，方便 lambda 表达式风格调用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.17.0
  */
 @FunctionalInterface
 public interface SaFilterAuthStrategy {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
index aed52789..cd818e8f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/filter/SaFilterErrorStrategy.java
@@ -21,7 +21,7 @@ package cn.dev33.satoken.filter;
  * <p> 此方法的返回值将在 toString() 后返回给前端，如果你要返回 JSON 数据，需要在返回前自行序列化为 JSON 字符串 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.16.0
  */
 @FunctionalInterface
 public interface SaFilterErrorStrategy {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
index 61cdc634..7bcb86ed 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/IsRunFunction.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.fun;
  * lambda 表达式辅助封装：根据 Boolean 变量，决定是否执行一个函数
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.13.0
  */
 public class IsRunFunction {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
index 6b14e53a..4f60747f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaFunction.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.fun;
  * 无形参、无返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.13.0
  */
 @FunctionalInterface
 public interface SaFunction {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
index 0427c5e9..031ec5df 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
@@ -22,7 +22,7 @@ import java.util.function.Supplier;
  * 生成唯一式 token 的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
  * @author click33
- * @since 2023/4/30
+ * @since 1.34.0
  */
 @FunctionalInterface
 public interface SaGenerateUniqueTokenFunction {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
index 911fc700..ed14d69b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamFunction.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.fun;
  * 单形参、无返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 @FunctionalInterface
 public interface SaParamFunction<T> {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
index 322f11d5..c35bd3a4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaParamRetFunction.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.fun;
  * 单形参、有返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 @FunctionalInterface
 public interface SaParamRetFunction<T, R> {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
index ac8057f6..031acb43 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRetFunction.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.fun;
  * 无形参、有返回值的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 @FunctionalInterface
 public interface SaRetFunction {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
index f5727317..9905374d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaRouteFunction.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.context.model.SaResponse;
  * 路由拦截器验证方法的函数式接口，方便开发者进行 lambda 表达式风格调用
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @FunctionalInterface
 public interface SaRouteFunction {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
index 7c9f2507..4341c416 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplate.java
@@ -21,7 +21,7 @@ import java.util.Map;
  * JSON 转换器 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public interface SaJsonTemplate {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
index c1e48f2d..7a9dd19c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/json/SaJsonTemplateDefaultImpl.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.exception.NotImplException;
  * <p> 如果代码断点走到了此默认实现类，说明框架没有注入有效的 JSON 转换器，需要开发者自行实现并注入 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaJsonTemplateDefaultImpl implements SaJsonTemplate {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
index 5a7b8a75..e5036e64 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenEventCenter.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.stp.StpLogic;
  * <p> 提供侦听器注册、事件发布能力 </p>
  * 
  * @author click33
- * @since 2022-8-19
+ * @since 1.31.0
  */
 public class SaTokenEventCenter {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
index 07c7b3de..09dc9739 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.stp.StpLogic;
  * <p> 你可以通过实现此接口在用户登录、退出等关键性操作时进行一些AOP切面操作 </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.17.0
  */
 public interface SaTokenListener {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
index da487ad0..53a15b43 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForLog.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 侦听器的一个实现：Log 打印
  * 
  * @author click33
- * @since 2022-11-2
+ * @since 1.33.0
  */
 public class SaTokenListenerForLog implements SaTokenListener {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
index dfacc771..4f3042b9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListenerForSimple.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.stp.SaLoginModel;
  * <p> 对所有事件方法提供空实现，方便开发者通过继承此类快速实现一个可用的侦听器 </p>
  * 
  * @author click33
- * @since 2022-8-20
+ * @since 1.31.0
  */
 public class SaTokenListenerForSimple implements SaTokenListener {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
index 4f0670f3..3ab0438f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLog.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.log;
  * Sa-Token 日志输出接口
  * 
  * @author click33
- * @since 2022-11-1
+ * @since 1.33.0
  */
 public interface SaLog {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
index e34134c4..80b21f02 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/log/SaLogForConsole.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.util.StrFormatter;
  * Sa-Token 日志实现类 [ 控制台打印 ]
  * 
  * @author click33
- * @since 2022-11-1
+ * @since 1.33.0
  */
 public class SaLogForConsole implements SaLog {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
index 0c148760..0e3ae4c7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaHttpMethod.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.exception.SaTokenException;
  * <p> 参考：Spring - HttpMethod 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public enum SaHttpMethod {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
index 57cbfe1a..99002a3e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouter.java
@@ -39,7 +39,7 @@ import cn.dev33.satoken.fun.SaParamRetFunction;
  * </pre>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public class SaRouter {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
index eb8289d8..6bbee590 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/router/SaRouterStaff.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.fun.SaParamRetFunction;
  * 路由匹配操作对象 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public class SaRouterStaff {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
index 814529d0..25bc6859 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameTemplate.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * <p> 解决同源系统互相调用时的身份认证校验， 例如：微服务网关请求转发鉴权、微服务RPC调用鉴权 
  * 
  * @author click33
- * @since 2022-10-24
+ * @since 1.32.0
  */
 public class SaSameTemplate {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
index 489dc819..9ecaf494 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/same/SaSameUtil.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.SaManager;
  * <p> 解决同源系统互相调用时的身份认证校验， 例如：微服务网关请求转发鉴权、微服务RPC调用鉴权 
  * 
  * @author click33
- * @since 2022-10-24
+ * @since 1.32.0
  */
 public class SaSameUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
index 84ef0319..1c844367 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/BCrypt.java
@@ -44,7 +44,7 @@ import java.security.SecureRandom;
  * }
  *
  * @author Damien Miller
- * @since 4.1.1
+ * @since 1.29.0
  */
 @SuppressWarnings("all")
 public class BCrypt {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
index 9692c638..d131bc59 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaBase64Util.java
@@ -22,7 +22,7 @@ import java.util.Base64;
  * Sa-Token Base64 工具类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.14.0
  */
 public class SaBase64Util {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
index a1c97b67..51304287 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/secure/SaSecureUtil.java
@@ -37,7 +37,7 @@ import java.util.UUID;
  * Sa-Token 常见加密算法工具类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.14.0
  */
 public class SaSecureUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index c10f765c..8437cbb2 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -43,7 +43,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class SaSession implements SaSetValueInterface, Serializable {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
index ad62a1a3..e38f23fa 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
@@ -35,7 +35,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * </pre>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class SaSessionCustomUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
index 343248b3..8abc7d52 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/TokenSign.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
  * <p> 挂在到 SaSession 上的 Token 签名，一般情况下，一个 TokenSign 代表一个登录的会话。</p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.8.0
  */
 public class TokenSign implements Serializable {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
index a6c0a825..b88c236d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignTemplate.java
@@ -38,7 +38,7 @@ import java.util.TreeMap;
  * </p>
  *
  * @author click33
- * @since 2022-4-27
+ * @since 1.30.0
  */
 public class SaSignTemplate {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
index 15b6125c..5d7a175c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/sign/SaSignUtil.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * API 参数签名算法 - 工具类
  *
  * @author click33
- * @since 2022-4-27
+ * @since 1.34.0
  */
 public class SaSignUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
index 551ac10f..8f433afd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
@@ -29,7 +29,7 @@ import java.util.Map;
  * </pre>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.29.0
  */
 public class SaLoginConfig {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index 7e55166a..37d65f5e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -32,7 +32,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * </pre>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.13.2
  */
 public class SaLoginModel {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
index e7f81f90..a86a1728 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
@@ -37,7 +37,7 @@ package cn.dev33.satoken.stp;
  * </p>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class SaTokenInfo {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
index 67189c7a..651f5f15 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterface.java
@@ -26,7 +26,7 @@ import java.util.List;
  * </p>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public interface StpInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
index b7b5360d..15b81549 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpInterfaceDefaultImpl.java
@@ -24,7 +24,7 @@ import java.util.List;
  * 如果开发者没有实现 StpInterface 接口，则框架会使用此默认实现类，所有方法都返回空集合，即：用户不具有任何权限和角色。
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class StpInterfaceDefaultImpl implements StpInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index c66c1043..450cdff3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -52,7 +52,7 @@ import static cn.dev33.satoken.exception.NotLoginException.*;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class StpLogic {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index 2c9d398a..55759305 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -26,7 +26,7 @@ import java.util.List;
  * Sa-Token 权限认证工具类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.10.0
  */
 public class StpUtil {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 708c0c8e..3b7cf8c2 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -47,7 +47,7 @@ import java.util.function.Function;
  * </pre>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public final class SaStrategy {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
index 6033f531..20f051d4 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempDefaultImpl.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.temp;
  * Sa-Token 临时令牌验证模块 默认实现类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 public class SaTempDefaultImpl implements SaTempInterface {
 	
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
index 201a7eba..c8e22eb1 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
@@ -28,7 +28,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 public interface SaTempInterface {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
index 198ffabf..71593cca 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempUtil.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.SaManager;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 public class SaTempUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
index 4879207a..6b519277 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaFoxUtil.java
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;
  * Sa-Token 内部工具类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.18.0
  */
 public class SaFoxUtil {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
index 96432fc2..1cf36e2f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaResult.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.22.0
  */
 public class SaResult extends LinkedHashMap<String, Object> implements Serializable{
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index 83057b53..21eb2db7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -24,7 +24,7 @@ package cn.dev33.satoken.util;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.8.0
  */
 public class SaTokenConsts {
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
index 0a540f2a..5b855766 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/StrFormatter.java
@@ -23,7 +23,7 @@ package cn.dev33.satoken.util;
  * </p>
  *
  * @author Looly
- * @since <= 1.34.0
+ * @since 1.33.0
  */
 public class StrFormatter {
 
@@ -64,7 +64,7 @@ public class StrFormatter {
 	 * @param placeHolder 占位符，例如{}
 	 * @param argArray    参数列表
 	 * @return 结果
-	 * @since 5.7.14
+	 * @since 1.33.0
 	 */
 	public static String formatWith(String strPattern, String placeHolder, Object... argArray) {
 		if (SaFoxUtil.isEmpty(strPattern) || SaFoxUtil.isEmpty(placeHolder) || SaFoxUtil.isEmpty(argArray)) {
diff --git a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
index 0fb61092..4bd10a53 100644
--- a/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
+++ b/sa-token-plugin/sa-token-alone-redis/src/main/java/cn/dev33/satoken/dao/alone/SaAloneRedisInject.java
@@ -48,7 +48,7 @@ import java.util.stream.Collectors;
  *
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.21.0
  */
 @Configuration
 public class SaAloneRedisInject implements EnvironmentAware{
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
index 4ff09fc6..f2482e80 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 集成 Thymeleaf 标签方言 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public class SaTokenDialect extends AbstractProcessorDialect {
 	
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
index fe6660c3..d9a61871 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenTagProcessor.java
@@ -28,7 +28,7 @@ import org.thymeleaf.templatemode.TemplateMode;
  * 封装 Sa-Token 标签方言处理器
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.0
  */
 public class SaTokenTagProcessor extends AbstractAttributeTagProcessor {
 
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
index 4fa3235e..2ff91e4d 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextCreatorForDubbo.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
  * Sa-Token 二级上下文 - 创建器 [ Dubbo版 ]
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenSecondContextCreatorForDubbo implements SaTokenSecondContextCreator {
 
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
index ce05db5c..c6dfa03f 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/SaTokenSecondContextForDubbo.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.exception.ApiDisabledException;
  * Sa-Token 二级上下文 [ Dubbo版本 ]
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenSecondContextForDubbo implements SaTokenSecondContext {
 
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
index b3d8e767..15aacb60 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboConsumerFilter.java
@@ -34,7 +34,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * Sa-Token 整合 Dubbo Consumer 端（调用端）过滤器
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = -30000)
 public class SaTokenDubboConsumerFilter implements Filter {
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
index b7a12c71..ba25089c 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/filter/SaTokenDubboProviderFilter.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.same.SaSameUtil;
  * Sa-Token 整合 Dubbo Provider端（被调用端）过滤器
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = -30000)
 public class SaTokenDubboProviderFilter implements Filter {
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
index 4a707be0..f411be02 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaRequestForDubbo.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * 对 SaRequest 包装类的实现（Dubbo 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaRequestForDubbo implements SaRequest {
 
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
index 0ed4cd01..e6b792d1 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaResponseForDubbo.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.rpc.RpcContext;
  * 对 SaResponse 包装类的实现（Dubbo 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaResponseForDubbo implements SaResponse {
 
diff --git a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
index 1f01da6e..ac7c93cc 100644
--- a/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
+++ b/sa-token-plugin/sa-token-dubbo/src/main/java/cn/dev33/satoken/context/dubbo/model/SaStorageForDubbo.java
@@ -23,7 +23,7 @@ import org.apache.dubbo.rpc.RpcContext;
  * 对 SaStorage 包装类的实现（Dubbo 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaStorageForDubbo implements SaStorage {
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
index 7ef653d1..1bc7357b 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextCreatorForDubbo3.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
  * Sa-Token 二级上下文 - 创建器 [Dubbo3版]
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenSecondContextCreatorForDubbo3 implements SaTokenSecondContextCreator {
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
index 46c29a0b..bd43ab98 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/SaTokenSecondContextForDubbo3.java
@@ -29,7 +29,7 @@ import org.apache.dubbo.rpc.RpcContext;
  * Sa-Token 二级上下文 [ Dubbo3版本 ]
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenSecondContextForDubbo3 implements SaTokenSecondContext {
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
index cdc4455c..b54b48f7 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ConsumerFilter.java
@@ -28,7 +28,7 @@ import org.apache.dubbo.rpc.*;
  * Sa-Token 整合 Dubbo3 Consumer 端（调用端）过滤器
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Activate(group = {CommonConstants.CONSUMER}, order = -30000)
 public class SaTokenDubbo3ConsumerFilter implements Filter {
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
index 4d624c03..fefbde12 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/filter/SaTokenDubbo3ProviderFilter.java
@@ -25,7 +25,7 @@ import org.apache.dubbo.rpc.*;
  * Sa-Token 整合 Dubbo3 Provider端（被调用端）过滤器
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Activate(group = {CommonConstants.PROVIDER}, order = -30000)
 public class SaTokenDubbo3ProviderFilter implements Filter {
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
index 35fd3d69..1200f1c0 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaRequestForDubbo3.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * 对 SaRequest 包装类的实现（Dubbo3 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaRequestForDubbo3 implements SaRequest {
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
index 1eefadda..fb9d536d 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaResponseForDubbo3.java
@@ -23,7 +23,7 @@ import org.apache.dubbo.rpc.RpcContext;
  * 对 SaResponse 包装类的实现（Dubbo3 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaResponseForDubbo3 implements SaResponse {
 
diff --git a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
index adc7b182..ccd90e1e 100644
--- a/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
+++ b/sa-token-plugin/sa-token-dubbo3/src/main/java/cn/dev33/satoken/context/dubbo3/model/SaStorageForDubbo3.java
@@ -23,7 +23,7 @@ import org.apache.dubbo.rpc.RpcContext;
  * 对 SaStorage 包装类的实现（Dubbo3 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaStorageForDubbo3 implements SaStorage {
 
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
index 17881896..bf79f5d2 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextCreatorForGrpc.java
@@ -23,7 +23,7 @@ import org.springframework.stereotype.Component;
  * Sa-Token 二级Context - 创建器 [Grpc版]
  *
  * @author lym
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Component
 public class SaTokenSecondContextCreatorForGrpc implements SaTokenSecondContextCreator {
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
index c0e57fbc..729fd9d8 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/SaTokenSecondContextForGrpc.java
@@ -29,7 +29,7 @@ import cn.dev33.satoken.exception.ApiDisabledException;
  * Sa-Token 上下文 [grpc版本]
  *
  * @author lym
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenSecondContextForGrpc implements SaTokenSecondContext {
 
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
index 9d2c51bf..5736373f 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/constants/GrpcContextConstants.java
@@ -23,7 +23,7 @@ import io.grpc.Metadata;
  * 常量 
  * 
  * @author lym
- * @since 2022/8/26 14:27
+ * @since 1.34.0
  */
 public class GrpcContextConstants {
     public static final Metadata.Key<String> SA_SAME_TOKEN =
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
index 1425efa4..cf117582 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/context/SaTokenGrpcContext.java
@@ -22,7 +22,7 @@ import java.util.Map;
 
 /**
  * @author lym
- * @since 2022/8/25 11:02
+ * @since 1.34.0
  **/
 public class SaTokenGrpcContext {
     /**
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
index 1d35e862..68add436 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenContextGrpcServerInterceptor.java
@@ -24,7 +24,7 @@ import org.springframework.core.Ordered;
  * 处理请求前，创建上下文
  * 
  * @author lym
- * @since 2022/8/24 10:09
+ * @since 1.34.0
  */
 @GrpcGlobalServerInterceptor
 public class SaTokenContextGrpcServerInterceptor implements ServerInterceptor, Ordered {
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
index ec88dd05..5a2dee19 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcClientInterceptor.java
@@ -39,7 +39,7 @@ import net.devh.boot.grpc.client.interceptor.GrpcGlobalClientInterceptor;
  * 客户端请求的时候，带上token
  * 
  * @author lym
- * @since 2022/8/24 15:45
+ * @since 1.34.0
  */
 @GrpcGlobalClientInterceptor
 public class SaTokenGrpcClientInterceptor implements ClientInterceptor, Ordered {
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
index 0331750d..a21cfc10 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/interceptor/SaTokenGrpcServerInterceptor.java
@@ -32,7 +32,7 @@ import net.devh.boot.grpc.server.interceptor.GrpcGlobalServerInterceptor;
  * 鉴权，设置token
  * 
  * @author lym
- * @since 2022/8/25 11:33
+ * @since 1.34.0
  **/
 @GrpcGlobalServerInterceptor
 public class SaTokenGrpcServerInterceptor implements ServerInterceptor {
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
index e06d096a..184d8007 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaRequestForGrpc.java
@@ -25,7 +25,7 @@ import java.util.Map;
  * Request for grpc
  *
  * @author lym
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaRequestForGrpc implements SaRequest {
 
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
index 29f6c51d..a001b445 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaResponseForGrpc.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.context.model.SaResponse;
  * Response for grpc
  *
  * @author lym
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaResponseForGrpc implements SaResponse {
     /**
diff --git a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
index 89063990..4a14eaf8 100644
--- a/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
+++ b/sa-token-plugin/sa-token-grpc/src/main/java/cn/dev33/satoken/context/grpc/model/SaStorageForGrpc.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.context.model.SaStorage;
  * Storage for grpc
  *
  * @author lym
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaStorageForGrpc implements SaStorage {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
index 7dbca1a2..eb195305 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
@@ -30,7 +30,7 @@ import cn.hutool.jwt.JWTException;
  * jwt 操作模板方法封装
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.31.0
  */
 public class SaJwtTemplate {
 	
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
index 62c673a1..3661b614 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtUtil.java
@@ -24,7 +24,7 @@ import cn.hutool.jwt.JWT;
  * jwt 操作工具类封装
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.27.1
  */
 public class SaJwtUtil {
 	
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index adad63a3..5966e5be 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.stp.StpUtil;
  * Sa-Token 整合 jwt -- Mixin 混入模式
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class StpLogicJwtForMixin extends StpLogic {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
index 91f26d82..fc5ba0e7 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.stp.StpUtil;
  * Sa-Token 整合 jwt -- Simple 简单模式
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class StpLogicJwtForSimple extends StpLogic {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index a21ebcab..a9140983 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -33,7 +33,7 @@ import java.util.Map;
  * Sa-Token 整合 jwt -- Stateless 无状态模式
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class StpLogicJwtForStateless extends StpLogic {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
index 3f2e4d3f..89e9d5ac 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/error/SaJwtErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.jwt.error;
  * 定义 sa-token-jwt 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-31
+ * @since 1.33.0
  */
 public interface SaJwtErrorCode {
 
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
index 3eae4a86..7d7c21bf 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtException.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * 一个异常：代表 jwt 模块相关错误
  * 
  * @author click33
- * @since 2022-10-31
+ * @since 1.33.0
  */
 public class SaJwtException extends SaTokenException {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
index 0e6316ff..4796a686 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/SaOAuth2Manager.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
  * Sa-Token-OAuth2 模块 总控类
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaOAuth2Manager {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
index dfe2b690..4511f226 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/config/SaOAuth2Config.java
@@ -25,7 +25,7 @@ import java.util.function.Supplier;
  * Sa-Token-OAuth2 配置类 Model
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaOAuth2Config implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
index 257f56c1..cd6a3fa4 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/error/SaOAuth2ErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.oauth2.error;
  * 定义 sa-token-oauth2 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-31
+ * @since 1.33.0
  */
 public interface SaOAuth2ErrorCode {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
index c7c76aaf..62803e27 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/exception/SaOAuth2Exception.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.exception.SaTokenException;
  * 一个异常：代表OAuth2认证流程错误 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.33.0
  */
 public class SaOAuth2Exception extends SaTokenException {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
index 0006791d..e1ee9bb7 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Consts.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.oauth2.logic;
  * Sa-Token-OAuth2 所有常量
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class SaOAuth2Consts {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
index 2da8c0dd..59c13a5f 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Handle.java
@@ -38,7 +38,7 @@ import cn.dev33.satoken.util.SaResult;
  * Sa-Token-OAuth2 请求处理类封装
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class SaOAuth2Handle {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
index f835a4c1..fa19ee73 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
@@ -36,7 +36,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token-OAuth2 模块 代码实现
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class SaOAuth2Template {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
index ae8c493a..856900d7 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Util.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.oauth2.model.SaClientModel;
  * Sa-Token-OAuth2 模块 工具类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class SaOAuth2Util {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
index 95524c19..13e1726f 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/AccessTokenModel.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * Model: Access-Token
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class AccessTokenModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
index fdf9e338..a24a83a9 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/ClientTokenModel.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * Model: Client-Token
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class ClientTokenModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
index 9461b2a2..17f517d5 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/CodeModel.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
  * Model: 授权码
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class CodeModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
index a79ccbd4..d120a358 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RefreshTokenModel.java
@@ -21,7 +21,7 @@ import java.io.Serializable;
  * Model: Refresh-Token
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class RefreshTokenModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
index 676626d6..8c266e2e 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/RequestAuthModel.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * 请求授权参数的Model
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class RequestAuthModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
index 65ee26c2..f0a5ba3d 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/model/SaClientModel.java
@@ -24,7 +24,7 @@ import cn.dev33.satoken.oauth2.config.SaOAuth2Config;
  * Client应用信息 Model
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.23.0
  */
 public class SaClientModel implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
index 36474f96..f050c447 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickInject.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.quick.web.SaQuickController;
  * Quick-Bean 注入
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 @Configuration
 @Import({ SaQuickController.class, SaQuickRegister.class})
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
index bd3e300c..c0893618 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickManager.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * SaQuickManager，持有 SaQuickConfig 配置对象全局引用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaQuickManager {
 
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
index 66291edf..ee334337 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/SaQuickRegister.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * Quick Login 相关 Bean 注册
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 @Configuration
 public class SaQuickRegister {
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
index 04a51044..496d89f0 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/config/SaQuickConfig.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.quick.config;
  * sa-quick 配置类 Model
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaQuickConfig {
 
diff --git a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
index ed0d664e..76fdc978 100644
--- a/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
+++ b/sa-token-plugin/sa-token-quick-login/src/main/java/cn/dev33/satoken/quick/web/SaQuickController.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.util.SaResult;
  * 登录Controller，处理登录相关请求
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 @Controller
 public class SaQuickController {
diff --git a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
index c63ea73a..f2a49023 100644
--- a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
+++ b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjsonCustomized.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Fastjson 定制版 SaSession，重写类型转换API、忽略 timeout 字段的序列化
  * 
  * @author click33
- * @since 2022-10-19
+ * @since 1.34.0
  */
 public class SaSessionForFastjsonCustomized extends SaSession {
 
diff --git a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
index 0d63f49d..7207076d 100644
--- a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
+++ b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
@@ -36,7 +36,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 持久层实现 [ Redis存储、fastjson序列化 ]
  * 
  * @author sikadai
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Component
 public class SaTokenDaoRedisFastjson implements SaTokenDao {
diff --git a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
index fc2c435c..bde2c07d 100644
--- a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
+++ b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaSessionForFastjson2Customized.java
@@ -25,7 +25,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Fastjson2 定制版 SaSession，重写类型转换API、忽略 timeout 字段的序列化
  * 
  * @author click33
- * @since 2022-10-19
+ * @since 1.34.0
  */
 public class SaSessionForFastjson2Customized extends SaSession {
 
diff --git a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
index bfd859ab..2061ffb9 100644
--- a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
+++ b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
@@ -36,7 +36,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 持久层实现 [ Redis存储、fastjson2序列化 ]
  * 
  * @author sikadai
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Component
 public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
diff --git a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index 41ac4ee5..ca387336 100644
--- a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.session.SaSession;
  * Jackson 定制版 SaSession，忽略 timeout 等属性的序列化
  *  
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @JsonIgnoreProperties({"timeout"})
 public class SaSessionForJacksonCustomized extends SaSession {
diff --git a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
index 418a5809..10512e7d 100644
--- a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
+++ b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
@@ -50,7 +50,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 持久层实现 [ Redis存储、Jackson序列化 ]
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Component
 public class SaTokenDaoRedisJackson implements SaTokenDao {
diff --git a/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
index 479e7636..a91fe362 100644
--- a/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
+++ b/sa-token-plugin/sa-token-redis/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedis.java
@@ -34,7 +34,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 持久层实现 [ Redis存储、JDK默认序列化 ]
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Component
 public class SaTokenDaoRedis implements SaTokenDao {
diff --git a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
index 069c4fa1..fe56ca4f 100644
--- a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
+++ b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaSessionForJacksonCustomized.java
@@ -22,7 +22,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
  * Jackson定制版SaSession，忽略 timeout 等属性的序列化 
  *  
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @JsonIgnoreProperties({"timeout"})
 public class SaSessionForJacksonCustomized extends SaSession {
diff --git a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
index 53528926..2f954a29 100644
--- a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
+++ b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
@@ -52,7 +52,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 持久层实现  [ Redisson客户端、Redis存储、Jackson序列化 ]
  * 
  * @author 疯狂的狮子Li
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Component
 public class SaTokenDaoRedissonJackson implements SaTokenDao {
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
index 2db1f9f0..ce38d570 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaSessionForJson.java
@@ -23,7 +23,7 @@ import org.noear.snack.ONode;
  * Snack3 定制版 SaSession，重写类型转换API
  * 
  * @author noear
- * @since 1.12
+ * @since 1.34.0
  */
 public class SaSessionForJson extends SaSession {
 
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
index 477be730..430ba2f7 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedis.java
@@ -23,7 +23,7 @@ import java.util.Properties;
  * SaTokenDao 的 redis 适配
  *
  * @author noear
- * @since 1.6
+ * @since 1.34.0
  */
 public class SaTokenDaoOfRedis extends SaTokenDaoOfRedisBase64 {
 
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
index db0c18c9..410b7336 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisBase64.java
@@ -28,7 +28,7 @@ import java.util.Set;
  * SaTokenDao 的 redis 适配（可以完全精准还原所有序列化类型）
  *
  * @author noear
- * @since 1.6
+ * @since 1.34.0
  */
 public class SaTokenDaoOfRedisBase64 implements SaTokenDao {
     private final RedisBucket redisBucket;
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
index ae9a686f..90ec9e05 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
@@ -31,7 +31,7 @@ import java.util.Set;
  * SaTokenDao 的 redis 适配（基于json序列化，不能完全精准还原所有类型）
  *
  * @author noear
- * @since 1.6
+ * @since 1.34.0
  */
 public class SaTokenDaoOfRedisJson implements SaTokenDao {
     private final RedisBucket redisBucket;
diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index 209db475..d01d39a8 100644
--- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -37,7 +37,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * </p>
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 @Aspect
 @Component
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
index 91905e43..b799e133 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/config/SaSsoConfig.java
@@ -30,7 +30,7 @@ import cn.dev33.satoken.util.SaResult;
  * Sa-Token SSO 单点登录模块 配置类 Model
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaSsoConfig implements Serializable {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
index ac7d2adc..d9c88797 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoConsts.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.sso;
  * Sa-Token-SSO模块相关常量
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaSsoConsts {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
index d920463a..53f7234d 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoManager.java
@@ -21,7 +21,7 @@ import cn.dev33.satoken.config.SaSsoConfig;
  * Sa-Token-SSO 模块 总控类
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaSsoManager {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index 3bc93a70..d07df254 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.util.SaResult;
  * SSO 请求处理器 
  * 
  * @author click33
- * @since 2022-10-25
+ * @since 1.32.0
  */
 public class SaSsoProcessor {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index 11b56529..7966dd3a 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -35,7 +35,7 @@ import java.util.*;
  * Sa-Token-SSO 单点登录模块
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaSsoTemplate {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
index 7b4e8452..22685abc 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoUtil.java
@@ -23,7 +23,7 @@ import java.util.Map;
  * Sa-Token-SSO 单点登录模块 工具类
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaSsoUtil {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
index 342ce9b6..9f748ade 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/error/SaSsoErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.sso.error;
  * 定义 sa-token-sso 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-31
+ * @since 1.33.0
  */
 public interface SaSsoErrorCode {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
index 180dcc2d..a33a3453 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoException.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.exception.SaTokenException;
  * 一个异常：代表 SSO 认证流程错误 
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.30.0
  */
 public class SaSsoException extends SaTokenException {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
index 49c5782e..8d2545fb 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ApiName.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.sso.name;
  * SSO 模块所有 API 路由名称定义 
  * 
  * @author click33
- * @since 2022-10-25
+ * @since 1.32.0
  */
 public class ApiName {
 
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
index a1fc3f04..92d33323 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/name/ParamName.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.sso.name;
  * SSO 模块所有参数名称定义 
  * 
  * @author click33
- * @since 2022-10-25
+ * @since 1.32.0
  */
 public class ParamName {
 
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
index 9bb66317..93e6aa7e 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
@@ -27,7 +27,7 @@ import io.jsonwebtoken.SignatureAlgorithm;
  * jwt 相关操作工具类，封装一下
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 public class SaJwtUtil {
 	
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
index e928ee92..525529ad 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaTempForJwt.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * Sa-Token 临时令牌验证模块接口 JWT实现类，提供以 JWT 为逻辑内核的临时 token 验证功能
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.20.0
  */
 public class SaTempForJwt implements SaTempInterface {
 	
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
index 854ab523..59eb0ff3 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/error/SaTempJwtErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.temp.jwt.error;
  * 定义 sa-token-temp-jwt 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-31
+ * @since 1.33.0
  */
 public interface SaTempJwtErrorCode {
 
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 78078ba1..2056bec2 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.servlet.error;
  * 定义 sa-token-servlet 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-30
+ * @since 1.34.0
  */
 public interface SaServletErrorCode {
 	
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 1152dcfb..bd205eb4 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -32,7 +32,7 @@ import java.util.*;
  * 对 SaRequest 包装类的实现（Jakarta-Servlet 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaRequestForServlet implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index ce319766..26e390df 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -24,7 +24,7 @@ import jakarta.servlet.http.HttpServletResponse;
  * 对 SaResponse 包装类的实现（Jakarta-Servlet 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaResponseForServlet implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index d1818d2d..0e289f58 100644
--- a/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -22,7 +22,7 @@ import jakarta.servlet.http.HttpServletRequest;
  * 对 SaStorage 包装类的实现（Jakarta-Servlet 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaStorageForServlet implements SaStorage {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index 51b77473..c03ea589 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -23,7 +23,7 @@ import reactor.core.publisher.Mono;
  * Reactor 上下文操作（异步），持有当前请求的 ServerWebExchange 全局引用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaReactorHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 75a8934f..4487ab16 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.reactor.model.SaStorageForReactor;
  * Reactor上下文操作（同步），持有当前请求的 ServerWebExchange 全局引用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaReactorSyncHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index d1dd56a1..dccfffb6 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.reactor.error;
  * 定义 sa-token-reactor-spring-boot-starter 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-30
+ * @since 1.33.0
  */
 public interface SaReactorSpringBootErrorCode {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 103dd412..944487eb 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -43,7 +43,7 @@ import java.util.List;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaReactorFilter implements SaFilter, WebFilter {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index c3c936e9..c8680735 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -35,7 +35,7 @@ import java.util.Set;
  * 对 SaRequest 包装类的实现（Reactor 响应式编程版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaRequestForReactor implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index 35df5ec5..f2d8ce9f 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.context.model.SaResponse;
  * 对 SaResponse 包装类的实现（Reactor 响应式编程版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaResponseForReactor implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 44f40677..0c338123 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.model.SaStorage;
  * 对 SaStorage 包装类的实现（Reactor 响应式编程版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaStorageForReactor implements SaStorage {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index fe80f1a7..71635a1a 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.spring.SaPathMatcherHolder;
  * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] ，基于 SaTokenContextForThreadLocal 定制
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.33.0
  */
 public class SaTokenContextForSpringReactor extends SaTokenContextForThreadLocal {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index 59205759..b4cf64be 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.SaTokenContext;
  * 注册 Sa-Token 所需要的 Bean
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenContextRegister {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
index 398f6e0c..de66935e 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorHolder.java
@@ -23,7 +23,7 @@ import reactor.core.publisher.Mono;
  * Reactor 上下文操作（异步），持有当前请求的 ServerWebExchange 全局引用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaReactorHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
index 75a8934f..684a9253 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/context/SaReactorSyncHolder.java
@@ -31,7 +31,7 @@ import cn.dev33.satoken.reactor.model.SaStorageForReactor;
  * Reactor上下文操作（同步），持有当前请求的 ServerWebExchange 全局引用
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaReactorSyncHolder {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
index a442cdc2..c9e1378a 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/error/SaReactorSpringBootErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.reactor.error;
  * 定义 sa-token-reactor3-spring-boot-starter 所有异常细分状态码
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public interface SaReactorSpringBootErrorCode {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
index 23f29914..0236c343 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/filter/SaReactorFilter.java
@@ -44,7 +44,7 @@ import reactor.core.publisher.Mono;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaReactorFilter implements SaFilter, WebFilter {
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
index 9f5f0002..4a85b97b 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaRequestForReactor.java
@@ -36,7 +36,7 @@ import java.util.Set;
  * 对 SaRequest 包装类的实现（Reactor 响应式编程版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaRequestForReactor implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
index 35df5ec5..6fb5ac86 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaResponseForReactor.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.context.model.SaResponse;
  * 对 SaResponse 包装类的实现（Reactor 响应式编程版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaResponseForReactor implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
index 44f40677..55e35ea8 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/model/SaStorageForReactor.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.model.SaStorage;
  * 对 SaStorage 包装类的实现（Reactor 响应式编程版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaStorageForReactor implements SaStorage {
 
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
index fe80f1a7..3d47d3ab 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextForSpringReactor.java
@@ -22,7 +22,7 @@ import cn.dev33.satoken.spring.SaPathMatcherHolder;
  * Sa-Token 上下文处理器 [ Spring Reactor 版本实现 ] ，基于 SaTokenContextForThreadLocal 定制
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenContextForSpringReactor extends SaTokenContextForThreadLocal {
 	
diff --git a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
index cd0bc663..059ae1a5 100644
--- a/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot3-starter/src/main/java/cn/dev33/satoken/reactor/spring/SaTokenContextRegister.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.SaTokenContext;
  * 注册 Sa-Token 所需要的 Bean
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenContextRegister {
 
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
index 78078ba1..c978b0f2 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/error/SaServletErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.servlet.error;
  * 定义 sa-token-servlet 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-30
+ * @since 1.33.0
  */
 public interface SaServletErrorCode {
 	
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
index 27198d1c..d3f0d2e7 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaRequestForServlet.java
@@ -33,7 +33,7 @@ import cn.dev33.satoken.util.SaFoxUtil;
  * 对 SaRequest 包装类的实现（Servlet 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaRequestForServlet implements SaRequest {
 
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
index a324d388..12880bd5 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaResponseForServlet.java
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse;
  * 对 SaResponse 包装类的实现（Servlet 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaResponseForServlet implements SaResponse {
 
diff --git a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
index 572f1525..676ae740 100644
--- a/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
+++ b/sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/model/SaStorageForServlet.java
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
  * 对 SaStorage 包装类的实现（Servlet 版）
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaStorageForServlet implements SaStorage {
 
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
index f6a9f76c..367ca64c 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/error/SaSpringBootErrorCode.java
@@ -19,7 +19,7 @@ package cn.dev33.satoken.error;
  * 定义 sa-token-spring-boot-starter 所有异常细分状态码 
  * 
  * @author click33
- * @since 2022-10-30 
+ * @since 1.34.0
  */
 public interface SaSpringBootErrorCode {
 	
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
index cf5fdb04..61f99f01 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java
@@ -43,7 +43,7 @@ import cn.dev33.satoken.temp.SaTempInterface;
  * 注入 Sa-Token 所需要的 Bean
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaBeanInject {
 
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
index 4452d1a7..1903cfc9 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaPathMatcherHolder.java
@@ -22,7 +22,7 @@ import org.springframework.util.PathMatcher;
  * 持有 PathMatcher 全局引用，方便快捷的调用 PathMatcher 相关方法
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaPathMatcherHolder {
 	
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
index f2c4f4c8..bc21de3d 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
@@ -27,7 +27,7 @@ import java.util.Map;
  *  JSON 转换器， Jackson 版实现 
  * 
  * @author click33
- * @since 2022-4-26
+ * @since 1.34.0
  */
 public class SaJsonTemplateForJackson implements SaJsonTemplate {
 
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
index ca3fc728..54542b93 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanInject.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.oauth2.logic.SaOAuth2Util;
  * 注入 Sa-Token-OAuth2 所需要的组件
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @ConditionalOnClass(SaOAuth2Manager.class)
 public class SaOAuth2BeanInject {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
index 42257420..26ce74cb 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/oauth2/SaOAuth2BeanRegister.java
@@ -25,7 +25,7 @@ import org.springframework.context.annotation.Bean;
  * 注册 Sa-Token-OAuth2 所需要的Bean
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @ConditionalOnClass(SaOAuth2Manager.class)
 public class SaOAuth2BeanRegister {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
index 797e6747..90bc7981 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanInject.java
@@ -28,7 +28,7 @@ import cn.dev33.satoken.sso.SaSsoUtil;
  * 注入 Sa-Token-SSO 所需要的 Bean
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @ConditionalOnClass(SaSsoManager.class)
 public class SaSsoBeanInject {
diff --git a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
index 89201168..04400323 100644
--- a/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/sso/SaSsoBeanRegister.java
@@ -26,7 +26,7 @@ import cn.dev33.satoken.sso.SaSsoManager;
  * 注册 Sa-Token-SSO 所需要的 Bean
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @ConditionalOnClass(SaSsoManager.class)
 public class SaSsoBeanRegister {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index bf01c436..7cc77e38 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -43,7 +43,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaServletFilter implements SaFilter, Filter {
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 05b02d9b..c84f6787 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -31,7 +31,7 @@ import java.lang.reflect.Method;
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
  * 
  * @author click33
- * @since 2022-8-21
+ * @since 1.31.0
  */
 public class SaInterceptor implements HandlerInterceptor {
 
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
index 8c35156c..ae9fcd63 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpring.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.servlet.model.SaStorageForServlet;
  * Sa-Token 上下文处理器 [ SpringMVC版本实现 ]。在 SpringMVC、SpringBoot 中使用 Sa-Token 时，必须注入此实现类，否则会出现上下文无效异常
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SaTokenContextForSpring implements SaTokenContext {
 
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index abafe198..c380827c 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.SaTokenContext;
  * 注册 Sa-Token 框架所需要的 Bean
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenContextRegister {
 
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index b4685abe..16514c5d 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -28,7 +28,7 @@ import cn.dev33.satoken.exception.NotWebContextException;
  * SpringMVC 相关操作工具类，快速获取当前会话的 HttpServletRequest、HttpServletResponse 对象
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.19.0
  */
 public class SpringMVCUtil {
 	
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
index 57e1460a..bbfcc4f3 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaServletFilter.java
@@ -42,7 +42,7 @@ import jakarta.servlet.ServletResponse;
  * </p>
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 @Order(SaTokenConsts.ASSEMBLY_ORDER)
 public class SaServletFilter implements SaFilter, Filter {
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 12cc7320..0884a2d7 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -32,7 +32,7 @@ import jakarta.servlet.http.HttpServletResponse;
  * Sa-Token 综合拦截器，提供注解鉴权和路由拦截鉴权能力 
  * 
  * @author click33
- * @since 2022-8-21
+ * @since 1.34.0
  */
 public class SaInterceptor implements HandlerInterceptor {
 
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
index 4954a4a7..ec51de10 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextForSpringInJakartaServlet.java
@@ -27,7 +27,7 @@ import cn.dev33.satoken.servlet.model.SaStorageForServlet;
  * Sa-Token 上下文处理器 [ SpringBoot3 Jakarta Servlet 版 ]，在 SpringBoot3 中使用 Sa-Token 时，必须注入此实现类，否则会出现上下文无效异常
  * 
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SaTokenContextForSpringInJakartaServlet implements SaTokenContext {
 
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
index fd460b37..0f881a0f 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SaTokenContextRegister.java
@@ -23,7 +23,7 @@ import cn.dev33.satoken.context.SaTokenContext;
  * 注册 Sa-Token 框架所需要的 Bean
  * 
  * @author click33
- * @since 2023年1月1日
+ * @since 1.34.0
  */
 public class SaTokenContextRegister {
 
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
index 75f24607..5eacab05 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/spring/SpringMVCUtil.java
@@ -27,7 +27,7 @@ import jakarta.servlet.http.HttpServletResponse;
  * SpringMVC 相关操作工具类，快速获取当前会话的 HttpServletRequest、HttpServletResponse 对象
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.34.0
  */
 public class SpringMVCUtil {
 	

From bacdc374664c1f2731285e601e20b7bed7e5d486 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 20 May 2023 18:43:59 +0800
Subject: [PATCH 100/129] =?UTF-8?q?StpLogic=20=E7=9A=84=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E8=BD=AC=E7=A7=BB=E5=88=B0=20SaStrategy=20=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/SaManager.java |  7 ++++++
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 14 +++++++----
 .../java/cn/dev33/satoken/stp/StpUtil.java    |  2 +-
 .../cn/dev33/satoken/strategy/SaStrategy.java | 23 +++++++++++++++++++
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index dc4c75e6..5c95e69a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -285,6 +285,13 @@ public class SaManager {
 		stpLogicMap.put(stpLogic.getLoginType(), stpLogic);
 	}
 
+	/**
+	 * 在全局集合中 移除 一个 StpLogic
+	 */
+	public static void removeStpLogic(String loginType) {
+		stpLogicMap.remove(loginType);
+	}
+
 	/**
 	 * 根据 LoginType 获取对应的StpLogic，如果不存在则新建并返回 
 	 * @param loginType 对应的账号类型 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index c66c1043..76baae4f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -67,10 +67,7 @@ public class StpLogic {
 	 * @param loginType 账号类型标识
 	 */
 	public StpLogic(String loginType) {
-		this.loginType = loginType;
-
-		// 在 SaManager 中记录下此 StpLogic，以便后续根据 LoginType 进行查找此对象
-		SaManager.putStpLogic(this);
+		setLoginType(loginType);
 	}
 
 	/**
@@ -89,9 +86,16 @@ public class StpLogic {
 	 * @return 对象自身
 	 */
 	public StpLogic setLoginType(String loginType){
+
+		// 先清除此 StpLogic 在全局 SaManager 中的记录
+		if(SaFoxUtil.isNotEmpty(this.loginType)) {
+			SaManager.removeStpLogic(this.loginType);
+		}
+
+		// 赋值
 		this.loginType = loginType;
 
-		// 因为 loginType 变了，所以需要往 SaManager 中重新 put 一下
+		// 将新的 loginType -> StpLogic 映射关系 put 到 SaManager 全局集合中，以便后续根据 LoginType 进行查找此对象
 		SaManager.putStpLogic(this);
 
 		return this;
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index 2c9d398a..e0dd2310 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -40,7 +40,7 @@ public class StpUtil {
 	/**
 	 * 底层使用的 StpLogic 对象
 	 */
-	public static StpLogic stpLogic = new StpLogic(TYPE); 
+	public static StpLogic stpLogic = SaManager.getStpLogic(TYPE);
 
 	/**
 	 * 获取当前 StpLogic 的账号类型
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 708c0c8e..8e89b64a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -21,6 +21,7 @@ import cn.dev33.satoken.basic.SaBasicUtil;
 import cn.dev33.satoken.exception.SaTokenException;
 import cn.dev33.satoken.fun.SaGenerateUniqueTokenFunction;
 import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 
@@ -240,6 +241,15 @@ public final class SaStrategy {
 		}
 	};
 
+	/**
+	 * 创建 StpLogic 的算法
+	 *
+	 * <p> 参数 [ 账号体系标识 ]
+	 */
+	public Function<String, StpLogic> createStpLogic = (loginType) -> {
+		return new StpLogic(loginType);
+	};
+
 
 	// ----------------------- 重写策略 set连缀风格
 
@@ -332,4 +342,17 @@ public final class SaStrategy {
 		return this;
 	}
 
+	/**
+	 * 创建 StpLogic 的算法
+	 *
+	 * <p> 参数 [ 账号体系标识 ]
+	 *
+	 * @param createStpLogic /
+	 * @return 对象自身
+	 */
+	public SaStrategy setCreateStpLogic(Function<String, StpLogic> createStpLogic) {
+		this.createStpLogic = createStpLogic;
+		return this;
+	}
+
 }

From fe4a5e100b044a6079378720d65ccc269288a265 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 21 May 2023 06:54:31 +0800
Subject: [PATCH 101/129] ...

---
 sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index bdf499b4..0b478b3b 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -40,7 +40,7 @@ public class StpUtil {
 	/**
 	 * 底层使用的 StpLogic 对象
 	 */
-	public static StpLogic stpLogic = SaManager.getStpLogic(TYPE);
+	public static StpLogic stpLogic = new StpLogic(TYPE);
 
 	/**
 	 * 获取当前 StpLogic 的账号类型

From 3e293ca5e0098fa799d39925a0d0053f67d9edc8 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sun, 21 May 2023 06:54:45 +0800
Subject: [PATCH 102/129] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/plugin/api-sign.md | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/sa-token-doc/plugin/api-sign.md b/sa-token-doc/plugin/api-sign.md
index 21cfd42c..375fbe8d 100644
--- a/sa-token-doc/plugin/api-sign.md
+++ b/sa-token-doc/plugin/api-sign.md
@@ -47,7 +47,7 @@ public SaResult addMoney(long userId, long money) {
 ``` java
 long userId = 10001;
 long money = 1000;
-String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money);
+String res = HttpUtil.request("http://b.com/api/addMoney?userId=" + userId + "&money=" + money);
 ```
 
 上述代码简单的完成了需求，但是很明显它有一个安全问题：
@@ -82,7 +82,7 @@ public SaResult addMoney(long userId, long money, String secretKey) {
 long userId = 10001;
 long money = 1000;
 String secretKey = "xxxxxxxxxxxxxxxxxxxx";
-String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money + "&secretKey=" + secretKey);
+String res = HttpUtil.request("http://b.com/api/addMoney?userId=" + userId + "&money=" + money + "&secretKey=" + secretKey);
 ```
 
 现在，即使 B 系统的接口被暴露了，也不会被陌生人任意调用了，安全性得到了一定的保证，但是仍然存在一些问题：
@@ -103,10 +103,10 @@ long money = 1000;
 String secretKey = "xxxxxxxxxxxxxxxxxxxx";
 
 // 计算 sign 参数
-String sign = md5("userId=" + userId + "&money=" + money + "&key=" + secretKey);
+String sign = md5("money=" + money + "&userId=" + userId + "&key=" + secretKey);
 
 // 将 sign 拼接在请求地址后面
-String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money + "&sign=" + sign);
+String res = HttpUtil.request("http://b.com/api/addMoney?userId=" + userId + "&money=" + money + "&sign=" + sign);
 ```
 
 **注意此处计算签名时，需要将所有参数按照字典顺序依次排列（key除外，挂在最后面）。**以下所有计算签名时同理，不再赘述。
@@ -120,7 +120,7 @@ String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&m
 public SaResult addMoney(long userId, long money, String sign) {
 
 	// 在 B 系统，使用同样的算法、同样的密钥，计算出 sign2，与传入的 sign 进行比对
-	String sign2 = md5("userId=" + userId + "&money=" + money + "&key=" + secretKey);
+	String sign2 = md5("money=" + money + "&userId=" + userId + "&key=" + secretKey);
 	if( ! sign2.equals(sign)) {
 		return SaResult.error("无效 sign，无法响应请求");
 	}
@@ -159,10 +159,10 @@ String nonce = SaFoxUtil.getRandomString(32); // 随机32位字符串
 String secretKey = "xxxxxxxxxxxxxxxxxxxx";
 
 // 计算 sign 参数
-String sign = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&key=" + secretKey);
+String sign = md5("money=" + money + "&nonce=" + nonce + "&userId=" + userId + "&key=" + secretKey);
 
 // 将 sign 拼接在请求地址后面
-String res = HttpUtil.request("http://a.com/api/addMoney?userId=" + userId + "&money=" + money + "nonce=" + nonce + "&sign=" + sign);
+String res = HttpUtil.request("http://b.com/api/addMoney?userId=" + userId + "&money=" + money + "nonce=" + nonce + "&sign=" + sign);
 ```
 
 然后在 B 系统接收请求时，也把 nonce 参数加进去生成 sign 字符串，进行比较：
@@ -178,7 +178,7 @@ public SaResult addMoney(long userId, long money, String nonce, String sign) {
 	}
 
 	// 2、验证签名
-	String sign2 = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&key=" + secretKey);
+	String sign2 = md5("money=" + money + "&nonce=" + nonce + "&userId=" + userId + "&key=" + secretKey);
 	if( ! sign2.equals(sign)) {
 		return SaResult.error("无效 sign，无法响应请求");
 	}
@@ -226,10 +226,10 @@ long timestamp = System.currentTimeMillis(); // 随机32位字符串
 String secretKey = "xxxxxxxxxxxxxxxxxxxx";
 
 // 计算 sign 参数
-String sign = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&key=" + secretKey);
+String sign = md5("money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&userId=" + userId + "&key=" + secretKey);
 
 // 将 sign 拼接在请求地址后面
-String res = HttpUtil.request("http://a.com/api/addMoney" +
+String res = HttpUtil.request("http://b.com/api/addMoney" +
 		"?userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&sign=" + sign);
 ```
 
@@ -333,10 +333,10 @@ long timestamp = System.currentTimeMillis(); // 当前时间戳
 String secretKey = "xxxxxxxxxxxxxxxxxxxx";
 
 // 计算 sign 参数
-String sign = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&key=" + secretKey);
+String sign = md5("money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&userId=" + userId + "&key=" + secretKey);
 
 // 将 sign 拼接在请求地址后面
-String res = HttpUtil.request("http://a.com/api/addMoney" +
+String res = HttpUtil.request("http://b.com/api/addMoney" +
 		"?userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&sign=" + sign);
 ```
 
@@ -360,7 +360,7 @@ public SaResult addMoney(long userId, long money, long timestamp, String nonce,
 	}
 
 	// 3、验证签名
-	String sign2 = md5("userId=" + userId + "&money=" + money + "&nonce=" + nonce + "&key=" + secretKey);
+	String sign2 = md5("money=" + money + "&nonce=" + nonce + "&timestamp=" + timestamp + "&userId=" + userId + "&key=" + secretKey);
 	if( ! sign2.equals(sign)) {
 		return SaResult.error("无效 sign，无法响应请求");
 	}
@@ -423,7 +423,7 @@ sa-token:
 
 ``` java
 // 请求地址
-String url = "http://a.com/api/addMoney";
+String url = "http://b.com/api/addMoney";
 
 // 请求参数
 Map<String, Object> paramMap = new LinkedHashMap<>();

From 4496242626946fa17ccfce8b9983a7e812ca0a63 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 22 May 2023 02:23:29 +0800
Subject: [PATCH 103/129] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=20StpLogic=20=E6=97=B6=E4=B8=8D=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=9C=A8=E5=85=A8=E5=B1=80=20SaManager=20=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java  | 5 ++---
 .../src/main/java/com/pj/satoken/StpUserUtil.java            | 2 +-
 .../src/main/java/com/pj/SaTokenApplication.java             | 2 +-
 .../src/main/java/com/pj/satoken/StpUserUtil.java            | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index 2b5f66f6..c930197c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -35,6 +35,7 @@ import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpInterfaceDefaultImpl;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.temp.SaTempDefaultImpl;
 import cn.dev33.satoken.temp.SaTempInterface;
 import cn.dev33.satoken.util.SaFoxUtil;
@@ -322,9 +323,7 @@ public class SaManager {
 				synchronized (SaManager.class) {
 					stpLogic = stpLogicMap.get(loginType);
 					if(stpLogic == null) {
-						stpLogic = new StpLogic(loginType);
-						// 此处无需手动put，因为 StpLogic 构造方法中会自动put 
-						// putStpLogic(stpLogic); 
+						stpLogic = SaStrategy.me.createStpLogic.apply(loginType);
 					}
 				}
 			} 
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
index 23640c1c..d90cc967 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -23,7 +23,7 @@ public class StpUserUtil {
 	/**
 	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "login";
+	public static final String TYPE = "user";
 
 	/**
 	 * 底层使用的 StpLogic 对象
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
index 08eaed43..90c20522 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
@@ -14,7 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class SaTokenApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(SaTokenApplication.class, args); 
+		SpringApplication.run(SaTokenApplication.class, args);
 		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
 	}
 
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
index 23640c1c..d90cc967 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -23,7 +23,7 @@ public class StpUserUtil {
 	/**
 	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "login";
+	public static final String TYPE = "user";
 
 	/**
 	 * 底层使用的 StpLogic 对象

From 4cf317818bf91f7ef571bca73e7e094e35195b8e Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 23 May 2023 05:01:16 +0800
Subject: [PATCH 104/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20SaCheckOr=20?=
 =?UTF-8?q?=E6=B3=A8=E8=A7=A3=EF=BC=8C=E6=89=B9=E9=87=8F=E6=B3=A8=E8=A7=A3?=
 =?UTF-8?q?=E9=89=B4=E6=9D=83=EF=BC=9A=E5=8F=AA=E8=A6=81=E6=BB=A1=E8=B6=B3?=
 =?UTF-8?q?=E5=85=B6=E4=B8=AD=E4=B8=80=E4=B8=AA=E6=B3=A8=E8=A7=A3=E5=8D=B3?=
 =?UTF-8?q?=E5=8F=AF=E9=80=9A=E8=BF=87=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/SaManager.java |   2 +-
 .../dev33/satoken/annotation/SaCheckOr.java   |  77 ++++++++++
 .../satoken/session/SaSessionCustomUtil.java  |   2 +-
 .../java/cn/dev33/satoken/stp/StpLogic.java   |  14 +-
 .../cn/dev33/satoken/strategy/SaStrategy.java | 138 ++++++++++++++++--
 .../dev33/satoken/temp/SaTempInterface.java   |   2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |   2 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |   2 +
 .../main/java/com/pj/satoken/StpUserUtil.java |   2 +
 .../main/java/com/pj/test/TestController.java |   5 +-
 .../oauth2/logic/SaOAuth2Template.java        |   2 +-
 .../satoken/dao/SaTokenDaoRedisFastjson.java  |   2 +-
 .../satoken/dao/SaTokenDaoRedisFastjson2.java |   2 +-
 .../satoken/dao/SaTokenDaoRedisJackson.java   |   2 +-
 .../dao/SaTokenDaoRedissonJackson.java        |   2 +-
 .../satoken/dao/SaTokenDaoOfRedisJson.java    |   2 +-
 .../cn/dev33/satoken/aop/SaCheckAspect.java   |   4 +-
 .../cn/dev33/satoken/sso/SaSsoTemplate.java   |   2 +-
 .../jboot/SaAnnotationInterceptor.java        |   2 +-
 .../jfinal/SaAnnotationInterceptor.java       |   2 +-
 .../solon/dao/SaTokenDaoOfRedisJson.java      |   2 +-
 .../solon/integration/SaTokenFilter.java      |   4 +-
 .../solon/integration/SaTokenInterceptor.java |   4 +-
 .../satoken/interceptor/SaInterceptor.java    |   4 +-
 .../satoken/interceptor/SaInterceptor.java    |   4 +-
 25 files changed, 241 insertions(+), 45 deletions(-)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
index c930197c..ee1f552e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/SaManager.java
@@ -323,7 +323,7 @@ public class SaManager {
 				synchronized (SaManager.class) {
 					stpLogic = stpLogicMap.get(loginType);
 					if(stpLogic == null) {
-						stpLogic = SaStrategy.me.createStpLogic.apply(loginType);
+						stpLogic = SaStrategy.instance.createStpLogic.apply(loginType);
 					}
 				}
 			} 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java
new file mode 100644
index 00000000..e9cef129
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * 批量注解鉴权：只要满足其中一个注解即可通过验证
+ *
+ * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
+ *
+ * @author kong
+ * @since 1.35.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.TYPE })
+public @interface SaCheckOr {
+
+    /**
+     * 设定 @SaCheckLogin，参考 {@link SaCheckLogin}
+     *
+     * @return /
+     */
+    SaCheckLogin[] login() default {};
+
+    /**
+     * 设定 @SaCheckPermission，参考 {@link SaCheckPermission}
+     *
+     * @return /
+     */
+    SaCheckPermission[] permission() default {};
+
+    /**
+     * 设定 @SaCheckRole，参考 {@link SaCheckRole}
+     *
+     * @return /
+     */
+    SaCheckRole[] role() default {};
+
+    /**
+     * 设定 @SaCheckSafe，参考 {@link SaCheckSafe}
+     *
+     * @return /
+     */
+    SaCheckSafe[] safe() default {};
+
+    /**
+     * 设定 @SaCheckBasic，参考 {@link SaCheckBasic}
+     *
+     * @return /
+     */
+    SaCheckBasic[] basic() default {};
+
+    /**
+     * 设定 @SaCheckDisable，参考 {@link SaCheckDisable}
+     *
+     * @return /
+     */
+    SaCheckDisable[] disable() default {};
+
+}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
index e38f23fa..eaa6834e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSessionCustomUtil.java
@@ -77,7 +77,7 @@ public class SaSessionCustomUtil {
 	public static SaSession getSessionById(String sessionId, boolean isCreate) {
 		SaSession session = SaManager.getSaTokenDao().getSession(splicingSessionKey(sessionId));
 		if (session == null && isCreate) {
-			session = SaStrategy.me.createSession.apply(splicingSessionKey(sessionId));
+			session = SaStrategy.instance.createSession.apply(splicingSessionKey(sessionId));
 			session.setType(SaTokenConsts.SESSION_TYPE__CUSTOM);
 			SaManager.getSaTokenDao().setSession(session, SaManager.getConfig().getTimeout());		
 		}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 6825ede2..9c8bd942 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -123,7 +123,7 @@ public class StpLogic {
 	 * @return 生成的tokenValue
 	 */
 	public String createTokenValue(Object loginId, String device, long timeout, Map<String, Object> extraData) {
-		return SaStrategy.me.createToken.apply(loginId, loginType);
+		return SaStrategy.instance.createToken.apply(loginId, loginType);
 	}
 
  	/**
@@ -501,7 +501,7 @@ public class StpLogic {
 		}
 		
 		// 4、如果代码走到此处，说明未能成功复用旧 token，需要根据算法新建 token
-		return SaStrategy.me.generateUniqueToken.execute(
+		return SaStrategy.instance.generateUniqueToken.execute(
 				"token",
 				getConfigOfMaxTryTimes(),
 				() -> {
@@ -1096,7 +1096,7 @@ public class StpLogic {
 
 		if(session == null && isCreate) {
 			// 创建这个 SaSession
-			session = SaStrategy.me.createSession.apply(sessionId);
+			session = SaStrategy.instance.createSession.apply(sessionId);
 
 			// 追加操作
 			if(appendOperation != null) {
@@ -1268,7 +1268,7 @@ public class StpLogic {
 		 */
 		if(isCreate) {
 			// 随机创建一个 Token
-			tokenValue = SaStrategy.me.generateUniqueToken.execute(
+			tokenValue = SaStrategy.instance.generateUniqueToken.execute(
 					"token",
 					getConfigOfMaxTryTimes(),
 					() -> {
@@ -2099,8 +2099,8 @@ public class StpLogic {
 			this.checkDisableLevel(loginId, service, at.level());
 		}
 	}
-	
-	
+
+
 	// ------------------- 账号封禁 -------------------  
 
 	/**
@@ -2715,7 +2715,7 @@ public class StpLogic {
 	 * @return /
 	 */
 	public boolean hasElement(List<String> list, String element) {
-		return SaStrategy.me.hasElement.apply(list, element);
+		return SaStrategy.instance.hasElement.apply(list, element);
 	}
 
 	/**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 2e8bf156..4b50b86e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -28,6 +28,7 @@ import cn.dev33.satoken.util.SaTokenConsts;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.BiFunction;
@@ -58,7 +59,8 @@ public final class SaStrategy {
 	/**
 	 * 获取 SaStrategy 对象的单例引用 
 	 */
-	public static final SaStrategy me = new SaStrategy();
+	public static final SaStrategy instance = new SaStrategy();
+
 
 	// ----------------------- 所有策略
 	
@@ -145,10 +147,10 @@ public final class SaStrategy {
 	public Consumer<Method> checkMethodAnnotation = (method) -> {
 
 		// 先校验 Method 所属 Class 上的注解 
-		me.checkElementAnnotation.accept(method.getDeclaringClass());
+		instance.checkElementAnnotation.accept(method.getDeclaringClass());
 
 		// 再校验 Method 上的注解  
-		me.checkElementAnnotation.accept(method);
+		instance.checkElementAnnotation.accept(method);
 	};
 
 	/**
@@ -156,41 +158,135 @@ public final class SaStrategy {
 	 * <p> 参数 [element元素] 
 	 */
 	public Consumer<AnnotatedElement> checkElementAnnotation = (target) -> {
+
 		// 校验 @SaCheckLogin 注解 
-		SaCheckLogin checkLogin = (SaCheckLogin) SaStrategy.me.getAnnotation.apply(target, SaCheckLogin.class);
+		SaCheckLogin checkLogin = (SaCheckLogin) SaStrategy.instance.getAnnotation.apply(target, SaCheckLogin.class);
 		if(checkLogin != null) {
 			SaManager.getStpLogic(checkLogin.type(), false).checkByAnnotation(checkLogin);
 		}
 		
 		// 校验 @SaCheckRole 注解 
-		SaCheckRole checkRole = (SaCheckRole) SaStrategy.me.getAnnotation.apply(target, SaCheckRole.class);
+		SaCheckRole checkRole = (SaCheckRole) SaStrategy.instance.getAnnotation.apply(target, SaCheckRole.class);
 		if(checkRole != null) {
 			SaManager.getStpLogic(checkRole.type(), false).checkByAnnotation(checkRole);
 		}
 		
 		// 校验 @SaCheckPermission 注解
-		SaCheckPermission checkPermission = (SaCheckPermission) SaStrategy.me.getAnnotation.apply(target, SaCheckPermission.class);
+		SaCheckPermission checkPermission = (SaCheckPermission) SaStrategy.instance.getAnnotation.apply(target, SaCheckPermission.class);
 		if(checkPermission != null) {
 			SaManager.getStpLogic(checkPermission.type(), false).checkByAnnotation(checkPermission);
 		}
 
 		// 校验 @SaCheckSafe 注解
-		SaCheckSafe checkSafe = (SaCheckSafe) SaStrategy.me.getAnnotation.apply(target, SaCheckSafe.class);
+		SaCheckSafe checkSafe = (SaCheckSafe) SaStrategy.instance.getAnnotation.apply(target, SaCheckSafe.class);
 		if(checkSafe != null) {
 			SaManager.getStpLogic(checkSafe.type(), false).checkByAnnotation(checkSafe);
 		}
 
 		// 校验 @SaCheckDisable 注解
-		SaCheckDisable checkDisable = (SaCheckDisable) SaStrategy.me.getAnnotation.apply(target, SaCheckDisable.class);
+		SaCheckDisable checkDisable = (SaCheckDisable) SaStrategy.instance.getAnnotation.apply(target, SaCheckDisable.class);
 		if(checkDisable != null) {
 			SaManager.getStpLogic(checkDisable.type(), false).checkByAnnotation(checkDisable);
 		}
 		
 		// 校验 @SaCheckBasic 注解
-		SaCheckBasic checkBasic = (SaCheckBasic) SaStrategy.me.getAnnotation.apply(target, SaCheckBasic.class);
+		SaCheckBasic checkBasic = (SaCheckBasic) SaStrategy.instance.getAnnotation.apply(target, SaCheckBasic.class);
 		if(checkBasic != null) {
 			SaBasicUtil.check(checkBasic.realm(), checkBasic.account());
 		}
+
+		// 校验 @SaCheckOr 注解
+		SaCheckOr checkOr = (SaCheckOr) SaStrategy.instance.getAnnotation.apply(target, SaCheckOr.class);
+		if(checkOr != null) {
+			SaStrategy.instance.checkOrAnnotation.accept(checkOr);
+		}
+	};
+
+	/**
+	 * 对一个 @SaCheckOr 进行注解校验
+	 * <p> 参数 [SaCheckOr 注解的实例]
+	 */
+	public Consumer<SaCheckOr> checkOrAnnotation = (at) -> {
+
+		// 记录校验过程中所有的异常
+		List<SaTokenException> errorList = new ArrayList<>();
+
+		// 逐个开始校验 >>>
+
+		// 1、校验注解：@SaCheckLogin
+		SaCheckLogin[] checkLoginArray = at.login();
+		for (SaCheckLogin item : checkLoginArray) {
+			try {
+				SaManager.getStpLogic(item.type(), false).checkByAnnotation(item);
+				return;
+			} catch (SaTokenException e) {
+				errorList.add(e);
+			}
+		}
+
+		// 2、校验注解：@SaCheckRole
+		SaCheckRole[] checkRoleArray = at.role();
+		for (SaCheckRole item : checkRoleArray) {
+			try {
+				SaManager.getStpLogic(item.type(), false).checkByAnnotation(item);
+				return;
+			} catch (SaTokenException e) {
+				errorList.add(e);
+			}
+		}
+
+		// 3、校验注解：@SaCheckPermission
+		SaCheckPermission[] checkPermissionArray = at.permission();
+		for (SaCheckPermission item : checkPermissionArray) {
+			try {
+				SaManager.getStpLogic(item.type(), false).checkByAnnotation(item);
+				return;
+			} catch (SaTokenException e) {
+				errorList.add(e);
+			}
+		}
+
+		// 4、校验注解：@SaCheckSafe
+		SaCheckSafe[] checkSafeArray = at.safe();
+		for (SaCheckSafe item : checkSafeArray) {
+			try {
+				SaManager.getStpLogic(item.type(), false).checkByAnnotation(item);
+				return;
+			} catch (SaTokenException e) {
+				errorList.add(e);
+			}
+		}
+
+		// 5、校验注解：@SaCheckDisable
+		SaCheckDisable[] checkDisableArray = at.disable();
+		for (SaCheckDisable item : checkDisableArray) {
+			try {
+				SaManager.getStpLogic(item.type(), false).checkByAnnotation(item);
+				return;
+			} catch (SaTokenException e) {
+				errorList.add(e);
+			}
+		}
+
+		// 6、校验注解：@SaCheckBasic
+		SaCheckBasic[] checkBasicArray = at.basic();
+		for (SaCheckBasic item : checkBasicArray) {
+			try {
+				SaBasicUtil.check(item.realm(), item.account());
+				return;
+			} catch (SaTokenException e) {
+				errorList.add(e);
+			}
+		}
+
+		// 如果执行到这里，有两种可能：
+		//		可能 1. SaCheckOr 注解上不包含任何注解校验，此时 errorList 里面一个异常都没有，我们直接跳过即可
+		//		可能 2. 所有注解校验都通过不了，此时 errorList 里面会有多个异常，我们随便抛出一个即可
+		if(errorList.size() == 0) {
+			// return;
+		} else {
+			throw errorList.get(0);
+		}
 	};
 
 	/**
@@ -207,8 +303,8 @@ public final class SaStrategy {
 	 * <p> 参数 [Method, 注解] 
 	 */
 	public BiFunction<Method, Class<? extends Annotation>, Boolean> isAnnotationPresent = (method, annotationClass) -> {
-		return me.getAnnotation.apply(method, annotationClass) != null ||
-				me.getAnnotation.apply(method.getDeclaringClass(), annotationClass) != null;
+		return instance.getAnnotation.apply(method, annotationClass) != null ||
+				instance.getAnnotation.apply(method.getDeclaringClass(), annotationClass) != null;
 	};
 
 	/**
@@ -308,6 +404,18 @@ public final class SaStrategy {
 		return this;
 	}
 
+	/**
+	 * 对一个 @SaCheckOr 进行注解校验
+	 * <p> 参数 [SaCheckOr 注解的实例]
+	 *
+	 * @param checkOrAnnotation /
+	 * @return 对象自身
+	 */
+	public SaStrategy setCheckOrAnnotation(Consumer<SaCheckOr> checkOrAnnotation) {
+		this.checkOrAnnotation = checkOrAnnotation;
+		return this;
+	}
+
 	/**
 	 * 从元素上获取注解  
 	 * <p> 参数 [element元素，要获取的注解类型] 
@@ -355,4 +463,12 @@ public final class SaStrategy {
 		return this;
 	}
 
+	//
+
+	/**
+	 * 请更换为 instance
+	 */
+	@Deprecated
+	public static final SaStrategy me = instance;
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
index c8e22eb1..0c081e54 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/temp/SaTempInterface.java
@@ -54,7 +54,7 @@ public interface SaTempInterface {
 	default String createToken(String service, Object value, long timeout) {
 		
 		// 生成 token 
-		String token = SaStrategy.me.createToken.apply(null, null);
+		String token = SaStrategy.instance.createToken.apply(null, null);
 		
 		// 持久化映射关系 
 		String key = splicingKeyTempToken(service, token);
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 537c32c5..c5c9f7a5 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -117,7 +117,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
     @Autowired
     public void rewriteSaStrategy() {
     	// 重写Sa-Token的注解处理器，增加注解合并功能 
-    	SaStrategy.me.getAnnotation = (element, annotationClass) -> {
+    	SaStrategy.instance.getAnnotation = (element, annotationClass) -> {
     		return AnnotatedElementUtils.getMergedAnnotation(element, annotationClass); 
     	};
     }
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
index d90cc967..9f526a9b 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author click33
  * @since <= 1.34.0
  */
+@Component
 public class StpUserUtil {
 
 	private StpUserUtil() {}
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
index d90cc967..9f526a9b 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -7,6 +7,7 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
+import org.springframework.stereotype.Component;
 
 import java.util.List;
 
@@ -16,6 +17,7 @@ import java.util.List;
  * @author click33
  * @since <= 1.34.0
  */
+@Component
 public class StpUserUtil {
 
 	private StpUserUtil() {}
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index 9c682c0e..6f977767 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -1,7 +1,7 @@
 package com.pj.test;
 
-import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
+import com.pj.satoken.StpUserUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,7 +18,7 @@ public class TestController {
 	// 测试登录  ---- http://localhost:8081/test/login
 	@RequestMapping("login")
 	public SaResult login(@RequestParam(defaultValue = "10001") long id) {
-		StpUtil.login(id);
+		StpUserUtil.login(id);
 		return SaResult.ok("登录成功");
 	}
 	
@@ -26,7 +26,6 @@ public class TestController {
 	@RequestMapping("test")
 	public SaResult test() {
 		System.out.println("------------进来了");
-		StpUtil.getExtra("name");
 		// 返回
 		return SaResult.data("");
 	}
diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
index fa19ee73..3ec864d3 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/logic/SaOAuth2Template.java
@@ -398,7 +398,7 @@ public class SaOAuth2Template {
 
 		// 3、是否在[允许地址列表]之中
 		List<String> allowList = SaFoxUtil.convertStringToList(checkClientModel(clientId).allowUrl);
-		if( ! SaStrategy.me.hasElement.apply(allowList, url)) {
+		if( ! SaStrategy.instance.hasElement.apply(allowList, url)) {
 			throw new SaOAuth2Exception("非法redirect_url：" + url).setCode(SaOAuth2ErrorCode.CODE_30114);
 		}
 	}
diff --git a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
index 7207076d..bd999f8c 100644
--- a/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
+++ b/sa-token-plugin/sa-token-redis-fastjson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson.java
@@ -64,7 +64,7 @@ public class SaTokenDaoRedisFastjson implements SaTokenDao {
 		}
 
 		// 重写 SaSession 生成策略 
-		SaStrategy.me.createSession = (sessionId) -> new SaSessionForFastjsonCustomized(sessionId);
+		SaStrategy.instance.createSession = (sessionId) -> new SaSessionForFastjsonCustomized(sessionId);
 		
 		// 指定相应的序列化方案 
 		StringRedisSerializer keySerializer = new StringRedisSerializer();
diff --git a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
index 2061ffb9..e53944db 100644
--- a/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
+++ b/sa-token-plugin/sa-token-redis-fastjson2/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisFastjson2.java
@@ -64,7 +64,7 @@ public class SaTokenDaoRedisFastjson2 implements SaTokenDao {
 		}
 
 		// 重写 SaSession 生成策略 
-		SaStrategy.me.createSession = (sessionId) -> new SaSessionForFastjson2Customized(sessionId);
+		SaStrategy.instance.createSession = (sessionId) -> new SaSessionForFastjson2Customized(sessionId);
 		
 		// 指定相应的序列化方案 
 		StringRedisSerializer keySerializer = new StringRedisSerializer();
diff --git a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
index 10512e7d..83ca2383 100644
--- a/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
+++ b/sa-token-plugin/sa-token-redis-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedisJackson.java
@@ -127,7 +127,7 @@ public class SaTokenDaoRedisJackson implements SaTokenDao {
 			this.objectMapper.registerModule(timeModule);
 
 			// 重写 SaSession 生成策略 
-			SaStrategy.me.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId);
+			SaStrategy.instance.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId);
 		} catch (Exception e) {
 			System.err.println(e.getMessage());
 		}
diff --git a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
index 2f954a29..00e68a72 100644
--- a/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
+++ b/sa-token-plugin/sa-token-redisson-jackson/src/main/java/cn/dev33/satoken/dao/SaTokenDaoRedissonJackson.java
@@ -120,7 +120,7 @@ public class SaTokenDaoRedissonJackson implements SaTokenDao {
 			timeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(TIME_FORMATTER));
 			this.objectMapper.registerModule(timeModule);
 			// 重写 SaSession 生成策略
-			SaStrategy.me.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId);
+			SaStrategy.instance.createSession = (sessionId) -> new SaSessionForJacksonCustomized(sessionId);
 		} catch (Exception e) {
 			System.err.println(e.getMessage());
 		}
diff --git a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
index 90ec9e05..525bd81e 100644
--- a/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-plugin/sa-token-redisx/src/main/java/cn/dev33/satoken/dao/SaTokenDaoOfRedisJson.java
@@ -44,7 +44,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
         redisBucket = redisClient.getBucket();
 
         // 重写 SaSession 生成策略
-        SaStrategy.me.createSession = (sessionId) -> new SaSessionForJson(sessionId);
+        SaStrategy.instance.createSession = (sessionId) -> new SaSessionForJson(sessionId);
 
     }
 
diff --git a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
index d01d39a8..b2d7d074 100644
--- a/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
+++ b/sa-token-plugin/sa-token-spring-aop/src/main/java/cn/dev33/satoken/aop/SaCheckAspect.java
@@ -83,11 +83,11 @@ public class SaCheckAspect {
 		Method method = signature.getMethod();
 		
 		// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权 
-		if(SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+		if(SaStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
 			// ... 
 		} else {
 			// 注解鉴权 
-			SaStrategy.me.checkMethodAnnotation.accept(method);
+			SaStrategy.instance.checkMethodAnnotation.accept(method);
 		}
 
 		// 执行原有逻辑
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index 7966dd3a..e9afff6c 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -283,7 +283,7 @@ public class SaSsoTemplate {
 		
 		// 3、是否在[允许地址列表]之中 
 		List<String> authUrlList = Arrays.asList(getAllowUrl().replaceAll(" ", "").split(",")); 
-		if( ! SaStrategy.me.hasElement.apply(authUrlList, url) ) {
+		if( ! SaStrategy.instance.hasElement.apply(authUrlList, url) ) {
 			throw new SaSsoException("非法redirect：" + url).setCode(SaSsoErrorCode.CODE_30002);
 		}
 		
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java
index 10df8d2a..4b5185d0 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/main/java/cn/dev33/satoken/jboot/SaAnnotationInterceptor.java
@@ -25,7 +25,7 @@ import com.jfinal.aop.Invocation;
 public class SaAnnotationInterceptor implements Interceptor {
     @Override
     public void intercept(Invocation invocation) {
-        SaStrategy.me.checkMethodAnnotation.accept((invocation.getMethod()));
+        SaStrategy.instance.checkMethodAnnotation.accept((invocation.getMethod()));
         invocation.invoke();
     }
 }
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java
index 129e36f4..39f79cd5 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/main/java/cn/dev33/satoken/jfinal/SaAnnotationInterceptor.java
@@ -25,7 +25,7 @@ import com.jfinal.aop.Invocation;
 public class SaAnnotationInterceptor implements Interceptor {
     @Override
     public void intercept(Invocation invocation) {
-        SaStrategy.me.checkMethodAnnotation.accept((invocation.getMethod()));
+        SaStrategy.instance.checkMethodAnnotation.accept((invocation.getMethod()));
         invocation.invoke();
     }
 }
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
index 771ddb9c..0d3c0c97 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/dao/SaTokenDaoOfRedisJson.java
@@ -45,7 +45,7 @@ public class SaTokenDaoOfRedisJson implements SaTokenDao {
         redisBucket = redisClient.getBucket();
 
         // 重写 SaSession 生成策略
-        SaStrategy.me.createSession = (sessionId) -> new SaSessionForJson(sessionId);
+        SaStrategy.instance.createSession = (sessionId) -> new SaSessionForJson(sessionId);
 
     }
 
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
index 1b811220..e419e2e7 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenFilter.java
@@ -181,12 +181,12 @@ public class SaTokenFilter implements SaFilter, Filter { //之所以改名，为
 			Method method = action.method().getMethod();
 
 			// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
-			if (SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+			if (SaStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
 				return false;
 			}
 
 			// 注解校验
-			SaStrategy.me.checkMethodAnnotation.accept(method);
+			SaStrategy.instance.checkMethodAnnotation.accept(method);
 		}
 
 		return true;
diff --git a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
index 7b170ac5..aee75b60 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
+++ b/sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenInterceptor.java
@@ -230,12 +230,12 @@ public class SaTokenInterceptor implements RouterInterceptor {
 			Method method = action.method().getMethod();
 
 			// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
-			if (SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+			if (SaStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
 				return false;
 			}
 
 			// 注解校验
-			SaStrategy.me.checkMethodAnnotation.accept(method);
+			SaStrategy.instance.checkMethodAnnotation.accept(method);
 		}
 
 		return true;
diff --git a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index c84f6787..78840ddd 100644
--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -100,13 +100,13 @@ public class SaInterceptor implements HandlerInterceptor {
 				Method method = ((HandlerMethod) handler).getMethod();
 
 				// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权
-				if(SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+				if(SaStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
 					// 注意这里直接就退出整个鉴权了，最底部的 auth.run() 路由拦截鉴权也被跳出了
 					return true;
 				}
 
 				// 执行注解鉴权
-				SaStrategy.me.checkMethodAnnotation.accept(method);
+				SaStrategy.instance.checkMethodAnnotation.accept(method);
 			}
 			
 			// Auth 路由拦截鉴权校验
diff --git a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
index 0884a2d7..e6c0fc13 100644
--- a/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
+++ b/sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/interceptor/SaInterceptor.java
@@ -101,13 +101,13 @@ public class SaInterceptor implements HandlerInterceptor {
 				Method method = ((HandlerMethod) handler).getMethod();
 
 				// 如果此 Method 或其所属 Class 标注了 @SaIgnore，则忽略掉鉴权 
-				if(SaStrategy.me.isAnnotationPresent.apply(method, SaIgnore.class)) {
+				if(SaStrategy.instance.isAnnotationPresent.apply(method, SaIgnore.class)) {
 					// 注意这里直接就退出整个鉴权了，最底部的 auth.run() 路由拦截鉴权也被跳出了
 					return true;
 				}
 
 				// 注解校验 
-				SaStrategy.me.checkMethodAnnotation.accept(method);
+				SaStrategy.instance.checkMethodAnnotation.accept(method);
 			}
 			
 			// Auth 校验  

From 4087751fccc12d24f3884cc0b38c0cdcdf260cdf Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 23 May 2023 05:18:39 +0800
Subject: [PATCH 105/129] =?UTF-8?q?SaCheckOr=20=E6=B3=A8=E8=A7=A3=E9=89=B4?=
 =?UTF-8?q?=E6=9D=83=E7=9A=84=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/use/at-check.md | 56 +++++++++++++++++++++++++++++++++++-
 1 file changed, 55 insertions(+), 1 deletion(-)

diff --git a/sa-token-doc/use/at-check.md b/sa-token-doc/use/at-check.md
index a4ff0a54..42f432c7 100644
--- a/sa-token-doc/use/at-check.md
+++ b/sa-token-doc/use/at-check.md
@@ -151,7 +151,61 @@ public class TestController {
 
 
 
-### 6、在业务逻辑层使用注解鉴权
+### 6、批量注解鉴权
+
+使用 `@SaCheckOr` 表示批量注解鉴权：
+
+``` java
+// 在 `@SaCheckOr` 中可以指定多个注解，只要当前会话满足其中一个注解即可通过验证，进入方法。
+@SaCheckOr(
+		login = @SaCheckLogin,
+		role = @SaCheckRole("admin"),
+		permission = @SaCheckPermission("user.add"),
+		safe = @SaCheckSafe("update-password"),
+		basic = @SaCheckBasic(account = "sa:123456"),
+		disable = @SaCheckDisable("submit-orders")
+)
+@RequestMapping("test")
+public SaResult test() {
+	// ... 
+	return SaResult.ok(); 
+}
+```
+
+每一项属性都可以写成数组形式，例如：
+
+``` java
+// 当前客户端只要有 [ login 账号登录] 或者 [user 账号登录] 其一，就可以通过验证进入方法。
+// 		注意：`type = "login"` 和 `type = "user"` 是多账号模式章节的扩展属性，此处你可以先略过这个知识点。
+@SaCheckOr(
+	login = { @SaCheckLogin(type = "login"), @SaCheckLogin(type = "user") }
+)
+@RequestMapping("test")
+public SaResult test() {
+	// ... 
+	return SaResult.ok(); 
+}
+```
+
+疑问：既然有了 `@SaCheckOr`，为什么没有与之对应的 `@SaCheckAnd` 呢？
+
+因为当你写多个注解时，其天然就是 `and` 校验关系，例如：
+ 
+``` java
+// 当你在一个方法上写多个注解鉴权时，其默认就是要满足所有注解规则后，才可以进入方法，只要有一个不满足，就会抛出异常
+@SaCheckLogin
+@SaCheckRole("admin")
+@SaCheckPermission("user.add")
+@RequestMapping("test")
+public SaResult test() {
+	// ... 
+	return SaResult.ok(); 
+}
+```
+
+
+
+### 7、在业务逻辑层使用注解鉴权
 疑问：我能否将注解写在其它架构层呢，比如业务逻辑层？
 
 使用拦截器模式，只能在`Controller层`进行注解鉴权，如需在任意层级使用注解鉴权，请参考：[AOP注解鉴权](/plugin/aop-at)

From 48ba6da91ad0233e83278c62a7853e073fb01a19 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 24 May 2023 16:17:42 +0800
Subject: [PATCH 106/129] =?UTF-8?q?=E5=9C=A8=E7=99=BB=E5=BD=95=E6=97=B6?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=80=A7=E6=A3=80=E6=9F=A5=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=20id=20=E6=98=AF=E5=90=A6=E4=B8=BA=E5=BC=82=E5=B8=B8=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=98=AF=E5=88=99=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/dev33/satoken/stp/StpLogic.java  | 15 ++++++++++-----
 .../src/main/java/com/pj/test/TestController.java |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 9c8bd942..850804db 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -521,17 +521,22 @@ public class StpLogic {
 	 */
 	protected void checkLoginArgs(Object id, SaLoginModel loginModel) {
 
-		// 1、先检查一下，传入的账号id是否可用
+		// 1、账号 id 不能为空
 		if(SaFoxUtil.isEmpty(id)) {
 			throw new SaTokenException("loginId 不能为空").setCode(SaErrorCode.CODE_11002);
 		}
 
-		// 2、判断账号id是否为简单类型
+		// 2、账号 id 不能是异常标记值
+		if(NotLoginException.ABNORMAL_LIST.contains(id.toString())) {
+			throw new SaTokenException("loginId 不能为以下值：" + NotLoginException.ABNORMAL_LIST);
+		}
+
+		// 3、账号 id 不能是简单类型
 		if( ! SaFoxUtil.isBasicType(id.getClass())) {
 			SaManager.log.warn("loginId 应该为简单类型，例如：String | int | long，不推荐使用复杂类型：" + id.getClass());
 		}
 
-		// 3、判断当前 StpLogic 是否支持 extra 扩展参数
+		// 4、判断当前 StpLogic 是否支持 extra 扩展参数
 		if( ! isSupportExtra()) {
 			// 如果不支持，开发者却传入了 extra 扩展参数，那么就打印警告信息
 			Map<String, Object> extraData = loginModel.getExtraData();
@@ -1040,8 +1045,8 @@ public class StpLogic {
 	 * @return / 
 	 */
 	public boolean isValidLoginId(Object loginId) {
-		// 判断标准：不为null，且不在异常标记项里面
-		return loginId != null && !NotLoginException.ABNORMAL_LIST.contains(loginId.toString());
+		// 判断标准：不为 null、空字符串，且不在异常标记项里面
+		return SaFoxUtil.isNotEmpty(loginId) && !NotLoginException.ABNORMAL_LIST.contains(loginId.toString());
 	}
 
 	/**
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index 6f977767..fe6b12d4 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -1,7 +1,7 @@
 package com.pj.test;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaResult;
-import com.pj.satoken.StpUserUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -18,7 +18,7 @@ public class TestController {
 	// 测试登录  ---- http://localhost:8081/test/login
 	@RequestMapping("login")
 	public SaResult login(@RequestParam(defaultValue = "10001") long id) {
-		StpUserUtil.login(id);
+		StpUtil.login(id);
 		return SaResult.ok("登录成功");
 	}
 	
@@ -27,7 +27,7 @@ public class TestController {
 	public SaResult test() {
 		System.out.println("------------进来了");
 		// 返回
-		return SaResult.data("");
+		return SaResult.data(null);
 	}
 	
 	// 测试   浏览器访问： http://localhost:8081/test/test2

From 814a64907ad4901b8de75d882f2866f68af2d6cc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Tue, 6 Jun 2023 06:18:52 +0800
Subject: [PATCH 107/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=E5=8A=A8=E6=80=81=E6=8C=87=E5=AE=9A=20active-timeout?=
 =?UTF-8?q?=20=E8=83=BD=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../satoken/annotation/SaCheckLogin.java      |   2 +-
 .../dev33/satoken/annotation/SaCheckOr.java   |   2 +-
 .../dev33/satoken/config/SaTokenConfig.java   |  74 ++++-
 .../satoken/listener/SaTokenListener.java     |   2 +-
 .../cn/dev33/satoken/stp/SaLoginConfig.java   |   8 +
 .../cn/dev33/satoken/stp/SaLoginModel.java    |  92 ++++---
 .../cn/dev33/satoken/stp/SaTokenInfo.java     |  20 +-
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 255 +++++++++++-------
 .../java/cn/dev33/satoken/stp/StpUtil.java    |  30 +--
 .../cn/dev33/satoken/util/SaTokenConsts.java  |  15 +-
 .../cn/dev33/satoken/util/SaValue2Box.java    | 219 +++++++++++++++
 .../com/pj/cases/use/LoginAuthController.java |   2 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |  34 ++-
 .../src/main/resources/application.yml        |  18 +-
 .../src/main/resources/application.yml        |  18 +-
 .../src/main/resources/application.yml        |  22 +-
 .../main/java/com/pj/test/TestController.java |   8 +-
 .../src/main/resources/app.yml                |  18 +-
 .../src/main/resources/application.yml        |  18 +-
 .../src/main/resources/application.yml        |  20 +-
 .../main/java/com/pj/test/TestController.java |   8 +-
 .../src/main/resources/application.yml        |  20 +-
 .../src/main/resources/application.yml        |  18 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |  34 ++-
 .../main/java/com/pj/test/TestController.java |  11 +-
 .../src/main/resources/application.yml        |  14 +-
 .../src/main/resources/application.yml        |  18 +-
 .../src/main/resources/application.yml        |  18 +-
 .../src/main/resources/application.yml        |  20 +-
 .../src/main/resources/application.yml        |  20 +-
 sa-token-doc/api/stp-util.md                  |  10 +-
 sa-token-doc/fun/exception-code.md            |   2 +-
 sa-token-doc/fun/token-info.md                |   2 +-
 sa-token-doc/fun/token-timeout.md             |  36 +--
 sa-token-doc/more/common-action.md            |  18 +-
 sa-token-doc/more/common-questions.md         |   2 +-
 sa-token-doc/more/noun-intro.md               |   2 +-
 sa-token-doc/plugin/jwt-extend.md             |   2 +-
 sa-token-doc/start/example.md                 |  30 +--
 sa-token-doc/start/solon-example.md           |  26 +-
 sa-token-doc/use/config.md                    |  36 +--
 .../satoken/jwt/StpLogicJwtForMixin.java      |   2 +-
 .../satoken/jwt/StpLogicJwtForStateless.java  |   2 +-
 .../satoken/jboot/test/AtteStartListener.java |   2 +-
 .../cn/dev33/satoken/jfinal/test/Config.java  |   2 +-
 .../src/test/resources/app.yml                |  22 +-
 .../src/test/resources/application.yml        |  16 +-
 .../core/config/SaTokenConfigTest.java        |   6 +-
 .../dev33/satoken/core/stp/TokenInfoTest.java |   4 +-
 .../dev33/satoken/springboot/BasicsTest.java  |  14 +-
 .../src/test/resources/sa-token2.properties   |  16 +-
 51 files changed, 835 insertions(+), 475 deletions(-)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
index a9b6d715..f7af52a7 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckLogin.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
  *
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
- * @author kong
+ * @author click33
  * @since 1.10.0
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java
index e9cef129..b008f083 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/annotation/SaCheckOr.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
  *
  * <p> 可标注在方法、类上（效果等同于标注在此类的所有方法上）
  *
- * @author kong
+ * @author click33
  * @since 1.35.0
  */
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
index 4cff2cb2..fa0d7379 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/config/SaTokenConfig.java
@@ -15,6 +15,7 @@
  */
 package cn.dev33.satoken.config;
 
+import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.util.SaFoxUtil;
 
 import java.io.Serializable;
@@ -37,14 +38,19 @@ public class SaTokenConfig implements Serializable {
 	/** token 名称 （同时也是： cookie 名称、提交 token 时参数的名称、存储 token 时的 key 前缀） */
 	private String tokenName = "satoken";
 
-	/** token 有效期（单位：秒） 默认30天，-1 代表永久 */
+	/** token 有效期（单位：秒） 默认30天，-1 代表永久有效 */
 	private long timeout = 60 * 60 * 24 * 30;
 
 	/**
 	 * token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 	 * （例如可以设置为 1800 代表 30 分钟内无操作就冻结）
 	 */
-	private long activityTimeout = -1;
+	private long activeTimeout = -1;
+
+	/**
+	 * 是否启用动态 activeTimeout 功能，如不需要请设置为 false，节省缓存请求次数
+	 */
+	private Boolean dynamicActiveTimeout = false;
 
 	/**
 	 * 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
@@ -102,7 +108,7 @@ public class SaTokenConfig implements Serializable {
 	private Boolean tokenSessionCheckLogin = true;
 
 	/**
-	 * 是否打开自动续签 activityTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
+	 * 是否打开自动续签 activeTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
 	 */
 	private Boolean autoRenew = true;
 
@@ -189,14 +195,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return token 有效期（单位：秒） 默认30天，-1 代表永久
+	 * @return token 有效期（单位：秒） 默认30天，-1 代表永久有效
 	 */
 	public long getTimeout() {
 		return timeout;
 	}
 
 	/**
-	 * @param timeout token 有效期（单位：秒） 默认30天，-1 代表永久
+	 * @param timeout token 有效期（单位：秒） 默认30天，-1 代表永久有效
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setTimeout(long timeout) {
@@ -208,17 +214,33 @@ public class SaTokenConfig implements Serializable {
 	 * @return token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 	 * 							（例如可以设置为 1800 代表 30 分钟内无操作就冻结）
 	 */
-	public long getActivityTimeout() {
-		return activityTimeout;
+	public long getActiveTimeout() {
+		return activeTimeout;
 	}
 
 	/**
-	 * @param activityTimeout token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	 * @param activeTimeout token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 	 * 								（例如可以设置为 1800 代表 30 分钟内无操作就冻结）
 	 * @return 对象自身
 	 */
-	public SaTokenConfig setActivityTimeout(long activityTimeout) {
-		this.activityTimeout = activityTimeout;
+	public SaTokenConfig setActiveTimeout(long activeTimeout) {
+		this.activeTimeout = activeTimeout;
+		return this;
+	}
+
+	/**
+	 * @return 是否启用动态 activeTimeout 功能，如不需要请设置为 false，节省缓存请求次数
+	 */
+	public Boolean getDynamicActiveTimeout() {
+		return dynamicActiveTimeout;
+	}
+
+	/**
+	 * @param dynamicActiveTimeout 是否启用动态 activeTimeout 功能，如不需要请设置为 false，节省缓存请求次数
+	 * @return 对象自身
+	 */
+	public SaTokenConfig setDynamicActiveTimeout(Boolean dynamicActiveTimeout) {
+		this.dynamicActiveTimeout = dynamicActiveTimeout;
 		return this;
 	}
 
@@ -399,14 +421,14 @@ public class SaTokenConfig implements Serializable {
 	}
 
 	/**
-	 * @return 是否打开自动续签 activityTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
+	 * @return 是否打开自动续签 activeTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
 	 */
 	public Boolean getAutoRenew() {
 		return autoRenew;
 	}
 
 	/**
-	 * @param autoRenew 是否打开自动续签 activityTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
+	 * @param autoRenew 是否打开自动续签 activeTimeout （如果此值为 true, 框架会在每次直接或间接调用 getLoginId() 时进行一次过期检查与续签操作）
 	 * @return 对象自身
 	 */
 	public SaTokenConfig setAutoRenew(Boolean autoRenew) {
@@ -633,7 +655,8 @@ public class SaTokenConfig implements Serializable {
 		return "SaTokenConfig ["
 				+ "tokenName=" + tokenName 
 				+ ", timeout=" + timeout 
-				+ ", activityTimeout=" + activityTimeout
+				+ ", activeTimeout=" + activeTimeout
+				+ ", dynamicActiveTimeout=" + dynamicActiveTimeout
 				+ ", isConcurrent=" + isConcurrent 
 				+ ", isShare=" + isShare 
 				+ ", maxLoginCount=" + maxLoginCount
@@ -662,4 +685,29 @@ public class SaTokenConfig implements Serializable {
 				+ "]";
 	}
 
+	/**
+	 * 请更改为 getActiveTimeout()
+	 * @return token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	 * 							（例如可以设置为 1800 代表 30 分钟内无操作就冻结）
+	 */
+	@Deprecated
+	public long getActivityTimeout() {
+		System.err.println("配置项已过期，请更换：sa-token.activity-timeout -> sa-token.active-timeout");
+		return activeTimeout;
+	}
+
+	/**
+	 * 请更改为 setActiveTimeout()
+	 * @param activityTimeout token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	 * 								（例如可以设置为 1800 代表 30 分钟内无操作就冻结）
+	 * @return 对象自身
+	 */
+	@Deprecated
+	public SaTokenConfig setActivityTimeout(long activityTimeout) {
+		System.err.println("配置项已过期，请更换：sa-token.activity-timeout -> sa-token.active-timeout");
+		this.activeTimeout = activityTimeout;
+		return this;
+	}
+
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
index 09dc9739..4de64e2e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/listener/SaTokenListener.java
@@ -110,7 +110,7 @@ public interface SaTokenListener {
 	void doLogoutSession(String id);
 
 	/**
-	 * 每次 Token 续期时触发（注意：是 timeout 续期，而不是 activity-timeout 续期）
+	 * 每次 Token 续期时触发（注意：是 timeout 续期，而不是 active-timeout 续期）
 	 * 
 	 * @param tokenValue token 值 
 	 * @param loginId 账号id 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
index 8f433afd..26353970 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginConfig.java
@@ -60,6 +60,14 @@ public class SaLoginConfig {
 		return create().setTimeout(timeout);
 	}
 
+	/**
+	 * @param activeTimeout 指定此次登录 token 最低活跃频率，单位：秒（如未指定，自动取全局配置的 activeTimeout 值）
+	 * @return 对象自身
+	 */
+	public static SaLoginModel setActiveTimeout(long activeTimeout) {
+		return create().setActiveTimeout(activeTimeout);
+	}
+
 	/**
 	 * @param extraData 扩展信息（只在jwt模式下生效）
 	 * @return 登录参数 Model
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
index 37d65f5e..b724837a 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaLoginModel.java
@@ -47,10 +47,15 @@ public class SaLoginModel {
 	public Boolean isLastingCookie = true;
 
 	/**
-	 * 指定此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
+	 * 指定此次登录 token 有效期，单位：秒 （如未指定，自动取全局配置的 timeout 值）
 	 */
 	public Long timeout;
 
+	/**
+	 * 指定此次登录 token 最低活跃频率，单位：秒（如未指定，则使用全局配置的 activeTimeout 值）
+	 */
+	private Long activeTimeout;
+
 	/**
 	 * 扩展信息（只在jwt模式下生效）
 	 */
@@ -91,16 +96,6 @@ public class SaLoginModel {
 		return isLastingCookie;
 	}
 
-	/**
-	 * @return 是否为持久Cookie（临时Cookie在浏览器关闭时会自动删除，持久Cookie在重新打开后依然存在）
-	 */
-	public Boolean getIsLastingCookieOrFalse() {
-		if(isLastingCookie == null) {
-			return false;
-		}
-		return isLastingCookie;
-	}
-
 	/**
 	 * @param isLastingCookie 是否为持久Cookie（临时Cookie在浏览器关闭时会自动删除，持久Cookie在重新打开后依然存在）
 	 * @return 对象自身
@@ -111,24 +106,14 @@ public class SaLoginModel {
 	}
 
 	/**
-	 * @return 指定此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
+	 * @return 指定此次登录 token 有效期，单位：秒
 	 */
 	public Long getTimeout() {
 		return timeout;
 	}
 
 	/**
-	 * @return timeout 值 （如果此配置项尚未配置，则取全局配置的值）
-	 */
-	public Long getTimeoutOrGlobalConfig() {
-		if(timeout == null) {
-			timeout = SaManager.getConfig().getTimeout();
-		}
-		return timeout;
-	}
-	
-	/**
-	 * @param timeout 指定此次登录token的有效期, 单位:秒 （如未指定，自动取全局配置的timeout值）
+	 * @param timeout 指定此次登录 token 有效期，单位：秒 （如未指定，自动取全局配置的 timeout 值）
 	 * @return 对象自身
 	 */
 	public SaLoginModel setTimeout(long timeout) {
@@ -136,6 +121,23 @@ public class SaLoginModel {
 		return this;
 	}
 
+	/**
+	 * @return 此次登录 token 最低活跃频率，单位：秒（如未指定，则使用全局配置的 activeTimeout 值）
+	 */
+	public Long getActiveTimeout() {
+		return activeTimeout;
+	}
+
+
+	/**
+	 * @param activeTimeout 指定此次登录 token 最低活跃频率，单位：秒（如未指定，则使用全局配置的 activeTimeout 值）
+	 * @return 对象自身
+	 */
+	public SaLoginModel setActiveTimeout(long activeTimeout) {
+		this.activeTimeout = activeTimeout;
+		return this;
+	}
+
 	/**
 	 * @return 扩展信息（只在jwt模式下生效）
 	 */
@@ -175,16 +177,6 @@ public class SaLoginModel {
 		return isWriteHeader;
 	}
 
-	/**
-	 * @return 是否在登录后将 Token 写入到响应头 （如果此配置项尚未配置，则取全局配置的值）
-	 */
-	public Boolean getIsWriteHeaderOrGlobalConfig() {
-		if(isWriteHeader == null) {
-			isWriteHeader = SaManager.getConfig().getIsWriteHeader();
-		}
-		return isWriteHeader;
-	}
-
 	/**
 	 * @param isWriteHeader 是否在登录后将 Token 写入到响应头
 	 * @return 对象自身
@@ -213,6 +205,7 @@ public class SaLoginModel {
 		this.tokenSignTag = tokenSignTag;
 		return this;
 	}
+
 	/*
 	 * toString 
 	 */
@@ -222,6 +215,7 @@ public class SaLoginModel {
 				+ "device=" + device
 				+ ", isLastingCookie=" + isLastingCookie
 				+ ", timeout=" + timeout
+				+ ", activeTimeout=" + activeTimeout
 				+ ", extraData=" + extraData
 				+ ", token=" + token
 				+ ", isWriteHeader=" + isWriteHeader
@@ -232,6 +226,36 @@ public class SaLoginModel {
 
 	// ------ 附加方法 
 
+	/**
+	 * @return 是否为持久Cookie（临时Cookie在浏览器关闭时会自动删除，持久Cookie在重新打开后依然存在）
+	 */
+	public Boolean getIsLastingCookieOrFalse() {
+		if(isLastingCookie == null) {
+			return false;
+		}
+		return isLastingCookie;
+	}
+
+	/**
+	 * @return timeout 值 （如果此配置项尚未配置，则取全局配置的值）
+	 */
+	public Long getTimeoutOrGlobalConfig() {
+		if(timeout == null) {
+			timeout = SaManager.getConfig().getTimeout();
+		}
+		return timeout;
+	}
+
+	/**
+	 * @return 是否在登录后将 Token 写入到响应头 （如果此配置项尚未配置，则取全局配置的值）
+	 */
+	public Boolean getIsWriteHeaderOrGlobalConfig() {
+		if(isWriteHeader == null) {
+			isWriteHeader = SaManager.getConfig().getIsWriteHeader();
+		}
+		return isWriteHeader;
+	}
+
 	/**
 	 * 写入扩展数据（只在jwt模式下生效） 
 	 * @param key 键
@@ -288,7 +312,7 @@ public class SaLoginModel {
 		}
 		return device;
 	}
-	
+
 	/**
 	 * 构建对象，初始化默认值 
 	 * @return 对象自身
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
index a86a1728..86c5aeae 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/SaTokenInfo.java
@@ -30,7 +30,7 @@ package cn.dev33.satoken.stp;
  *         "tokenTimeout": 2591977,          // token剩余有效期 (单位: 秒)
  *         "sessionTimeout": 2591977,        // Account-Session剩余有效时间 (单位: 秒)
  *         "tokenSessionTimeout": -2,        // Token-Session剩余有效时间 (单位: 秒) (-2表示系统中不存在这个缓存)
- *         "tokenActivityTimeout": -1,       // token剩余无操作有效时间 (单位: 秒)
+ *         "tokenActiveTimeout": -1,       // Token 距离被冻结还剩多少时间 (单位: 秒)
  *         "loginDevice": "default-device"   // 登录设备类型
  *     }
  *     </pre>
@@ -65,8 +65,8 @@ public class SaTokenInfo {
 	/** Token-Session 剩余有效时间（单位: 秒） */
 	public long tokenSessionTimeout;
 
-	/** token 剩余无操作有效时间（单位: 秒） */
-	public long tokenActivityTimeout;
+	/** token 距离被冻结还剩多少时间（单位: 秒） */
+	public long tokenActiveTimeout;
 
 	/** 登录设备类型 */
 	public String loginDevice;
@@ -189,17 +189,17 @@ public class SaTokenInfo {
 	}
 
 	/**
-	 * @return token 剩余无操作有效时间（单位: 秒）
+	 * @return token 距离被冻结还剩多少时间（单位: 秒）
 	 */
-	public long getTokenActivityTimeout() {
-		return tokenActivityTimeout;
+	public long getTokenActiveTimeout() {
+		return tokenActiveTimeout;
 	}
 
 	/**
-	 * @param tokenActivityTimeout token 剩余无操作有效时间（单位: 秒）
+	 * @param tokenActiveTimeout token 距离被冻结还剩多少时间（单位: 秒）
 	 */
-	public void setTokenActivityTimeout(long tokenActivityTimeout) {
-		this.tokenActivityTimeout = tokenActivityTimeout;
+	public void setTokenActiveTimeout(long tokenActiveTimeout) {
+		this.tokenActiveTimeout = tokenActiveTimeout;
 	}
 
 	/**
@@ -238,7 +238,7 @@ public class SaTokenInfo {
 		return "SaTokenInfo [tokenName=" + tokenName + ", tokenValue=" + tokenValue + ", isLogin=" + isLogin
 				+ ", loginId=" + loginId + ", loginType=" + loginType + ", tokenTimeout=" + tokenTimeout
 				+ ", sessionTimeout=" + sessionTimeout + ", tokenSessionTimeout=" + tokenSessionTimeout
-				+ ", tokenActivityTimeout=" + tokenActivityTimeout + ", loginDevice=" + loginDevice + ", tag=" + tag
+				+ ", tokenActiveTimeout=" + tokenActiveTimeout + ", loginDevice=" + loginDevice + ", tag=" + tag
 				+ "]";
 	}
 
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 850804db..a06861f9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -34,6 +34,7 @@ import cn.dev33.satoken.session.TokenSign;
 import cn.dev33.satoken.strategy.SaStrategy;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
+import cn.dev33.satoken.util.SaValue2Box;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -342,7 +343,7 @@ public class StpLogic {
 		info.tokenTimeout = getTokenTimeout();
 		info.sessionTimeout = getSessionTimeout();
 		info.tokenSessionTimeout = getTokenSessionTimeout();
-		info.tokenActivityTimeout = getTokenActivityTimeout();
+		info.tokenActiveTimeout = getTokenActiveTimeout();
 		info.loginDevice = getLoginDevice();
 		return info;
 	}
@@ -401,7 +402,7 @@ public class StpLogic {
 		// 1、创建会话 
 		String token = createLoginSession(id, loginModel);
 
-		// 2、在当前客户端注入Token 
+		// 2、在当前客户端注入 token
 		setTokenValue(token, loginModel);
 	}
 
@@ -445,8 +446,10 @@ public class StpLogic {
 		// 6、保存 token -> id 的映射关系，方便日后根据 token 找账号 id
 		saveTokenToIdMapping(tokenValue, id, loginModel.getTimeout());
 
-		// 7、写入这个 token 的最后活跃时间 token-last-activity
-		setLastActivityToNow(tokenValue); 
+		// 7、写入这个 token 的最后活跃时间 token-last-active
+		if(isOpenCheckActiveTimeout()) {
+			setLastActiveToNow(tokenValue, loginModel.getActiveTimeout(), loginModel.getTimeoutOrGlobalConfig());
+		}
 
 		// 8、$$ 发布全局事件：账号 xxx 登录成功
 		SaTokenEventCenter.doLogin(loginType, id, tokenValue, loginModel);
@@ -541,10 +544,15 @@ public class StpLogic {
 			// 如果不支持，开发者却传入了 extra 扩展参数，那么就打印警告信息
 			Map<String, Object> extraData = loginModel.getExtraData();
 			if(extraData != null && extraData.size() > 0) {
-				SaManager.log.warn("当前 StpLogic 不支持 extra 扩展参数模式，传入的 extra 数据将被忽略");
+				SaManager.log.warn("当前 StpLogic 不支持 extra 扩展参数模式，传入的 extra 参数将被忽略");
 			}
 		}
 
+		// 5、如果全局配置未启动动态 activeTimeout 功能，但是此次登录却传入了 activeTimeout 参数，那么就打印警告信息
+		if( ! getConfig().getDynamicActiveTimeout() && loginModel.getActiveTimeout() != null) {
+			SaManager.log.warn("当前全局配置未开启动态 activeTimeout 功能，传入的 activeTimeout 参数将被忽略");
+		}
+
 	}
 
 	// --- 注销 
@@ -570,7 +578,7 @@ public class StpLogic {
 		storage.delete(splicingKeyJustCreatedSave());
 
  		// 4、清除当前上下文的 [ 活跃度校验 check 标记 ]
-		storage.delete(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY);
+		storage.delete(SaTokenConsts.TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY);
 
  		// 5、清除这个 token 的其它相关信息
  		logoutByTokenValue(tokenValue);
@@ -606,7 +614,7 @@ public class StpLogic {
 				session.removeTokenSign(tokenValue);
 
 				// 2.3、清除这个 token 的最后活跃时间记录
-				clearLastActivity(tokenValue);
+				clearLastActive(tokenValue);
 
 		 		// 2.4、清除 token -> id 的映射关系
 				deleteTokenToIdMapping(tokenValue);
@@ -654,7 +662,7 @@ public class StpLogic {
 			session.removeTokenSign(tokenValue);
 
 			// 3.3、清除这个 token 的最后活跃时间记录
-			clearLastActivity(tokenValue);
+			clearLastActive(tokenValue);
 
 	 		// 3.4、清除 token -> id 的映射关系
 			deleteTokenToIdMapping(tokenValue);
@@ -677,7 +685,7 @@ public class StpLogic {
 	 */
 	public void logoutByTokenValue(String tokenValue) {
 		// 1、清除这个 token 的最后活跃时间记录
-		clearLastActivity(tokenValue);
+		clearLastActive(tokenValue);
 		
 		// 2、清除这个 token 的 Token-Session 对象
 		deleteTokenSession(tokenValue);
@@ -736,7 +744,7 @@ public class StpLogic {
 				session.removeTokenSign(tokenValue);
 
 				// 2.3、清除这个 token 的最后活跃时间记录
-				clearLastActivity(tokenValue);
+				clearLastActive(tokenValue);
 
 				// 2.4、将此 token 标记为：已被踢下线
 				updateTokenToIdMapping(tokenValue, NotLoginException.KICK_OUT);
@@ -761,7 +769,7 @@ public class StpLogic {
 	 */
 	public void kickoutByTokenValue(String tokenValue) {
 		// 1、清除这个 token 的最后活跃时间记录
-		clearLastActivity(tokenValue); 	
+		clearLastActive(tokenValue);
 		
 		// 2、此处不需要清除它的 Token-Session 对象
 		// deleteTokenSession(tokenValue);
@@ -808,7 +816,7 @@ public class StpLogic {
 				session.removeTokenSign(tokenValue);
 
 				// 2.3、清除这个 token 的最后活跃时间记录
-				clearLastActivity(tokenValue);
+				clearLastActive(tokenValue);
 
 				// 2.4、将此 token 标记为：已被顶下线
 				updateTokenToIdMapping(tokenValue, NotLoginException.BE_REPLACED);
@@ -886,15 +894,15 @@ public class StpLogic {
 			throw NotLoginException.newInstance(loginType, KICK_OUT, KICK_OUT_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11015);
  		}
 
- 		// 7、检查此 token 的最后活跃时间是否已经超过了 activity-timeout 的限制，
+ 		// 7、检查此 token 的最后活跃时间是否已经超过了 active-timeout 的限制，
 		//    如果是则代表其已被冻结，需要抛出：token 已过期
-	 	checkActivityTimeout(tokenValue);
+	 	checkActiveTimeout(tokenValue);
 
 		// ------ 至此，loginId 已经是一个合法的值，代表当前会话是一个正常的登录状态了
 
- 		// 8、如果配置了自动续签功能, 则: 更新这个 token 的最后活跃时间 （注意此处的续签是在续 activity-timeout，而非 timeout）
- 		if(getConfig().getAutoRenew()) {
- 	 		updateLastActivityToNow(tokenValue);
+ 		// 8、如果配置了自动续签功能, 则: 更新这个 token 的最后活跃时间 （注意此处的续签是在续 active-timeout，而非 timeout）
+ 		if(isOpenCheckActiveTimeout() && getConfig().getAutoRenew()) {
+ 	 		updateLastActiveToNow(tokenValue);
  		}
 
  		// 9、返回 loginId
@@ -947,7 +955,7 @@ public class StpLogic {
  		}
 
  		// 4、如果 token 已被冻结，也返回 null
- 		if(getTokenActivityTimeoutByToken(tokenValue) == SaTokenDao.NOT_VALUE_EXPIRE) {
+ 		if(getTokenActiveTimeoutByToken(tokenValue) == SaTokenDao.NOT_VALUE_EXPIRE) {
  			return null;
  		}
 
@@ -1285,7 +1293,9 @@ public class StpLogic {
 			);
 
 			// 写入此 token 的最后活跃时间
-			setLastActivityToNow(tokenValue);
+			if(isOpenCheckActiveTimeout()) {
+				setLastActiveToNow(tokenValue, null, null);
+			}
 
 			// 在当前上下文写入此 TokenValue
 			setTokenValue(tokenValue);
@@ -1317,38 +1327,77 @@ public class StpLogic {
 	}
 
 
-	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
+	// ------------------- Active-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
- 	 * 写入指定 token 的 [ 最后活跃时间 ] 为当前时间戳
+ 	 * 写入指定 token 的 [ 最后活跃时间 ] 为当前时间戳 √√√
 	 *
- 	 * @param tokenValue 指定token 
+ 	 * @param tokenValue 指定token
+	 * @param activeTimeout 这个 token 的最低活跃频率，单位：秒，填 null 代表使用全局配置的 activeTimeout 值
+	 * @param timeout 保存数据时使用的 ttl 值，单位：秒，填 null 代表使用全局配置的 timeout 值
  	 */
- 	protected void setLastActivityToNow(String tokenValue) {
+ 	protected void setLastActiveToNow(String tokenValue, Long activeTimeout, Long timeout) {
 
- 		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
- 		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
- 			return;
- 		}
+		// 如果提供的 timeout 为null，则使用全局配置的 timeout 值
+		SaTokenConfig config = getConfig();
+		if(timeout == null) {
+			timeout = config.getTimeout();
+		}
+		// activeTimeout 变量无需赋值默认值，因为当缓存中没有这个值时，会自动使用全局配置的值
 
  		// 将[ 最后活跃时间 ] 标记为当前时间戳
- 		getSaTokenDao().set(splicingKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()), getConfig().getTimeout());
+		String key = splicingKeyLastActiveTime(tokenValue);
+		String value = String.valueOf(System.currentTimeMillis());
+		if(config.getDynamicActiveTimeout() && activeTimeout != null) {
+			value += "," + activeTimeout;
+		}
+ 		getSaTokenDao().set(key, value, timeout);
  	}
- 	
- 	/**
+
+	/**
+	 * 续签指定 token：将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
+	 *
+	 * @param tokenValue 指定token
+	 */
+	public void updateLastActiveToNow(String tokenValue) {
+		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
+		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenCheckActiveTimeout() ) {
+			return;
+		}
+
+
+		// 将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
+		String key = splicingKeyLastActiveTime(tokenValue);
+		String value = new SaValue2Box(System.currentTimeMillis(), getTokenUseActiveTimeout(tokenValue)).toString();
+		getSaTokenDao().update(key, value);
+	}
+
+	/**
+	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
+	 * <h2>
+	 * 		请注意: 即使 token 已被冻结 也可续签成功，
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActiveTimeout() 强制检查是否冻结即可
+	 * </h2>
+	 */
+	public void updateLastActiveToNow() {
+		updateLastActiveToNow(getTokenValue());
+	}
+
+	/**
  	 * 清除指定 Token 的 [ 最后活跃时间记录 ]
 	 *
  	 * @param tokenValue 指定 token
  	 */
- 	protected void clearLastActivity(String tokenValue) {
+ 	protected void clearLastActive(String tokenValue) {
 
 		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
-		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
+		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenCheckActiveTimeout() ) {
 			return;
 		}
 
  		// 删除 [ 最后活跃时间 ]
- 		getSaTokenDao().delete(splicingKeyLastActivityTime(tokenValue));
+		String key = splicingKeyLastActiveTime(tokenValue);
+ 		getSaTokenDao().delete(key);
  	}
  	
  	/**
@@ -1356,73 +1405,72 @@ public class StpLogic {
 	 *
  	 * @param tokenValue 指定 token
  	 */
- 	public void checkActivityTimeout(String tokenValue) {
+ 	public void checkActiveTimeout(String tokenValue) {
 
 		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
-		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
+		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenCheckActiveTimeout() ) {
 			return;
 		}
 
- 		// 如果本次请求已经有了 [ 检查标记 ]，说明已经校验过了，此时无需重复校验，立即返回
+		// 下面开始校验这个 token 是否已被冻结
+		// 		storage.get(key, () -> {}) 可以避免一次请求多次校验，造成不必要的性能消耗
  		SaStorage storage = SaHolder.getStorage();
- 		if(storage.get(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY) != null) {
- 			return;
- 		}
+		storage.get(SaTokenConsts.TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY, () -> {
 
- 		// ------------ 下面开始校验这个 token 是否已被冻结
+			// 1、获取这个 token 的剩余活跃有效期
+			long activeTimeout = getTokenActiveTimeoutByToken(tokenValue);
 
- 		// 1、获取这个 token 的剩余活跃有效期
- 		long timeout = getTokenActivityTimeoutByToken(tokenValue);
+			// 2、值为 -1 代表此 token 已经被设置永不冻结，无须继续验证
+			if(activeTimeout == SaTokenDao.NEVER_EXPIRE) {
+				return true;
+			}
 
-		// 2、值为 -1 代表此 token 已经被设置永不冻结，无须继续验证
-		if(timeout == SaTokenDao.NEVER_EXPIRE) {
-			// 此句代码含义参考最下面
-			storage.set(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY, true);
-			return;
-		}
+			// 3、值为 -2 代表已被冻结，此时需要抛出异常
+			if(activeTimeout == SaTokenDao.NOT_VALUE_EXPIRE) {
+				throw NotLoginException.newInstance(loginType, TOKEN_FREEZE, TOKEN_FREEZE_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11016);
+			}
 
-		// 3、值为 -2 代表已被冻结，此时需要抛出异常
-		if(timeout == SaTokenDao.NOT_VALUE_EXPIRE) {
-			throw NotLoginException.newInstance(loginType, TOKEN_FREEZE, TOKEN_FREEZE_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11016);
-		}
- 		// --- 至此，验证已通过 
-
- 		// 4、打上 [ 检查标记 ]，标记一下当前请求已经通过校验，避免一次请求多次校验，造成不必要的性能消耗
- 		storage.set(SaTokenConsts.TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY, true);
+			// --- 验证通过
+			return true;
+		});
  	}
 
  	/**
  	 * 检查当前 token 是否已被冻结，如果是则抛出异常
  	 */
- 	public void checkActivityTimeout() {
- 		checkActivityTimeout(getTokenValue());
+ 	public void checkActiveTimeout() {
+ 		checkActiveTimeout(getTokenValue());
  	}
- 	
- 	/**
- 	 * 续签指定 token：将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
+
+	/**
+	 * 获取指定 token 在缓存中的 activeTimeout 值，如果不存在则返回 null
 	 *
- 	 * @param tokenValue 指定token 
- 	 */
- 	public void updateLastActivityToNow(String tokenValue) {
-		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
-		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenActivityCheck() ) {
-			return;
+	 * @param tokenValue 指定token
+	 * @return /
+	 */
+	public Long getTokenUseActiveTimeout(String tokenValue) {
+		// 先取出这个 token 的最后活跃时间值
+		String key = splicingKeyLastActiveTime(tokenValue);
+		String value = getSaTokenDao().get(key);
+
+		// 先获取缓存库里的值，获取不到则使用全局配置
+		SaValue2Box box = new SaValue2Box(value);
+		return box.getValue2AsLong(null);
+	}
+
+	/**
+	 * 获取指定 token 在缓存中的 activeTimeout 值，如果不存在则返回全局配置的 activeTimeout 值
+	 *
+	 * @param tokenValue 指定token
+	 * @return /
+	 */
+	public long getTokenUseActiveTimeoutOrGlobalConfig(String tokenValue) {
+		Long activeTimeout = getTokenUseActiveTimeout(tokenValue);
+		if(activeTimeout == null) {
+			return getConfig().getActiveTimeout();
 		}
-
-		// 将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
-		getSaTokenDao().update(splicingKeyLastActivityTime(tokenValue), String.valueOf(System.currentTimeMillis()));
- 	}
-
- 	/**
- 	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
- 	 * <h2>
-	 * 		请注意: 即使 token 已被冻结 也可续签成功，
- 	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
-	 * </h2>
- 	 */
- 	public void updateLastActivityToNow() {
- 		updateLastActivityToNow(getTokenValue());
- 	}
+		return activeTimeout;
+	}
 
 
 	// ------------------- 过期时间相关 -------------------
@@ -1499,8 +1547,8 @@ public class StpLogic {
 	 *
  	 * @return /
  	 */
- 	public long getTokenActivityTimeout() {
- 		return getTokenActivityTimeoutByToken(getTokenValue());
+ 	public long getTokenActiveTimeout() {
+ 		return getTokenActiveTimeoutByToken(getTokenValue());
  	}
  	
  	/**
@@ -1509,10 +1557,10 @@ public class StpLogic {
  	 * @param tokenValue 指定 token
  	 * @return /
  	 */
- 	public long getTokenActivityTimeoutByToken(String tokenValue) {
+ 	public long getTokenActiveTimeoutByToken(String tokenValue) {
 
 		// 如果全局配置了永不冻结, 则返回 -1
-		if( ! isOpenActivityCheck() ) {
+		if( ! isOpenCheckActiveTimeout() ) {
 			return SaTokenDao.NEVER_EXPIRE;
 		}
 
@@ -1524,27 +1572,32 @@ public class StpLogic {
  		// ------ 开始查询
 
  		// 1、先获取这个 token 的最后活跃时间，13位时间戳
- 		String keyLastActivityTime = splicingKeyLastActivityTime(tokenValue);
- 		String lastActivityTimeString = getSaTokenDao().get(keyLastActivityTime);
+ 		String key = splicingKeyLastActiveTime(tokenValue);
+ 		String lastActiveTimeString = getSaTokenDao().get(key);
+
 
  		// 2、如果查不到，返回-2
- 		if(lastActivityTimeString == null) {
+ 		if(lastActiveTimeString == null) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		}
 
- 		// 3、计算最后活跃时间 和 此时此刻 的时间差
+ 		// 3、计算最后活跃时间 距离 此时此刻 的时间差
 		//    计算公式为: (当前时间 - 最后活跃时间) / 1000
- 		long lastActivityTime = Long.parseLong(lastActivityTimeString);
- 		long apartSecond = (System.currentTimeMillis() - lastActivityTime) / 1000;
+		SaValue2Box box = new SaValue2Box(lastActiveTimeString);
+ 		long lastActiveTime = box.getValue1AsLong();
+		// 实际时间差
+ 		long timeDiff = (System.currentTimeMillis() - lastActiveTime) / 1000;
+		// 该 token 允许的时间差
+		long allowTimeDiff = getTokenUseActiveTimeoutOrGlobalConfig(tokenValue);
 
  		// 4、校验这个时间差是否超过了允许的值
 		//    计算公式为: 允许的最大时间差 - 实际时间差，判断是否 < 0， 如果是则代表已经被冻结 ，返回-2
-		long timeout = getConfig().getActivityTimeout() - apartSecond;
- 		if(timeout < 0) {
+		long activeTimeout = allowTimeDiff - timeDiff;
+ 		if(activeTimeout < 0) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		} else {
 			// 否则代表没冻结，返回剩余有效时间
-			return timeout;
+			return activeTimeout;
 		}
  	}
 
@@ -1597,8 +1650,8 @@ public class StpLogic {
  		getSessionByLoginId(loginId).updateMinTimeout(timeout);
  		
  		// 5、更新此 token 的最后活跃时间
- 		if(isOpenActivityCheck()) {
- 			dao.updateTimeout(splicingKeyLastActivityTime(tokenValue), timeout);
+ 		if(isOpenCheckActiveTimeout()) {
+ 			dao.updateTimeout(splicingKeyLastActiveTime(tokenValue), timeout);
  		}
 
 		// 6、$$ 发布事件：某某 token 被续期了
@@ -2603,8 +2656,8 @@ public class StpLogic {
 	 * @param tokenValue token值
 	 * @return key
 	 */
-	public String splicingKeyLastActivityTime(String tokenValue) {
-		return getConfig().getTokenName() + ":" + loginType + ":last-activity:" + tokenValue;
+	public String splicingKeyLastActiveTime(String tokenValue) {
+		return getConfig().getTokenName() + ":" + loginType + ":last-active:" + tokenValue;
 	}
 
 	/**
@@ -2677,8 +2730,8 @@ public class StpLogic {
 	 *
  	 * @return / 
  	 */
- 	public boolean isOpenActivityCheck() {
- 		return getConfig().getActivityTimeout() != SaTokenDao.NEVER_EXPIRE;
+ 	public boolean isOpenCheckActiveTimeout() {
+ 		return getConfig().getActiveTimeout() != SaTokenDao.NEVER_EXPIRE;
  	}
 
     /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index 0b478b3b..945c88d9 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -26,7 +26,7 @@ import java.util.List;
  * Sa-Token 权限认证工具类
  *
  * @author click33
- * @since 1.10.0
+ * @since 1.0.0
  */
 public class StpUtil {
 	
@@ -493,26 +493,26 @@ public class StpUtil {
 	}
 	
 
-	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
-
-	/**
-	 * 检查当前 token 是否已被冻结，如果是则抛出异常
-	 */
- 	public static void checkActivityTimeout() {
- 		stpLogic.checkActivityTimeout();
- 	}
+	// ------------------- Active-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
 	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
 	 * <h2>
 	 * 		请注意: 即使 token 已被冻结 也可续签成功，
-	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActiveTimeout() 强制检查是否冻结即可
 	 * </h2>
 	 */
- 	public static void updateLastActivityToNow() {
- 		stpLogic.updateLastActivityToNow();
+	public static void updateLastActiveToNow() {
+		stpLogic.updateLastActiveToNow();
+	}
+
+	/**
+	 * 检查当前 token 是否已被冻结，如果是则抛出异常
+	 */
+ 	public static void checkActiveTimeout() {
+ 		stpLogic.checkActiveTimeout();
  	}
- 	
+
 
 	// ------------------- 过期时间相关 -------------------  
 
@@ -558,8 +558,8 @@ public class StpUtil {
 	 *
 	 * @return /
 	 */
- 	public static long getTokenActivityTimeout() {
- 		return stpLogic.getTokenActivityTimeout();
+ 	public static long getTokenActiveTimeout() {
+ 		return stpLogic.getTokenActiveTimeout();
  	}
 
 	/**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
index 21eb2db7..2c2d94d8 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaTokenConsts.java
@@ -67,9 +67,9 @@ public class SaTokenConsts {
 	public static final String JUST_CREATED_NOT_PREFIX = "JUST_CREATED_NOT_PREFIX_"; 	
 
 	/**
-	 * 常量 key 标记: 如果本次请求已经验证过 [ 临时过期 ] , 则以此值存储在当前 request 中
+	 * 常量 key 标记: 如果本次请求已经验证过 activeTimeout, 则以此 key 在 storage 中做一个标记
 	 */
-	public static final String TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY = "TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY_"; 	
+	public static final String TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY = "TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY_";
 
 	/**
 	 * 常量 key 标记: 在登录时，默认使用的设备类型 
@@ -193,6 +193,13 @@ public class SaTokenConsts {
 	 * 请更换为 JUST_CREATED  
 	 */
 	@Deprecated
-	public static final String JUST_CREATED_SAVE_KEY = JUST_CREATED; 	
-	
+	public static final String JUST_CREATED_SAVE_KEY = JUST_CREATED;
+
+	/**
+	 * 请更换为 TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY
+	 */
+	@Deprecated
+	public static final String TOKEN_ACTIVITY_TIMEOUT_CHECKED_KEY = TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY;
+
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java
new file mode 100644
index 00000000..6a9dcdbd
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.util;
+
+
+/**
+ * 封装两个值的容器，方便取值、写值等操作，value1 和 value2 用逗号隔开，形如：123,abc
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+public class SaValue2Box {
+
+    /**
+     * 第一个值
+     */
+    private Object value1;
+
+    /**
+     * 第二个值
+     */
+    private Object value2;
+
+    /**
+     * 直接提供两个值构建
+     * @param value1 第一个值
+     * @param value2 第二个值
+     */
+    public SaValue2Box(Object value1, Object value2) {
+        this.value1 = value1;
+        this.value2 = value2;
+    }
+
+    /**
+     * 根据字符串构建，字符串形如：123,abc
+     * @param valueString 形如：123,abc
+     */
+    public SaValue2Box(String valueString) {
+        if(valueString == null){
+            return;
+        }
+        String[] split = valueString.split(",");
+        if(split.length == 0){
+            // do nothing
+        }
+        else if(split.length == 1){
+            this.value1 = split[0];
+        }
+        else {
+            this.value1 = split[0];
+            this.value2 = split[1];
+        }
+    }
+
+    /**
+     * 获取第一个值
+     * @return 第一个值
+     */
+    public Object getValue1() {
+        return value1;
+    }
+
+    /**
+     * 获取第二个值
+     * @return 第二个值
+     */
+    public Object getValue2() {
+        return value2;
+    }
+
+    /**
+     * 设置第一个值
+     * @param value1 第一个值
+     */
+    public void setValue1(Object value1) {
+        this.value1 = value1;
+    }
+
+    /**
+     * 设置第二个值
+     * @param value2 第二个值
+     */
+    public void setValue2(Object value2) {
+        this.value2 = value2;
+    }
+
+    /**
+     * 判断第一个值是否为 null 或者空字符串
+     * @return /
+     */
+    public boolean value1IsEmpty() {
+        return SaFoxUtil.isEmpty(value1);
+    }
+
+    /**
+     * 判断第二个值是否为 null 或者空字符串
+     * @return /
+     */
+    public boolean value2IsEmpty() {
+        return SaFoxUtil.isEmpty(value2);
+    }
+
+    /**
+     * 获取第一个值，并转化为 String 类型
+     * @return /
+     */
+    public String getValue1AsString() {
+        return value1 == null ? null : value1.toString();
+    }
+
+    /**
+     * 获取第二个值，并转化为 String 类型
+     * @return /
+     */
+    public String getValue2AsString() {
+        return value2 == null ? null : value2.toString();
+    }
+
+    /**
+     * 获取第一个值，并转化为 long 类型
+     * @return /
+     */
+    public long getValue1AsLong() {
+        return Long.parseLong(value1.toString());
+    }
+
+    /**
+     * 获取第二个值，并转化为 long 类型
+     * @return /
+     */
+    public long getValue2AsLong() {
+        return Long.parseLong(value2.toString());
+    }
+
+    /**
+     * 获取第一个值，并转化为 long 类型，值不存在则返回默认值
+     * @return /
+     */
+    public Long getValue1AsLong(Long defaultValue) {
+        // 这里如果改成三元表达式，会导致自动拆箱造成空指针异常，所以只能用 if-else
+        if(value1 == null){
+            return defaultValue;
+        }
+        return Long.parseLong(value1.toString());
+    }
+
+    /**
+     * 获取第二个值，并转化为 long 类型，值不存在则返回默认值
+     * @return /
+     */
+    public Long getValue2AsLong(Long defaultValue) {
+        // 这里如果改成三元表达式，会导致自动拆箱造成空指针异常，所以只能用 if-else
+        if(value2 == null){
+            return defaultValue;
+        }
+        return Long.parseLong(value2.toString());
+    }
+
+    /**
+     * 该容器是否为无值状态，即：value1 无值、value2 无值
+     * @return /
+     */
+    public boolean isNotValueState() {
+        return value1IsEmpty() && value2IsEmpty();
+    }
+
+    /**
+     * 该容器是否为单值状态，即：value1 有值、value2 == 无值
+     * @return /
+     */
+    public boolean isSingleValueState() {
+        return ! value1IsEmpty() && value2IsEmpty();
+    }
+
+    /**
+     * 该容器是否为双值状态，即：value2 有值 （在 value2 有值的情况下，即使 value1 无值，也视为双值状态）
+     * @return /
+     */
+    public boolean isDoubleValueState() {
+        return ! value2IsEmpty();
+    }
+
+    /**
+     * 获取两个值的字符串形式，形如：123,abc
+     *
+     * <br><br>
+     * <pre>
+     *     System.out.println(new SaValue2Box(1, 2));     // 1,2
+     *     System.out.println(new SaValue2Box(null, null));   // null
+     *     System.out.println(new SaValue2Box(1, null));   // 1
+     *     System.out.println(new SaValue2Box(null, 2));  // 2
+     * </pre>
+     * @return /
+     */
+    @Override
+    public String toString() {
+        if(value1 == null && value2 == null) {
+            return null;
+        }
+        if(value1 != null && value2 == null) {
+            return value1.toString();
+        }
+        return (value1 == null ? "" : value1.toString()) + "," + (value2 == null ? "" : value2.toString());
+    }
+
+}
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
index 6860ce75..6fcf96d2 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/cases/use/LoginAuthController.java
@@ -111,7 +111,7 @@ public class LoginAuthController {
 		System.out.println("当前登录账号的类型：" + info.getLoginType());
 		System.out.println("当前登录客户端的设备类型：" + info.getLoginDevice());
 		System.out.println("当前 Token 的剩余有效期：" + info.getTokenTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
-		System.out.println("当前 Token 的剩余临时有效期：" + info.getTokenActivityTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
+		System.out.println("当前 Token 距离被冻结还剩：" + info.getTokenActiveTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
 		System.out.println("当前 Account-Session 的剩余有效期" + info.getSessionTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
 		System.out.println("当前 Token-Session 的剩余有效期" + info.getTokenSessionTimeout()); // 单位：秒，-1代表永久有效，-2代表值不存在
 		
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
index 9f526a9b..adb3b0a0 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -7,17 +7,15 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 /**
- * Sa-Token 权限认证工具类 (User版)
+ * Sa-Token 权限认证工具类 (User 版)
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.0.0
  */
-@Component
 public class StpUserUtil {
 
 	private StpUserUtil() {}
@@ -25,7 +23,7 @@ public class StpUserUtil {
 	/**
 	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "user";
+	public static final String TYPE = "login";
 
 	/**
 	 * 底层使用的 StpLogic 对象
@@ -483,24 +481,24 @@ public class StpUserUtil {
 	}
 
 
-	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
-
-	/**
-	 * 检查当前 token 是否已被冻结，如果是则抛出异常
-	 */
-	public static void checkActivityTimeout() {
-		stpLogic.checkActivityTimeout();
-	}
+	// ------------------- Active-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
 	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
 	 * <h2>
 	 * 		请注意: 即使 token 已被冻结 也可续签成功，
-	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActiveTimeout() 强制检查是否冻结即可
 	 * </h2>
 	 */
-	public static void updateLastActivityToNow() {
-		stpLogic.updateLastActivityToNow();
+	public static void updateLastActiveToNow() {
+		stpLogic.updateLastActiveToNow();
+	}
+
+	/**
+	 * 检查当前 token 是否已被冻结，如果是则抛出异常
+	 */
+	public static void checkActiveTimeout() {
+		stpLogic.checkActiveTimeout();
 	}
 
 
@@ -548,8 +546,8 @@ public class StpUserUtil {
 	 *
 	 * @return /
 	 */
-	public static long getTokenActivityTimeout() {
-		return stpLogic.getTokenActivityTimeout();
+	public static long getTokenActiveTimeout() {
+		return stpLogic.getTokenActiveTimeout();
 	}
 
 	/**
diff --git a/sa-token-demo/sa-token-demo-case/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-case/src/main/resources/application.yml
index cb63067a..051ea222 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-case/src/main/resources/application.yml
@@ -2,22 +2,22 @@
 server:
     port: 8081
         
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
-    is-log: false
+    is-log: true
     
 spring: 
     # redis配置 
diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml
index f0cf4189..e0a7d436 100644
--- a/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-jwt/src/main/resources/application.yml
@@ -2,21 +2,21 @@
 server:
     port: 8081
 
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
-    # 是否打印操作日志
+    # 是否输出操作日志 
     is-log: true
     # jwt秘钥 
     jwt-secret-key: asdasdasifhueuiwyurfewbfjsdafjk
diff --git a/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/resources/application.yml
index 424afda2..bf400e19 100644
--- a/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-remember-me/server_project/src/main/resources/application.yml
@@ -2,24 +2,22 @@
 server:
     port: 80
 
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 禁止写入cookie
-    is-read-cookie: false
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
-    is-share: false
-    # token风格
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
+    is-share: true
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
-    is-log: false
+    is-log: true
 
 spring: 
     # redis配置 
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
index 50e75177..30f06694 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-solon/src/main/java/com/pj/test/TestController.java
@@ -159,8 +159,8 @@ public class TestController {
 	public AjaxJson atCheck() {
 		System.out.println("======================= 进入方法，测试注解鉴权接口 ========================= ");
 		System.out.println("只有通过注解鉴权，才能进入此方法");
-//		StpUtil.checkActivityTimeout();
-//		StpUtil.updateLastActivityToNow();
+//		StpUtil.checkActiveTimeout();
+//		StpUtil.updateLastActiveToNow();
 		return AjaxJson.getSuccess();
 	}
 	
@@ -174,8 +174,8 @@ public class TestController {
 	// [活动时间] 续签： http://localhost:8081/test/rene
 	@Mapping("rene")
 	public AjaxJson rene() {
-		StpUtil.checkActivityTimeout();
-		StpUtil.updateLastActivityToNow();
+		StpUtil.checkActiveTimeout();
+		StpUtil.updateLastActiveToNow();
 		return AjaxJson.getSuccess("续签成功");
 	}
 	
diff --git a/sa-token-demo/sa-token-demo-solon/src/main/resources/app.yml b/sa-token-demo/sa-token-demo-solon/src/main/resources/app.yml
index 74dd60ef..b196368c 100644
--- a/sa-token-demo/sa-token-demo-solon/src/main/resources/app.yml
+++ b/sa-token-demo/sa-token-demo-solon/src/main/resources/app.yml
@@ -2,19 +2,19 @@
 server:
     port: 8081
 
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
-    allow-concurrent-login: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+    is-concurrent: true
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
     is-log: true
diff --git a/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
index 55685ecb..3a2d6f57 100644
--- a/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-springboot-redis/src/main/resources/application.yml
@@ -1,20 +1,20 @@
 # 端口
 server:
     port: 8081
-        
-# sa-token配置
+
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
     is-log: true
diff --git a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/resources/application.yml
index cbd12290..2e3219f5 100644
--- a/sa-token-demo/sa-token-demo-springboot-redisson/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-springboot-redisson/src/main/resources/application.yml
@@ -2,21 +2,21 @@
 server:
     port: 8081
 
-# sa-token配置
-sa-token:
-    # token名称 (同时也是cookie名称)
+# sa-token 配置
+sa-token: 
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
-    # 是否输出操作日志
+    # 是否输出操作日志 
     is-log: true
 
 spring:
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
index cccdd95d..fe914cf0 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/java/com/pj/test/TestController.java
@@ -160,8 +160,8 @@ public class TestController {
 	public AjaxJson atCheck() {
 		System.out.println("======================= 进入方法，测试注解鉴权接口 ========================= ");
 		System.out.println("只有通过注解鉴权，才能进入此方法");
-//		StpUtil.checkActivityTimeout();
-//		StpUtil.updateLastActivityToNow();
+//		StpUtil.checkActiveTimeout();
+//		StpUtil.updateLastActiveToNow();
 		return AjaxJson.getSuccess();
 	}
 	
@@ -175,8 +175,8 @@ public class TestController {
 	// [活动时间] 续签： http://localhost:8081/test/rene
 	@RequestMapping("rene")
 	public AjaxJson rene() {
-		StpUtil.checkActivityTimeout();
-		StpUtil.updateLastActivityToNow();
+		StpUtil.checkActiveTimeout();
+		StpUtil.updateLastActiveToNow();
 		return AjaxJson.getSuccess("续签成功");
 	}
 	
diff --git a/sa-token-demo/sa-token-demo-springboot/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-springboot/src/main/resources/application.yml
index cb63067a..2db5fb77 100644
--- a/sa-token-demo/sa-token-demo-springboot/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-springboot/src/main/resources/application.yml
@@ -1,23 +1,23 @@
 # 端口
 server:
     port: 8081
-        
-# sa-token配置
+
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
-    is-log: false
+    is-log: true
     
 spring: 
     # redis配置 
diff --git a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/resources/application.yml
index 0ea7252c..1b1934e0 100644
--- a/sa-token-demo/sa-token-demo-springboot3-redis/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-springboot3-redis/src/main/resources/application.yml
@@ -1,20 +1,20 @@
 # 端口
 server:
     port: 8081
-        
-# sa-token配置
+
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
     is-log: true
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
index 9f526a9b..adb3b0a0 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -7,17 +7,15 @@ import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.SaLoginModel;
 import cn.dev33.satoken.stp.SaTokenInfo;
 import cn.dev33.satoken.stp.StpLogic;
-import org.springframework.stereotype.Component;
 
 import java.util.List;
 
 /**
- * Sa-Token 权限认证工具类 (User版)
+ * Sa-Token 权限认证工具类 (User 版)
  *
  * @author click33
- * @since <= 1.34.0
+ * @since 1.0.0
  */
-@Component
 public class StpUserUtil {
 
 	private StpUserUtil() {}
@@ -25,7 +23,7 @@ public class StpUserUtil {
 	/**
 	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "user";
+	public static final String TYPE = "login";
 
 	/**
 	 * 底层使用的 StpLogic 对象
@@ -483,24 +481,24 @@ public class StpUserUtil {
 	}
 
 
-	// ------------------- Activity-Timeout token 最低活跃度 验证相关 -------------------
-
-	/**
-	 * 检查当前 token 是否已被冻结，如果是则抛出异常
-	 */
-	public static void checkActivityTimeout() {
-		stpLogic.checkActivityTimeout();
-	}
+	// ------------------- Active-Timeout token 最低活跃度 验证相关 -------------------
 
 	/**
 	 * 续签当前 token：(将 [最后操作时间] 更新为当前时间戳)
 	 * <h2>
 	 * 		请注意: 即使 token 已被冻结 也可续签成功，
-	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActivityTimeout() 强制检查是否冻结即可
+	 * 		如果此场景下需要提示续签失败，可在此之前调用 checkActiveTimeout() 强制检查是否冻结即可
 	 * </h2>
 	 */
-	public static void updateLastActivityToNow() {
-		stpLogic.updateLastActivityToNow();
+	public static void updateLastActiveToNow() {
+		stpLogic.updateLastActiveToNow();
+	}
+
+	/**
+	 * 检查当前 token 是否已被冻结，如果是则抛出异常
+	 */
+	public static void checkActiveTimeout() {
+		stpLogic.checkActiveTimeout();
 	}
 
 
@@ -548,8 +546,8 @@ public class StpUserUtil {
 	 *
 	 * @return /
 	 */
-	public static long getTokenActivityTimeout() {
-		return stpLogic.getTokenActivityTimeout();
+	public static long getTokenActiveTimeout() {
+		return stpLogic.getTokenActiveTimeout();
 	}
 
 	/**
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index fe6b12d4..cf2c5ba4 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -1,11 +1,15 @@
 package com.pj.test;
 
+import cn.dev33.satoken.stp.SaLoginConfig;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Date;
+
 /**
  * 测试专用Controller 
  * @author click33
@@ -18,14 +22,15 @@ public class TestController {
 	// 测试登录  ---- http://localhost:8081/test/login
 	@RequestMapping("login")
 	public SaResult login(@RequestParam(defaultValue = "10001") long id) {
-		StpUtil.login(id);
+		StpUtil.login(id, SaLoginConfig.setActiveTimeout(20));
 		return SaResult.ok("登录成功");
 	}
-	
+
 	// 测试   浏览器访问： http://localhost:8081/test/test
 	@RequestMapping("test")
 	public SaResult test() {
-		System.out.println("------------进来了");
+		System.out.println("------------进来了 " + SaFoxUtil.formatDate(new Date()));
+		StpUtil.checkLogin();
 		// 返回
 		return SaResult.data(null);
 	}
diff --git a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
index 221cb0f1..33c83e8a 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
@@ -4,17 +4,17 @@ server:
         
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: 100000
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
     is-log: true
diff --git a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/resources/application.yml
index 3e644c7f..1828ff6a 100644
--- a/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-webflux-springboot3/src/main/resources/application.yml
@@ -2,21 +2,21 @@
 server:
     port: 8081
 
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
-    # 日志
+    # 是否输出操作日志 
     is-log: true
         
 spring: 
diff --git a/sa-token-demo/sa-token-demo-webflux/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-webflux/src/main/resources/application.yml
index 3e644c7f..1828ff6a 100644
--- a/sa-token-demo/sa-token-demo-webflux/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-webflux/src/main/resources/application.yml
@@ -2,21 +2,21 @@
 server:
     port: 8081
 
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
-    # 日志
+    # 是否输出操作日志 
     is-log: true
         
 spring: 
diff --git a/sa-token-demo/sa-token-demo-websocket-spring/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-websocket-spring/src/main/resources/application.yml
index cb63067a..2db5fb77 100644
--- a/sa-token-demo/sa-token-demo-websocket-spring/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-websocket-spring/src/main/resources/application.yml
@@ -1,23 +1,23 @@
 # 端口
 server:
     port: 8081
-        
-# sa-token配置
+
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
-    is-log: false
+    is-log: true
     
 spring: 
     # redis配置 
diff --git a/sa-token-demo/sa-token-demo-websocket/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-websocket/src/main/resources/application.yml
index cb63067a..2db5fb77 100644
--- a/sa-token-demo/sa-token-demo-websocket/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-websocket/src/main/resources/application.yml
@@ -1,23 +1,23 @@
 # 端口
 server:
     port: 8081
-        
-# sa-token配置
+
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # 是否输出操作日志 
-    is-log: false
+    is-log: true
     
 spring: 
     # redis配置 
diff --git a/sa-token-doc/api/stp-util.md b/sa-token-doc/api/stp-util.md
index 1837df09..8395090f 100644
--- a/sa-token-doc/api/stp-util.md
+++ b/sa-token-doc/api/stp-util.md
@@ -90,12 +90,12 @@ StpUtil.getSessionBySessionId("xxxx-xxxx-xxxx");   // 获取指定key的Session,
 
 ### 6、Token有效期相关
 ``` java
-// 临时有效期
-StpUtil.getTokenActivityTimeout();   // 获取当前 token [临时过期] 剩余有效时间 (单位: 秒)
-StpUtil.checkActivityTimeout();   // 检查当前token 是否已经[临时过期]，如果已经过期则抛出异常  
-StpUtil.updateLastActivityToNow();   // 续签当前token：(将 [最后操作时间] 更新为当前时间戳)   
+// Token 最低活跃频率
+StpUtil.getTokenActiveTimeout();   // 获取当前 token 距离被冻结还剩多少时间 (单位: 秒)
+StpUtil.checkActiveTimeout();   // 检查当前token 是否已经被冻结，如果是则抛出异常  
+StpUtil.updateLastActiveToNow();   // 续签当前token：(将 [最后操作时间] 更新为当前时间戳)   
 
-// 长久有效期
+// Token 有效期
 StpUtil.getTokenTimeout();   // 获取当前登录者的 token 剩余有效时间 (单位: 秒)
 StpUtil.getSessionTimeout();   // 获取当前登录者的 Account-Session 剩余有效时间 (单位: 秒)
 StpUtil.getTokenSessionTimeout();   // 获取当前 Token-Session 剩余有效时间 (单位: 秒) 
diff --git a/sa-token-doc/fun/exception-code.md b/sa-token-doc/fun/exception-code.md
index 3cfc33c8..0675dc1f 100644
--- a/sa-token-doc/fun/exception-code.md
+++ b/sa-token-doc/fun/exception-code.md
@@ -79,7 +79,7 @@ SaToken 中的所有异常都是继承于 `SaTokenException` 的，也就是说
 | 11013		| Token已过期							|
 | 11014		| Token已被顶下线						|
 | 11015		| Token已被踢下线						|
-| 11016		| Token已临时过期						|
+| 11016		| Token已被冻结						|
 | 11031		| 在未集成 sa-token-jwt 插件时调用 getExtra() 抛出异常					|
 | 11041		| 缺少指定的角色							|
 | 11051		| 缺少指定的权限							|
diff --git a/sa-token-doc/fun/token-info.md b/sa-token-doc/fun/token-info.md
index ab31874b..68e69a5d 100644
--- a/sa-token-doc/fun/token-info.md
+++ b/sa-token-doc/fun/token-info.md
@@ -15,7 +15,7 @@ token信息Model: 用来描述一个token的常用参数
 		"tokenTimeout": 2591977,          // token剩余有效期 (单位: 秒)
 		"sessionTimeout": 2591977,        // Account-Session剩余有效时间 (单位: 秒)
 		"tokenSessionTimeout": -2,        // Token-Session剩余有效时间 (单位: 秒) (-2表示系统中不存在这个缓存)
-		"tokenActivityTimeout": -1,       // token剩余无操作有效时间 (单位: 秒)
+		"tokenActiveTimeout": -1,         // token 距离被冻结还剩的时间 (单位: 秒)
 		"loginDevice": "default-device"   // 登录设备类型 
 	},
 }
diff --git a/sa-token-doc/fun/token-timeout.md b/sa-token-doc/fun/token-timeout.md
index e5397514..309110dd 100644
--- a/sa-token-doc/fun/token-timeout.md
+++ b/sa-token-doc/fun/token-timeout.md
@@ -2,7 +2,7 @@
 
 <!-- 本篇介绍Token有效期的详细用法 -->
 
-Sa-Token 提供两种 Token 自动过期策略，分别是 `timeout` 与 `activity-timeout`，配置方法如下：
+Sa-Token 提供两种 Token 自动过期策略，分别是 `timeout` 与 `active-timeout`，配置方法如下：
 
 <!---------------------------- tabs:start ---------------------------->
 <!------------- tab:yaml 风格  ------------->
@@ -11,14 +11,14 @@ sa-token:
 	# token 有效期（单位：秒），默认30天，-1代表永不过期 
 	timeout: 2592000
 	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-	activity-timeout: -1
+	active-timeout: -1
 ```
 <!------------- tab:properties 风格  ------------->
 ``` properties
 # token 有效期（单位：秒），默认30天，-1代表永不过期 
 sa-token.timeout=2592000
 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-sa-token.activity-timeout=-1
+sa-token.active-timeout=-1
 ```
 <!---------------------------- tabs:end ---------------------------->
 
@@ -29,7 +29,7 @@ sa-token.activity-timeout=-1
 > 2. 银行为你颁发一张储蓄卡（系统为你颁发一个Token），以后每次存取钱都要带上这张卡（后续每次访问系统都要提交 Token）。
 > 3. 银行为这张卡设定两个过期时间：
 > 	- 第一个是 `timeout`，代表这张卡的长久有效期，就是指这张卡最长能用多久，假设 `timeout=3年`，那么3年后此卡将被银行删除，想要继续来银行办理业务必须重新办卡（Token 过期后想要访问系统必须重新登录）。
-> 	- 第二个就是 `activity-timeout`，代表这张卡的最低活跃频率限制，就是指这张卡必须每隔多久来银行一次，假设 `activity-timeout=1月` ，你如果超过1月不来办一次业务，银行就将你的卡冻结，列为长期不动户（Token 长期不访问系统，被冻结，但不会被删除）。
+> 	- 第二个就是 `active-timeout`，代表这张卡的最低活跃频率限制，就是指这张卡必须每隔多久来银行一次，假设 `active-timeout=1月` ，你如果超过1月不来办一次业务，银行就将你的卡冻结，列为长期不动户（Token 长期不访问系统，被冻结，但不会被删除）。
 > 4. 两个过期策略可以单独配置，也可以同时配置，只要有其中一个有效期超出了范围，这张卡就会变得不可用（两个有效期只要有一个过期了，Token就无法成功访问系统了）。
 
 下面是对两个过期策略的详细解释：
@@ -40,33 +40,33 @@ sa-token.activity-timeout=-1
 3. `timeout`的值配置为-1后，代表永久有效，不会过期。
 
 
-### activity-timeout
-1. `activity-timeout`代表最低活跃频率，单位/秒，例如将其配置为 1800 (30分钟)，代表用户如果30分钟无操作，则此Token会立即过期（被冻结，但不会删除掉）。
+### active-timeout
+1. `active-timeout`代表最低活跃频率，单位/秒，例如将其配置为 1800 (30分钟)，代表用户如果30分钟无操作，则此Token会立即过期（被冻结，但不会删除掉）。
 2. 如果在30分钟内用户有操作，则会再次续签30分钟，用户如果一直操作则会一直续签，直到连续30分钟无操作，Token才会过期。
-3. `activity-timeout`的值配置为-1后，代表永久有效，不会过期，此时也无需频繁续签。
+3. `active-timeout`的值配置为-1后，代表永久有效，不会过期，此时也无需频繁续签。
 
 
-### 关于activity-timeout的续签
-如果`activity-timeout`配置了大于零的值，Sa-Token 会在登录时开始计时，在每次直接或间接调用`getLoginId()`时进行一次冻结检查与续签操作。
+### 关于active-timeout的续签
+如果`active-timeout`配置了大于零的值，Sa-Token 会在登录时开始计时，在每次直接或间接调用`getLoginId()`时进行一次冻结检查与续签操作。
 此时会有两种情况：
 1. 一种是会话无操作时间太长，Token已经被冻结，此时框架会抛出`NotLoginException`异常(场景值=-3)，
-2. 另一种则是会话在`activity-timeout`有效期内通过检查，此时Token可以成功续签 
+2. 另一种则是会话在`active-timeout`有效期内通过检查，此时Token可以成功续签 
 
 
-### 我可以手动续签 activity-timeout 吗？
+### 我可以手动续签 active-timeout 吗？
 **可以！**
 如果框架的自动续签算法无法满足您的业务需求，你可以进行手动续签，Sa-Token 提供两个API供你操作：
-1. `StpUtil.checkActivityTimeout()`: 检查当前Token 是否已经被冻结，如果是则抛出异常
-2. `StpUtil.updateLastActivityToNow()`: 续签当前Token：(将 [最后操作时间] 更新为当前时间戳) 
+1. `StpUtil.checkActiveTimeout()`: 检查当前Token 是否已经被冻结，如果是则抛出异常
+2. `StpUtil.updateLastActiveToNow()`: 续签当前Token：(将 [最后操作时间] 更新为当前时间戳) 
 
 注意：在手动续签时，即使 Token 已经被冻结也可续签成功（解冻），如果此场景下需要提示续签失败，可采用先检查再续签的形式保证Token有效性 
 
 例如以下代码：
 ``` java
 // 先检查是否已被冻结
-StpUtil.checkActivityTimeout();
+StpUtil.checkActiveTimeout();
 // 检查通过后继续续签
-StpUtil.updateLastActivityToNow();
+StpUtil.updateLastActiveToNow();
 ```
 
 同时，你还可以关闭框架的自动续签（在配置文件中配置 `autoRenew=false` ），此时续签操作完全由开发者控制，框架不再自动进行任何续签操作
@@ -75,16 +75,16 @@ StpUtil.updateLastActivityToNow();
 
 ``` java
 // 为指定 Token 续签 
-StpUtil.stpLogic.updateLastActivityToNow(tokenValue);
+StpUtil.stpLogic.updateLastActiveToNow(tokenValue);
 ```
 
 
-### timeout 与 activity-timeout 可以同时使用吗？
+### timeout 与 active-timeout 可以同时使用吗？
 **可以同时使用！** 
 两者的认证逻辑彼此独立，互不干扰，可以同时使用。
 
 
-### StpUtil 类中哪些公开方法支持临时有效期自动续签 activity-timeout? 
+### StpUtil 类中哪些公开方法支持自动续签 active-timeout? 
 > 直接或间接获取了当前用户id的方法 （间接调用过 StpLogic.getLoginId() 方法）
 
 | 包括但不限于这些： |
diff --git a/sa-token-doc/more/common-action.md b/sa-token-doc/more/common-action.md
index db92396f..b9b3a54c 100644
--- a/sa-token-doc/more/common-action.md
+++ b/sa-token-doc/more/common-action.md
@@ -73,18 +73,20 @@ SaFoxUtil.toList(... strs);    // String 数组转集合
 
 1、首先在项目根目录，创建一个配置文件：`sa-token.properties`
 
-``` java
-# token名称 (同时也是cookie名称)
+``` properties
+# token 名称 (同时也是 cookie 名称)
 tokenName=satoken
-# token有效期，单位s 默认30天, -1代表永不过期 
+# token 有效期（单位：秒） 默认30天，-1 代表永久有效
 timeout=2592000
-# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-activityTimeout=-1
-# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) =-1
+# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+activeTimeout=-1
+# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 isConcurrent=true
-# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 isShare=true
-# token风格
+# token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
+tokenStyle=uuid
+# 是否输出操作日志 
 isLog=false
 ```
 
diff --git a/sa-token-doc/more/common-questions.md b/sa-token-doc/more/common-questions.md
index 9dcb325e..1189b16c 100644
--- a/sa-token-doc/more/common-questions.md
+++ b/sa-token-doc/more/common-questions.md
@@ -88,7 +88,7 @@ Sa-Token 的部分 API 只能在 Web 上下文中才能调用，例如：`StpUti
 - 可能9：可能是多账号鉴权的关系，在多账号模式下，如果是 `StpUserUtil.login()` 颁发的token，你从 `StpUtil.checkLogin()` 进行校验，永远都是无效token，因为账号体系没对上。
 
 **如果是：Token已过期：6ad93254-b286-4ec9-9997-4430b0341ca0**
-- 可能1：前端提交的 token 临时过期（activity-timeout超时了，比如配置了 activity-timeout=120，但是超过了120秒没有访问接口）。
+- 可能1：前端提交的 token 已被冻结（active-timeout超时了，比如配置了 active-timeout=120，但是超过了120秒没有访问接口）。
 - 可能2：集成jwt，而且使用的是 Mixin 或 Stateless 模式，而且token过期了（timeout超时了）。
 
 **如果是：Token已被顶下线：6ad93254-b286-4ec9-9997-4430b0341ca0**
diff --git a/sa-token-doc/more/noun-intro.md b/sa-token-doc/more/noun-intro.md
index 8d85314c..22b85da9 100644
--- a/sa-token-doc/more/noun-intro.md
+++ b/sa-token-doc/more/noun-intro.md
@@ -18,7 +18,7 @@ Sa-Token 无意发明任何晦涩概念提升逼格，但在处理 issue 、Q群
 
 #### 两种过期时间：
 - timeout：会话 Token 的长久有效期。
-- activity-timeout：会话的临时有效期。
+- active-timeout：会话 Token 的最低活跃频率。
 
 两者的差别详见：[Token有效期详解](/fun/token-timeout)
 
diff --git a/sa-token-doc/plugin/jwt-extend.md b/sa-token-doc/plugin/jwt-extend.md
index 7aed51f9..84f534b8 100644
--- a/sa-token-doc/plugin/jwt-extend.md
+++ b/sa-token-doc/plugin/jwt-extend.md
@@ -150,7 +150,7 @@ eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpbklkIjoiMTAwMDEiLCJybiI6IjZYYzgySzB
 | 角色认证					| 支持			| 支持				| 支持				|
 | 权限认证					| 支持			| 支持				| 支持				|
 | timeout 有效期				| 支持			| 支持				| 支持				|
-| activity-timeout 有效期	| 支持			| 支持				| 不支持				|
+| active-timeout 有效期		| 支持			| 支持				| 不支持				|
 | id反查Token				| 支持			| 支持				| 不支持				|
 | 会话管理					| 支持			| 部分支持			| 不支持				|
 | 注解鉴权					| 支持			| 支持				| 支持				|
diff --git a/sa-token-doc/start/example.md b/sa-token-doc/start/example.md
index b5e267db..6be60871 100644
--- a/sa-token-doc/start/example.md
+++ b/sa-token-doc/start/example.md
@@ -57,18 +57,18 @@ server:
 sa-token: 
 	# token 名称（同时也是 cookie 名称）
 	token-name: satoken
-	# token 有效期（单位：秒），默认30天，-1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
 	timeout: 2592000
-	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-	activity-timeout: -1
-	# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 	is-concurrent: true
-	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 	is-share: true
-	# token 风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 	token-style: uuid
-	# 是否输出操作日志 
-	is-log: false
+    # 是否输出操作日志 
+	is-log: true
 ```
 
 <!------------- tab:application.properties 风格  ------------->
@@ -78,20 +78,20 @@ server.port=8081
 	
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 
-# token名称（同时也是 cookie 名称）
+# token 名称（同时也是 cookie 名称）
 sa-token.token-name=satoken
-# token 有效期（单位：秒），默认30天，-1代表永不过期 
+# token 有效期（单位：秒） 默认30天，-1 代表永久有效
 sa-token.timeout=2592000
 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-sa-token.activity-timeout=-1
-# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+sa-token.active-timeout=-1
+# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 sa-token.is-concurrent=true
-# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 sa-token.is-share=true
-# token 风格
+# token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 sa-token.token-style=uuid
 # 是否输出操作日志 
-sa-token.is-log=false
+sa-token.is-log=true
 ```
 
 <!---------------------------- tabs:end ---------------------------->
diff --git a/sa-token-doc/start/solon-example.md b/sa-token-doc/start/solon-example.md
index a6a87e41..c31a989f 100644
--- a/sa-token-doc/start/solon-example.md
+++ b/sa-token-doc/start/solon-example.md
@@ -68,18 +68,18 @@ server:
 sa-token: 
 	# token 名称（同时也是 cookie 名称）
 	token-name: satoken
-	# token 有效期（单位：秒），默认30天，-1代表永不过期 
+	# token 有效期（单位：秒） 默认30天，-1 代表永久有效
 	timeout: 2592000
 	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-	activity-timeout: -1
-	# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+	active-timeout: -1
+	# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 	is-concurrent: true
-	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 	is-share: true
-	# token 风格
+	# token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 	token-style: uuid
 	# 是否输出操作日志 
-	is-log: false
+	is-log: true
 ```
 
 <!------------- tab:app.properties 风格  ------------->
@@ -89,20 +89,20 @@ server.port=8081
     
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 
-# token名称（同时也是 cookie 名称）
+# token 名称（同时也是 cookie 名称）
 sa-token.token-name=satoken
-# token 有效期（单位：秒），默认30天，-1代表永不过期 
+# token 有效期（单位：秒） 默认30天，-1 代表永久有效
 sa-token.timeout=2592000
 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-sa-token.activity-timeout=-1
-# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+sa-token.active-timeout=-1
+# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 sa-token.is-concurrent=true
-# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 sa-token.is-share=true
-# token 风格
+# token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 sa-token.token-style=uuid
 # 是否输出操作日志 
-sa-token.is-log=false
+sa-token.is-log=true
 ```
 
 <!---------------------------- tabs:end ---------------------------->
diff --git a/sa-token-doc/use/config.md b/sa-token-doc/use/config.md
index a4828da3..1d6a0956 100644
--- a/sa-token-doc/use/config.md
+++ b/sa-token-doc/use/config.md
@@ -14,38 +14,38 @@
 sa-token: 
 	# token 名称（同时也是 cookie 名称）
 	token-name: satoken
-	# token 有效期（单位：秒），默认30天，-1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
 	timeout: 2592000
-	# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-	activity-timeout: -1
-	# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+	active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 	is-concurrent: true
-	# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 	is-share: true
-	# token 风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 	token-style: uuid
-	# 是否输出操作日志 
-	is-log: false
+    # 是否输出操作日志 
+	is-log: true
 ```
 
 <!------------- tab:properties 风格  ------------->
 ``` properties
 ############## Sa-Token 配置 (文档: https://sa-token.cc) ##############
 
-# token名称（同时也是 cookie 名称）
+# token 名称（同时也是 cookie 名称）
 sa-token.token-name=satoken
-# token 有效期（单位：秒），默认30天，-1代表永不过期 
+# token 有效期（单位：秒） 默认30天，-1 代表永久有效
 sa-token.timeout=2592000
 # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-sa-token.activity-timeout=-1
-# 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
+sa-token.active-timeout=-1
+# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 sa-token.is-concurrent=true
-# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 sa-token.is-share=true
-# token 风格
+# token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
 sa-token.token-style=uuid
 # 是否输出操作日志 
-sa-token.is-log=false
+sa-token.is-log=true
 ```
 
 <!---------------------------- tabs:end ---------------------------->
@@ -70,7 +70,7 @@ public class SaTokenConfigure {
 		SaTokenConfig config = new SaTokenConfig();
 		config.setTokenName("satoken");             // token 名称（同时也是 cookie 名称）
 		config.setTimeout(30 * 24 * 60 * 60);       // token 有效期（单位：秒），默认30天，-1代表永不过期 
-		config.setActivityTimeout(-1);              // token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+		config.setActiveTimeout(-1);              // token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 		config.setIsConcurrent(true);               // 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 		config.setIsShare(true);                    // 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 		config.setTokenStyle("uuid");               // token 风格
@@ -92,7 +92,7 @@ public class SaTokenConfigure {
 	public void configSaToken(SaTokenConfig config) {
 		config.setTokenName("satoken");             // token 名称（同时也是 cookie 名称）
 		config.setTimeout(30 * 24 * 60 * 60);       // token 有效期（单位：秒），默认30天，-1代表永不过期 
-		config.setActivityTimeout(-1);              // token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+		config.setActiveTimeout(-1);              // token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
 		config.setIsConcurrent(true);               // 是否允许同一账号多地同时登录（为 true 时允许一起登录，为 false 时新登录挤掉旧登录）
 		config.setIsShare(true);                    // 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token）
 		config.setTokenStyle("uuid");               // token 风格
@@ -116,7 +116,7 @@ public class SaTokenConfigure {
 | :--------				| :--------	| :--------	| :--------																			|
 | tokenName				| String	| satoken	| Token 名称 （同时也是 Cookie 名称、数据持久化前缀）													|
 | timeout				| long		| 2592000	| Token 有效期（单位：秒），默认30天，-1代表永不过期 [参考：token有效期详解](/fun/token-timeout)		|
-| activityTimeout		| long		| -1		| Token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结（例如可以设置为1800代表30分钟内无操作就过期） 	[参考：token有效期详解](/fun/token-timeout)													|
+| activeTimeout			| long		| -1		| Token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结（例如可以设置为1800代表30分钟内无操作就冻结） 	[参考：token有效期详解](/fun/token-timeout)													|
 | isConcurrent			| Boolean	| true		| 是否允许同一账号并发登录 （为 true 时允许一起登录，为 false 时新登录挤掉旧登录）															|
 | isShare				| Boolean	| true		| 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token，为 false 时每次登录新建一个 token） 	|
 | maxLoginCount			| int		| 12		| 同一账号最大登录数量，-1代表不限 （只有在 `isConcurrent=true`，`isShare=false` 时此配置才有效），[详解](/use/config?id=配置项详解：maxlogincount)	|
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index 5966e5be..38077af3 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -89,7 +89,7 @@ public class StpLogicJwtForMixin extends StpLogic {
 		info.tokenTimeout = getTokenTimeout();
 		info.sessionTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
 		info.tokenSessionTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
-		info.tokenActivityTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
+		info.tokenActiveTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
 		info.loginDevice = getLoginDevice();
 		return info;
 	}
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index a9140983..daf5e4c6 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -91,7 +91,7 @@ public class StpLogicJwtForStateless extends StpLogic {
 		info.tokenTimeout = getTokenTimeout();
 		info.sessionTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
 		info.tokenSessionTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
-		info.tokenActivityTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
+		info.tokenActiveTimeout = SaTokenDao.NOT_VALUE_EXPIRE;
 		info.loginDevice = getLoginDevice();
 		return info;
 	}
diff --git a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java
index a53bd731..073dccee 100644
--- a/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java
+++ b/sa-token-starter/sa-token-jboot-plugin/src/test/java/cn/dev33/satoken/jboot/test/AtteStartListener.java
@@ -39,7 +39,7 @@ public class AtteStartListener implements JbootAppListener {
         SaTokenConfig saTokenConfig = new SaTokenConfig();
         saTokenConfig.setTokenStyle(SaTokenConsts.TOKEN_STYLE_SIMPLE_UUID);
         saTokenConfig.setTimeout(60*60*4);  //登录有效时间4小时
-        saTokenConfig.setActivityTimeout(30*60); //半小时无操作过期处理
+        saTokenConfig.setActiveTimeout(30*60); //半小时无操作就冻结 token 
         saTokenConfig.setIsShare(false);
         saTokenConfig.setTokenName("token");    //更换satoken的名称
         saTokenConfig.setCookie(new SaCookieConfig().setHttpOnly(true));    //开启cookies的httponly属性
diff --git a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java
index 8fe79e8e..527e5821 100644
--- a/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java
+++ b/sa-token-starter/sa-token-jfinal-plugin/src/test/java/cn/dev33/satoken/jfinal/test/Config.java
@@ -38,7 +38,7 @@ public class Config extends JFinalConfig {
         SaTokenConfig saTokenConfig = new SaTokenConfig();
         saTokenConfig.setTokenStyle(SaTokenConsts.TOKEN_STYLE_SIMPLE_UUID);
         saTokenConfig.setTimeout(60*60*4);  //登录有效时间4小时
-        saTokenConfig.setActivityTimeout(30*60); //半小时无操作过期处理
+        saTokenConfig.setActiveTimeout(30*60); //半小时无操作就冻结 token 
         saTokenConfig.setIsShare(false);
         saTokenConfig.setTokenName("token");    //更改satoken的cookies名称
         SaCookieConfig saCookieConfig = new SaCookieConfig();
diff --git a/sa-token-starter/sa-token-solon-plugin/src/test/resources/app.yml b/sa-token-starter/sa-token-solon-plugin/src/test/resources/app.yml
index 5dd15890..06aa42b1 100644
--- a/sa-token-starter/sa-token-solon-plugin/src/test/resources/app.yml
+++ b/sa-token-starter/sa-token-solon-plugin/src/test/resources/app.yml
@@ -1,21 +1,21 @@
 
 
-# sa-token配置
+# sa-token 配置
 sa-token:
-  # token名称 (同时也是cookie名称)
+  # token 名称 (同时也是 cookie 名称)
   token-name: satoken
-  # token有效期，单位s 默认30天, -1代表永不过期
+  # token 有效期（单位：秒） 默认30天，-1 代表永久有效
   timeout: 2592000
-  # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-  activity-timeout: -1
-  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
-  allow-concurrent-login: true
-  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+  # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+  active-timeout: -1
+  # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+  is-concurrent: true
+  # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
   is-share: true
-  # token风格
+  # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
   token-style: uuid
-  # 是否输出操作日志
-  is-log: false
+  # 是否输出操作日志 
+  is-log: true
 
 
 sa-token-dao: #名字可以随意取
diff --git a/sa-token-test/sa-token-jwt-test/src/test/resources/application.yml b/sa-token-test/sa-token-jwt-test/src/test/resources/application.yml
index 0f148e62..b2cd002e 100644
--- a/sa-token-test/sa-token-jwt-test/src/test/resources/application.yml
+++ b/sa-token-test/sa-token-jwt-test/src/test/resources/application.yml
@@ -2,19 +2,19 @@
 server:
     port: 8081
 
-# sa-token配置
+# sa-token 配置
 sa-token: 
-    # token名称 (同时也是cookie名称)
+    # token 名称 (同时也是 cookie 名称)
     token-name: satoken
-    # token有效期，单位s 默认30天, -1代表永不过期 
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
-    # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-    activity-timeout: -1
-    # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) 
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
-    # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
     is-share: true
-    # token风格
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
     token-style: uuid
     # jwt秘钥 
     jwt-secret-key: asdasdasifhueuiwyurfewbfjsdafjk
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
index 7848a86b..a99ccb3b 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/config/SaTokenConfigTest.java
@@ -41,8 +41,8 @@ public class SaTokenConfigTest {
 		config.setTimeout(100204);
 		Assertions.assertEquals(config.getTimeout(), 100204);
 		
-		config.setActivityTimeout(1804);
-		Assertions.assertEquals(config.getActivityTimeout(), 1804);
+		config.setActiveTimeout(1804);
+		Assertions.assertEquals(config.getActiveTimeout(), 1804);
 
 		config.setIsConcurrent(false);
 		Assertions.assertEquals(config.getIsConcurrent(), false);
@@ -111,7 +111,7 @@ public class SaTokenConfigTest {
 		SaTokenConfig config = SaTokenConfigFactory.createConfig("sa-token2.properties");
 		Assertions.assertEquals(config.getTokenName(), "use-token");
 		Assertions.assertEquals(config.getTimeout(), 9000);
-		Assertions.assertEquals(config.getActivityTimeout(), 240);
+		Assertions.assertEquals(config.getActiveTimeout(), 240);
 		Assertions.assertEquals(config.getIsConcurrent(), false);
 		Assertions.assertEquals(config.getIsShare(), false);
 		Assertions.assertEquals(config.getIsLog(), true);
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
index 3a076a11..f0956425 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/core/stp/TokenInfoTest.java
@@ -45,7 +45,7 @@ public class TokenInfoTest {
 		info.setTokenTimeout(1800);
 		info.setSessionTimeout(120);
 		info.setTokenSessionTimeout(1800);
-		info.setTokenActivityTimeout(120);
+		info.setTokenActiveTimeout(120);
 		info.setLoginDevice("PC");
 		info.setTag("xxx");
 
@@ -57,7 +57,7 @@ public class TokenInfoTest {
 		Assertions.assertEquals(info.getTokenTimeout(), 1800);
 		Assertions.assertEquals(info.getSessionTimeout(), 120);
 		Assertions.assertEquals(info.getTokenSessionTimeout(), 1800);
-		Assertions.assertEquals(info.getTokenActivityTimeout(), 120);
+		Assertions.assertEquals(info.getTokenActiveTimeout(), 120);
 		Assertions.assertEquals(info.getLoginDevice(), "PC");
 		Assertions.assertEquals(info.getTag(), "xxx");
 		
diff --git a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
index f0bdb8d6..fa365f1e 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
+++ b/sa-token-test/sa-token-springboot-test/src/test/java/cn/dev33/satoken/springboot/BasicsTest.java
@@ -75,7 +75,7 @@ public class BasicsTest {
 	@BeforeAll
     public static void beforeClass() {
     	System.out.println("\n\n------------------------ 基础测试 star ...");
-    	SaManager.getConfig().setActivityTimeout(180);
+    	SaManager.getConfig().setActiveTimeout(180);
     }
 
 	// 结束 
@@ -710,20 +710,20 @@ public class BasicsTest {
     	Assertions.assertEquals(tokenSession.get("code"), "123456");
     }
 
-    // 测试，临时过期 
+    // 测试，token 最低活跃频率  
     @Test
-    public void testActivityTimeout() {
+    public void testActiveTimeout() {
     	// 登录 
     	StpUtil.login(10001);
     	Assertions.assertNotNull(StpUtil.getTokenValue());
     	
     	// 默认跟随全局 timeout 
-    	StpUtil.updateLastActivityToNow();
-    	long activityTimeout = StpUtil.getTokenActivityTimeout();
-    	Assertions.assertTrue(activityTimeout <=180 || activityTimeout >=179);
+    	StpUtil.updateLastActiveToNow();
+    	long activeTimeout = StpUtil.getTokenActiveTimeout();
+    	Assertions.assertTrue(activeTimeout <=180 || activeTimeout >=179);
     	
     	// 不会抛出异常 
-    	Assertions.assertDoesNotThrow(() -> StpUtil.checkActivityTimeout());
+    	Assertions.assertDoesNotThrow(() -> StpUtil.checkActiveTimeout());
     }
 
     // 测试，上下文 API 
diff --git a/sa-token-test/sa-token-springboot-test/src/test/resources/sa-token2.properties b/sa-token-test/sa-token-springboot-test/src/test/resources/sa-token2.properties
index 929ff96e..e65a57f6 100644
--- a/sa-token-test/sa-token-springboot-test/src/test/resources/sa-token2.properties
+++ b/sa-token-test/sa-token-springboot-test/src/test/resources/sa-token2.properties
@@ -1,12 +1,12 @@
-# token名称 (同时也是cookie名称)
+# token 名称 (同时也是 cookie 名称)
 tokenName=use-token
-# token有效期，单位s 默认30天, -1代表永不过期 
+# token 有效期（单位：秒） 默认30天，-1 代表永久有效
 timeout=9000
-# token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-activityTimeout=240
-# 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) =-1
+# token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+activeTimeout=240
+# 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
 isConcurrent=false
-# 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) 
+# 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
 isShare=false
-# token风格
-isLog=true
+# 是否输出操作日志 
+isLog=true
\ No newline at end of file

From 152418165e6fa1e3b678ea8986642810dca710e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Jun 2023 02:59:38 +0000
Subject: [PATCH 108/129] Bump vite

Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.2.0 to 3.2.7.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v3.2.7/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v3.2.7/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../package-lock.json                          | 18 +++++++++++-------
 .../sa-token-demo-sso-client-vue3/package.json |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package-lock.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package-lock.json
index bacdedea..c45798ad 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package-lock.json
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package-lock.json
@@ -14,7 +14,7 @@
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^3.2.0",
-        "vite": "^3.2.0"
+        "vite": "^3.2.7"
       }
     },
     "node_modules/@babel/parser": {
@@ -775,9 +775,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/vite/-/vite-3.2.0.tgz",
-      "integrity": "sha512-Ovj7+cqIdM1I0LPCk2CWxzgADXMix3NLXpUT6g7P7zg/a9grk/TaC3qn9YMg7w7M0POIVCBOp1aBANJW+RH7oA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmmirror.com/vite/-/vite-3.2.7.tgz",
+      "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.15.9",
@@ -795,6 +795,7 @@
         "fsevents": "~2.3.2"
       },
       "peerDependencies": {
+        "@types/node": ">= 14",
         "less": "*",
         "sass": "*",
         "stylus": "*",
@@ -802,6 +803,9 @@
         "terser": "^5.4.0"
       },
       "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
@@ -1322,9 +1326,9 @@
       "dev": true
     },
     "vite": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/vite/-/vite-3.2.0.tgz",
-      "integrity": "sha512-Ovj7+cqIdM1I0LPCk2CWxzgADXMix3NLXpUT6g7P7zg/a9grk/TaC3qn9YMg7w7M0POIVCBOp1aBANJW+RH7oA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmmirror.com/vite/-/vite-3.2.7.tgz",
+      "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
       "dev": true,
       "requires": {
         "esbuild": "^0.15.9",
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package.json
index f4a3c237..557d53a9 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package.json
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue3/package.json
@@ -15,6 +15,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^3.2.0",
-    "vite": "^3.2.0"
+    "vite": "^3.2.7"
   }
 }

From 688cde980f66f8eaaa0e925d56b3ab123e22ff24 Mon Sep 17 00:00:00 2001
From: AppleOfGray <emailtome123456@163.com>
Date: Tue, 6 Jun 2023 03:28:07 +0000
Subject: [PATCH 109/129] =?UTF-8?q?update=20sa-token-doc/sso/sso-type3.md.?=
 =?UTF-8?q?=20sso=E7=9A=84demo=E9=A1=B9=E7=9B=AE=E5=9D=87=E5=B7=B2?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB,=20=E6=96=87=E6=A1=A3=E4=B9=9F=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E8=BF=9B=E8=A1=8C=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/sso/sso-type3.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-doc/sso/sso-type3.md b/sa-token-doc/sso/sso-type3.md
index b26766f5..aebd01f9 100644
--- a/sa-token-doc/sso/sso-type3.md
+++ b/sa-token-doc/sso/sso-type3.md
@@ -14,7 +14,7 @@
 
 所以模式三的主要目标：也就是在 模式二的基础上 解决上述 三个难题 
 
-> 模式三的 Demo 示例地址：`/sa-token-demo/sa-token-demo-sso3-client/` 
+> 模式三的 Demo 示例地址：`/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/` 
 > [源码链接](https://gitee.com/dromara/sa-token/tree/dev/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client)，如遇难点可参考示例 
 
 

From d83640ab5ecd476a31286a1483c69abb7f67df51 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 7 Jun 2023 13:14:05 +0800
Subject: [PATCH 110/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=20active-timeout=20?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 75 +++++++++----------
 .../cn/dev33/satoken/util/SaValue2Box.java    |  2 +-
 .../src/main/resources/application.yml        |  2 +-
 3 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index a06861f9..49f0b677 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -614,7 +614,9 @@ public class StpLogic {
 				session.removeTokenSign(tokenValue);
 
 				// 2.3、清除这个 token 的最后活跃时间记录
-				clearLastActive(tokenValue);
+				if(isOpenCheckActiveTimeout()) {
+					clearLastActive(tokenValue);
+				}
 
 		 		// 2.4、清除 token -> id 的映射关系
 				deleteTokenToIdMapping(tokenValue);
@@ -662,7 +664,9 @@ public class StpLogic {
 			session.removeTokenSign(tokenValue);
 
 			// 3.3、清除这个 token 的最后活跃时间记录
-			clearLastActive(tokenValue);
+			if(isOpenCheckActiveTimeout()) {
+				clearLastActive(tokenValue);
+			}
 
 	 		// 3.4、清除 token -> id 的映射关系
 			deleteTokenToIdMapping(tokenValue);
@@ -685,7 +689,9 @@ public class StpLogic {
 	 */
 	public void logoutByTokenValue(String tokenValue) {
 		// 1、清除这个 token 的最后活跃时间记录
-		clearLastActive(tokenValue);
+		if(isOpenCheckActiveTimeout()) {
+			clearLastActive(tokenValue);
+		}
 		
 		// 2、清除这个 token 的 Token-Session 对象
 		deleteTokenSession(tokenValue);
@@ -744,7 +750,9 @@ public class StpLogic {
 				session.removeTokenSign(tokenValue);
 
 				// 2.3、清除这个 token 的最后活跃时间记录
-				clearLastActive(tokenValue);
+				if(isOpenCheckActiveTimeout()) {
+					clearLastActive(tokenValue);
+				}
 
 				// 2.4、将此 token 标记为：已被踢下线
 				updateTokenToIdMapping(tokenValue, NotLoginException.KICK_OUT);
@@ -769,7 +777,9 @@ public class StpLogic {
 	 */
 	public void kickoutByTokenValue(String tokenValue) {
 		// 1、清除这个 token 的最后活跃时间记录
-		clearLastActive(tokenValue);
+		if(isOpenCheckActiveTimeout()) {
+			clearLastActive(tokenValue);
+		}
 		
 		// 2、此处不需要清除它的 Token-Session 对象
 		// deleteTokenSession(tokenValue);
@@ -816,7 +826,9 @@ public class StpLogic {
 				session.removeTokenSign(tokenValue);
 
 				// 2.3、清除这个 token 的最后活跃时间记录
-				clearLastActive(tokenValue);
+				if(isOpenCheckActiveTimeout()) {
+					clearLastActive(tokenValue);
+				}
 
 				// 2.4、将此 token 标记为：已被顶下线
 				updateTokenToIdMapping(tokenValue, NotLoginException.BE_REPLACED);
@@ -894,16 +906,17 @@ public class StpLogic {
 			throw NotLoginException.newInstance(loginType, KICK_OUT, KICK_OUT_MESSAGE, tokenValue).setCode(SaErrorCode.CODE_11015);
  		}
 
- 		// 7、检查此 token 的最后活跃时间是否已经超过了 active-timeout 的限制，
-		//    如果是则代表其已被冻结，需要抛出：token 已过期
-	 	checkActiveTimeout(tokenValue);
+		// 7、检查此 token 的最后活跃时间是否已经超过了 active-timeout 的限制，如果是则代表其已被冻结，需要抛出：token 已被冻结
+		if(isOpenCheckActiveTimeout()) {
+			checkActiveTimeout(tokenValue);
 
-		// ------ 至此，loginId 已经是一个合法的值，代表当前会话是一个正常的登录状态了
+			// ------ 至此，loginId 已经是一个合法的值，代表当前会话是一个正常的登录状态了
 
- 		// 8、如果配置了自动续签功能, 则: 更新这个 token 的最后活跃时间 （注意此处的续签是在续 active-timeout，而非 timeout）
- 		if(isOpenCheckActiveTimeout() && getConfig().getAutoRenew()) {
- 	 		updateLastActiveToNow(tokenValue);
- 		}
+			// 8、如果配置了自动续签功能, 则: 更新这个 token 的最后活跃时间 （注意此处的续签是在续 active-timeout，而非 timeout）
+			if(getConfig().getAutoRenew()) {
+				updateLastActiveToNow(tokenValue);
+			}
+		}
 
  		// 9、返回 loginId
  		return loginId;
@@ -1345,7 +1358,7 @@ public class StpLogic {
 		}
 		// activeTimeout 变量无需赋值默认值，因为当缓存中没有这个值时，会自动使用全局配置的值
 
- 		// 将[ 最后活跃时间 ] 标记为当前时间戳
+ 		// 将此 token 的 [ 最后活跃时间 ] 标记为当前时间戳
 		String key = splicingKeyLastActiveTime(tokenValue);
 		String value = String.valueOf(System.currentTimeMillis());
 		if(config.getDynamicActiveTimeout() && activeTimeout != null) {
@@ -1360,13 +1373,6 @@ public class StpLogic {
 	 * @param tokenValue 指定token
 	 */
 	public void updateLastActiveToNow(String tokenValue) {
-		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
-		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenCheckActiveTimeout() ) {
-			return;
-		}
-
-
-		// 将这个 token 的 [ 最后活跃时间 ] 更新为当前时间戳
 		String key = splicingKeyLastActiveTime(tokenValue);
 		String value = new SaValue2Box(System.currentTimeMillis(), getTokenUseActiveTimeout(tokenValue)).toString();
 		getSaTokenDao().update(key, value);
@@ -1389,15 +1395,7 @@ public class StpLogic {
  	 * @param tokenValue 指定 token
  	 */
  	protected void clearLastActive(String tokenValue) {
-
-		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
-		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenCheckActiveTimeout() ) {
-			return;
-		}
-
- 		// 删除 [ 最后活跃时间 ]
-		String key = splicingKeyLastActiveTime(tokenValue);
- 		getSaTokenDao().delete(key);
+ 		getSaTokenDao().delete(splicingKeyLastActiveTime(tokenValue));
  	}
  	
  	/**
@@ -1407,13 +1405,7 @@ public class StpLogic {
  	 */
  	public void checkActiveTimeout(String tokenValue) {
 
-		// 如果提供的 token 无效，或者配置没有打开 token 活跃度校验, 则立即返回，无需操作
-		if(SaFoxUtil.isEmpty(tokenValue) || ! isOpenCheckActiveTimeout() ) {
-			return;
-		}
-
-		// 下面开始校验这个 token 是否已被冻结
-		// 		storage.get(key, () -> {}) 可以避免一次请求多次校验，造成不必要的性能消耗
+		// storage.get(key, () -> {}) 可以避免一次请求多次校验，造成不必要的性能消耗
  		SaStorage storage = SaHolder.getStorage();
 		storage.get(SaTokenConsts.TOKEN_ACTIVE_TIMEOUT_CHECKED_KEY, () -> {
 
@@ -1449,11 +1441,16 @@ public class StpLogic {
 	 * @return /
 	 */
 	public Long getTokenUseActiveTimeout(String tokenValue) {
+		// 在未启用动态 activeTimeout 功能时，直接返回 null
+		if( ! getConfig().getDynamicActiveTimeout()) {
+			return null;
+		}
+
 		// 先取出这个 token 的最后活跃时间值
 		String key = splicingKeyLastActiveTime(tokenValue);
 		String value = getSaTokenDao().get(key);
 
-		// 先获取缓存库里的值，获取不到则使用全局配置
+		// 解析，无值的情况下返回 null
 		SaValue2Box box = new SaValue2Box(value);
 		return box.getValue2AsLong(null);
 	}
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java
index 6a9dcdbd..db627b64 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/util/SaValue2Box.java
@@ -201,7 +201,7 @@ public class SaValue2Box {
      *     System.out.println(new SaValue2Box(1, 2));     // 1,2
      *     System.out.println(new SaValue2Box(null, null));   // null
      *     System.out.println(new SaValue2Box(1, null));   // 1
-     *     System.out.println(new SaValue2Box(null, 2));  // 2
+     *     System.out.println(new SaValue2Box(null, 2));  // ,2
      * </pre>
      * @return /
      */
diff --git a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
index 33c83e8a..cce187f4 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-test/src/main/resources/application.yml
@@ -9,7 +9,7 @@ sa-token:
     # token 有效期（单位：秒） 默认30天，-1 代表永久有效
     timeout: 2592000
     # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
-    active-timeout: 100000
+    active-timeout: -1
     # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
     is-concurrent: true
     # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）

From 15027bbe095234aa23f9dd867cb1ac618b275adb Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 7 Jun 2023 14:16:52 +0800
Subject: [PATCH 111/129] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E5=A3=B0=E6=98=8E=E6=8A=BD=E7=A6=BB=E4=B8=BA=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E7=9A=84=E5=87=BD=E6=95=B0=E5=BC=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaCheckElementAnnotationFunction.java     |  33 +++++
 .../SaCheckMethodAnnotationFunction.java      |  33 +++++
 .../strategy/SaCheckOrAnnotationFunction.java |  34 +++++
 .../fun/strategy/SaCreateSessionFunction.java |  34 +++++
 .../strategy/SaCreateStpLogicFunction.java    |  34 +++++
 .../fun/strategy/SaCreateTokenFunction.java   |  32 +++++
 .../SaGenerateUniqueTokenFunction.java        |   7 +-
 .../fun/strategy/SaGetAnnotationFunction.java |  34 +++++
 .../fun/strategy/SaHasElementFunction.java    |  33 +++++
 .../SaIsAnnotationPresentFunction.java        |  34 +++++
 .../cn/dev33/satoken/strategy/SaStrategy.java | 136 ++++++++----------
 .../main/java/com/pj/SaTokenApplication.java  |   8 ++
 sa-token-doc/fun/plugin-dev.md                |   2 +-
 sa-token-doc/up/many-account.md               |   2 +-
 sa-token-doc/up/token-style.md                |   2 +-
 15 files changed, 376 insertions(+), 82 deletions(-)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java
 rename sa-token-core/src/main/java/cn/dev33/satoken/fun/{ => strategy}/SaGenerateUniqueTokenFunction.java (88%)
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java
 create mode 100644 sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java
new file mode 100644
index 00000000..97a67c2e
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckElementAnnotationFunction.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import java.lang.reflect.AnnotatedElement;
+import java.util.function.Consumer;
+
+/**
+ * 函数式接口：对一个 [元素] 对象进行注解校验 （注解鉴权内部实现）
+ *
+ * <p>  参数：element元素  </p>
+ * <p>  返回：无  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaCheckElementAnnotationFunction extends Consumer<AnnotatedElement> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java
new file mode 100644
index 00000000..8bcd4318
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckMethodAnnotationFunction.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import java.lang.reflect.Method;
+import java.util.function.Consumer;
+
+/**
+ * 函数式接口：对一个 [Method] 对象进行注解校验 （注解鉴权内部实现）
+ *
+ * <p>  参数：Method句柄  </p>
+ * <p>  返回：无  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaCheckMethodAnnotationFunction extends Consumer<Method> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java
new file mode 100644
index 00000000..c6f6ad54
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCheckOrAnnotationFunction.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import cn.dev33.satoken.annotation.SaCheckOr;
+
+import java.util.function.Consumer;
+
+/**
+ * 函数式接口：对一个 @SaCheckOr 进行注解校验
+ *
+ * <p>  参数：SaCheckOr 注解的实例  </p>
+ * <p>  返回：无  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaCheckOrAnnotationFunction extends Consumer<SaCheckOr> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java
new file mode 100644
index 00000000..0963edff
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateSessionFunction.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import cn.dev33.satoken.session.SaSession;
+
+import java.util.function.Function;
+
+/**
+ * 函数式接口：创建 SaSession 的策略
+ *
+ * <p>  参数：SessionId  </p>
+ * <p>  返回：SaSession对象  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaCreateSessionFunction extends Function<String, SaSession> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java
new file mode 100644
index 00000000..2c3c75d6
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateStpLogicFunction.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import cn.dev33.satoken.stp.StpLogic;
+
+import java.util.function.Function;
+
+/**
+ * 函数式接口：创建 StpLogic 的算法
+ *
+ * <p>  参数：账号体系标识  </p>
+ * <p>  返回：创建好的 StpLogic 对象  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaCreateStpLogicFunction extends Function<String, StpLogic> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java
new file mode 100644
index 00000000..f85c40bb
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaCreateTokenFunction.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import java.util.function.BiFunction;
+
+/**
+ * 函数式接口：创建 token 的策略
+ *
+ * <p>  参数：账号 id、账号类型  </p>
+ * <p>  返回：token 值  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaCreateTokenFunction extends BiFunction<Object, String, String> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java
similarity index 88%
rename from sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
rename to sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java
index 031ec5df..d1a72f0f 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/fun/SaGenerateUniqueTokenFunction.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGenerateUniqueTokenFunction.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.dev33.satoken.fun;
+package cn.dev33.satoken.fun.strategy;
 
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -21,8 +21,11 @@ import java.util.function.Supplier;
 /**
  * 生成唯一式 token 的函数式接口，方便开发者进行 lambda 表达式风格调用
  *
+ * <p>  参数：元素名称, 最大尝试次数, 创建 token 函数, 检查 token 函数 </p>
+ * <p>  返回：生成的token  </p>
+ *
  * @author click33
- * @since 1.34.0
+ * @since 1.35.0
  */
 @FunctionalInterface
 public interface SaGenerateUniqueTokenFunction {
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java
new file mode 100644
index 00000000..6908b639
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaGetAnnotationFunction.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.util.function.BiFunction;
+
+/**
+ * 函数式接口：从元素上获取注解
+ *
+ * <p>  参数：element元素，要获取的注解类型  </p>
+ * <p>  返回：注解对象  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaGetAnnotationFunction extends BiFunction<AnnotatedElement, Class<? extends Annotation> , Annotation> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java
new file mode 100644
index 00000000..3ee75089
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaHasElementFunction.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import java.util.List;
+import java.util.function.BiFunction;
+
+/**
+ * 函数式接口：判断集合中是否包含指定元素（模糊匹配）
+ *
+ * <p>  参数：集合、元素  </p>
+ * <p>  返回：是否包含  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaHasElementFunction extends BiFunction<List<String>, String, Boolean> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java
new file mode 100644
index 00000000..88fe7072
--- /dev/null
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/fun/strategy/SaIsAnnotationPresentFunction.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2020-2099 sa-token.cc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package cn.dev33.satoken.fun.strategy;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.function.BiFunction;
+
+/**
+ * 函数式接口：判断一个 Method 或其所属 Class 是否包含指定注解
+ *
+ * <p>  参数：Method、注解  </p>
+ * <p>  返回：是否包含  </p>
+ *
+ * @author click33
+ * @since 1.35.0
+ */
+@FunctionalInterface
+public interface SaIsAnnotationPresentFunction extends BiFunction<Method, Class<? extends Annotation>, Boolean> {
+
+}
\ No newline at end of file
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 4b50b86e..ee1afc75 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -19,20 +19,16 @@ import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.*;
 import cn.dev33.satoken.basic.SaBasicUtil;
 import cn.dev33.satoken.exception.SaTokenException;
-import cn.dev33.satoken.fun.SaGenerateUniqueTokenFunction;
+import cn.dev33.satoken.fun.strategy.SaGenerateUniqueTokenFunction;
+import cn.dev33.satoken.fun.strategy.*;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.function.Function;
 
 /**
@@ -42,7 +38,7 @@ import java.util.function.Function;
  * </p>
  * <pre>
 	// SaStrategy全局单例，所有方法都用以下形式重写 
-	SaStrategy.me.setCreateToken((loginId, loginType) -》 {
+	SaStrategy.instance.setCreateToken((loginId, loginType) -》 {
 		// 自定义Token生成的算法 
 		return "xxxx";
 	});
@@ -65,10 +61,9 @@ public final class SaStrategy {
 	// ----------------------- 所有策略
 	
 	/**
-	 * 创建 Token 的策略 
-	 * <p> 参数 [ 账号id, 账号类型 ]
+	 * 创建 Token 的策略
 	 */
-	public BiFunction<Object, String, String> createToken = (loginId, loginType) -> {
+	public SaCreateTokenFunction createToken = (loginId, loginType) -> {
 		// 根据配置的tokenStyle生成不同风格的token 
 		String tokenStyle = SaManager.getConfig().getTokenStyle();
 
@@ -106,18 +101,16 @@ public final class SaStrategy {
 	};
 	
 	/**
-	 * 创建 Session 的策略 
-	 * <p> 参数 [SessionId] 
+	 * 创建 Session 的策略
 	 */
-	public Function<String, SaSession> createSession = (sessionId) -> {
+	public SaCreateSessionFunction createSession = (sessionId) -> {
 		return new SaSession(sessionId);
 	};
 
 	/**
-	 * 判断：集合中是否包含指定元素（模糊匹配） 
-	 * <p> 参数 [集合, 元素] 
+	 * 判断：集合中是否包含指定元素（模糊匹配）
 	 */
-	public BiFunction<List<String>, String, Boolean> hasElement = (list, element) -> {
+	public SaHasElementFunction hasElement = (list, element) -> {
 
 		// 空集合直接返回false
 		if(list == null || list.size() == 0) {
@@ -141,10 +134,9 @@ public final class SaStrategy {
 	};
 
 	/**
-	 * 对一个 [Method] 对象进行注解校验 （注解鉴权内部实现） 
-	 * <p> 参数 [Method句柄] 
+	 * 对一个 [Method] 对象进行注解校验 （注解鉴权内部实现）
 	 */
-	public Consumer<Method> checkMethodAnnotation = (method) -> {
+	public SaCheckMethodAnnotationFunction checkMethodAnnotation = (method) -> {
 
 		// 先校验 Method 所属 Class 上的注解 
 		instance.checkElementAnnotation.accept(method.getDeclaringClass());
@@ -154,49 +146,48 @@ public final class SaStrategy {
 	};
 
 	/**
-	 * 对一个 [元素] 对象进行注解校验 （注解鉴权内部实现） 
-	 * <p> 参数 [element元素] 
+	 * 对一个 [元素] 对象进行注解校验 （注解鉴权内部实现）
 	 */
-	public Consumer<AnnotatedElement> checkElementAnnotation = (target) -> {
+	public SaCheckElementAnnotationFunction checkElementAnnotation = (element) -> {
 
 		// 校验 @SaCheckLogin 注解 
-		SaCheckLogin checkLogin = (SaCheckLogin) SaStrategy.instance.getAnnotation.apply(target, SaCheckLogin.class);
+		SaCheckLogin checkLogin = (SaCheckLogin) SaStrategy.instance.getAnnotation.apply(element, SaCheckLogin.class);
 		if(checkLogin != null) {
 			SaManager.getStpLogic(checkLogin.type(), false).checkByAnnotation(checkLogin);
 		}
 		
 		// 校验 @SaCheckRole 注解 
-		SaCheckRole checkRole = (SaCheckRole) SaStrategy.instance.getAnnotation.apply(target, SaCheckRole.class);
+		SaCheckRole checkRole = (SaCheckRole) SaStrategy.instance.getAnnotation.apply(element, SaCheckRole.class);
 		if(checkRole != null) {
 			SaManager.getStpLogic(checkRole.type(), false).checkByAnnotation(checkRole);
 		}
 		
 		// 校验 @SaCheckPermission 注解
-		SaCheckPermission checkPermission = (SaCheckPermission) SaStrategy.instance.getAnnotation.apply(target, SaCheckPermission.class);
+		SaCheckPermission checkPermission = (SaCheckPermission) SaStrategy.instance.getAnnotation.apply(element, SaCheckPermission.class);
 		if(checkPermission != null) {
 			SaManager.getStpLogic(checkPermission.type(), false).checkByAnnotation(checkPermission);
 		}
 
 		// 校验 @SaCheckSafe 注解
-		SaCheckSafe checkSafe = (SaCheckSafe) SaStrategy.instance.getAnnotation.apply(target, SaCheckSafe.class);
+		SaCheckSafe checkSafe = (SaCheckSafe) SaStrategy.instance.getAnnotation.apply(element, SaCheckSafe.class);
 		if(checkSafe != null) {
 			SaManager.getStpLogic(checkSafe.type(), false).checkByAnnotation(checkSafe);
 		}
 
 		// 校验 @SaCheckDisable 注解
-		SaCheckDisable checkDisable = (SaCheckDisable) SaStrategy.instance.getAnnotation.apply(target, SaCheckDisable.class);
+		SaCheckDisable checkDisable = (SaCheckDisable) SaStrategy.instance.getAnnotation.apply(element, SaCheckDisable.class);
 		if(checkDisable != null) {
 			SaManager.getStpLogic(checkDisable.type(), false).checkByAnnotation(checkDisable);
 		}
 		
 		// 校验 @SaCheckBasic 注解
-		SaCheckBasic checkBasic = (SaCheckBasic) SaStrategy.instance.getAnnotation.apply(target, SaCheckBasic.class);
+		SaCheckBasic checkBasic = (SaCheckBasic) SaStrategy.instance.getAnnotation.apply(element, SaCheckBasic.class);
 		if(checkBasic != null) {
 			SaBasicUtil.check(checkBasic.realm(), checkBasic.account());
 		}
 
 		// 校验 @SaCheckOr 注解
-		SaCheckOr checkOr = (SaCheckOr) SaStrategy.instance.getAnnotation.apply(target, SaCheckOr.class);
+		SaCheckOr checkOr = (SaCheckOr) SaStrategy.instance.getAnnotation.apply(element, SaCheckOr.class);
 		if(checkOr != null) {
 			SaStrategy.instance.checkOrAnnotation.accept(checkOr);
 		}
@@ -204,9 +195,8 @@ public final class SaStrategy {
 
 	/**
 	 * 对一个 @SaCheckOr 进行注解校验
-	 * <p> 参数 [SaCheckOr 注解的实例]
 	 */
-	public Consumer<SaCheckOr> checkOrAnnotation = (at) -> {
+	public SaCheckOrAnnotationFunction checkOrAnnotation = (at) -> {
 
 		// 记录校验过程中所有的异常
 		List<SaTokenException> errorList = new ArrayList<>();
@@ -290,26 +280,23 @@ public final class SaStrategy {
 	};
 
 	/**
-	 * 从元素上获取注解  
-	 * <p> 参数 [element元素，要获取的注解类型] 
+	 * 从元素上获取注解
 	 */
-	public BiFunction<AnnotatedElement, Class<? extends Annotation> , Annotation> getAnnotation = (element, annotationClass)->{
+	public SaGetAnnotationFunction getAnnotation = (element, annotationClass)->{
 		// 默认使用jdk的注解处理器 
 		return element.getAnnotation(annotationClass);
 	};
 
 	/**
-	 * 判断一个 Method 或其所属 Class 是否包含指定注解 
-	 * <p> 参数 [Method, 注解] 
+	 * 判断一个 Method 或其所属 Class 是否包含指定注解
 	 */
-	public BiFunction<Method, Class<? extends Annotation>, Boolean> isAnnotationPresent = (method, annotationClass) -> {
+	public SaIsAnnotationPresentFunction isAnnotationPresent = (method, annotationClass) -> {
 		return instance.getAnnotation.apply(method, annotationClass) != null ||
 				instance.getAnnotation.apply(method.getDeclaringClass(), annotationClass) != null;
 	};
 
 	/**
 	 * 生成唯一式 token 的算法
-	 * <p> 参数 [元素名称, 最大尝试次数, 创建 token 函数, 检查 token 函数]
 	 */
 	public SaGenerateUniqueTokenFunction generateUniqueToken = (elementName, maxTryTimes, createTokenFunction, checkTokenFunction) -> {
 
@@ -339,10 +326,8 @@ public final class SaStrategy {
 
 	/**
 	 * 创建 StpLogic 的算法
-	 *
-	 * <p> 参数 [ 账号体系标识 ]
 	 */
-	public Function<String, StpLogic> createStpLogic = (loginType) -> {
+	public SaCreateStpLogicFunction createStpLogic = (loginType) -> {
 		return new StpLogic(loginType);
 	};
 
@@ -350,56 +335,56 @@ public final class SaStrategy {
 	// ----------------------- 重写策略 set连缀风格
 
 	/**
-	 * 重写创建 Token 的策略 
-	 * <p> 参数 [账号id, 账号类型] 
+	 * 重写创建 Token 的策略
+	 *
 	 * @param createToken / 
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setCreateToken(BiFunction<Object, String, String> createToken) {
+	public SaStrategy setCreateToken(SaCreateTokenFunction createToken) {
 		this.createToken = createToken;
 		return this;
 	}
 
 	/**
-	 * 重写创建 Session 的策略 
-	 * <p> 参数 [SessionId] 
+	 * 重写创建 Session 的策略
+	 *
 	 * @param createSession / 
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setCreateSession(Function<String, SaSession> createSession) {
+	public SaStrategy setCreateSession(SaCreateSessionFunction createSession) {
 		this.createSession = createSession;
 		return this;
 	}
 
 	/**
-	 * 判断：集合中是否包含指定元素（模糊匹配） 
-	 * <p> 参数 [集合, 元素] 
+	 * 判断：集合中是否包含指定元素（模糊匹配）
+	 *
 	 * @param hasElement /
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setHasElement(BiFunction<List<String>, String, Boolean> hasElement) {
+	public SaStrategy setHasElement(SaHasElementFunction hasElement) {
 		this.hasElement = hasElement;
 		return this;
 	}
 
 	/**
-	 * 对一个 [Method] 对象进行注解校验 （注解鉴权内部实现） 
-	 * <p> 参数 [Method句柄] 
+	 * 对一个 [Method] 对象进行注解校验 （注解鉴权内部实现）
+	 *
 	 * @param checkMethodAnnotation /
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setCheckMethodAnnotation(Consumer<Method> checkMethodAnnotation) {
+	public SaStrategy setCheckMethodAnnotation(SaCheckMethodAnnotationFunction checkMethodAnnotation) {
 		this.checkMethodAnnotation = checkMethodAnnotation;
 		return this;
 	}
 
 	/**
-	 * 对一个 [元素] 对象进行注解校验 （注解鉴权内部实现） 
-	 * <p> 参数 [element元素] 
+	 * 对一个 [元素] 对象进行注解校验 （注解鉴权内部实现）
+	 *
 	 * @param checkElementAnnotation / 
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setCheckElementAnnotation(Consumer<AnnotatedElement> checkElementAnnotation) {
+	public SaStrategy setCheckElementAnnotation(SaCheckElementAnnotationFunction checkElementAnnotation) {
 		this.checkElementAnnotation = checkElementAnnotation;
 		return this;
 	}
@@ -409,41 +394,40 @@ public final class SaStrategy {
 	 * <p> 参数 [SaCheckOr 注解的实例]
 	 *
 	 * @param checkOrAnnotation /
-	 * @return 对象自身
+	 * @return /
 	 */
-	public SaStrategy setCheckOrAnnotation(Consumer<SaCheckOr> checkOrAnnotation) {
+	public SaStrategy setCheckOrAnnotation(SaCheckOrAnnotationFunction checkOrAnnotation) {
 		this.checkOrAnnotation = checkOrAnnotation;
 		return this;
 	}
 
 	/**
-	 * 从元素上获取注解  
-	 * <p> 参数 [element元素，要获取的注解类型] 
+	 * 从元素上获取注解
+	 *
 	 * @param getAnnotation / 
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setGetAnnotation(BiFunction<AnnotatedElement, Class<? extends Annotation> , Annotation> getAnnotation) {
+	public SaStrategy setGetAnnotation(SaGetAnnotationFunction getAnnotation) {
 		this.getAnnotation = getAnnotation;
 		return this;
 	}
 
 	/**
-	 * 判断一个 Method 或其所属 Class 是否包含指定注解 
-	 * <p> 参数 [Method, 注解] 
+	 * 判断一个 Method 或其所属 Class 是否包含指定注解
+	 *
 	 * @param isAnnotationPresent / 
-	 * @return 对象自身 
+	 * @return /
 	 */
-	public SaStrategy setIsAnnotationPresent(BiFunction<Method, Class<? extends Annotation>, Boolean> isAnnotationPresent) {
+	public SaStrategy setIsAnnotationPresent(SaIsAnnotationPresentFunction isAnnotationPresent) {
 		this.isAnnotationPresent = isAnnotationPresent;
 		return this;
 	}
 
 	/**
 	 * 生成唯一式 token 的算法
-	 * <p> 参数 [元素名称, 最大尝试次数, 创建 token 函数, 检查 token 函数]
 	 *
 	 * @param generateUniqueToken /
-	 * @return 对象自身
+	 * @return /
 	 */
 	public SaStrategy setGenerateUniqueToken(SaGenerateUniqueTokenFunction generateUniqueToken) {
 		this.generateUniqueToken = generateUniqueToken;
@@ -453,12 +437,10 @@ public final class SaStrategy {
 	/**
 	 * 创建 StpLogic 的算法
 	 *
-	 * <p> 参数 [ 账号体系标识 ]
-	 *
 	 * @param createStpLogic /
-	 * @return 对象自身
+	 * @return /
 	 */
-	public SaStrategy setCreateStpLogic(Function<String, StpLogic> createStpLogic) {
+	public SaStrategy setCreateStpLogic(SaCreateStpLogicFunction createStpLogic) {
 		this.createStpLogic = createStpLogic;
 		return this;
 	}
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
index 90c20522..c667db18 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
@@ -1,6 +1,7 @@
 package com.pj;
 
 import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.strategy.SaStrategy;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -16,6 +17,13 @@ public class SaTokenApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(SaTokenApplication.class, args);
 		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
+
+		// SaStrategy全局单例，所有方法都用以下形式重写
+		SaStrategy.instance.setCreateToken((loginId, loginType) -> {
+			// 自定义Token生成的算法
+			return "xxxx";
+		});
+
 	}
 
 }
diff --git a/sa-token-doc/fun/plugin-dev.md b/sa-token-doc/fun/plugin-dev.md
index 98a4d54c..9c9d6de7 100644
--- a/sa-token-doc/fun/plugin-dev.md
+++ b/sa-token-doc/fun/plugin-dev.md
@@ -21,7 +21,7 @@ SaStrategy 的每一个函数都可以单独重写，以 “自定义Token生成
 
 ``` java
 // 重写 Token 生成策略 
-SaStrategy.me.createToken = (loginId, loginType) -> {
+SaStrategy.instance.createToken = (loginId, loginType) -> {
 	return SaFoxUtil.getRandomString(60);    // 随机60位长度字符串
 };
 ```
diff --git a/sa-token-doc/up/many-account.md b/sa-token-doc/up/many-account.md
index 12cb3022..d9ec75a0 100644
--- a/sa-token-doc/up/many-account.md
+++ b/sa-token-doc/up/many-account.md
@@ -92,7 +92,7 @@ public class SaTokenConfigure {
     @Autowired
     public void rewriteSaStrategy() {
     	// 重写Sa-Token的注解处理器，增加注解合并功能 
-		SaStrategy.me.getAnnotation = (element, annotationClass) -> {
+		SaStrategy.instance.getAnnotation = (element, annotationClass) -> {
 			return AnnotatedElementUtils.getMergedAnnotation(element, annotationClass); 
 		};
     }
diff --git a/sa-token-doc/up/token-style.md b/sa-token-doc/up/token-style.md
index 78f9620a..d0179ec0 100644
--- a/sa-token-doc/up/token-style.md
+++ b/sa-token-doc/up/token-style.md
@@ -51,7 +51,7 @@ public class SaTokenConfigure {
     @Autowired
     public void rewriteSaStrategy() {
     	// 重写 Token 生成策略 
-    	SaStrategy.me.createToken = (loginId, loginType) -> {
+    	SaStrategy.instance.createToken = (loginId, loginType) -> {
     		return SaFoxUtil.getRandomString(60);	// 随机60位长度字符串
     	};
     }

From b43fa1a1c98626fc45bdf63da65de0e3e5546a82 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 7 Jun 2023 14:18:24 +0800
Subject: [PATCH 112/129] ...

---
 .../src/main/java/com/pj/SaTokenApplication.java          | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
index c667db18..90c20522 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/SaTokenApplication.java
@@ -1,7 +1,6 @@
 package com.pj;
 
 import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.strategy.SaStrategy;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -17,13 +16,6 @@ public class SaTokenApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(SaTokenApplication.class, args);
 		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
-
-		// SaStrategy全局单例，所有方法都用以下形式重写
-		SaStrategy.instance.setCreateToken((loginId, loginType) -> {
-			// 自定义Token生成的算法
-			return "xxxx";
-		});
-
 	}
 
 }

From f59b1b3885b075953eb5848b7c8b3989563df27b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 7 Jun 2023 15:49:04 +0800
Subject: [PATCH 113/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E5=88=86=20?=
 =?UTF-8?q?TokenSign=20=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B9=E4=BE=BF=E7=9A=84=E6=93=8D=E4=BD=9C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BC=9A=E8=AF=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/dev33/satoken/session/SaSession.java   | 68 ++++++++++++++-----
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 58 ++++++++++------
 .../java/cn/dev33/satoken/stp/StpUtil.java    | 22 ++++++
 .../cn/dev33/satoken/strategy/SaStrategy.java | 59 ++++++++--------
 .../main/java/com/pj/test/TestController.java |  3 +-
 5 files changed, 142 insertions(+), 68 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
index 8437cbb2..83d8bc2e 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/session/SaSession.java
@@ -15,20 +15,16 @@
  */
 package cn.dev33.satoken.session;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
-
 import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.application.SaSetValueInterface;
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.util.SaFoxUtil;
 
+import java.io.Serializable;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * Session Model，会话作用域的读取值对象
  *
@@ -277,14 +273,15 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	 * @param device 设备类型，填 null 代表不限设备类型  
 	 * @return token签名列表
 	 */
-	public List<TokenSign> tokenSignListCopyByDevice(String device) {
+	public List<TokenSign> getTokenSignListByDevice(String device) {
 		// 返回全部
 		if(device == null) {
 			return tokenSignListCopy();
 		}
-		// 返回筛选后的 
+		// 返回筛选后的
+		List<TokenSign> tokenSignList = tokenSignListCopy();
 		List<TokenSign> list = new ArrayList<>();
-		for (TokenSign tokenSign : tokenSignListCopy()) {
+		for (TokenSign tokenSign : tokenSignList) {
 			if(SaFoxUtil.equals(tokenSign.getDevice(), device)) {
 				list.add(tokenSign);
 			}
@@ -292,6 +289,24 @@ public class SaSession implements SaSetValueInterface, Serializable {
 		return list;
 	}
 
+	/**
+	 * 获取当前 Session 上的所有 token 列表
+	 *
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 token
+	 */
+	public List<String> getTokenValueListByDevice(String device) {
+		// 遍历解析，按照设备类型进行筛选
+		List<TokenSign> tokenSignList = tokenSignListCopy();
+		List<String> tokenValueList = new ArrayList<>();
+		for (TokenSign tokenSign : tokenSignList) {
+			if(device == null || tokenSign.getDevice().equals(device)) {
+				tokenValueList.add(tokenSign.getValue());
+			}
+		}
+		return tokenValueList;
+	}
+
 	/**
 	 * 查找一个 Token 签名
 	 *
@@ -313,13 +328,18 @@ public class SaSession implements SaSetValueInterface, Serializable {
 	 * @param tokenSign Token 签名
 	 */
 	public void addTokenSign(TokenSign tokenSign) {
-		// 如果已经存在于列表中，则无需再次添加 
-		if(getTokenSign(tokenSign.getValue()) != null) {
-			return;
+		// 根据 tokenValue 值查重，如果不存在，则添加
+		TokenSign oldTokenSign = getTokenSign(tokenSign.getValue());
+		if(oldTokenSign == null) {
+			tokenSignList.add(tokenSign);
+			update();
+		} else {
+			// 如果存在，则更新
+			oldTokenSign.setValue(tokenSign.getValue());
+			oldTokenSign.setDevice(tokenSign.getDevice());
+			oldTokenSign.setTag(tokenSign.getTag());
+			update();
 		}
-		// 添加并更新
-		tokenSignList.add(tokenSign);
-		update();
 	}
 
 	/**
@@ -512,4 +532,18 @@ public class SaSession implements SaSetValueInterface, Serializable {
 		this.update();
 	}
 
+	//
+
+
+	/**
+	 * 请更换为：getTokenSignListByDevice(device)
+	 *
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return token签名列表
+	 */
+	@Deprecated
+	public List<TokenSign> tokenSignListCopyByDevice(String device) {
+		return getTokenSignListByDevice(device);
+	}
+
 }
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 49f0b677..fe8a618c 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -36,7 +36,6 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 import cn.dev33.satoken.util.SaValue2Box;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -490,8 +489,8 @@ public class StpLogic {
 			// 3.1、看看全局配置的 IsShare 参数，配置为 true 才是允许复用旧 token
 			if(getConfigOfIsShare()) {
 
-				// 根据账号id + 设备标识，尝试获取旧的 token
-				String tokenValue = getTokenValueByLoginId(id, loginModel.getDeviceOrDefault());
+				// 根据账号id，尝试获取旧的 token
+				String tokenValue = getTokenValueByLoginId(id, null);
 
 				// 如果有值，那就直接复用
 				if(SaFoxUtil.isNotEmpty(tokenValue)) {
@@ -605,7 +604,7 @@ public class StpLogic {
 		if(session != null) {
 
 			// 2、遍历此账号所有从这个 device 设备上登录的客户端，清除相关数据
-			for (TokenSign tokenSign: session.tokenSignListCopyByDevice(device)) {
+			for (TokenSign tokenSign: session.getTokenSignListByDevice(device)) {
 
 				// 2.1、获取此客户端的 token 值
 				String tokenValue = tokenSign.getValue();
@@ -652,7 +651,7 @@ public class StpLogic {
 		}
 
 		// 2、获取这个账号指定设备类型下的所有登录客户端
-		List<TokenSign> list = session.tokenSignListCopyByDevice(device);
+		List<TokenSign> list = session.getTokenSignListByDevice(device);
 
 		// 3、按照登录时间倒叙，超过 maxLoginCount 数量的，全部注销掉
 		for (int i = 0; i < list.size() - maxLoginCount; i++) {
@@ -741,7 +740,7 @@ public class StpLogic {
 		if(session != null) {
 
 			// 2、遍历此账号所有从这个 device 设备上登录的客户端，清除相关数据
-			for (TokenSign tokenSign: session.tokenSignListCopyByDevice(device)) {
+			for (TokenSign tokenSign: session.getTokenSignListByDevice(device)) {
 
 				// 2.1、获取此客户端的 token 值
 				String tokenValue = tokenSign.getValue();
@@ -817,7 +816,7 @@ public class StpLogic {
 		if(session != null) {
 
 			// 2、遍历此账号所有从这个 device 设备上登录的客户端，清除相关数据
-			for (TokenSign tokenSign: session.tokenSignListCopyByDevice(device)) {
+			for (TokenSign tokenSign: session.getTokenSignListByDevice(device)) {
 
 				// 2.1、获取此客户端的 token 值
 				String tokenValue = tokenSign.getValue();
@@ -858,8 +857,18 @@ public class StpLogic {
 		// 		2、并且不在异常项集合里（此项在 getLoginIdDefaultNull() 方法里完成判断）
  		return getLoginIdDefaultNull() != null;
  	}
- 	
- 	/** 
+
+	/**
+	 * 判断指定账号是否已经登录
+	 *
+	 * @return 已登录返回 true，未登录返回 false
+	 */
+	public boolean isLogin(Object loginId) {
+		// 判断条件：能否根据 loginId 查询到对应的 tokenSign 值
+		return getTokenSignListByLoginId(loginId, null).size() > 0;
+	}
+
+	/**
  	 * 检验当前会话是否已经登录，如未登录，则抛出异常 
  	 */
  	public void checkLogin() {
@@ -1989,17 +1998,28 @@ public class StpLogic {
 			return Collections.emptyList();
 		}
 
-		// 遍历解析，按照设备类型进行筛选
-		List<TokenSign> tokenSignList = session.tokenSignListCopy();
-		List<String> tokenValueList = new ArrayList<>();
-		for (TokenSign tokenSign : tokenSignList) {
-			if(device == null || tokenSign.getDevice().equals(device)) {
-				tokenValueList.add(tokenSign.getValue());
-			}
-		}
-		return tokenValueList;
+		// 按照设备类型进行筛选
+		return session.getTokenValueListByDevice(device);
 	}
-	
+
+	/**
+	 * 获取指定账号 id 指定设备类型端的 tokenSign 集合
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 token
+	 */
+	public List<TokenSign> getTokenSignListByLoginId(Object loginId, String device) {
+		// 如果该账号的 Account-Session 为 null，说明此账号尚没有客户端在登录，此时返回空集合
+		SaSession session = getSessionByLoginId(loginId, false);
+		if(session == null) {
+			return Collections.emptyList();
+		}
+
+		// 按照设备类型进行筛选
+		return session.getTokenSignListByDevice(device);
+	}
+
 	/**
 	 * 返回当前会话的登录设备类型
 	 *
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index 945c88d9..05275467 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -19,7 +19,9 @@ import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.fun.SaFunction;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.session.SaSession;
+import cn.dev33.satoken.session.TokenSign;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -314,6 +316,15 @@ public class StpUtil {
 		return stpLogic.isLogin();
 	}
 
+	/**
+	 * 判断指定账号是否已经登录
+	 *
+	 * @return 已登录返回 true，未登录返回 false
+	 */
+	public static boolean isLogin(Object loginId) {
+		return stpLogic.isLogin(loginId);
+	}
+
 	/**
 	 * 检验当前会话是否已经登录，如未登录，则抛出异常
 	 */
@@ -814,6 +825,17 @@ public class StpUtil {
 		return stpLogic.getTokenValueListByLoginId(loginId, device);
 	}
 
+	/**
+	 * 获取指定账号 id 指定设备类型端的 tokenSign 集合
+	 *
+	 * @param loginId 账号id
+	 * @param device 设备类型，填 null 代表不限设备类型
+	 * @return 此 loginId 的所有登录 tokenSign
+	 */
+	public static List<TokenSign> getTokenSignListByLoginId(Object loginId, String device) {
+		return stpLogic.getTokenSignListByLoginId(loginId, device);
+	}
+
 	/**
 	 * 返回当前会话的登录设备类型
 	 *
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index ee1afc75..6e1b9262 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -29,21 +29,20 @@ import cn.dev33.satoken.util.SaTokenConsts;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import java.util.function.Function;
 
 /**
- * Sa-Token 策略对象 
+ * Sa-Token 策略对象
  * <p>
  * 此类统一定义框架内的一些关键性逻辑算法，方便开发者进行按需重写，例：
  * </p>
  * <pre>
-	// SaStrategy全局单例，所有方法都用以下形式重写 
-	SaStrategy.instance.setCreateToken((loginId, loginType) -》 {
-		// 自定义Token生成的算法 
-		return "xxxx";
-	});
+ // SaStrategy全局单例，所有方法都用以下形式重写
+ SaStrategy.instance.setCreateToken((loginId, loginType) -》 {
+ // 自定义Token生成的算法
+ return "xxxx";
+ });
  * </pre>
- * 
+ *
  * @author click33
  * @since 1.27.0
  */
@@ -53,18 +52,18 @@ public final class SaStrategy {
 	}
 
 	/**
-	 * 获取 SaStrategy 对象的单例引用 
+	 * 获取 SaStrategy 对象的单例引用
 	 */
 	public static final SaStrategy instance = new SaStrategy();
 
 
 	// ----------------------- 所有策略
-	
+
 	/**
 	 * 创建 Token 的策略
 	 */
 	public SaCreateTokenFunction createToken = (loginId, loginType) -> {
-		// 根据配置的tokenStyle生成不同风格的token 
+		// 根据配置的tokenStyle生成不同风格的token
 		String tokenStyle = SaManager.getConfig().getTokenStyle();
 
 		switch (tokenStyle) {
@@ -99,7 +98,7 @@ public final class SaStrategy {
 				return UUID.randomUUID().toString();
 		}
 	};
-	
+
 	/**
 	 * 创建 Session 的策略
 	 */
@@ -117,19 +116,19 @@ public final class SaStrategy {
 			return false;
 		}
 
-		// 先尝试一下简单匹配，如果可以匹配成功则无需继续模糊匹配 
+		// 先尝试一下简单匹配，如果可以匹配成功则无需继续模糊匹配
 		if (list.contains(element)) {
 			return true;
 		}
-		
-		// 开始模糊匹配 
+
+		// 开始模糊匹配
 		for (String patt : list) {
 			if(SaFoxUtil.vagueMatch(patt, element)) {
 				return true;
 			}
 		}
-		
-		// 走出for循环说明没有一个元素可以匹配成功 
+
+		// 走出for循环说明没有一个元素可以匹配成功
 		return false;
 	};
 
@@ -138,10 +137,10 @@ public final class SaStrategy {
 	 */
 	public SaCheckMethodAnnotationFunction checkMethodAnnotation = (method) -> {
 
-		// 先校验 Method 所属 Class 上的注解 
+		// 先校验 Method 所属 Class 上的注解
 		instance.checkElementAnnotation.accept(method.getDeclaringClass());
 
-		// 再校验 Method 上的注解  
+		// 再校验 Method 上的注解
 		instance.checkElementAnnotation.accept(method);
 	};
 
@@ -150,18 +149,18 @@ public final class SaStrategy {
 	 */
 	public SaCheckElementAnnotationFunction checkElementAnnotation = (element) -> {
 
-		// 校验 @SaCheckLogin 注解 
+		// 校验 @SaCheckLogin 注解
 		SaCheckLogin checkLogin = (SaCheckLogin) SaStrategy.instance.getAnnotation.apply(element, SaCheckLogin.class);
 		if(checkLogin != null) {
 			SaManager.getStpLogic(checkLogin.type(), false).checkByAnnotation(checkLogin);
 		}
-		
-		// 校验 @SaCheckRole 注解 
+
+		// 校验 @SaCheckRole 注解
 		SaCheckRole checkRole = (SaCheckRole) SaStrategy.instance.getAnnotation.apply(element, SaCheckRole.class);
 		if(checkRole != null) {
 			SaManager.getStpLogic(checkRole.type(), false).checkByAnnotation(checkRole);
 		}
-		
+
 		// 校验 @SaCheckPermission 注解
 		SaCheckPermission checkPermission = (SaCheckPermission) SaStrategy.instance.getAnnotation.apply(element, SaCheckPermission.class);
 		if(checkPermission != null) {
@@ -179,7 +178,7 @@ public final class SaStrategy {
 		if(checkDisable != null) {
 			SaManager.getStpLogic(checkDisable.type(), false).checkByAnnotation(checkDisable);
 		}
-		
+
 		// 校验 @SaCheckBasic 注解
 		SaCheckBasic checkBasic = (SaCheckBasic) SaStrategy.instance.getAnnotation.apply(element, SaCheckBasic.class);
 		if(checkBasic != null) {
@@ -283,7 +282,7 @@ public final class SaStrategy {
 	 * 从元素上获取注解
 	 */
 	public SaGetAnnotationFunction getAnnotation = (element, annotationClass)->{
-		// 默认使用jdk的注解处理器 
+		// 默认使用jdk的注解处理器
 		return element.getAnnotation(annotationClass);
 	};
 
@@ -337,7 +336,7 @@ public final class SaStrategy {
 	/**
 	 * 重写创建 Token 的策略
 	 *
-	 * @param createToken / 
+	 * @param createToken /
 	 * @return /
 	 */
 	public SaStrategy setCreateToken(SaCreateTokenFunction createToken) {
@@ -348,7 +347,7 @@ public final class SaStrategy {
 	/**
 	 * 重写创建 Session 的策略
 	 *
-	 * @param createSession / 
+	 * @param createSession /
 	 * @return /
 	 */
 	public SaStrategy setCreateSession(SaCreateSessionFunction createSession) {
@@ -381,7 +380,7 @@ public final class SaStrategy {
 	/**
 	 * 对一个 [元素] 对象进行注解校验 （注解鉴权内部实现）
 	 *
-	 * @param checkElementAnnotation / 
+	 * @param checkElementAnnotation /
 	 * @return /
 	 */
 	public SaStrategy setCheckElementAnnotation(SaCheckElementAnnotationFunction checkElementAnnotation) {
@@ -404,7 +403,7 @@ public final class SaStrategy {
 	/**
 	 * 从元素上获取注解
 	 *
-	 * @param getAnnotation / 
+	 * @param getAnnotation /
 	 * @return /
 	 */
 	public SaStrategy setGetAnnotation(SaGetAnnotationFunction getAnnotation) {
@@ -415,7 +414,7 @@ public final class SaStrategy {
 	/**
 	 * 判断一个 Method 或其所属 Class 是否包含指定注解
 	 *
-	 * @param isAnnotationPresent / 
+	 * @param isAnnotationPresent /
 	 * @return /
 	 */
 	public SaStrategy setIsAnnotationPresent(SaIsAnnotationPresentFunction isAnnotationPresent) {
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index cf2c5ba4..9e7ff6a6 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -1,6 +1,5 @@
 package com.pj.test;
 
-import cn.dev33.satoken.stp.SaLoginConfig;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
@@ -22,7 +21,7 @@ public class TestController {
 	// 测试登录  ---- http://localhost:8081/test/login
 	@RequestMapping("login")
 	public SaResult login(@RequestParam(defaultValue = "10001") long id) {
-		StpUtil.login(id, SaLoginConfig.setActiveTimeout(20));
+		StpUtil.login(id);
 		return SaResult.ok("登录成功");
 	}
 

From 3626c490b8df61787f23ed3e36c10c973695276b Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 8 Jun 2023 10:30:58 +0800
Subject: [PATCH 114/129] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=BA=20StpLogic?=
 =?UTF-8?q?=20=E5=8D=95=E7=8B=AC=E9=85=8D=E7=BD=AE=20SaTokenConfig=20?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E7=9A=84=E8=83=BD=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/dev33/satoken/stp/StpLogic.java   | 122 +++++++++++-------
 .../cn/dev33/satoken/strategy/SaStrategy.java |   3 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |   2 +-
 .../java/com/pj/satoken/SaTokenConfigure.java |   9 +-
 .../main/java/com/pj/satoken/StpUserUtil.java |   2 +-
 .../main/java/com/pj/test/TestController.java |   6 +-
 sa-token-doc/up/many-account.md               |  42 +++---
 .../satoken/jwt/StpLogicJwtForMixin.java      |   4 +-
 .../satoken/jwt/StpLogicJwtForSimple.java     |   2 +-
 .../satoken/jwt/StpLogicJwtForStateless.java  |   6 +-
 10 files changed, 113 insertions(+), 85 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index fe8a618c..340c9907 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -60,7 +60,7 @@ public class StpLogic {
 	 * 账号类型标识，多账号体系时（一个系统多套用户表）用此值区分具体要校验的是哪套用户，比如：login、user、admin
 	 */
 	public String loginType;
-	
+
 	/**
 	 * 初始化 StpLogic, 并指定账号类型
 	 *
@@ -100,8 +100,44 @@ public class StpLogic {
 
 		return this;
 	}
-	
-	
+
+	private SaTokenConfig config;
+
+	/**
+	 * 写入当前 StpLogic 单独使用的配置对象
+	 *
+	 * @param config 配置对象
+	 * @return 对象自身
+	 */
+	public StpLogic setConfig(SaTokenConfig config) {
+		this.config = config;
+		return this;
+	}
+
+	/**
+	 * 返回当前 StpLogic 使用的配置对象，如果当前 StpLogic 没有配置，则返回 null
+	 *
+	 * @return /
+	 */
+	public SaTokenConfig getConfig() {
+		return config;
+	}
+
+	/**
+	 * 返回当前 StpLogic 使用的配置对象，如果当前 StpLogic 没有配置，则返回全局配置对象
+	 *
+	 * @return /
+	 */
+	public SaTokenConfig getConfigOrGlobal() {
+		SaTokenConfig cfg = getConfig();
+		if(cfg != null) {
+			return cfg;
+		}
+		return SaManager.getConfig();
+	}
+
+
+
 	// ------------------- 获取 token 相关 -------------------
 	
 	/**
@@ -132,7 +168,7 @@ public class StpLogic {
  	 * @param tokenValue token 值
  	 */
 	public void setTokenValue(String tokenValue){
-		setTokenValue(tokenValue, new SaLoginModel().setTimeout(getConfig().getTimeout()));
+		setTokenValue(tokenValue, new SaLoginModel().setTimeout(getConfigOrGlobal().getTimeout()));
 	}
 	
  	/**
@@ -162,7 +198,7 @@ public class StpLogic {
 		setTokenValueToStorage(tokenValue);
 		
 		// 2. 将 token 写入到当前会话的 Cookie 里
-		if (getConfig().getIsReadCookie()) {
+		if (getConfigOrGlobal().getIsReadCookie()) {
 			setTokenValueToCookie(tokenValue, loginModel.getCookieTimeout());
 		}
 		
@@ -184,7 +220,7 @@ public class StpLogic {
 		// 2、保存 token
 		//	- 如果没有配置前缀模式，直接保存
 		// 	- 如果配置了前缀模式，则拼接上前缀保存
-		String tokenPrefix = getConfig().getTokenPrefix();
+		String tokenPrefix = getConfigOrGlobal().getTokenPrefix();
 		if( SaFoxUtil.isEmpty(tokenPrefix) ) {
 			storage.set(splicingKeyJustCreatedSave(), tokenValue);
 		} else {
@@ -202,7 +238,7 @@ public class StpLogic {
  	 * @param cookieTimeout Cookie存活时间（单位：秒，填-1代表为内存Cookie，浏览器关闭后消失）
  	 */
 	public void setTokenValueToCookie(String tokenValue, int cookieTimeout){
-		SaCookieConfig cfg = getConfig().getCookie();
+		SaCookieConfig cfg = getConfigOrGlobal().getCookie();
 		SaCookie cookie = new SaCookie()
 				.setName(getTokenName())
 				.setValue(tokenValue)
@@ -252,7 +288,7 @@ public class StpLogic {
 		String tokenValue = getTokenValueNotCut();
 
 		// 2、如果全局配置打开了前缀模式，则二次处理一下
-		String tokenPrefix = getConfig().getTokenPrefix();
+		String tokenPrefix = getConfigOrGlobal().getTokenPrefix();
 		if(SaFoxUtil.isNotEmpty(tokenPrefix)) {
 
 			// 情况2.1：如果提交的 token 为空，则转为 null
@@ -289,7 +325,7 @@ public class StpLogic {
 		// 获取相应对象
 		SaStorage storage = SaHolder.getStorage();
 		SaRequest request = SaHolder.getRequest();
-		SaTokenConfig config = getConfig();
+		SaTokenConfig config = getConfigOrGlobal();
 		String keyTokenName = getTokenName();
 		String tokenValue = null;
 		
@@ -428,7 +464,7 @@ public class StpLogic {
 		checkLoginArgs(id, loginModel);
 		
 		// 2、初始化 loginModel ，给一些参数补上默认值
-		SaTokenConfig config = getConfig();
+		SaTokenConfig config = getConfigOrGlobal();
 		loginModel.build(config);
 
 		// 3、给这个账号分配一个可用的 token
@@ -473,7 +509,7 @@ public class StpLogic {
 
 		// 1、获取全局配置的 isConcurrent 参数
 		//    如果配置为：不允许一个账号多地同时登录，则需要先将这个账号的历史登录会话标记为：被顶下线
-		Boolean isConcurrent = getConfig().getIsConcurrent();
+		Boolean isConcurrent = getConfigOrGlobal().getIsConcurrent();
 		if( ! isConcurrent) {
 			replaced(id, loginModel.getDevice());
 		}
@@ -548,7 +584,7 @@ public class StpLogic {
 		}
 
 		// 5、如果全局配置未启动动态 activeTimeout 功能，但是此次登录却传入了 activeTimeout 参数，那么就打印警告信息
-		if( ! getConfig().getDynamicActiveTimeout() && loginModel.getActiveTimeout() != null) {
+		if( ! getConfigOrGlobal().getDynamicActiveTimeout() && loginModel.getActiveTimeout() != null) {
 			SaManager.log.warn("当前全局配置未开启动态 activeTimeout 功能，传入的 activeTimeout 参数将被忽略");
 		}
 
@@ -567,8 +603,8 @@ public class StpLogic {
  		}
  		
  		// 2、如果打开了 Cookie 模式，则先把 Cookie 数据清除掉
- 		if(getConfig().getIsReadCookie()){
- 			SaCookieConfig cookie = getConfig().getCookie();
+ 		if(getConfigOrGlobal().getIsReadCookie()){
+ 			SaCookieConfig cookie = getConfigOrGlobal().getCookie();
  			SaHolder.getResponse().deleteCookie(getTokenName(), cookie.getPath(), cookie.getDomain());
 		}
 
@@ -922,7 +958,7 @@ public class StpLogic {
 			// ------ 至此，loginId 已经是一个合法的值，代表当前会话是一个正常的登录状态了
 
 			// 8、如果配置了自动续签功能, 则: 更新这个 token 的最后活跃时间 （注意此处的续签是在续 active-timeout，而非 timeout）
-			if(getConfig().getAutoRenew()) {
+			if(getConfigOrGlobal().getAutoRenew()) {
 				updateLastActiveToNow(tokenValue);
 			}
 		}
@@ -1139,7 +1175,7 @@ public class StpLogic {
 			}
 
 			// 将这个 SaSession 入库
-			getSaTokenDao().setSession(session, getConfig().getTimeout());
+			getSaTokenDao().setSession(session, getConfigOrGlobal().getTimeout());
 		}
 		return session;
 	}
@@ -1239,7 +1275,7 @@ public class StpLogic {
 	public SaSession getTokenSession(boolean isCreate) {
 
 		// 1、如果配置了：tokenSessionCheckLogin == true，则需要先校验当前是否登录，未登录情况下不允许拿到 Token-Session
-		if(getConfig().getTokenSessionCheckLogin()) {
+		if(getConfigOrGlobal().getTokenSessionCheckLogin()) {
 			checkLogin();
 		}
 
@@ -1307,7 +1343,7 @@ public class StpLogic {
 					"token",
 					getConfigOfMaxTryTimes(),
 					() -> {
-						return createTokenValue(null, null, getConfig().getTimeout(), null);
+						return createTokenValue(null, null, getConfigOrGlobal().getTimeout(), null);
 					},
 					token -> {
 						return getTokenSessionByToken(token, false) == null;
@@ -1361,7 +1397,7 @@ public class StpLogic {
  	protected void setLastActiveToNow(String tokenValue, Long activeTimeout, Long timeout) {
 
 		// 如果提供的 timeout 为null，则使用全局配置的 timeout 值
-		SaTokenConfig config = getConfig();
+		SaTokenConfig config = getConfigOrGlobal();
 		if(timeout == null) {
 			timeout = config.getTimeout();
 		}
@@ -1451,7 +1487,7 @@ public class StpLogic {
 	 */
 	public Long getTokenUseActiveTimeout(String tokenValue) {
 		// 在未启用动态 activeTimeout 功能时，直接返回 null
-		if( ! getConfig().getDynamicActiveTimeout()) {
+		if( ! getConfigOrGlobal().getDynamicActiveTimeout()) {
 			return null;
 		}
 
@@ -1473,7 +1509,7 @@ public class StpLogic {
 	public long getTokenUseActiveTimeoutOrGlobalConfig(String tokenValue) {
 		Long activeTimeout = getTokenUseActiveTimeout(tokenValue);
 		if(activeTimeout == null) {
-			return getConfig().getActiveTimeout();
+			return getConfigOrGlobal().getActiveTimeout();
 		}
 		return activeTimeout;
 	}
@@ -1618,7 +1654,7 @@ public class StpLogic {
  		renewTimeout(tokenValue, timeout);
  		
  		// 2、续期客户端 Cookie 有效期
- 		if(getConfig().getIsReadCookie()) {
+ 		if(getConfigOrGlobal().getIsReadCookie()) {
 			// 如果 timeout = -1，代表永久，但是一般浏览器不支持永久 Cookie，所以此处设置为 int 最大值
 			// 如果 timeout 大于 int 最大值，会造成数据溢出，所以也要将其设置为 int 最大值
 			if(timeout == SaTokenDao.NEVER_EXPIRE || timeout > Integer.MAX_VALUE) {
@@ -2634,7 +2670,7 @@ public class StpLogic {
 	 * @return key
 	 */
 	public String splicingKeyTokenName() {
- 		return getConfig().getTokenName();
+ 		return getConfigOrGlobal().getTokenName();
  	}
 	
 	/**  
@@ -2644,7 +2680,7 @@ public class StpLogic {
 	 * @return key
 	 */
 	public String splicingKeyTokenValue(String tokenValue) {
-		return getConfig().getTokenName() + ":" + loginType + ":token:" + tokenValue;
+		return getConfigOrGlobal().getTokenName() + ":" + loginType + ":token:" + tokenValue;
 	}
 	
 	/** 
@@ -2654,7 +2690,7 @@ public class StpLogic {
 	 * @return key
 	 */
 	public String splicingKeySession(Object loginId) {
-		return getConfig().getTokenName() + ":" + loginType + ":session:" + loginId;
+		return getConfigOrGlobal().getTokenName() + ":" + loginType + ":session:" + loginId;
 	}
 	
 	/**  
@@ -2664,7 +2700,7 @@ public class StpLogic {
 	 * @return key
 	 */
 	public String splicingKeyTokenSession(String tokenValue) {
-		return getConfig().getTokenName() + ":" + loginType + ":token-session:" + tokenValue;
+		return getConfigOrGlobal().getTokenName() + ":" + loginType + ":token-session:" + tokenValue;
 	}
 	
 	/** 
@@ -2674,7 +2710,7 @@ public class StpLogic {
 	 * @return key
 	 */
 	public String splicingKeyLastActiveTime(String tokenValue) {
-		return getConfig().getTokenName() + ":" + loginType + ":last-active:" + tokenValue;
+		return getConfigOrGlobal().getTokenName() + ":" + loginType + ":last-active:" + tokenValue;
 	}
 
 	/**
@@ -2704,7 +2740,7 @@ public class StpLogic {
 	 * @return key 
 	 */
 	public String splicingKeyDisable(Object loginId, String service) {
-		return getConfig().getTokenName() + ":" + loginType + ":disable:" + service + ":" + loginId;
+		return getConfigOrGlobal().getTokenName() + ":" + loginType + ":disable:" + service + ":" + loginId;
 	}
 
 	/**  
@@ -2717,20 +2753,19 @@ public class StpLogic {
 	public String splicingKeySafe(String tokenValue, String service) {
 		// 格式：<Token名称>:<账号类型>:<safe>:<业务标识>:<Token值>
 		// 形如：satoken:login:safe:important:gr_SwoIN0MC1ewxHX_vfCW3BothWDZMMtx__
-		return getConfig().getTokenName() + ":" + loginType + ":safe:" + service + ":" + tokenValue;
+		return getConfigOrGlobal().getTokenName() + ":" + loginType + ":safe:" + service + ":" + tokenValue;
 	}
 
 	
 	// ------------------- Bean 对象、字段代理 -------------------
-	
+
 	/**
-	 * 返回全局配置对象
+	 * 返回当前 StpLogic 使用的持久化对象
 	 *
-	 * @return / 
+	 * @return /
 	 */
-	public SaTokenConfig getConfig() {
-		// 为什么再次代理一层? 为某些业务场景下需要 [ 不同StpLogic不同配置 ] 提供便利
-		return SaManager.getConfig();
+	public SaTokenDao getSaTokenDao() {
+		return SaManager.getSaTokenDao();
 	}
 
 	/**
@@ -2739,7 +2774,7 @@ public class StpLogic {
 	 * @return / 
 	 */
 	public boolean getConfigOfIsShare() {
-		return getConfig().getIsShare();
+		return getConfigOrGlobal().getIsShare();
 	}
 
  	/**
@@ -2748,7 +2783,7 @@ public class StpLogic {
  	 * @return / 
  	 */
  	public boolean isOpenCheckActiveTimeout() {
- 		return getConfig().getActiveTimeout() != SaTokenDao.NEVER_EXPIRE;
+ 		return getConfigOrGlobal().getActiveTimeout() != SaTokenDao.NEVER_EXPIRE;
  	}
 
     /**
@@ -2757,7 +2792,7 @@ public class StpLogic {
      * @return Cookie 应该保存的时长
      */
     public int getConfigOfCookieTimeout() {
-    	long timeout = getConfig().getTimeout();
+    	long timeout = getConfigOrGlobal().getTimeout();
     	if(timeout == SaTokenDao.NEVER_EXPIRE) {
     		return Integer.MAX_VALUE;
     	}
@@ -2770,18 +2805,9 @@ public class StpLogic {
 	 * @return /
 	 */
 	public int getConfigOfMaxTryTimes() {
-		return getConfig().getMaxTryTimes();
+		return getConfigOrGlobal().getMaxTryTimes();
 	}
 
-	/**
-	 * 返回持久化对象
-	 *
-	 * @return / 
-	 */
-	public SaTokenDao getSaTokenDao() {
-		return SaManager.getSaTokenDao();
-	}
-	
 	/**
 	 * 判断：集合中是否包含指定元素（模糊匹配）
 	 *
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
index 6e1b9262..d68a3ad3 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/strategy/SaStrategy.java
@@ -19,7 +19,6 @@ import cn.dev33.satoken.SaManager;
 import cn.dev33.satoken.annotation.*;
 import cn.dev33.satoken.basic.SaBasicUtil;
 import cn.dev33.satoken.exception.SaTokenException;
-import cn.dev33.satoken.fun.strategy.SaGenerateUniqueTokenFunction;
 import cn.dev33.satoken.fun.strategy.*;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.stp.StpLogic;
@@ -64,7 +63,7 @@ public final class SaStrategy {
 	 */
 	public SaCreateTokenFunction createToken = (loginId, loginType) -> {
 		// 根据配置的tokenStyle生成不同风格的token
-		String tokenStyle = SaManager.getConfig().getTokenStyle();
+		String tokenStyle = SaManager.getStpLogic(loginType).getConfigOrGlobal().getTokenStyle();
 
 		switch (tokenStyle) {
 			// uuid
diff --git a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
index adb3b0a0..ddaf4d25 100644
--- a/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-case/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -23,7 +23,7 @@ public class StpUserUtil {
 	/**
 	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "login";
+	public static final String TYPE = "user";
 
 	/**
 	 * 底层使用的 StpLogic 对象
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java
index 2d8eeff9..9ca5c083 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/SaTokenConfigure.java
@@ -1,16 +1,15 @@
 package com.pj.satoken;
 
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
 import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.filter.SaServletFilter;
 import cn.dev33.satoken.interceptor.SaInterceptor;
 import cn.dev33.satoken.router.SaHttpMethod;
 import cn.dev33.satoken.router.SaRouter;
 import cn.dev33.satoken.util.SaResult;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 
 /**
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
index adb3b0a0..ddaf4d25 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/satoken/StpUserUtil.java
@@ -23,7 +23,7 @@ public class StpUserUtil {
 	/**
 	 * 多账号体系下的类型标识
 	 */
-	public static final String TYPE = "login";
+	public static final String TYPE = "user";
 
 	/**
 	 * 底层使用的 StpLogic 对象
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index 9e7ff6a6..8e5be6a0 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -1,8 +1,10 @@
 package com.pj.test;
 
+import cn.dev33.satoken.stp.SaLoginConfig;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
+import com.pj.satoken.StpUserUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,7 +23,7 @@ public class TestController {
 	// 测试登录  ---- http://localhost:8081/test/login
 	@RequestMapping("login")
 	public SaResult login(@RequestParam(defaultValue = "10001") long id) {
-		StpUtil.login(id);
+		StpUtil.login(id, SaLoginConfig.setActiveTimeout(1000));
 		return SaResult.ok("登录成功");
 	}
 
@@ -29,7 +31,7 @@ public class TestController {
 	@RequestMapping("test")
 	public SaResult test() {
 		System.out.println("------------进来了 " + SaFoxUtil.formatDate(new Date()));
-		StpUtil.checkLogin();
+		StpUserUtil.login(10001, SaLoginConfig.setActiveTimeout(2000));
 		// 返回
 		return SaResult.data(null);
 	}
diff --git a/sa-token-doc/up/many-account.md b/sa-token-doc/up/many-account.md
index d9ec75a0..cad8c732 100644
--- a/sa-token-doc/up/many-account.md
+++ b/sa-token-doc/up/many-account.md
@@ -164,28 +164,30 @@ public class StpUserUtil {
 如果自定义的 StpUserUtil 需要使用不同 SaTokenConfig 对象, 也很简单，参考示例如下：
 
 ``` java
-public class StpUserUtil {
-	
-	// 使用匿名子类 重写`stpLogic对象`的一些方法 
-	public static StpLogic stpLogic = new StpLogic("user") {
-		
-		// 首先自定义一个 Config 对象 
-		SaTokenConfig config = new SaTokenConfig()
-			.setTokenName("satoken")
-			.setTimeout(2592000)
-			// ... 其它set
-			;
-		
-		// 然后重写 stpLogic 配置获取方法 
-		@Override
-		public SaTokenConfig getConfig() {
-			return config;
-		}
-	};
-	
-	// ... 
+@Configuration
+public class SaTokenConfigure {
 	
+	@Autowired
+	public void setSaTokenConfig() {
+		// 设定 StpUtil 使用的 SaTokenConfig 配置参数对象
+		SaTokenConfig config1 = new SaTokenConfig();
+		config1.setTokenName("satoken1");
+		config1.setTimeout(1000);
+		config1.setTokenStyle("random-64");
+		// 更多设置 ... 
+		StpUtil.stpLogic.setConfig(config1);
+
+		// 设定 StpUserUtil 使用的 SaTokenConfig 配置参数对象
+		SaTokenConfig config2 = new SaTokenConfig();
+		config2.setTokenName("satoken2");
+		config2.setTimeout(2000);
+		config2.setTokenStyle("tik");
+		// 更多设置 ... 
+		StpUserUtil.stpLogic.setConfig(config2);
+	}
+
 }
+
 ```
 
 ### 9、多账号体系混合鉴权
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
index 38077af3..8903b563 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMixin.java
@@ -55,7 +55,7 @@ public class StpLogicJwtForMixin extends StpLogic {
 	 * @return / 
 	 */
 	public String jwtSecretKey() {
-		String keyt = getConfig().getJwtSecretKey();
+		String keyt = getConfigOrGlobal().getJwtSecretKey();
 		SaJwtException.throwByNull(keyt, "请配置jwt秘钥", SaJwtErrorCode.CODE_30205);
 		return keyt;
 	}
@@ -120,7 +120,7 @@ public class StpLogicJwtForMixin extends StpLogic {
  		SaHolder.getStorage().delete(splicingKeyJustCreatedSave());
  		
  		// 如果打开了Cookie模式，则把cookie清除掉 
- 		if(getConfig().getIsReadCookie()){
+ 		if(getConfigOrGlobal().getIsReadCookie()){
  			SaHolder.getResponse().deleteCookie(getTokenName());
 		}
 	}
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
index fc5ba0e7..a384a38d 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForSimple.java
@@ -50,7 +50,7 @@ public class StpLogicJwtForSimple extends StpLogic {
 	 * @return / 
 	 */
 	public String jwtSecretKey() {
-		String keyt = getConfig().getJwtSecretKey();
+		String keyt = getConfigOrGlobal().getJwtSecretKey();
 		SaJwtException.throwByNull(keyt, "请配置jwt秘钥", SaJwtErrorCode.CODE_30205);
 		return keyt;
 	}
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
index daf5e4c6..9be8b18d 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStateless.java
@@ -57,7 +57,7 @@ public class StpLogicJwtForStateless extends StpLogic {
 	 * @return / 
 	 */
 	public String jwtSecretKey() {
-		String keyt = getConfig().getJwtSecretKey();
+		String keyt = getConfigOrGlobal().getJwtSecretKey();
 		SaJwtException.throwByNull(keyt, "请配置jwt秘钥", SaJwtErrorCode.CODE_30205);
 		return keyt;
 	}
@@ -111,7 +111,7 @@ public class StpLogicJwtForStateless extends StpLogic {
 		checkLoginArgs(id, loginModel);
 
 		// 2、初始化 loginModel ，给一些参数补上默认值
-		loginModel.build(getConfig());
+		loginModel.build(getConfigOrGlobal());
 		
 		// 3、生成一个token
 		String tokenValue = createTokenValue(id, loginModel.getDeviceOrDefault(), loginModel.getTimeout(), loginModel.getExtraData());
@@ -151,7 +151,7 @@ public class StpLogicJwtForStateless extends StpLogic {
  		SaHolder.getStorage().delete(splicingKeyJustCreatedSave());
  		
  		// 如果打开了Cookie模式，则把cookie清除掉 
- 		if(getConfig().getIsReadCookie()){
+ 		if(getConfigOrGlobal().getIsReadCookie()){
  			SaHolder.getResponse().deleteCookie(getTokenName());
 		}
 	}

From 3c1babc3e169bd072825ac07bfb3fbb54e590517 Mon Sep 17 00:00:00 2001
From: AppleOfGray <emailtome123456@163.com>
Date: Thu, 8 Jun 2023 02:35:05 +0000
Subject: [PATCH 115/129] =?UTF-8?q?update=20sa-token-doc/sso/sso-server.md?=
 =?UTF-8?q?.=20satoken=203=20=E7=BE=A4=E6=9C=89=E4=BA=BA=E5=9C=A8=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95sso=20=E6=A8=A1=E5=BC=8F=E4=B8=80=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99,=20s1.stp.com=E8=BF=9B=E8=A1=8Cclient=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95,=20localhost=E6=9F=A5=E7=9C=8Bserver=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81.=20=E4=B8=BA=E9=81=BF=E5=85=8D=E8=BF=99=E7=A7=8D?=
 =?UTF-8?q?=E6=83=85=E5=86=B5,=20=E5=8A=A0=E5=85=A5=E6=8F=90=E9=86=92.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/sso/sso-server.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-doc/sso/sso-server.md b/sa-token-doc/sso/sso-server.md
index 6c0a32ec..c596aa76 100644
--- a/sa-token-doc/sso/sso-server.md
+++ b/sa-token-doc/sso/sso-server.md
@@ -261,7 +261,7 @@ public class SaSsoServerApplication {
 
 ![sso-server-start](https://oss.dev33.cn/sa-token/doc/sso/sso-server-start.png 's-w-sh')
 
-访问统一授权地址：
+访问统一授权地址(仅测试SSO Server部署是否成功访问localhost,测试SSO模式一到模式三建议按照对应文档的域名进行配置并访问)：
 - [http://localhost:9000/sso/auth](http://localhost:9000/sso/auth)
 
 ![sso-server-init-login.png](https://oss.dev33.cn/sa-token/doc/sso/sso-server-init-login.png 's-w-sh')

From 30352742f65adddd6a39f6785bf27de628a7a81d Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 8 Jun 2023 11:43:01 +0800
Subject: [PATCH 116/129] =?UTF-8?q?=E4=BD=BF=E5=8A=A8=E6=80=81=20active-ti?=
 =?UTF-8?q?meout=20=E6=94=AF=E6=8C=81=20-1=20=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/dev33/satoken/stp/StpLogic.java   | 10 +++++++---
 .../src/main/java/cn/dev33/satoken/stp/StpUtil.java    |  1 -
 .../src/main/java/com/pj/test/TestController.java      |  5 ++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
index 340c9907..2e6fc52d 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpLogic.java
@@ -1617,13 +1617,12 @@ public class StpLogic {
  		String key = splicingKeyLastActiveTime(tokenValue);
  		String lastActiveTimeString = getSaTokenDao().get(key);
 
-
  		// 2、如果查不到，返回-2
  		if(lastActiveTimeString == null) {
  			return SaTokenDao.NOT_VALUE_EXPIRE;
  		}
 
- 		// 3、计算最后活跃时间 距离 此时此刻 的时间差
+		// 3、计算最后活跃时间 距离 此时此刻 的时间差
 		//    计算公式为: (当前时间 - 最后活跃时间) / 1000
 		SaValue2Box box = new SaValue2Box(lastActiveTimeString);
  		long lastActiveTime = box.getValue1AsLong();
@@ -1631,6 +1630,10 @@ public class StpLogic {
  		long timeDiff = (System.currentTimeMillis() - lastActiveTime) / 1000;
 		// 该 token 允许的时间差
 		long allowTimeDiff = getTokenUseActiveTimeoutOrGlobalConfig(tokenValue);
+		if(allowTimeDiff == SaTokenDao.NEVER_EXPIRE) {
+			// 如果允许的时间差为 -1 ，则代表永不冻结，此处需要立即返回 -1 ，无需后续计算
+			return SaTokenDao.NEVER_EXPIRE;
+		}
 
  		// 4、校验这个时间差是否超过了允许的值
 		//    计算公式为: 允许的最大时间差 - 实际时间差，判断是否 < 0， 如果是则代表已经被冻结 ，返回-2
@@ -2783,7 +2786,8 @@ public class StpLogic {
  	 * @return / 
  	 */
  	public boolean isOpenCheckActiveTimeout() {
- 		return getConfigOrGlobal().getActiveTimeout() != SaTokenDao.NEVER_EXPIRE;
+		SaTokenConfig cfg = getConfigOrGlobal();
+		return cfg.getActiveTimeout() != SaTokenDao.NEVER_EXPIRE || cfg.getDynamicActiveTimeout();
  	}
 
     /**
diff --git a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
index 05275467..57334edd 100644
--- a/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/stp/StpUtil.java
@@ -21,7 +21,6 @@ import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.session.SaSession;
 import cn.dev33.satoken.session.TokenSign;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
diff --git a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
index 8e5be6a0..5dd97ced 100644
--- a/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
+++ b/sa-token-demo/sa-token-demo-test/src/main/java/com/pj/test/TestController.java
@@ -4,7 +4,6 @@ import cn.dev33.satoken.stp.SaLoginConfig;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
-import com.pj.satoken.StpUserUtil;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,7 +22,7 @@ public class TestController {
 	// 测试登录  ---- http://localhost:8081/test/login
 	@RequestMapping("login")
 	public SaResult login(@RequestParam(defaultValue = "10001") long id) {
-		StpUtil.login(id, SaLoginConfig.setActiveTimeout(1000));
+		StpUtil.login(id, SaLoginConfig.setActiveTimeout(-1));
 		return SaResult.ok("登录成功");
 	}
 
@@ -31,7 +30,7 @@ public class TestController {
 	@RequestMapping("test")
 	public SaResult test() {
 		System.out.println("------------进来了 " + SaFoxUtil.formatDate(new Date()));
-		StpUserUtil.login(10001, SaLoginConfig.setActiveTimeout(2000));
+		StpUtil.getLoginId();
 		// 返回
 		return SaResult.data(null);
 	}

From 5c01deb780d0568042401f944c10b55d8338c9c8 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Thu, 8 Jun 2023 19:36:38 +0800
Subject: [PATCH 117/129] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=A1=E9=AA=8C=20?=
 =?UTF-8?q?ticket=20=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml        |   2 +-
 .../cn/dev33/satoken/sso/SaSsoProcessor.java  |  11 +-
 .../cn/dev33/satoken/sso/SaSsoTemplate.java   | 134 +++++++++++-------
 3 files changed, 90 insertions(+), 57 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml
index 9f5aad02..af6f09fe 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso2-client/src/main/resources/application.yml
@@ -5,7 +5,7 @@ server:
 # sa-token配置 
 sa-token: 
     # SSO-相关配置
-    sso: 
+    sso:
         # SSO-Server端 统一认证地址 
         auth-url: http://sa-sso-server.com:9000/sso/auth
         # auth-url: http://127.0.0.1:8848/sa-token-demo-sso-server-h5/sso-auth.html
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
index d07df254..873785a4 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoProcessor.java
@@ -141,16 +141,15 @@ public class SaSsoProcessor {
 		
 		// 校验ticket，获取 loginId 
 		Object loginId = ssoTemplate.checkTicket(ticket, client);
+		if(SaFoxUtil.isEmpty(loginId)) {
+			return SaResult.error("无效ticket：" + ticket);
+		}
 
 		// 注册此客户端的单点注销回调URL 
 		ssoTemplate.registerSloCallbackUrl(loginId, sloCallback);
 		
-		// 给 client 端响应结果 
-		if(SaFoxUtil.isEmpty(loginId)) {
-			return SaResult.error("无效ticket：" + ticket);
-		} else {
-			return SaResult.data(loginId);
-		}
+		// 给 client 端响应结果
+		return SaResult.data(loginId);
 	}
 
 	/**
diff --git a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
index e9afff6c..f173f25d 100644
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/SaSsoTemplate.java
@@ -95,42 +95,20 @@ public class SaSsoTemplate {
 
 
 	// ---------------------- Ticket 操作 ---------------------- 
-	
+
 	/**
-	 * 根据 账号id 创建一个 Ticket码 
-	 * @param loginId 账号id 
-	 * @param client 客户端标识 
-	 * @return Ticket码 
-	 */
-	public String createTicket(Object loginId, String client) {
-		// 创建 Ticket
-		String ticket = randomTicket(loginId);
-		
-		// 保存 Ticket
-		saveTicket(ticket, loginId, client);
-		saveTicketIndex(ticket, loginId);
-		
-		// 返回 Ticket
-		return ticket;
-	}
-	
-	/**
-	 * 保存 Ticket 
+	 * 保存 Ticket 关联的 loginId
 	 * @param ticket ticket码
-	 * @param loginId 账号id 
-	 * @param client 客户端标识 
+	 * @param loginId 账号id
 	 */
-	public void saveTicket(String ticket, Object loginId, String client) {
-		String value = String.valueOf(loginId);
-		if(SaFoxUtil.isNotEmpty(client)) {
-			value += "," + client;
-		}
+	public void saveTicket(String ticket, Object loginId) {
+		// 保存 ticket -> loginId 的关系
 		long ticketTimeout = SaSsoManager.getConfig().getTicketTimeout();
-		SaManager.getSaTokenDao().set(splicingTicketSaveKey(ticket), value, ticketTimeout); 
+		SaManager.getSaTokenDao().set(splicingTicketSaveKey(ticket), String.valueOf(loginId), ticketTimeout);
 	}
 	
 	/**
-	 * 保存 Ticket 索引 
+	 * 保存 Ticket 索引 （id 反查 ticket）
 	 * @param ticket ticket码
 	 * @param loginId 账号id 
 	 */
@@ -138,7 +116,20 @@ public class SaSsoTemplate {
 		long ticketTimeout = SaSsoManager.getConfig().getTicketTimeout();
 		SaManager.getSaTokenDao().set(splicingTicketIndexKey(loginId), String.valueOf(ticket), ticketTimeout); 
 	}
-	
+
+	/**
+	 * 保存 Ticket 关联的 client
+	 * @param ticket ticket码
+	 * @param client 客户端标识
+	 */
+	public void saveTicketToClient(String ticket, String client) {
+		if(SaFoxUtil.isEmpty(client)) {
+			return;
+		}
+		long ticketTimeout = SaSsoManager.getConfig().getTicketTimeout();
+		SaManager.getSaTokenDao().set(splicingTicketToClientSaveKey(ticket), client, ticketTimeout);
+	}
+
 	/**
 	 * 删除 Ticket 
 	 * @param ticket Ticket码
@@ -162,7 +153,18 @@ public class SaSsoTemplate {
 	}
 
 	/**
-	 * 根据 Ticket码 获取账号id，如果Ticket码无效则返回null 
+	 * 删除 Ticket 关联的 client
+	 * @param ticket Ticket码
+	 */
+	public void deleteTicketToClient(String ticket) {
+		if(ticket == null) {
+			return;
+		}
+		SaManager.getSaTokenDao().delete(splicingTicketToClientSaveKey(ticket));
+	}
+
+	/**
+	 * 查询 ticket 指向的 loginId，如果 ticket 码无效则返回 null
 	 * @param ticket Ticket码
 	 * @return 账号id 
 	 */
@@ -170,17 +172,11 @@ public class SaSsoTemplate {
 		if(SaFoxUtil.isEmpty(ticket)) {
 			return null;
 		}
-		String loginId = SaManager.getSaTokenDao().get(splicingTicketSaveKey(ticket));
-		// 如果是 "a,b" 的格式，则只取最前面的一项 
-		if(loginId != null && loginId.contains(",")) {
-			String[] arr = loginId.split(",");
-			loginId = arr[0];
-		}
-		return loginId;
+		return SaManager.getSaTokenDao().get(splicingTicketSaveKey(ticket));
 	}
 
 	/**
-	 * 根据 Ticket码 获取账号id，并转换为指定类型 
+	 * 查询 ticket 指向的 loginId，并转换为指定类型
 	 * @param <T> 要转换的类型 
 	 * @param ticket Ticket码
 	 * @param cs 要转换的类型 
@@ -191,7 +187,7 @@ public class SaSsoTemplate {
 	}
 
 	/**
-	 * 查询 指定账号id的 Ticket值 
+	 * 查询 指定 loginId 其所属的 ticket 值
 	 * @param loginId 账号id 
 	 * @return Ticket值 
 	 */
@@ -202,6 +198,39 @@ public class SaSsoTemplate {
 		return SaManager.getSaTokenDao().get(splicingTicketIndexKey(loginId));
 	}
 
+	/**
+	 * 查询 ticket 关联的 client，如果 ticket 码无效则返回 null
+	 * @param ticket Ticket码
+	 * @return 账号id
+	 */
+	public String getTicketToClient(String ticket) {
+		if(SaFoxUtil.isEmpty(ticket)) {
+			return null;
+		}
+		return SaManager.getSaTokenDao().get(splicingTicketToClientSaveKey(ticket));
+	}
+
+	//
+
+	/**
+	 * 根据 账号id 创建一个 Ticket码
+	 * @param loginId 账号id
+	 * @param client 客户端标识
+	 * @return Ticket码
+	 */
+	public String createTicket(Object loginId, String client) {
+		// 创建 Ticket
+		String ticket = randomTicket(loginId);
+
+		// 保存 Ticket
+		saveTicket(ticket, loginId);
+		saveTicketIndex(ticket, loginId);
+		saveTicketToClient(ticket, client);
+
+		// 返回 Ticket
+		return ticket;
+	}
+
 	/**
 	 * 校验 Ticket 码，获取账号id，如果此ticket是有效的，则立即删除 
 	 * @param ticket Ticket码
@@ -223,23 +252,19 @@ public class SaSsoTemplate {
 		
 		if(loginId != null) {
 
-			// 如果是 "a,b" 的格式，则解析出对应的 Client
-			String ticketClient = null;
-			if(loginId.contains(",")) {
-				String[] arr = loginId.split(",");
-				loginId = arr[0];
-				ticketClient = arr[1];
-			}
+			// 解析出这个 ticket 关联的 Client
+			String ticketClient = getTicketToClient(ticket);
 			
 			// 如果指定了 client 标识，则校验一下 client 标识是否一致 
 			if(SaFoxUtil.isNotEmpty(client) && SaFoxUtil.notEquals(client, ticketClient)) {
 				throw new SaSsoException("该 ticket 不属于 client=" + client + ", ticket 值: " + ticket)
 					.setCode(SaSsoErrorCode.CODE_30011);
 			}
-			
+
 			// 删除 ticket 信息，使其只有一次性有效
 			deleteTicket(ticket);
 			deleteTicketIndex(loginId);
+			deleteTicketToClient(ticket);
 		}
 		
 		// 
@@ -559,7 +584,16 @@ public class SaSsoTemplate {
 	 * @return key
 	 */
 	public String splicingTicketSaveKey(String ticket) {
-		return SaManager.getConfig().getTokenName() + ":ticket:" + ticket;
+		return getStpLogic().getConfigOrGlobal().getTokenName() + ":ticket:" + ticket;
+	}
+
+	/**
+	 * 拼接key：Ticket 查 所属的 client
+	 * @param ticket ticket值
+	 * @return key
+	 */
+	public String splicingTicketToClientSaveKey(String ticket) {
+		return getStpLogic().getConfigOrGlobal().getTokenName() + ":ticket-client:" + ticket;
 	}
 
 	/**
@@ -568,7 +602,7 @@ public class SaSsoTemplate {
 	 * @return key
 	 */
 	public String splicingTicketIndexKey(Object id) {
-		return SaManager.getConfig().getTokenName() + ":id-ticket:" + id;
+		return getStpLogic().getConfigOrGlobal().getTokenName() + ":id-ticket:" + id;
 	}
 
 

From 81fba06d0ad7ec4dd93a7a5bb2fdc71de9895006 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 9 Jun 2023 13:56:47 +0800
Subject: [PATCH 118/129] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yml                   | 2 +-
 .../main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
index a61bc655..931f2519 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso3-client/src/main/resources/application.yml
@@ -5,7 +5,7 @@ server:
 # sa-token配置 
 sa-token: 
     # SSO-相关配置
-    sso: 
+    sso:
         # SSO-Server端 统一认证地址 
         auth-url: http://sa-sso-server.com:9000/sso/auth
         # 使用 Http 请求校验ticket (模式三)
diff --git a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
index 93e6aa7e..88dac617 100644
--- a/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
+++ b/sa-token-plugin/sa-token-temp-jwt/src/main/java/cn/dev33/satoken/temp/jwt/SaJwtUtil.java
@@ -108,17 +108,18 @@ public class SaJwtUtil {
     }
 
     /**
-     * 从一个 jwt-token 解析出载荷, 并取出其剩余有效期 
+     * 从一个 jwt-token 解析出载荷, 并取出其剩余有效期
+	 * @param service 指定的服务类型
      * @param jwtToken JwtToken值 
      * @param keyt 秘钥
      * @return 值 
      */
-    public static long getTimeout(String key, String jwtToken, String keyt) {
+    public static long getTimeout(String service, String jwtToken, String keyt) {
     	// 取出数据 
     	Claims claims = parseToken(jwtToken, keyt);
     	
-    	// 如果给定的 key 不对
-    	if(claims.get(KEY_VALUE + key) == null) {
+    	// 如果给定的 service 不对
+    	if(claims.get(KEY_VALUE + service) == null) {
     		return SaTokenDao.NOT_VALUE_EXPIRE;
     	}
     	

From 12118e5bb11a01cb31bcb9a8fad645e28f914799 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 9 Jun 2023 16:06:25 +0800
Subject: [PATCH 119/129] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B5=9E=E5=8A=A9?=
 =?UTF-8?q?=E8=80=85=E5=90=8D=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/more/sa-token-donate.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sa-token-doc/more/sa-token-donate.md b/sa-token-doc/more/sa-token-donate.md
index 8694211c..1ba59bcc 100644
--- a/sa-token-doc/more/sa-token-donate.md
+++ b/sa-token-doc/more/sa-token-donate.md
@@ -21,6 +21,10 @@ Sa-Token 采用 Apache-2.0 开源协议，**承诺框架本身与官网文档永
 
 | 赞助人											| 赞助金额		| 留言										| 时间			|
 | :--------										| :--------		| :--------									| :--------		|
+| [javahuang](https://gitee.com/javahrp)		| ¥ 200.0		| [SurveyKing：功能最强大的调查问卷系统和考试系统，开源](https://gitee.com/surveyking/surveyking)					| 2023-06-08 	|
+| [dyjgitdyjgit](https://gitee.com/qtinfogit)	| ¥ 20.0		| 感谢您的开源项目！							| 2023-05-22 	|
+| 砰嚓嚓（QQ打赏）								| ¥ 20.0		| 一点打赏不成敬意							| 2023-05-15 	|
+| [xc_Moving](https://gitee.com/fireZhang)		| ¥ 20.0		| 感谢您的开源项目！感谢SA-token帮我度过项目的难关		| 2023-05-11 	|
 | [BeckJin](https://gitee.com/beckjin666)		| ¥ 100.0		| [明道云-零代码开发平台，快速响应业务需求。从“IT背锅侠”，变成“IT英雄”。](https://mingdao.com?s=st)					| 2023-05-08 	|
 | [SummerHy](https://gitee.com/hurumo)			| ¥ 10.0		| 国产，就是棒，：）							| 2023-05-07 	|
 | [gdl](https://gitee.com/gdl97)				| ¥ 20.0		| 感谢您的开源项目！作者牛逼！					| 2023-04-29 	|

From bb5e61a554e017063030043d5b24a1e105269204 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Fri, 16 Jun 2023 23:13:15 +0800
Subject: [PATCH 120/129] =?UTF-8?q?=E5=9C=A8=E8=A7=A3=E6=9E=90jwt=E4=BB=A4?=
 =?UTF-8?q?=E7=89=8C=E6=97=B6=E5=BC=BA=E5=88=B6=E6=8C=87=E5=AE=9A=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8D=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/pj/SaTokenJwtDemoApplication.java     |  5 ++--
 .../cn/dev33/satoken/jwt/SaJwtTemplate.java   | 26 ++++++++++++++-----
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java
index 1207a2c1..65a76bb0 100644
--- a/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java
+++ b/sa-token-demo/sa-token-demo-jwt/src/main/java/com/pj/SaTokenJwtDemoApplication.java
@@ -1,16 +1,15 @@
 package com.pj;
 
+import cn.dev33.satoken.SaManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import cn.dev33.satoken.SaManager;
-
 @SpringBootApplication
 public class SaTokenJwtDemoApplication {
 	
 	public static void main(String[] args) {
 		SpringApplication.run(SaTokenJwtDemoApplication.class, args); 
-		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig()); 
+		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
 	}
 	
 }
\ No newline at end of file
diff --git a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
index eb195305..f527ec86 100644
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/SaJwtTemplate.java
@@ -15,9 +15,6 @@
  */
 package cn.dev33.satoken.jwt;
 
-import java.util.Map;
-import java.util.Objects;
-
 import cn.dev33.satoken.dao.SaTokenDao;
 import cn.dev33.satoken.jwt.error.SaJwtErrorCode;
 import cn.dev33.satoken.jwt.exception.SaJwtException;
@@ -25,6 +22,11 @@ import cn.dev33.satoken.util.SaFoxUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.jwt.JWT;
 import cn.hutool.jwt.JWTException;
+import cn.hutool.jwt.signers.JWTSigner;
+import cn.hutool.jwt.signers.JWTSignerUtil;
+
+import java.util.Map;
+import java.util.Objects;
 
 /**
  * jwt 操作模板方法封装
@@ -139,9 +141,19 @@ public class SaJwtTemplate {
 	 * @return 根据 JWT 对象和 keyt 秘钥，生成的 token 字符串
 	 */
 	public String generateToken (JWT jwt, String keyt) {
-		return jwt.setKey(keyt.getBytes()).sign();
+		return jwt.setKey(keyt.getBytes()).setSigner(createSigner(keyt)).sign();
 	}
-	
+
+	/**
+	 * 返回 jwt 使用的签名算法
+	 *
+	 * @param keyt 秘钥
+	 * @return /
+	 */
+	public JWTSigner createSigner (String keyt) {
+		return JWTSignerUtil.hs256(keyt.getBytes());
+	}
+
 	// ------ 解析 
 
     /**
@@ -174,8 +186,8 @@ public class SaJwtTemplate {
 		}
     	JSONObject payloads = jwt.getPayloads();
     	
-    	// 校验 Token 签名 
-    	boolean verify = jwt.setKey(keyt.getBytes()).verify();
+    	// 校验 Token 签名
+		boolean verify = jwt.setKey(keyt.getBytes()).setSigner(createSigner(keyt)).verify();
     	if( ! verify) {
     		throw new SaJwtException("jwt 签名无效：" + token).setCode(SaJwtErrorCode.CODE_30202);
     	}

From 5a5ba1d634ead9d6e277b900fcb895c32dde9030 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Sat, 17 Jun 2023 17:46:49 +0800
Subject: [PATCH 121/129] =?UTF-8?q?=E5=AE=9A=E4=B9=89=20sa-token-bom=20?=
 =?UTF-8?q?=E5=8C=85=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BC=95=E5=85=A5=20sa-tok?=
 =?UTF-8?q?en=20=E6=97=B6=E5=AF=B9=E9=BD=90=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mvn clean.bat                                 |  37 +++-
 pom.xml                                       |   3 +-
 sa-token-bom/.gitignore                       |  13 ++
 sa-token-bom/pom.xml                          | 171 ++++++++++++++++++
 .../sa-token-demo-bom-import/.gitignore       |  12 ++
 .../sa-token-demo-bom-import/pom.xml          |  84 +++++++++
 .../java/com/pj/SaTokenDemoApplication.java   |  27 +++
 .../java/com/pj/current/GlobalException.java  |  20 ++
 .../main/java/com/pj/test/TestController.java |  32 ++++
 .../src/main/resources/application.yml        |  52 ++++++
 sa-token-dependencies/pom.xml                 | 153 +---------------
 11 files changed, 450 insertions(+), 154 deletions(-)
 create mode 100644 sa-token-bom/.gitignore
 create mode 100644 sa-token-bom/pom.xml
 create mode 100644 sa-token-demo/sa-token-demo-bom-import/.gitignore
 create mode 100644 sa-token-demo/sa-token-demo-bom-import/pom.xml
 create mode 100644 sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/SaTokenDemoApplication.java
 create mode 100644 sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/current/GlobalException.java
 create mode 100644 sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/test/TestController.java
 create mode 100644 sa-token-demo/sa-token-demo-bom-import/src/main/resources/application.yml

diff --git a/mvn clean.bat b/mvn clean.bat
index c15f651f..f2df64a4 100644
--- a/mvn clean.bat	
+++ b/mvn clean.bat	
@@ -22,17 +22,42 @@ cd sa-token-demo-springboot3-redis & call mvn clean & cd ..
 cd sa-token-demo-springboot-redis & call mvn clean & cd ..
 cd sa-token-demo-springboot-redisson & call mvn clean & cd ..
 cd sa-token-demo-test & call mvn clean & cd ..
-cd sa-token-demo-sso1-client & call mvn clean & cd ..
-cd sa-token-demo-sso2-client & call mvn clean & cd ..
-cd sa-token-demo-sso3-client & call mvn clean & cd ..
-cd sa-token-demo-sso3-client-nosdk & call mvn clean & cd ..
-cd sa-token-demo-sso-server & call mvn clean & cd ..
-cd sa-token-demo-sso-server-solon & call mvn clean & cd ..
 cd sa-token-demo-thymeleaf & call mvn clean & cd ..
 cd sa-token-demo-webflux & call mvn clean & cd ..
 cd sa-token-demo-webflux-springboot3 & call mvn clean & cd ..
 cd sa-token-demo-websocket & call mvn clean & cd ..
 cd sa-token-demo-websocket-spring & call mvn clean & cd ..
+cd sa-token-demo-bom-import & call mvn clean & cd ..
+
+cd sa-token-demo-sso
+cd sa-token-demo-sso-server & call mvn clean & cd ..
+cd sa-token-demo-sso1-client & call mvn clean & cd ..
+cd sa-token-demo-sso2-client & call mvn clean & cd ..
+cd sa-token-demo-sso3-client & call mvn clean & cd ..
+cd sa-token-demo-sso3-client-nosdk & call mvn clean & cd ..
+cd ..
+
+cd sa-token-demo-sso-for-solon
+cd sa-token-demo-sso1-client-solon & call mvn clean & cd ..
+cd sa-token-demo-sso2-client-solon & call mvn clean & cd ..
+cd sa-token-demo-sso3-client-solon & call mvn clean & cd ..
+cd sa-token-demo-sso-server-solon & call mvn clean & cd ..
+cd ..
+
+cd sa-token-demo-oauth2
+cd sa-token-demo-oauth2-client & call mvn clean & cd ..
+cd sa-token-demo-oauth2-server & call mvn clean & cd ..
+cd ..
+
+cd sa-token-demo-remember-me
+cd server_project & call mvn clean & cd ..
+cd ..
+
+
+
+
+
+
 
 cd ..
 
diff --git a/pom.xml b/pom.xml
index ed2f2297..c47da5c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,12 +19,13 @@
 	<!-- 所有模块 -->
 	<modules>
 		<module>sa-token-dependencies</module>
+		<module>sa-token-bom</module>
 		<module>sa-token-core</module>
 		<module>sa-token-starter</module>
 		<module>sa-token-plugin</module>
 	</modules>
 
-<!-- 开源协议 apache 2.0 -->
+	<!-- 开源协议 apache 2.0 -->
 	<licenses>
 		<license>
 			<name>Apache 2</name>
diff --git a/sa-token-bom/.gitignore b/sa-token-bom/.gitignore
new file mode 100644
index 00000000..8122f47c
--- /dev/null
+++ b/sa-token-bom/.gitignore
@@ -0,0 +1,13 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.factorypath
+
+.idea/
+.iml
\ No newline at end of file
diff --git a/sa-token-bom/pom.xml b/sa-token-bom/pom.xml
new file mode 100644
index 00000000..3aaeacb4
--- /dev/null
+++ b/sa-token-bom/pom.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>cn.dev33</groupId>
+    <artifactId>sa-token-bom</artifactId>
+    <version>${revision}</version>
+    <packaging>pom</packaging>
+    <name>sa-token-bom</name>
+    <description>Sa-Token Bom</description>
+
+    <properties>
+        <revision>1.34.1</revision>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- sa-token 核心 -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <!-- region sa-token-starter -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-starter</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jboot-plugin</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jfinal-plugin</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-reactor-spring-boot-starter</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-servlet</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jakarta-servlet</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-solon-plugin</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot-autoconfig</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot-starter</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-boot3-starter</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- endregion-->
+
+            <!-- region sa-token-plugin -->
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-plugin</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-alone-redis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-dubbo</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-grpc</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redis</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redis-fastjson</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redis-fastjson2</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redis-jackson</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redisson-jackson</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-redisx</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-dialect-thymeleaf</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-jwt</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-oauth2</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-quick-login</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-spring-aop</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-sso</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.dev33</groupId>
+                <artifactId>sa-token-temp-jwt</artifactId>
+                <version>${revision}</version>
+            </dependency>
+            <!-- endregion-->
+
+        </dependencies>
+    </dependencyManagement>
+
+</project>
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-bom-import/.gitignore b/sa-token-demo/sa-token-demo-bom-import/.gitignore
new file mode 100644
index 00000000..99a6e767
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-bom-import/.gitignore
@@ -0,0 +1,12 @@
+target/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+.classpath
+.project
+
+.idea/
+
+.factorypath
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-bom-import/pom.xml b/sa-token-demo/sa-token-demo-bom-import/pom.xml
new file mode 100644
index 00000000..8746ea69
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-bom-import/pom.xml
@@ -0,0 +1,84 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>cn.dev33</groupId>
+	<artifactId>sa-token-demo-bom-import</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	
+	<!-- SpringBoot -->
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.5.14</version>
+		<relativePath/>
+	</parent>
+	
+	<!-- 定义 Sa-Token 版本号 -->
+	<properties>
+		<sa-token.version>1.34.1</sa-token.version>
+	</properties>
+
+	<dependencies>
+
+		<!-- SpringBoot依赖 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-aop</artifactId>
+		</dependency>
+		
+		<!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->
+		<dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-spring-boot-starter</artifactId>
+        </dependency>
+
+		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
+		<dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-redis-jackson</artifactId>
+        </dependency>
+
+		<!-- Sa-Token整合 jwt -->
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-jwt</artifactId>
+		</dependency>
+
+		<!-- 提供Redis连接池 -->
+		<dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        
+		<!-- @ConfigurationProperties -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		
+	</dependencies>
+
+
+	<!-- 依赖管理 (不会真正的引入依赖，只会限定其版本) -->
+	<dependencyManagement>
+		<dependencies>
+
+			<!-- Sa-Token 所有包的版本定义 -->
+			<dependency>
+				<groupId>cn.dev33</groupId>
+				<artifactId>sa-token-bom</artifactId>
+				<version>1.34.1</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+
+		</dependencies>
+	</dependencyManagement>
+	
+</project>
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/SaTokenDemoApplication.java b/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/SaTokenDemoApplication.java
new file mode 100644
index 00000000..9ae761b9
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/SaTokenDemoApplication.java
@@ -0,0 +1,27 @@
+package com.pj;
+
+import cn.dev33.satoken.SaManager;
+import cn.dev33.satoken.jwt.StpLogicJwtForSimple;
+import cn.dev33.satoken.stp.StpLogic;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Sa-Token 使用 bom 包引入框架
+ */
+@SpringBootApplication
+public class SaTokenDemoApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(SaTokenDemoApplication.class, args); 
+		System.out.println("\n启动成功：Sa-Token配置如下：" + SaManager.getConfig());
+	}
+
+	// Sa-Token 整合 jwt (Simple 简单模式)
+	@Bean
+	public StpLogic getStpLogicJwt() {
+		return new StpLogicJwtForSimple();
+	}
+
+}
diff --git a/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/current/GlobalException.java b/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/current/GlobalException.java
new file mode 100644
index 00000000..6b804761
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/current/GlobalException.java
@@ -0,0 +1,20 @@
+package com.pj.current;
+
+import cn.dev33.satoken.util.SaResult;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+/**
+ * 全局异常处理 
+ */
+@RestControllerAdvice
+public class GlobalException {
+
+	// 全局异常拦截（拦截项目中的所有异常）
+	@ExceptionHandler
+	public SaResult handlerException(Exception e){
+		e.printStackTrace();
+		return SaResult.error(e.getMessage());
+	}
+	
+}
diff --git a/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/test/TestController.java b/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/test/TestController.java
new file mode 100644
index 00000000..26fc75fb
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-bom-import/src/main/java/com/pj/test/TestController.java
@@ -0,0 +1,32 @@
+package com.pj.test;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.dev33.satoken.util.SaResult;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 测试专用Controller 
+ * @author click33
+ *
+ */
+@RestController
+@RequestMapping("/test/")
+public class TestController {
+
+	// 测试   浏览器访问： http://localhost:8081/test/test
+	@RequestMapping("test")
+	public SaResult test() {
+		System.out.println("------------进来了");
+		StpUtil.login(10001);
+		return SaResult.ok();
+	}
+	
+	// 测试   浏览器访问： http://localhost:8081/test/test2
+	@RequestMapping("test2")
+	public SaResult test2() {
+		StpUtil.checkLogin();
+		return SaResult.ok();
+	}
+
+}
diff --git a/sa-token-demo/sa-token-demo-bom-import/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-bom-import/src/main/resources/application.yml
new file mode 100644
index 00000000..fc74e9a1
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-bom-import/src/main/resources/application.yml
@@ -0,0 +1,52 @@
+# 端口
+server:
+    port: 8081
+
+# sa-token 配置
+sa-token: 
+    # token 名称 (同时也是 cookie 名称)
+    token-name: satoken
+    # token 有效期（单位：秒） 默认30天，-1 代表永久有效
+    timeout: 2592000
+    # token 最低活跃频率（单位：秒），如果 token 超过此时间没有访问系统就会被冻结，默认-1 代表不限制，永不冻结
+    active-timeout: -1
+    # 是否允许同一账号多地同时登录 （为 true 时允许一起登录, 为 false 时新登录挤掉旧登录）
+    is-concurrent: true
+    # 在多人登录同一账号时，是否共用一个 token （为 true 时所有登录共用一个 token, 为 false 时每次登录新建一个 token）
+    is-share: true
+    # token 风格（默认可取值：uuid、simple-uuid、random-32、random-64、random-128、tik）
+    token-style: uuid
+    # 是否输出操作日志 
+    is-log: true
+    # jwt秘钥
+    jwt-secret-key: asdasdasifhueuiwyurfewbfjsdafjk
+
+
+spring:
+    # redis配置 
+    redis:
+        # Redis数据库索引（默认为0）
+        database: 1
+        # Redis服务器地址
+        host: 127.0.0.1
+        # Redis服务器连接端口
+        port: 6379
+        # Redis服务器连接密码（默认为空）
+        password: 
+        # 连接超时时间
+        timeout: 10s
+        lettuce:
+            pool:
+                # 连接池最大连接数
+                max-active: 200
+                # 连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+                # 连接池中的最大空闲连接
+                max-idle: 10
+                # 连接池中的最小空闲连接
+                min-idle: 0
+        
+        
+        
+        
+        
\ No newline at end of file
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index defc5f24..87fd03e9 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -243,157 +243,16 @@
 				<artifactId>jjwt</artifactId>
 				<version>${jjwt.version}</version>
 	        </dependency>
-			
-			
-			
-			<!-- ****************** Sa-Token 自身依赖 ****************** -->
+
+			<!-- sa-token 自身依赖 -->
 			<dependency>
 				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-core</artifactId>
+				<artifactId>sa-token-bom</artifactId>
 				<version>${revision}</version>
+				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
-			
-			<!-- region sa-token-starter -->
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-starter</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-jboot-plugin</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-jfinal-plugin</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-reactor-spring-boot-starter</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-servlet</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-jakarta-servlet</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-solon-plugin</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-spring-boot-autoconfig</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-spring-boot-starter</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-spring-boot3-starter</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<!-- endregion-->
-			
-			<!-- region sa-token-plugin -->
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-plugin</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-alone-redis</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dubbo</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-grpc</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-redis</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-redis-fastjson</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-redis-fastjson2</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-redis-jackson</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-redisson-jackson</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-redisx</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-dialect-thymeleaf</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-jwt</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-oauth2</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-quick-login</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-spring-aop</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-sso</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<dependency>
-				<groupId>cn.dev33</groupId>
-				<artifactId>sa-token-temp-jwt</artifactId>
-				<version>${revision}</version>
-			</dependency>
-			<!-- endregion-->
-			
+
         </dependencies>
     </dependencyManagement>
 

From 03f28da9889ea132963a37af89d30435783d3854 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 19 Jun 2023 00:17:15 +0800
Subject: [PATCH 122/129] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=96=B9=E8=A8=80=E5=91=BD=E5=90=8D=E7=A9=BA=E9=97=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=BC=BA=20ide=20=E4=BB=A3=E7=A0=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pj/SaTokenThymeleafDemoApplication.java   |  3 +-
 .../src/main/resources/templates/index.html   | 18 ++---
 sa-token-doc/plugin/thymeleaf-extend.md       |  4 +-
 .../thymeleaf/dialect/Sa-Token-Dialect.xml    | 71 +++++++++++++++++++
 .../thymeleaf/dialect/SaTokenDialect.java     |  6 +-
 5 files changed, 88 insertions(+), 14 deletions(-)
 create mode 100644 sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/Sa-Token-Dialect.xml

diff --git a/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/SaTokenThymeleafDemoApplication.java b/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/SaTokenThymeleafDemoApplication.java
index bcd9cd24..dbbd2eb0 100644
--- a/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/SaTokenThymeleafDemoApplication.java
+++ b/sa-token-demo/sa-token-demo-thymeleaf/src/main/java/com/pj/SaTokenThymeleafDemoApplication.java
@@ -10,7 +10,8 @@ public class SaTokenThymeleafDemoApplication {
 	
 	public static void main(String[] args) {
 		SpringApplication.run(SaTokenThymeleafDemoApplication.class, args); 
-		System.out.println("\n启动成功：sa-token配置如下：" + SaManager.getConfig());
+		System.out.println("\n启动成功，Sa-Token 配置如下：" + SaManager.getConfig());
+		System.out.println("\n测试访问：http://localhost:8081/");
 	}
 	
 }
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-thymeleaf/src/main/resources/templates/index.html b/sa-token-demo/sa-token-demo-thymeleaf/src/main/resources/templates/index.html
index 3886256b..9952fcc9 100644
--- a/sa-token-demo/sa-token-demo-thymeleaf/src/main/resources/templates/index.html
+++ b/sa-token-demo/sa-token-demo-thymeleaf/src/main/resources/templates/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh">
+<html lang="zh" xmlns:sa="http://www.thymeleaf.org/extras/sa-token">
 	<head>
 		<title>Sa-Token 集成 Thymeleaf 标签方言</title>
 		<meta charset="utf-8">
@@ -9,28 +9,28 @@
 		<div class="view-box" style="padding: 30px;">
 			<h2>Sa-Token 集成 Thymeleaf 标签方言 —— 测试页面</h2>
 			<p>
-				<a href="login" target="_blank">登录</a> 
+				<a href="login" target="_blank">登录</a>
 				<a href="logout" target="_blank">注销</a>
 			</p>
-			
+
 			<p>登录之后才能显示：<span sa:login>value</span></p>
 			<p>不登录才能显示：<span sa:notLogin>value</span></p>
-			
+
 			<p>具有角色 admin 才能显示：<span sa:hasRole="admin">value</span></p>
 			<p>同时具备多个角色才能显示：<span sa:hasRoleAnd="admin, ceo, cto">value</span></p>
 			<p>只要具有其中一个角色就能显示：<span sa:hasRoleOr="admin, ceo, cto">value</span></p>
-			<p>不具有角色 admin 才能显示：<span sa:lackRole="admin">value</span></p>
-			
+			<p>不具有角色 admin 才能显示：<span sa:notRole="admin">value</span></p>
+
 			<p>具有权限 user-add 才能显示：<span sa:hasPermission="user-add">value</span></p>
 			<p>同时具备多个权限才能显示：<span sa:hasPermissionAnd="user-add, user-delete, user-get">value</span></p>
 			<p>只要具有其中一个权限就能显示：<span sa:hasPermissionOr="user-add, user-delete, user-get">value</span></p>
-			<p>不具有权限 user-add 才能显示：<span sa:lackPermission="user-add">value</span></p>
-			
+			<p>不具有权限 user-add 才能显示：<span sa:notPermission="user-add">value</span></p>
+
 			<p th:if="${stp.isLogin()}">
 				从SaSession中取值：
 				<span th:text="${stp.getSession().get('name', '')}"></span>
 			</p>
-			
+
 		</div>
 	</body>
 </html>
diff --git a/sa-token-doc/plugin/thymeleaf-extend.md b/sa-token-doc/plugin/thymeleaf-extend.md
index ae8f00fd..9a17fd5c 100644
--- a/sa-token-doc/plugin/thymeleaf-extend.md
+++ b/sa-token-doc/plugin/thymeleaf-extend.md
@@ -72,7 +72,7 @@ public class SaTokenConfigure {
 </p>
 <p>
 	不具有角色 admin 才能显示：
-	<span sa:lackRole="admin">value</span>
+	<span sa:notRole="admin">value</span>
 </p>
 ```
 
@@ -92,7 +92,7 @@ public class SaTokenConfigure {
 </p>
 <p>
 	不具有权限 user-add 才能显示：
-	<span sa:lackPermission="user-add">value</span>
+	<span sa:notPermission="user-add">value</span>
 </p>
 ```
 
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/Sa-Token-Dialect.xml b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/Sa-Token-Dialect.xml
new file mode 100644
index 00000000..92b05bb0
--- /dev/null
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/Sa-Token-Dialect.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ =============================================================================
+  ~
+  ~   Copyright (c) 2011-2018, The THYMELEAF team (http://www.thymeleaf.org)
+  ~
+  ~   Licensed under the Apache License, Version 2.0 (the "License");
+  ~   you may not use this file except in compliance with the License.
+  ~   You may obtain a copy of the License at
+  ~
+  ~       http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~   Unless required by applicable law or agreed to in writing, software
+  ~   distributed under the License is distributed on an "AS IS" BASIS,
+  ~   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~   See the License for the specific language governing permissions and
+  ~   limitations under the License.
+  ~
+  ~ =============================================================================
+  -->
+
+<dialect
+        xmlns="http://www.thymeleaf.org/extras/dialect"
+        prefix="sa"
+        namespace-uri="http://www.thymeleaf.org/extras/sa-token"
+        class="cn.dev33.satoken.thymeleaf.dialect.SaTokenDialect">
+
+    <!-- 登录判断 -->
+    <attribute-processor name="login">
+        <documentation> <![CDATA[ 登录之后才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="notLogin">
+        <documentation> <![CDATA[ 不登录才能显示元素 ]]> </documentation>
+    </attribute-processor>
+
+    <!-- 角色判断 -->
+    <attribute-processor name="hasRole">
+        <documentation> <![CDATA[ 具有指定角色才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="hasRoleAnd">
+        <documentation> <![CDATA[ 同时具备多个角色才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="hasRoleOr">
+        <documentation> <![CDATA[ 只要具有其中一个角色就能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="notRole">
+        <documentation> <![CDATA[ 不具有指定角色才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="lackRole">
+        <documentation> <![CDATA[ 不具有指定角色才能显示元素（未来版本可能废弃，建议更换为 notRole） ]]> </documentation>
+    </attribute-processor>
+
+    <!-- 权限判断 -->
+    <attribute-processor name="hasPermission">
+        <documentation> <![CDATA[ 具有指定权限才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="hasPermissionAnd">
+        <documentation> <![CDATA[ 同时具备多个权限才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="hasPermissionOr">
+        <documentation> <![CDATA[ 只要具有其中一个权限就能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="notPermission">
+        <documentation> <![CDATA[ 不具有指定权限才能显示元素 ]]> </documentation>
+    </attribute-processor>
+    <attribute-processor name="lackPermission">
+        <documentation> <![CDATA[ 不具有指定权限才能显示元素（未来版本可能废弃，建议更换为 notPermission） ]]> </documentation>
+    </attribute-processor>
+
+</dialect>
diff --git a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
index f2482e80..8bfc681e 100644
--- a/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
+++ b/sa-token-plugin/sa-token-dialect-thymeleaf/src/main/java/cn/dev33/satoken/thymeleaf/dialect/SaTokenDialect.java
@@ -72,14 +72,16 @@ public class SaTokenDialect extends AbstractProcessorDialect {
 
 				// 角色判断
 				new SaTokenTagProcessor(prefix, "hasRole", value -> stpLogic.hasRole(value)),
-				new SaTokenTagProcessor(prefix, "hasRoleOr", value -> stpLogic.hasRoleOr(toArray(value))),
 				new SaTokenTagProcessor(prefix, "hasRoleAnd", value -> stpLogic.hasRoleAnd(toArray(value))),
+				new SaTokenTagProcessor(prefix, "hasRoleOr", value -> stpLogic.hasRoleOr(toArray(value))),
+				new SaTokenTagProcessor(prefix, "notRole", value -> ! stpLogic.hasRole(value)),
 				new SaTokenTagProcessor(prefix, "lackRole", value -> ! stpLogic.hasRole(value)),
 
 				// 权限判断
 				new SaTokenTagProcessor(prefix, "hasPermission", value -> stpLogic.hasPermission(value)),
-				new SaTokenTagProcessor(prefix, "hasPermissionOr", value -> stpLogic.hasPermissionOr(toArray(value))),
 				new SaTokenTagProcessor(prefix, "hasPermissionAnd", value -> stpLogic.hasPermissionAnd(toArray(value))),
+				new SaTokenTagProcessor(prefix, "hasPermissionOr", value -> stpLogic.hasPermissionOr(toArray(value))),
+				new SaTokenTagProcessor(prefix, "notPermission", value -> ! stpLogic.hasPermission(value)),
 				new SaTokenTagProcessor(prefix, "lackPermission", value -> ! stpLogic.hasPermission(value))
 
 		));

From 69fc759a95c2764f57bb4ef781e9925400b10a10 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 02:11:37 +0800
Subject: [PATCH 123/129] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsconfig.json                             |    19 +
 .../package-lock.json                         | 10708 ++++++++--------
 .../package.json                              |    21 +-
 .../public/index.html                         |     2 +-
 .../vue.config.js                             |     4 +
 5 files changed, 5407 insertions(+), 5347 deletions(-)
 create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/jsconfig.json
 create mode 100644 sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/vue.config.js

diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/jsconfig.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/jsconfig.json
new file mode 100644
index 00000000..4aafc5f6
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/jsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "esnext",
+    "baseUrl": "./",
+    "moduleResolution": "node",
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
+    ]
+  }
+}
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
index 1965c58b..fcf6af58 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package-lock.json
@@ -14,18 +14,18 @@
         "vue-router": "^3.6.5"
       },
       "devDependencies": {
-        "@vue/cli-plugin-babel": "~5.0.8",
-        "@vue/cli-plugin-eslint": "~5.0.8",
-        "@vue/cli-service": "~5.0.8",
-        "babel-eslint": "^10.1.0",
-        "eslint": "^6.7.2",
-        "eslint-plugin-vue": "^6.2.2",
-        "vue-template-compiler": "^2.6.11"
+        "@babel/core": "^7.12.16",
+        "@babel/eslint-parser": "^7.12.16",
+        "@vue/cli-plugin-babel": "~5.0.0",
+        "@vue/cli-plugin-eslint": "~5.0.0",
+        "@vue/cli-service": "~5.0.0",
+        "eslint": "^7.32.0",
+        "eslint-plugin-vue": "^8.0.3"
       }
     },
     "node_modules/@achrinza/node-ipc": {
       "version": "9.2.6",
-      "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.6.tgz",
+      "resolved": "https://registry.npmmirror.com/@achrinza/node-ipc/-/node-ipc-9.2.6.tgz",
       "integrity": "sha512-ULSIYPy4ZPM301dfCxRz0l2GJjOwIo/PqmWonIu1bLml7UmnVQmH+juJcoyXp6E8gIRRNAjGYftJnNQlfy4vPg==",
       "dev": true,
       "dependencies": {
@@ -38,12 +38,12 @@
       }
     },
     "node_modules/@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
@@ -51,114 +51,119 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "dev": true,
       "dependencies": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.19.4.tgz",
-      "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.22.5.tgz",
+      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.19.6.tgz",
-      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "dev": true,
       "dependencies": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helpers": "^7.19.4",
-        "@babel/parser": "^7.19.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4",
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
+        "json5": "^2.2.2",
         "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.19.6.tgz",
-      "integrity": "sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==",
+    "node_modules/@babel/eslint-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
+      "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.19.4",
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": "^10.13.0 || ^12.13.0 || >=14.0.0"
+      },
+      "peerDependencies": {
+        "@babel/core": ">=7.11.0",
+        "eslint": "^7.5.0 || ^8.0.0"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.5.tgz",
+      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/generator/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
+      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.19.3",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
-      "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
+      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.19.3",
-        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -169,18 +174,20 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -190,13 +197,14 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -206,9 +214,9 @@
       }
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.17.7",
@@ -223,125 +231,113 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/types": "^7.18.6"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.19.4",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -351,120 +347,121 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
+      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.19.4"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-      "integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
+      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
+      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.19.4.tgz",
-      "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.4",
-        "@babel/types": "^7.19.4"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       },
@@ -473,9 +470,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.19.6.tgz",
-      "integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -484,12 +481,12 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -499,14 +496,14 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -515,27 +512,9 @@
         "@babel/core": "^7.13.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-class-properties": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
       "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "dev": true,
       "dependencies": {
@@ -549,198 +528,17 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.12.0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-decorators": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.6.tgz",
-      "integrity": "sha512-PKWforYpkVkogpOW0RaPuh7eQ7AoFgBJP+d87tQCRY2LVbvyGtfRM7RtrhCBsNgZb+2EY28SeWB6p2xe1Z5oAw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
+      "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.19.1",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.19.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/plugin-syntax-decorators": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -750,16 +548,10 @@
       }
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      },
       "engines": {
         "node": ">=6.9.0"
       },
@@ -769,7 +561,7 @@
     },
     "node_modules/@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
       "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "dev": true,
       "dependencies": {
@@ -785,7 +577,7 @@
     },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
       "dependencies": {
@@ -797,7 +589,7 @@
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "dependencies": {
@@ -809,7 +601,7 @@
     },
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
       "dependencies": {
@@ -823,12 +615,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-decorators": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-      "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
+      "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -839,7 +631,7 @@
     },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
       "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
       "dependencies": {
@@ -851,7 +643,7 @@
     },
     "node_modules/@babel/plugin-syntax-export-namespace-from": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
       "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
       "dependencies": {
@@ -862,12 +654,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
-      "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -876,9 +668,36 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
       "dependencies": {
@@ -889,12 +708,12 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -905,7 +724,7 @@
     },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
       "dependencies": {
@@ -917,7 +736,7 @@
     },
     "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
       "dependencies": {
@@ -929,7 +748,7 @@
     },
     "node_modules/@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "dependencies": {
@@ -941,7 +760,7 @@
     },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "dependencies": {
@@ -953,7 +772,7 @@
     },
     "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "dependencies": {
@@ -965,7 +784,7 @@
     },
     "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
       "dependencies": {
@@ -977,7 +796,7 @@
     },
     "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
       "dependencies": {
@@ -992,7 +811,7 @@
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "dependencies": {
@@ -1005,30 +824,64 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-arrow-functions": {
+    "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
       "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
       },
       "engines": {
         "node": ">=6.9.0"
       },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-arrow-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
+      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1038,12 +891,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1053,12 +906,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz",
-      "integrity": "sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
+      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1067,20 +920,53 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+    "node_modules/@babel/plugin-transform-class-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-class-static-block": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.12.0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-classes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
+      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "globals": "^11.1.0"
       },
       "engines": {
@@ -1091,12 +977,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1106,12 +993,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz",
-      "integrity": "sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
+      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1121,13 +1008,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1137,12 +1024,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1152,13 +1055,29 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1168,12 +1087,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1183,14 +1102,30 @@
       }
     },
     "node_modules/@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-json-strings": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1200,12 +1135,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1215,12 +1166,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1230,13 +1181,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1246,14 +1197,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1263,15 +1214,15 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1281,13 +1232,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1297,13 +1248,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1313,12 +1264,63 @@
       }
     },
     "node_modules/@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1328,13 +1330,46 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1344,12 +1379,46 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-      "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-methods": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1359,12 +1428,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1374,13 +1443,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
+      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.1"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1390,12 +1459,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1405,16 +1474,16 @@
       }
     },
     "node_modules/@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
+      "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1425,12 +1494,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1440,13 +1509,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1456,12 +1525,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1471,12 +1540,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1486,12 +1555,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1501,12 +1570,28 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
+      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1516,13 +1601,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1531,39 +1616,43 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/preset-env": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
+    "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
       "dev": true,
       "dependencies": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/preset-env": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.22.5.tgz",
+      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -1573,44 +1662,61 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.19.4",
-        "@babel/plugin-transform-classes": "^7.19.0",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.19.4",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.18.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.18.8",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.19.4",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
+        "@babel/types": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "core-js-compat": "^3.30.2",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -1622,7 +1728,7 @@
     },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
       "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "dependencies": {
@@ -1636,46 +1742,52 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+      "dev": true
+    },
     "node_modules/@babel/runtime": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
-      "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.5.tgz",
+      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
       "dev": true,
       "dependencies": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.13.11"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.19.6.tgz",
-      "integrity": "sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.5.tgz",
+      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.19.6",
-        "@babel/types": "^7.19.4",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1684,42 +1796,122 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.19.4.tgz",
-      "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmmirror.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
+      "dependencies": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/globals": {
+      "version": "13.20.0",
+      "resolved": "https://registry.npmmirror.com/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+      "dev": true,
+      "dependencies": {
+        "type-fest": "^0.20.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/@eslint/eslintrc/node_modules/type-fest": {
+      "version": "0.20.2",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.3.0.tgz",
       "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
       "dev": true
     },
     "node_modules/@hapi/topo": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.1.0.tgz",
       "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+    "node_modules/@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "dependencies": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       },
       "engines": {
         "node": ">=6.0.0"
@@ -1744,54 +1936,55 @@
       }
     },
     "node_modules/@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.3.tgz",
+      "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
       "dev": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
-    "node_modules/@jridgewell/source-map/node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-      "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/set-array": "^1.0.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
-        "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.18",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
       "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "3.1.0",
         "@jridgewell/sourcemap-codec": "1.4.14"
       }
     },
+    "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.4.14",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "dev": true
+    },
     "node_modules/@leichtgewicht/ip-codec": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
       "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
       "dev": true
     },
+    "node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "dependencies": {
+        "eslint-scope": "5.1.1"
+      }
+    },
     "node_modules/@node-ipc/js-queue": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
       "integrity": "sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw==",
       "dev": true,
       "dependencies": {
@@ -1803,7 +1996,7 @@
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "dependencies": {
@@ -1816,7 +2009,7 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
       "engines": {
@@ -1825,7 +2018,7 @@
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "dependencies": {
@@ -1838,13 +2031,13 @@
     },
     "node_modules/@polka/url": {
       "version": "1.0.0-next.21",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+      "resolved": "https://registry.npmmirror.com/@polka/url/-/url-1.0.0-next.21.tgz",
       "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
       "dev": true
     },
     "node_modules/@sideway/address": {
       "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
       "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
       "dev": true,
       "dependencies": {
@@ -1853,13 +2046,13 @@
     },
     "node_modules/@sideway/formula": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@sideway/formula/-/formula-3.0.1.tgz",
       "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
       "dev": true
     },
     "node_modules/@sideway/pinpoint": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "dev": true
     },
@@ -1953,7 +2146,7 @@
     },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "dev": true,
       "engines": {
@@ -1962,7 +2155,7 @@
     },
     "node_modules/@types/body-parser": {
       "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.2.tgz",
       "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
       "dev": true,
       "dependencies": {
@@ -1972,7 +2165,7 @@
     },
     "node_modules/@types/bonjour": {
       "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/bonjour/-/bonjour-3.5.10.tgz",
       "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
       "dev": true,
       "dependencies": {
@@ -1981,7 +2174,7 @@
     },
     "node_modules/@types/connect": {
       "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/connect/-/connect-3.4.35.tgz",
       "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
       "dev": true,
       "dependencies": {
@@ -1989,9 +2182,9 @@
       }
     },
     "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
       "dev": true,
       "dependencies": {
         "@types/express-serve-static-core": "*",
@@ -1999,9 +2192,9 @@
       }
     },
     "node_modules/@types/eslint": {
-      "version": "8.4.8",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.8.tgz",
-      "integrity": "sha512-zUCKQI1bUCTi+0kQs5ZQzQ/XILWRLIlh15FXWNykJ+NG3TMKMVvwwC6GP3DR1Ylga15fB7iAExSzc4PNlR5i3w==",
+      "version": "8.40.2",
+      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.40.2.tgz",
+      "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
       "dev": true,
       "dependencies": {
         "@types/estree": "*",
@@ -2010,7 +2203,7 @@
     },
     "node_modules/@types/eslint-scope": {
       "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
       "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
       "dependencies": {
@@ -2020,105 +2213,116 @@
     },
     "node_modules/@types/estree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.1.tgz",
       "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
       "dev": true
     },
     "node_modules/@types/express": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+      "version": "4.17.17",
+      "resolved": "https://registry.npmmirror.com/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "dev": true,
       "dependencies": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
+        "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
         "@types/serve-static": "*"
       }
     },
     "node_modules/@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+      "version": "4.17.35",
+      "resolved": "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
+      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "node_modules/@types/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
       "dev": true
     },
     "node_modules/@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+      "version": "1.17.11",
+      "resolved": "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.11.tgz",
+      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.12",
+      "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
       "dev": true
     },
     "node_modules/@types/mime": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
       "dev": true
     },
     "node_modules/@types/minimist": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz",
       "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz",
-      "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ==",
+      "version": "20.3.1",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.3.1.tgz",
+      "integrity": "sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==",
       "dev": true
     },
     "node_modules/@types/normalize-package-data": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
       "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "node_modules/@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
     "node_modules/@types/qs": {
       "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz",
       "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.4.tgz",
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
       "dev": true
     },
     "node_modules/@types/retry": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/retry/-/retry-0.12.0.tgz",
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
       "dev": true
     },
+    "node_modules/@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmmirror.com/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "dev": true,
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
       "dev": true,
       "dependencies": {
@@ -2126,9 +2330,9 @@
       }
     },
     "node_modules/@types/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.1.tgz",
+      "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==",
       "dev": true,
       "dependencies": {
         "@types/mime": "*",
@@ -2137,7 +2341,7 @@
     },
     "node_modules/@types/sockjs": {
       "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/sockjs/-/sockjs-0.3.33.tgz",
       "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
       "dev": true,
       "dependencies": {
@@ -2145,9 +2349,9 @@
       }
     },
     "node_modules/@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmmirror.com/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dev": true,
       "dependencies": {
         "@types/node": "*"
@@ -2155,19 +2359,19 @@
     },
     "node_modules/@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
       "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
       "dev": true
     },
     "node_modules/@vue/babel-helper-vue-transform-on": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz",
       "integrity": "sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==",
       "dev": true
     },
     "node_modules/@vue/babel-plugin-jsx": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz",
       "integrity": "sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==",
       "dev": true,
       "dependencies": {
@@ -2184,7 +2388,7 @@
     },
     "node_modules/@vue/babel-plugin-transform-vue-jsx": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
       "integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
       "dev": true,
       "dependencies": {
@@ -2201,7 +2405,7 @@
     },
     "node_modules/@vue/babel-plugin-transform-vue-jsx/node_modules/html-tags": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-2.0.0.tgz",
       "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
       "dev": true,
       "engines": {
@@ -2210,7 +2414,7 @@
     },
     "node_modules/@vue/babel-preset-app": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz",
       "integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
       "dev": true,
       "dependencies": {
@@ -2245,10 +2449,22 @@
         }
       }
     },
+    "node_modules/@vue/babel-preset-app/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@vue/babel-preset-app/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2260,9 +2476,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/@vue/babel-preset-app/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/@vue/babel-preset-jsx": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
       "integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
       "dev": true,
       "dependencies": {
@@ -2287,7 +2509,7 @@
     },
     "node_modules/@vue/babel-sugar-composition-api-inject-h": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
       "integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
       "dev": true,
       "dependencies": {
@@ -2299,7 +2521,7 @@
     },
     "node_modules/@vue/babel-sugar-composition-api-render-instance": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
       "integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
       "dev": true,
       "dependencies": {
@@ -2311,7 +2533,7 @@
     },
     "node_modules/@vue/babel-sugar-functional-vue": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
       "integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
       "dev": true,
       "dependencies": {
@@ -2323,7 +2545,7 @@
     },
     "node_modules/@vue/babel-sugar-inject-h": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
       "integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
       "dev": true,
       "dependencies": {
@@ -2335,7 +2557,7 @@
     },
     "node_modules/@vue/babel-sugar-v-model": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
       "integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
       "dev": true,
       "dependencies": {
@@ -2352,7 +2574,7 @@
     },
     "node_modules/@vue/babel-sugar-v-model/node_modules/camelcase": {
       "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
       "engines": {
@@ -2361,7 +2583,7 @@
     },
     "node_modules/@vue/babel-sugar-v-model/node_modules/html-tags": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-2.0.0.tgz",
       "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
       "dev": true,
       "engines": {
@@ -2370,7 +2592,7 @@
     },
     "node_modules/@vue/babel-sugar-v-on": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
       "integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
       "dev": true,
       "dependencies": {
@@ -2384,7 +2606,7 @@
     },
     "node_modules/@vue/babel-sugar-v-on/node_modules/camelcase": {
       "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
       "engines": {
@@ -2393,13 +2615,13 @@
     },
     "node_modules/@vue/cli-overlay": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz",
       "integrity": "sha512-KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ==",
       "dev": true
     },
     "node_modules/@vue/cli-plugin-babel": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz",
       "integrity": "sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ==",
       "dev": true,
       "dependencies": {
@@ -2416,7 +2638,7 @@
     },
     "node_modules/@vue/cli-plugin-eslint": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz",
       "integrity": "sha512-d11+I5ONYaAPW1KyZj9GlrV/E6HZePq5L5eAF5GgoVdu6sxr6bDgEoxzhcS1Pk2eh8rn1MxG/FyyR+eCBj/CNg==",
       "dev": true,
       "dependencies": {
@@ -2431,124 +2653,9 @@
         "eslint": ">=7.5.0"
       }
     },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/ajv-keywords": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3"
-      },
-      "peerDependencies": {
-        "ajv": "^8.8.2"
-      }
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/eslint-webpack-plugin": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
-      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
-      "dev": true,
-      "dependencies": {
-        "@types/eslint": "^7.29.0 || ^8.4.1",
-        "jest-worker": "^28.0.2",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "eslint": "^7.0.0 || ^8.0.0",
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/jest-worker": {
-      "version": "28.1.3",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
-      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
-      "dev": true,
-      "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
-      }
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-      "dev": true,
-      "dependencies": {
-        "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
-        "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/@vue/cli-plugin-eslint/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
     "node_modules/@vue/cli-plugin-router": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
       "integrity": "sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg==",
       "dev": true,
       "dependencies": {
@@ -2560,7 +2667,7 @@
     },
     "node_modules/@vue/cli-plugin-vuex": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
       "integrity": "sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==",
       "dev": true,
       "peerDependencies": {
@@ -2569,7 +2676,7 @@
     },
     "node_modules/@vue/cli-service": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-service/-/cli-service-5.0.8.tgz",
       "integrity": "sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==",
       "dev": true,
       "dependencies": {
@@ -2666,21 +2773,9 @@
         }
       }
     },
-    "node_modules/@vue/cli-service/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/@vue/cli-shared-utils": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
       "integrity": "sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ==",
       "dev": true,
       "dependencies": {
@@ -2700,7 +2795,7 @@
     },
     "node_modules/@vue/cli-shared-utils/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -2708,14 +2803,11 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/@vue/cli-shared-utils/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
@@ -2724,14 +2816,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/@vue/cli-shared-utils/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -2743,23 +2832,35 @@
     },
     "node_modules/@vue/cli-shared-utils/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/@vue/cli-shared-utils/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
+    "node_modules/@vue/cli-shared-utils/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@vue/cli-shared-utils/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -2773,7 +2874,7 @@
     },
     "node_modules/@vue/cli-shared-utils/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -2783,10 +2884,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/@vue/cli-shared-utils/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/@vue/compiler-sfc": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz",
-      "integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==",
+      "version": "2.7.14",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz",
+      "integrity": "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==",
       "dependencies": {
         "@babel/parser": "^7.18.4",
         "postcss": "^8.4.14",
@@ -2795,7 +2902,7 @@
     },
     "node_modules/@vue/component-compiler-utils": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
       "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
       "dev": true,
       "dependencies": {
@@ -2814,13 +2921,13 @@
     },
     "node_modules/@vue/component-compiler-utils/node_modules/hash-sum": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
       "dev": true
     },
     "node_modules/@vue/component-compiler-utils/node_modules/lru-cache": {
       "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz",
       "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
       "dev": true,
       "dependencies": {
@@ -2830,13 +2937,13 @@
     },
     "node_modules/@vue/component-compiler-utils/node_modules/picocolors": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz",
       "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
       "dev": true
     },
     "node_modules/@vue/component-compiler-utils/node_modules/postcss": {
       "version": "7.0.39",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz",
       "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
       "dev": true,
       "dependencies": {
@@ -2845,23 +2952,19 @@
       },
       "engines": {
         "node": ">=6.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
       }
     },
     "node_modules/@vue/component-compiler-utils/node_modules/yallist": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
       "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
       "dev": true
     },
     "node_modules/@vue/vue-loader-v15": {
       "name": "vue-loader",
-      "version": "15.10.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
-      "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+      "version": "15.10.1",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
+      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
       "dev": true,
       "dependencies": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -2885,36 +2988,10 @@
     },
     "node_modules/@vue/vue-loader-v15/node_modules/hash-sum": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
       "dev": true
     },
-    "node_modules/@vue/vue-loader-v15/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/@vue/vue-loader-v15/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -2922,166 +2999,166 @@
       "dev": true
     },
     "node_modules/@webassemblyjs/ast": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
-      "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/helper-numbers": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
-      "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
-      "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
-      "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
-      "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
-      "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
-      "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/ieee754": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
-      "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "node_modules/@webassemblyjs/leb128": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
-      "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@webassemblyjs/utf8": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
-      "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
-      "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/helper-wasm-section": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-opt": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5",
-        "@webassemblyjs/wast-printer": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-gen": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
-      "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-opt": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
-      "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wasm-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
-      "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "node_modules/@webassemblyjs/wast-printer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
-      "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
       "dependencies": {
-        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
     "node_modules/accepts": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "dependencies": {
@@ -3093,9 +3170,9 @@
       }
     },
     "node_modules/acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "dev": true,
       "bin": {
         "acorn": "bin/acorn"
@@ -3104,6 +3181,15 @@
         "node": ">=0.4.0"
       }
     },
+    "node_modules/acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^8"
+      }
+    },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -3115,7 +3201,7 @@
     },
     "node_modules/acorn-walk": {
       "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.2.0.tgz",
       "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true,
       "engines": {
@@ -3123,9 +3209,9 @@
       }
     },
     "node_modules/address": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/address/-/address-1.2.1.tgz",
-      "integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/address/-/address-1.2.2.tgz",
+      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
       "dev": true,
       "engines": {
         "node": ">= 10.0.0"
@@ -3145,7 +3231,7 @@
     },
     "node_modules/ajv-formats": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
       "dependencies": {
@@ -3161,24 +3247,20 @@
       }
     },
     "node_modules/ajv-formats/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
@@ -3191,21 +3273,27 @@
         "ajv": "^6.9.1"
       }
     },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/ansi-html-community": {
       "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
       "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
       "dev": true,
       "engines": [
@@ -3243,9 +3331,9 @@
       "dev": true
     },
     "node_modules/anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "dependencies": {
         "normalize-path": "^3.0.0",
@@ -3272,13 +3360,13 @@
     },
     "node_modules/array-flatten": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-2.1.2.tgz",
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
     "node_modules/array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
       "engines": {
@@ -3286,17 +3374,17 @@
       }
     },
     "node_modules/astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
     "node_modules/async": {
       "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "resolved": "https://registry.npmmirror.com/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "dependencies": {
@@ -3310,7 +3398,7 @@
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true,
       "engines": {
@@ -3318,23 +3406,13 @@
       }
     },
     "node_modules/autoprefixer": {
-      "version": "10.4.12",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-      "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
+      "version": "10.4.14",
+      "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/autoprefixer"
-        }
-      ],
       "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001407",
+        "browserslist": "^4.21.5",
+        "caniuse-lite": "^1.0.30001464",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -3351,53 +3429,19 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.1.3.tgz",
-      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.4.0.tgz",
+      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/axios/node_modules/form-data": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
-      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmmirror.com/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "deprecated": "babel-eslint is now @babel/eslint-parser. This package will no longer receive updates.",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "eslint": ">= 4.12.1"
-      }
-    },
     "node_modules/babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.3.0.tgz",
+      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
       "dev": true,
       "dependencies": {
         "find-cache-dir": "^3.3.1",
@@ -3413,9 +3457,23 @@
         "webpack": ">=2"
       }
     },
+    "node_modules/babel-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
     "node_modules/babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
       "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dev": true,
       "dependencies": {
@@ -3423,13 +3481,13 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
+      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
         "semver": "^6.1.1"
       },
       "peerDependencies": {
@@ -3437,25 +3495,25 @@
       }
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
+      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "core-js-compat": "^3.30.1"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
       }
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
+      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.0"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0-0"
@@ -3469,27 +3527,13 @@
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "dev": true
     },
     "node_modules/batch": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "resolved": "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz",
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
@@ -3504,7 +3548,7 @@
     },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true,
       "engines": {
@@ -3513,7 +3557,7 @@
     },
     "node_modules/bl": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
       "dev": true,
       "dependencies": {
@@ -3524,13 +3568,13 @@
     },
     "node_modules/bluebird": {
       "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
     "node_modules/body-parser": {
       "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.1.tgz",
       "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "dependencies": {
@@ -3554,7 +3598,7 @@
     },
     "node_modules/body-parser/node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "engines": {
@@ -3563,7 +3607,7 @@
     },
     "node_modules/body-parser/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -3572,14 +3616,14 @@
     },
     "node_modules/body-parser/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/bonjour-service": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/bonjour-service/-/bonjour-service-1.1.1.tgz",
+      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
       "dev": true,
       "dependencies": {
         "array-flatten": "^2.1.2",
@@ -3590,7 +3634,7 @@
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
@@ -3606,7 +3650,7 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "dependencies": {
@@ -3617,15 +3661,15 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "version": "4.21.9",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.9.tgz",
+      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
+        "caniuse-lite": "^1.0.30001503",
+        "electron-to-chromium": "^1.4.431",
+        "node-releases": "^2.0.12",
+        "update-browserslist-db": "^1.0.11"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3636,23 +3680,9 @@
     },
     "node_modules/buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -3660,13 +3690,13 @@
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "node_modules/bytes": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true,
       "engines": {
@@ -3675,20 +3705,26 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=6"
       }
     },
     "node_modules/camel-case": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/camel-case/-/camel-case-4.1.2.tgz",
       "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
       "dependencies": {
@@ -3696,27 +3732,18 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/camel-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/camelcase": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/caniuse-api": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz",
       "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
       "dependencies": {
@@ -3727,9 +3754,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001426",
-      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz",
-      "integrity": "sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==",
+      "version": "1.0.30001505",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001505.tgz",
+      "integrity": "sha512-jaAOR5zVtxHfL0NjZyflVTtXm3D3J9P15zSJ7HmQF8dSKGA6tqzQq+0ZI3xkjyQj46I4/M0K2GbMpcAFOcbr3A==",
       "dev": true
     },
     "node_modules/case-sensitive-paths-webpack-plugin": {
@@ -3755,23 +3782,11 @@
         "node": ">=4"
       }
     },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
     "node_modules/chokidar": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ],
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -3790,7 +3805,7 @@
     },
     "node_modules/chokidar/node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "dependencies": {
@@ -3816,9 +3831,9 @@
       "dev": true
     },
     "node_modules/clean-css": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
-      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmmirror.com/clean-css/-/clean-css-5.3.2.tgz",
+      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "dev": true,
       "dependencies": {
         "source-map": "~0.6.0"
@@ -3925,24 +3940,12 @@
       }
     },
     "node_modules/cli-spinners": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.9.0.tgz",
+      "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==",
       "dev": true,
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 10"
       }
     },
     "node_modules/clipboardy": {
@@ -3961,7 +3964,7 @@
     },
     "node_modules/cliui": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "dependencies": {
@@ -3972,7 +3975,7 @@
     },
     "node_modules/clone": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/clone/-/clone-1.0.4.tgz",
       "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true,
       "engines": {
@@ -3981,7 +3984,7 @@
     },
     "node_modules/clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "dependencies": {
@@ -4010,14 +4013,14 @@
     },
     "node_modules/colord": {
       "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "resolved": "https://registry.npmmirror.com/colord/-/colord-2.9.3.tgz",
       "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true
     },
     "node_modules/colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "version": "2.0.20",
+      "resolved": "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true
     },
     "node_modules/combined-stream": {
@@ -4033,7 +4036,7 @@
     },
     "node_modules/commander": {
       "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true,
       "engines": {
@@ -4048,7 +4051,7 @@
     },
     "node_modules/compressible": {
       "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
       "dependencies": {
@@ -4060,7 +4063,7 @@
     },
     "node_modules/compression": {
       "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "resolved": "https://registry.npmmirror.com/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
       "dependencies": {
@@ -4078,7 +4081,7 @@
     },
     "node_modules/compression/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -4087,13 +4090,13 @@
     },
     "node_modules/compression/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/compression/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
@@ -4105,7 +4108,7 @@
     },
     "node_modules/connect-history-api-fallback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true,
       "engines": {
@@ -4114,8 +4117,9 @@
     },
     "node_modules/consolidate": {
       "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+      "resolved": "https://registry.npmmirror.com/consolidate/-/consolidate-0.15.1.tgz",
       "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
+      "deprecated": "Please upgrade to consolidate v1.0.0+ as it has been modernized with several long-awaited fixes implemented. Maintenance is supported by Forward Email at https://forwardemail.net ; follow/watch https://github.com/ladjs/consolidate for updates and release changelog",
       "dev": true,
       "dependencies": {
         "bluebird": "^3.1.1"
@@ -4126,7 +4130,7 @@
     },
     "node_modules/content-disposition": {
       "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "dependencies": {
@@ -4137,9 +4141,9 @@
       }
     },
     "node_modules/content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -4153,7 +4157,7 @@
     },
     "node_modules/cookie": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz",
       "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true,
       "engines": {
@@ -4162,13 +4166,13 @@
     },
     "node_modules/cookie-signature": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
     "node_modules/copy-webpack-plugin": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
       "integrity": "sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==",
       "dev": true,
       "dependencies": {
@@ -4182,18 +4186,14 @@
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^5.1.0"
       }
     },
     "node_modules/copy-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -4202,41 +4202,33 @@
       },
       "engines": {
         "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/core-js": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.26.0.tgz",
-      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
       "hasInstallScript": true
     },
     "node_modules/core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.31.0.tgz",
+      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.21.4"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+        "browserslist": "^4.21.5"
       }
     },
     "node_modules/core-util-is": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
     "node_modules/cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
       "dependencies": {
         "@types/parse-json": "^4.0.0",
@@ -4275,9 +4267,9 @@
       }
     },
     "node_modules/css-declaration-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
-      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
+      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
       "dev": true,
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -4287,35 +4279,43 @@
       }
     },
     "node_modules/css-loader": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.1.0",
-        "postcss": "^8.4.7",
+        "postcss": "^8.4.21",
         "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.5"
+        "semver": "^7.3.8"
       },
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/css-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/css-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -4327,9 +4327,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/css-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/css-minimizer-webpack-plugin": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
       "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
       "dev": true,
       "dependencies": {
@@ -4343,10 +4349,6 @@
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^5.0.0"
       },
@@ -4366,24 +4368,20 @@
       }
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "dependencies": {
@@ -4395,32 +4393,28 @@
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
     "node_modules/css-minimizer-webpack-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/css-select": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
       "dependencies": {
@@ -4429,14 +4423,11 @@
         "domhandler": "^4.3.1",
         "domutils": "^2.8.0",
         "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
       }
     },
     "node_modules/css-tree": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz",
       "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dev": true,
       "dependencies": {
@@ -4449,19 +4440,16 @@
     },
     "node_modules/css-what": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true,
       "engines": {
         "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
       }
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
       "bin": {
@@ -4472,46 +4460,42 @@
       }
     },
     "node_modules/cssnano": {
-      "version": "5.1.13",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz",
-      "integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==",
+      "version": "5.1.15",
+      "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "dev": true,
       "dependencies": {
-        "cssnano-preset-default": "^5.2.12",
+        "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
-      },
       "peerDependencies": {
         "postcss": "^8.2.15"
       }
     },
     "node_modules/cssnano-preset-default": {
-      "version": "5.2.12",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz",
-      "integrity": "sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==",
+      "version": "5.2.14",
+      "resolved": "https://registry.npmmirror.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
       "dev": true,
       "dependencies": {
-        "css-declaration-sorter": "^6.3.0",
+        "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^3.1.0",
         "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
-        "postcss-convert-values": "^5.1.2",
+        "postcss-colormin": "^5.3.1",
+        "postcss-convert-values": "^5.1.3",
         "postcss-discard-comments": "^5.1.2",
         "postcss-discard-duplicates": "^5.1.0",
         "postcss-discard-empty": "^5.1.1",
         "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.6",
-        "postcss-merge-rules": "^5.1.2",
+        "postcss-merge-longhand": "^5.1.7",
+        "postcss-merge-rules": "^5.1.4",
         "postcss-minify-font-values": "^5.1.0",
         "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.3",
+        "postcss-minify-params": "^5.1.4",
         "postcss-minify-selectors": "^5.2.1",
         "postcss-normalize-charset": "^5.1.0",
         "postcss-normalize-display-values": "^5.1.0",
@@ -4519,11 +4503,11 @@
         "postcss-normalize-repeat-style": "^5.1.1",
         "postcss-normalize-string": "^5.1.0",
         "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.0",
+        "postcss-normalize-unicode": "^5.1.1",
         "postcss-normalize-url": "^5.1.0",
         "postcss-normalize-whitespace": "^5.1.1",
         "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.0",
+        "postcss-reduce-initial": "^5.1.2",
         "postcss-reduce-transforms": "^5.1.0",
         "postcss-svgo": "^5.1.0",
         "postcss-unique-selectors": "^5.1.1"
@@ -4537,7 +4521,7 @@
     },
     "node_modules/cssnano-utils": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
       "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
       "dev": true,
       "engines": {
@@ -4549,7 +4533,7 @@
     },
     "node_modules/csso": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
       "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "dev": true,
       "dependencies": {
@@ -4560,15 +4544,9 @@
       }
     },
     "node_modules/csstype": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.1.tgz",
-      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
-    },
-    "node_modules/de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-      "dev": true
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/debug": {
       "version": "4.3.4",
@@ -4604,7 +4582,7 @@
     },
     "node_modules/default-gateway": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/default-gateway/-/default-gateway-6.0.3.tgz",
       "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
       "dependencies": {
@@ -4616,7 +4594,7 @@
     },
     "node_modules/default-gateway/node_modules/cross-spawn": {
       "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
       "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
       "dependencies": {
@@ -4630,7 +4608,7 @@
     },
     "node_modules/default-gateway/node_modules/execa": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
       "dependencies": {
@@ -4646,38 +4624,29 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
     "node_modules/default-gateway/node_modules/get-stream": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/default-gateway/node_modules/is-stream": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/default-gateway/node_modules/npm-run-path": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
       "dependencies": {
@@ -4689,7 +4658,7 @@
     },
     "node_modules/default-gateway/node_modules/path-key": {
       "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
       "engines": {
@@ -4698,7 +4667,7 @@
     },
     "node_modules/default-gateway/node_modules/shebang-command": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
       "dependencies": {
@@ -4710,7 +4679,7 @@
     },
     "node_modules/default-gateway/node_modules/shebang-regex": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
       "engines": {
@@ -4719,7 +4688,7 @@
     },
     "node_modules/default-gateway/node_modules/which": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "dependencies": {
@@ -4734,19 +4703,16 @@
     },
     "node_modules/defaults": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
       "dependencies": {
         "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/define-lazy-prop": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true,
       "engines": {
@@ -4754,9 +4720,9 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
@@ -4764,9 +4730,6 @@
       },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/delayed-stream": {
@@ -4779,7 +4742,7 @@
     },
     "node_modules/depd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true,
       "engines": {
@@ -4788,7 +4751,7 @@
     },
     "node_modules/destroy": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true,
       "engines": {
@@ -4798,13 +4761,13 @@
     },
     "node_modules/detect-node": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz",
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "dependencies": {
@@ -4816,14 +4779,14 @@
     },
     "node_modules/dns-equal": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/dns-equal/-/dns-equal-1.0.0.tgz",
       "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
       "dev": true
     },
     "node_modules/dns-packet": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmmirror.com/dns-packet/-/dns-packet-5.6.0.tgz",
+      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
       "dev": true,
       "dependencies": {
         "@leichtgewicht/ip-codec": "^2.0.1"
@@ -4846,7 +4809,7 @@
     },
     "node_modules/dom-converter": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz",
       "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
       "dev": true,
       "dependencies": {
@@ -4855,33 +4818,24 @@
     },
     "node_modules/dom-serializer": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
       "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.2.0",
         "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
     "node_modules/domelementtype": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
       "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
+      "dev": true
     },
     "node_modules/domhandler": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz",
       "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
       "dependencies": {
@@ -4889,28 +4843,22 @@
       },
       "engines": {
         "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
     "node_modules/domutils": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "resolved": "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "dependencies": {
         "dom-serializer": "^1.0.1",
         "domelementtype": "^2.2.0",
         "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
     "node_modules/dot-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/dot-case/-/dot-case-3.0.4.tgz",
       "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
       "dev": true,
       "dependencies": {
@@ -4918,15 +4866,9 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/dot-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/dotenv": {
       "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-10.0.0.tgz",
       "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
       "dev": true,
       "engines": {
@@ -4941,13 +4883,13 @@
     },
     "node_modules/duplexer": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
     "node_modules/easy-stack": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz",
       "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
       "dev": true,
       "engines": {
@@ -4956,14 +4898,14 @@
     },
     "node_modules/ee-first": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
+      "version": "1.4.434",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.434.tgz",
+      "integrity": "sha512-5Gvm09UZTQRaWrimRtWRO5rvaX6Kpk5WHAPKDa7A4Gj6NIPuJ8w8WNpnxCXdd+CJJt6RBU6tUw0KyULoW6XuHw==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -4983,7 +4925,7 @@
     },
     "node_modules/encodeurl": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true,
       "engines": {
@@ -5000,9 +4942,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
-      "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -5012,18 +4954,27 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "dependencies": {
+        "ansi-colors": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
     "node_modules/entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
+      "dev": true
     },
     "node_modules/error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "dependencies": {
@@ -5040,9 +4991,9 @@
       }
     },
     "node_modules/es-module-lexer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
-      "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
       "dev": true
     },
     "node_modules/escalade": {
@@ -5056,7 +5007,7 @@
     },
     "node_modules/escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
@@ -5070,46 +5021,49 @@
       }
     },
     "node_modules/eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmmirror.com/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "version": "7.32.0",
+      "resolved": "https://registry.npmmirror.com/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
         "is-glob": "^4.0.0",
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
+        "optionator": "^0.9.1",
         "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -5117,35 +5071,77 @@
         "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": "^8.10.0 || ^10.13.0 || >=11.10.1"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/eslint-plugin-vue": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz",
-      "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==",
+      "version": "8.7.1",
+      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz",
+      "integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==",
       "dev": true,
       "dependencies": {
+        "eslint-utils": "^3.0.0",
         "natural-compare": "^1.4.0",
-        "semver": "^5.6.0",
-        "vue-eslint-parser": "^7.0.0"
+        "nth-check": "^2.0.1",
+        "postcss-selector-parser": "^6.0.9",
+        "semver": "^7.3.5",
+        "vue-eslint-parser": "^8.0.1"
       },
       "engines": {
-        "node": ">=8.10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "eslint": "^5.0.0 || ^6.0.0"
+        "eslint": "^6.2.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
+    "node_modules/eslint-plugin-vue/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/eslint-plugin-vue/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
-        "semver": "bin/semver"
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
+    "node_modules/eslint-plugin-vue/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/eslint-scope": {
       "version": "5.1.1",
       "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-5.1.1.tgz",
@@ -5160,9 +5156,9 @@
       }
     },
     "node_modules/eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^1.1.0"
@@ -5171,7 +5167,7 @@
         "node": ">=6"
       }
     },
-    "node_modules/eslint-visitor-keys": {
+    "node_modules/eslint-utils/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
       "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
@@ -5180,13 +5176,188 @@
         "node": ">=4"
       }
     },
-    "node_modules/eslint/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
+      "dev": true,
+      "dependencies": {
+        "@types/eslint": "^7.29.0 || ^8.4.1",
+        "jest-worker": "^28.0.2",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "peerDependencies": {
+        "eslint": "^7.0.0 || ^8.0.0",
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/ajv-keywords": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+      "dev": true,
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3"
+      },
+      "peerDependencies": {
+        "ajv": "^8.8.2"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/jest-worker": {
+      "version": "28.1.3",
+      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-28.1.3.tgz",
+      "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/schema-utils": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+      "dev": true,
+      "dependencies": {
+        "@types/json-schema": "^7.0.9",
+        "ajv": "^8.9.0",
+        "ajv-formats": "^2.1.1",
+        "ajv-keywords": "^5.1.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      }
+    },
+    "node_modules/eslint-webpack-plugin/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/@babel/code-frame": {
+      "version": "7.12.11",
+      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.12.11.tgz",
+      "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/highlight": "^7.10.4"
+      }
+    },
+    "node_modules/eslint/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
+    "node_modules/eslint/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dev": true,
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/eslint/node_modules/glob-parent": {
@@ -5202,50 +5373,167 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "12.4.0",
-      "resolved": "https://registry.npmmirror.com/globals/-/globals-12.4.0.tgz",
-      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+      "version": "13.20.0",
+      "resolved": "https://registry.npmmirror.com/globals/-/globals-13.20.0.tgz",
+      "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
       "dev": true,
       "dependencies": {
-        "type-fest": "^0.8.1"
+        "type-fest": "^0.20.2"
       },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/eslint/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "node_modules/eslint/node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/ignore": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/eslint/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/semver": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "dev": true,
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eslint/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/eslint/node_modules/type-fest": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
-      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "version": "0.20.2",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmmirror.com/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+    "node_modules/eslint/node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
       "dependencies": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">= 8"
+      }
+    },
+    "node_modules/eslint/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
+    "node_modules/espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmmirror.com/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "engines": {
+        "node": "^10.12.0 || >=12.0.0"
+      }
+    },
+    "node_modules/espree/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/espree/node_modules/eslint-visitor-keys": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
       }
     },
     "node_modules/esprima": {
@@ -5262,9 +5550,9 @@
       }
     },
     "node_modules/esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "dependencies": {
         "estraverse": "^5.1.0"
@@ -5323,7 +5611,7 @@
     },
     "node_modules/etag": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true,
       "engines": {
@@ -5332,7 +5620,7 @@
     },
     "node_modules/event-pubsub": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz",
       "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
       "dev": true,
       "engines": {
@@ -5341,13 +5629,13 @@
     },
     "node_modules/eventemitter3": {
       "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "node_modules/events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
       "engines": {
@@ -5374,7 +5662,7 @@
     },
     "node_modules/express": {
       "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "resolved": "https://registry.npmmirror.com/express/-/express-4.18.2.tgz",
       "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "dependencies": {
@@ -5416,13 +5704,13 @@
     },
     "node_modules/express/node_modules/array-flatten": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "dev": true
     },
     "node_modules/express/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -5431,24 +5719,10 @@
     },
     "node_modules/express/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -5457,7 +5731,7 @@
     },
     "node_modules/fast-glob": {
       "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz",
       "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "dependencies": {
@@ -5473,7 +5747,7 @@
     },
     "node_modules/fast-glob/node_modules/glob-parent": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
       "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
       "dependencies": {
@@ -5496,9 +5770,9 @@
       "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "dependencies": {
         "reusify": "^1.0.4"
@@ -5506,7 +5780,7 @@
     },
     "node_modules/faye-websocket": {
       "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "resolved": "https://registry.npmmirror.com/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
       "dependencies": {
@@ -5517,32 +5791,32 @@
       }
     },
     "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
       "dev": true,
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
     "node_modules/file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "dependencies": {
-        "flat-cache": "^2.0.1"
+        "flat-cache": "^3.0.4"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "dependencies": {
@@ -5554,7 +5828,7 @@
     },
     "node_modules/finalhandler": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz",
       "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "dependencies": {
@@ -5572,7 +5846,7 @@
     },
     "node_modules/finalhandler/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -5581,7 +5855,7 @@
     },
     "node_modules/finalhandler/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
@@ -5613,35 +5887,22 @@
       }
     },
     "node_modules/flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
       "dependencies": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       },
       "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/flat-cache/node_modules/rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
+        "node": "^10.12.0 || >=12.0.0"
       }
     },
     "node_modules/flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmmirror.com/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
@@ -5657,9 +5918,22 @@
         }
       }
     },
+    "node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
     "node_modules/forwarded": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true,
       "engines": {
@@ -5668,20 +5942,16 @@
     },
     "node_modules/fraction.js": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.2.0.tgz",
       "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
       "dev": true,
       "engines": {
         "node": "*"
-      },
-      "funding": {
-        "type": "patreon",
-        "url": "https://www.patreon.com/infusion"
       }
     },
     "node_modules/fresh": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true,
       "engines": {
@@ -5690,7 +5960,7 @@
     },
     "node_modules/fs-extra": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
       "dependencies": {
@@ -5704,9 +5974,9 @@
       }
     },
     "node_modules/fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/fs-monkey/-/fs-monkey-1.0.4.tgz",
+      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
       "dev": true
     },
     "node_modules/fs.realpath": {
@@ -5717,7 +5987,7 @@
     },
     "node_modules/fsevents": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "hasInstallScript": true,
@@ -5760,17 +6030,15 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/get-stream": {
@@ -5804,7 +6072,7 @@
     },
     "node_modules/glob-parent": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "dependencies": {
@@ -5816,7 +6084,7 @@
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
@@ -5831,7 +6099,7 @@
     },
     "node_modules/globby": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz",
       "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "dependencies": {
@@ -5844,29 +6112,17 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globby/node_modules/ignore": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-      "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
       }
     },
     "node_modules/graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
     "node_modules/gzip-size": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz",
       "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
       "dependencies": {
@@ -5874,14 +6130,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/handle-thing": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
@@ -5908,26 +6161,29 @@
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
       "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
       "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.1.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/hash-sum": {
@@ -5956,13 +6212,13 @@
     },
     "node_modules/hosted-git-info": {
       "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "node_modules/hpack.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "resolved": "https://registry.npmmirror.com/hpack.js/-/hpack.js-2.1.6.tgz",
       "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
       "dependencies": {
@@ -5973,9 +6229,9 @@
       }
     },
     "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-      "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
       "dependencies": {
         "core-util-is": "~1.0.0",
@@ -5989,13 +6245,13 @@
     },
     "node_modules/hpack.js/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
       "dev": true
     },
     "node_modules/hpack.js/node_modules/string_decoder": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
       "dependencies": {
@@ -6003,14 +6259,14 @@
       }
     },
     "node_modules/html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/html-entities/-/html-entities-2.3.6.tgz",
+      "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw==",
       "dev": true
     },
     "node_modules/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
       "dev": true,
       "dependencies": {
@@ -6030,21 +6286,18 @@
       }
     },
     "node_modules/html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "dev": true,
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
+      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
       "dev": true,
       "dependencies": {
         "@types/html-minifier-terser": "^6.0.0",
@@ -6056,26 +6309,15 @@
       "engines": {
         "node": ">=10.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
       "peerDependencies": {
         "webpack": "^5.20.0"
       }
     },
     "node_modules/htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
       "dependencies": {
         "domelementtype": "^2.0.1",
         "domhandler": "^4.0.0",
@@ -6085,13 +6327,13 @@
     },
     "node_modules/http-deceiver": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "resolved": "https://registry.npmmirror.com/http-deceiver/-/http-deceiver-1.2.7.tgz",
       "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
       "dev": true
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "dependencies": {
@@ -6107,13 +6349,13 @@
     },
     "node_modules/http-parser-js": {
       "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "resolved": "https://registry.npmmirror.com/http-parser-js/-/http-parser-js-0.5.8.tgz",
       "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
       "dev": true
     },
     "node_modules/http-proxy": {
       "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "resolved": "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz",
       "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
       "dependencies": {
@@ -6127,7 +6369,7 @@
     },
     "node_modules/http-proxy-middleware": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "resolved": "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
       "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
       "dependencies": {
@@ -6151,7 +6393,7 @@
     },
     "node_modules/human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
       "engines": {
@@ -6172,7 +6414,7 @@
     },
     "node_modules/icss-utils": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
       "engines": {
@@ -6184,28 +6426,14 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "dev": true
     },
     "node_modules/ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmmirror.com/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
       "engines": {
         "node": ">= 4"
@@ -6213,7 +6441,7 @@
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "dependencies": {
@@ -6222,9 +6450,6 @@
       },
       "engines": {
         "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/imurmurhash": {
@@ -6252,98 +6477,10 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "node_modules/inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmmirror.com/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/inquirer/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/inquirer/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/inquirer/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
       "dev": true,
       "engines": {
         "node": ">= 10"
@@ -6351,13 +6488,13 @@
     },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
       "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
       "dev": true
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
       "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dev": true,
       "dependencies": {
@@ -6380,9 +6517,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "version": "2.12.1",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -6411,7 +6548,7 @@
     },
     "node_modules/is-file-esm": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-file-esm/-/is-file-esm-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-file-esm/-/is-file-esm-1.0.0.tgz",
       "integrity": "sha512-rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA==",
       "dev": true,
       "dependencies": {
@@ -6441,7 +6578,7 @@
     },
     "node_modules/is-interactive": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-interactive/-/is-interactive-1.0.0.tgz",
       "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
       "dev": true,
       "engines": {
@@ -6450,7 +6587,7 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
       "engines": {
@@ -6459,19 +6596,16 @@
     },
     "node_modules/is-plain-obj": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
       "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
       "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-plain-object": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
       "dependencies": {
@@ -6492,14 +6626,11 @@
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/is-wsl": {
@@ -6516,7 +6647,7 @@
     },
     "node_modules/isarray": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
       "dev": true
     },
@@ -6528,7 +6659,7 @@
     },
     "node_modules/isobject": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "dev": true,
       "engines": {
@@ -6543,7 +6674,7 @@
     },
     "node_modules/jest-worker": {
       "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
       "dependencies": {
@@ -6557,7 +6688,7 @@
     },
     "node_modules/jest-worker/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -6566,7 +6697,7 @@
     },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
       "dependencies": {
@@ -6574,27 +6705,24 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
     "node_modules/joi": {
-      "version": "17.6.4",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.4.tgz",
-      "integrity": "sha512-tPzkTJHZQjSFCc842QpdVpOZ9LI2txApboNUbW70qgnRB14Lzl+oWQOPdF2N4yqyiY14wBGe8lc7f/2hZxbGmw==",
+      "version": "17.9.2",
+      "resolved": "https://registry.npmmirror.com/joi/-/joi-17.9.2.tgz",
+      "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
       "dev": true,
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
         "@hapi/topo": "^5.0.0",
         "@sideway/address": "^4.1.3",
-        "@sideway/formula": "^3.0.0",
+        "@sideway/formula": "^3.0.1",
         "@sideway/pinpoint": "^2.0.0"
       }
     },
     "node_modules/js-message": {
       "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
+      "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",
       "integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==",
       "dev": true,
       "engines": {
@@ -6640,7 +6768,7 @@
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true
     },
@@ -6658,7 +6786,7 @@
     },
     "node_modules/json5": {
       "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
       "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
       "bin": {
@@ -6670,7 +6798,7 @@
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
       "dependencies": {
@@ -6682,7 +6810,7 @@
     },
     "node_modules/kind-of": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
       "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "dev": true,
       "engines": {
@@ -6690,9 +6818,9 @@
       }
     },
     "node_modules/klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
       "dev": true,
       "engines": {
         "node": ">= 8"
@@ -6718,22 +6846,22 @@
       }
     },
     "node_modules/levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmmirror.com/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/lilconfig": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "dev": true,
       "engines": {
         "node": ">=10"
@@ -6741,13 +6869,13 @@
     },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
       "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
       "dev": true
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
       "engines": {
@@ -6755,17 +6883,29 @@
       }
     },
     "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
       "dev": true,
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
+        "json5": "^1.0.1"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/loader-utils/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "dev": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
     "node_modules/locate-path": {
@@ -6788,7 +6928,7 @@
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
       "dev": true
     },
@@ -6800,7 +6940,7 @@
     },
     "node_modules/lodash.kebabcase": {
       "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
       "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
       "dev": true
     },
@@ -6812,19 +6952,31 @@
     },
     "node_modules/lodash.memoize": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
       "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
       "dev": true
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmmirror.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
     "node_modules/lodash.uniq": {
       "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
       "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
       "dev": true
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/log-symbols/-/log-symbols-4.1.0.tgz",
       "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "dependencies": {
@@ -6833,14 +6985,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/log-symbols/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -6848,14 +6997,11 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/log-symbols/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
@@ -6864,14 +7010,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/log-symbols/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -6883,13 +7026,13 @@
     },
     "node_modules/log-symbols/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/log-symbols/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -6898,7 +7041,7 @@
     },
     "node_modules/log-symbols/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -6910,7 +7053,7 @@
     },
     "node_modules/log-update": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/log-update/-/log-update-2.3.0.tgz",
       "integrity": "sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==",
       "dev": true,
       "dependencies": {
@@ -6922,18 +7065,9 @@
         "node": ">=4"
       }
     },
-    "node_modules/log-update/node_modules/ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/log-update/node_modules/ansi-regex": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-3.0.1.tgz",
       "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
       "dev": true,
       "engines": {
@@ -6942,7 +7076,7 @@
     },
     "node_modules/log-update/node_modules/cli-cursor": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-2.1.0.tgz",
       "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
       "dev": true,
       "dependencies": {
@@ -6954,7 +7088,7 @@
     },
     "node_modules/log-update/node_modules/is-fullwidth-code-point": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
       "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
       "dev": true,
       "engines": {
@@ -6963,7 +7097,7 @@
     },
     "node_modules/log-update/node_modules/mimic-fn": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-1.2.0.tgz",
       "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "dev": true,
       "engines": {
@@ -6972,7 +7106,7 @@
     },
     "node_modules/log-update/node_modules/onetime": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/onetime/-/onetime-2.0.1.tgz",
       "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
       "dev": true,
       "dependencies": {
@@ -6984,7 +7118,7 @@
     },
     "node_modules/log-update/node_modules/restore-cursor": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-2.0.0.tgz",
       "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
       "dev": true,
       "dependencies": {
@@ -6997,7 +7131,7 @@
     },
     "node_modules/log-update/node_modules/string-width": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz",
       "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "dev": true,
       "dependencies": {
@@ -7010,7 +7144,7 @@
     },
     "node_modules/log-update/node_modules/strip-ansi": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz",
       "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
       "dev": true,
       "dependencies": {
@@ -7022,7 +7156,7 @@
     },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
       "integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==",
       "dev": true,
       "dependencies": {
@@ -7035,29 +7169,20 @@
     },
     "node_modules/lower-case": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz",
       "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/lower-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "yallist": "^3.0.2"
       }
     },
     "node_modules/make-dir": {
@@ -7074,13 +7199,13 @@
     },
     "node_modules/mdn-data": {
       "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
     "node_modules/media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true,
       "engines": {
@@ -7088,12 +7213,12 @@
       }
     },
     "node_modules/memfs": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-      "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmmirror.com/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
       "dependencies": {
-        "fs-monkey": "^1.0.3"
+        "fs-monkey": "^1.0.4"
       },
       "engines": {
         "node": ">= 4.0.0"
@@ -7101,13 +7226,13 @@
     },
     "node_modules/merge-descriptors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
       "dev": true
     },
     "node_modules/merge-source-map": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz",
       "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
       "dev": true,
       "dependencies": {
@@ -7116,13 +7241,13 @@
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
     "node_modules/merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
       "engines": {
@@ -7131,7 +7256,7 @@
     },
     "node_modules/methods": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true,
       "engines": {
@@ -7140,7 +7265,7 @@
     },
     "node_modules/micromatch": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
@@ -7153,7 +7278,7 @@
     },
     "node_modules/mime": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true,
       "bin": {
@@ -7192,9 +7317,9 @@
       }
     },
     "node_modules/mini-css-extract-plugin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
+      "version": "2.7.6",
+      "resolved": "https://registry.npmmirror.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
+      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
       "dev": true,
       "dependencies": {
         "schema-utils": "^4.0.0"
@@ -7202,33 +7327,25 @@
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^5.0.0"
       }
     },
     "node_modules/mini-css-extract-plugin/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/mini-css-extract-plugin/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "dependencies": {
@@ -7240,32 +7357,28 @@
     },
     "node_modules/mini-css-extract-plugin/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
     "node_modules/mini-css-extract-plugin/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/minimalistic-assert": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
       "dev": true
     },
@@ -7282,15 +7395,15 @@
       }
     },
     "node_modules/minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true
     },
     "node_modules/minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "dependencies": {
         "yallist": "^4.0.0"
@@ -7299,6 +7412,12 @@
         "node": ">=8"
       }
     },
+    "node_modules/minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/mkdirp": {
       "version": "0.5.6",
       "resolved": "https://registry.npmmirror.com/mkdirp/-/mkdirp-0.5.6.tgz",
@@ -7312,14 +7431,14 @@
       }
     },
     "node_modules/module-alias": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz",
-      "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.3.tgz",
+      "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
       "dev": true
     },
     "node_modules/mrmime": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
       "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
       "dev": true,
       "engines": {
@@ -7334,7 +7453,7 @@
     },
     "node_modules/multicast-dns": {
       "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "resolved": "https://registry.npmmirror.com/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
       "dependencies": {
@@ -7345,12 +7464,6 @@
         "multicast-dns": "cli.js"
       }
     },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz",
@@ -7363,9 +7476,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -7381,7 +7494,7 @@
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true,
       "engines": {
@@ -7402,7 +7515,7 @@
     },
     "node_modules/no-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/no-case/-/no-case-3.0.4.tgz",
       "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
       "dependencies": {
@@ -7410,16 +7523,10 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/no-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.11",
+      "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
       "dev": true,
       "dependencies": {
         "whatwg-url": "^5.0.0"
@@ -7438,7 +7545,7 @@
     },
     "node_modules/node-forge": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true,
       "engines": {
@@ -7446,14 +7553,14 @@
       }
     },
     "node_modules/node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.12.tgz",
+      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
       "dev": true
     },
     "node_modules/normalize-package-data": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "dependencies": {
@@ -7465,7 +7572,7 @@
     },
     "node_modules/normalize-package-data/node_modules/semver": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
       "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
       "dev": true,
       "bin": {
@@ -7474,7 +7581,7 @@
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true,
       "engines": {
@@ -7483,7 +7590,7 @@
     },
     "node_modules/normalize-range": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true,
       "engines": {
@@ -7492,14 +7599,11 @@
     },
     "node_modules/normalize-url": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-url/-/normalize-url-6.1.0.tgz",
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true,
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/npm-run-path": {
@@ -7516,14 +7620,11 @@
     },
     "node_modules/nth-check": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
       "dependencies": {
         "boolbase": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
     "node_modules/object-assign": {
@@ -7536,17 +7637,14 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+      "version": "1.12.3",
+      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "dev": true
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
       "engines": {
@@ -7555,7 +7653,7 @@
     },
     "node_modules/object.assign": {
       "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.4.tgz",
       "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
       "dependencies": {
@@ -7566,20 +7664,17 @@
       },
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/obuf": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
     "node_modules/on-finished": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "dependencies": {
@@ -7591,7 +7686,7 @@
     },
     "node_modules/on-headers": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true,
       "engines": {
@@ -7620,9 +7715,9 @@
       }
     },
     "node_modules/open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmmirror.com/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
       "dependencies": {
         "define-lazy-prop": "^2.0.0",
@@ -7631,14 +7726,11 @@
       },
       "engines": {
         "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/opener": {
       "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "resolved": "https://registry.npmmirror.com/opener/-/opener-1.5.2.tgz",
       "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true,
       "bin": {
@@ -7646,17 +7738,17 @@
       }
     },
     "node_modules/optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmmirror.com/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmmirror.com/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "dev": true,
       "dependencies": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.8.0"
@@ -7664,7 +7756,7 @@
     },
     "node_modules/ora": {
       "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ora/-/ora-5.4.1.tgz",
       "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dev": true,
       "dependencies": {
@@ -7680,14 +7772,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/ora/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -7695,14 +7784,11 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/ora/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
@@ -7711,14 +7797,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/ora/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -7730,13 +7813,13 @@
     },
     "node_modules/ora/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/ora/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -7745,7 +7828,7 @@
     },
     "node_modules/ora/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -7755,15 +7838,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/p-finally/-/p-finally-1.0.0.tgz",
@@ -7799,7 +7873,7 @@
     },
     "node_modules/p-retry": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "resolved": "https://registry.npmmirror.com/p-retry/-/p-retry-4.6.2.tgz",
       "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
       "dependencies": {
@@ -7821,7 +7895,7 @@
     },
     "node_modules/param-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/param-case/-/param-case-3.0.4.tgz",
       "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
       "dev": true,
       "dependencies": {
@@ -7829,12 +7903,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/param-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/parent-module/-/parent-module-1.0.1.tgz",
@@ -7847,18 +7915,9 @@
         "node": ">=6"
       }
     },
-    "node_modules/parent-module/node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "dependencies": {
@@ -7869,9 +7928,6 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/parse5": {
@@ -7897,7 +7953,7 @@
     },
     "node_modules/parseurl": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true,
       "engines": {
@@ -7906,7 +7962,7 @@
     },
     "node_modules/pascal-case": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/pascal-case/-/pascal-case-3.1.2.tgz",
       "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
       "dev": true,
       "dependencies": {
@@ -7914,12 +7970,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/pascal-case/node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-      "dev": true
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
@@ -7955,13 +8005,13 @@
     },
     "node_modules/path-to-regexp": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
       "dev": true
     },
     "node_modules/path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
       "engines": {
@@ -7970,19 +8020,16 @@
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true,
       "engines": {
         "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
     "node_modules/pkg-dir": {
@@ -7999,7 +8046,7 @@
     },
     "node_modules/portfinder": {
       "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+      "resolved": "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz",
       "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
       "dev": true,
       "dependencies": {
@@ -8013,7 +8060,7 @@
     },
     "node_modules/portfinder/node_modules/debug": {
       "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz",
       "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
       "dependencies": {
@@ -8021,21 +8068,11 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        }
-      ],
+      "version": "8.4.24",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
       "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       },
@@ -8045,7 +8082,7 @@
     },
     "node_modules/postcss-calc": {
       "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-8.2.4.tgz",
       "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "dev": true,
       "dependencies": {
@@ -8057,12 +8094,12 @@
       }
     },
     "node_modules/postcss-colormin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-      "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmmirror.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
         "postcss-value-parser": "^4.2.0"
@@ -8075,12 +8112,12 @@
       }
     },
     "node_modules/postcss-convert-values": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz",
-      "integrity": "sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmmirror.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.20.3",
+        "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -8092,7 +8129,7 @@
     },
     "node_modules/postcss-discard-comments": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
       "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "dev": true,
       "engines": {
@@ -8104,7 +8141,7 @@
     },
     "node_modules/postcss-discard-duplicates": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
       "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "dev": true,
       "engines": {
@@ -8116,7 +8153,7 @@
     },
     "node_modules/postcss-discard-empty": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
       "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "dev": true,
       "engines": {
@@ -8128,7 +8165,7 @@
     },
     "node_modules/postcss-discard-overridden": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
       "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
       "dev": true,
       "engines": {
@@ -8140,7 +8177,7 @@
     },
     "node_modules/postcss-loader": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-loader/-/postcss-loader-6.2.1.tgz",
       "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "dev": true,
       "dependencies": {
@@ -8151,19 +8188,27 @@
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "postcss": "^7.0.0 || ^8.0.1",
         "webpack": "^5.0.0"
       }
     },
+    "node_modules/postcss-loader/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/postcss-loader/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
       "dev": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -8175,14 +8220,20 @@
         "node": ">=10"
       }
     },
+    "node_modules/postcss-loader/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/postcss-merge-longhand": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz",
-      "integrity": "sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
       "dev": true,
       "dependencies": {
         "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.0"
+        "stylehacks": "^5.1.1"
       },
       "engines": {
         "node": "^10 || ^12 || >=14.0"
@@ -8192,12 +8243,12 @@
       }
     },
     "node_modules/postcss-merge-rules": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz",
-      "integrity": "sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmmirror.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "cssnano-utils": "^3.1.0",
         "postcss-selector-parser": "^6.0.5"
@@ -8211,7 +8262,7 @@
     },
     "node_modules/postcss-minify-font-values": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
       "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "dev": true,
       "dependencies": {
@@ -8226,7 +8277,7 @@
     },
     "node_modules/postcss-minify-gradients": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
       "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "dev": true,
       "dependencies": {
@@ -8242,12 +8293,12 @@
       }
     },
     "node_modules/postcss-minify-params": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz",
-      "integrity": "sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       },
@@ -8260,7 +8311,7 @@
     },
     "node_modules/postcss-minify-selectors": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
       "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "dev": true,
       "dependencies": {
@@ -8275,7 +8326,7 @@
     },
     "node_modules/postcss-modules-extract-imports": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
       "engines": {
@@ -8286,9 +8337,9 @@
       }
     },
     "node_modules/postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dev": true,
       "dependencies": {
         "icss-utils": "^5.0.0",
@@ -8304,7 +8355,7 @@
     },
     "node_modules/postcss-modules-scope": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
       "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
       "dependencies": {
@@ -8319,7 +8370,7 @@
     },
     "node_modules/postcss-modules-values": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
       "dependencies": {
@@ -8334,7 +8385,7 @@
     },
     "node_modules/postcss-normalize-charset": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
       "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "dev": true,
       "engines": {
@@ -8346,7 +8397,7 @@
     },
     "node_modules/postcss-normalize-display-values": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
       "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "dev": true,
       "dependencies": {
@@ -8361,7 +8412,7 @@
     },
     "node_modules/postcss-normalize-positions": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
       "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
       "dev": true,
       "dependencies": {
@@ -8376,7 +8427,7 @@
     },
     "node_modules/postcss-normalize-repeat-style": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
       "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
       "dev": true,
       "dependencies": {
@@ -8391,7 +8442,7 @@
     },
     "node_modules/postcss-normalize-string": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
       "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
       "dev": true,
       "dependencies": {
@@ -8406,7 +8457,7 @@
     },
     "node_modules/postcss-normalize-timing-functions": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
       "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
       "dev": true,
       "dependencies": {
@@ -8420,12 +8471,12 @@
       }
     },
     "node_modules/postcss-normalize-unicode": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-      "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
       },
       "engines": {
@@ -8437,7 +8488,7 @@
     },
     "node_modules/postcss-normalize-url": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
       "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "dev": true,
       "dependencies": {
@@ -8453,7 +8504,7 @@
     },
     "node_modules/postcss-normalize-whitespace": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
       "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "dev": true,
       "dependencies": {
@@ -8468,7 +8519,7 @@
     },
     "node_modules/postcss-ordered-values": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
       "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "dev": true,
       "dependencies": {
@@ -8483,12 +8534,12 @@
       }
     },
     "node_modules/postcss-reduce-initial": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-      "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0"
       },
       "engines": {
@@ -8500,7 +8551,7 @@
     },
     "node_modules/postcss-reduce-transforms": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
       "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "dev": true,
       "dependencies": {
@@ -8514,9 +8565,9 @@
       }
     },
     "node_modules/postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "dependencies": {
         "cssesc": "^3.0.0",
@@ -8528,7 +8579,7 @@
     },
     "node_modules/postcss-svgo": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
       "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
       "dev": true,
       "dependencies": {
@@ -8544,7 +8595,7 @@
     },
     "node_modules/postcss-unique-selectors": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
       "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
       "dev": true,
       "dependencies": {
@@ -8559,23 +8610,23 @@
     },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "node_modules/prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
       "optional": true,
       "bin": {
@@ -8583,14 +8634,11 @@
       },
       "engines": {
         "node": ">=10.13.0"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
       }
     },
     "node_modules/pretty-error": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/pretty-error/-/pretty-error-4.0.0.tgz",
       "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
       "dev": true,
       "dependencies": {
@@ -8600,7 +8648,7 @@
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
@@ -8615,7 +8663,7 @@
     },
     "node_modules/progress-webpack-plugin": {
       "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz",
+      "resolved": "https://registry.npmmirror.com/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz",
       "integrity": "sha512-sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA==",
       "dev": true,
       "dependencies": {
@@ -8630,21 +8678,9 @@
         "webpack": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/progress-webpack-plugin/node_modules/figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-      "dev": true,
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "dependencies": {
@@ -8657,7 +8693,7 @@
     },
     "node_modules/proxy-addr/node_modules/ipaddr.js": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
       "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
       "dev": true,
       "engines": {
@@ -8686,9 +8722,9 @@
       }
     },
     "node_modules/punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
       "engines": {
         "node": ">=6"
@@ -8696,7 +8732,7 @@
     },
     "node_modules/qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
       "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
       "dependencies": {
@@ -8704,34 +8740,17 @@
       },
       "engines": {
         "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "dev": true
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "dependencies": {
@@ -8740,7 +8759,7 @@
     },
     "node_modules/range-parser": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true,
       "engines": {
@@ -8749,7 +8768,7 @@
     },
     "node_modules/raw-body": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz",
       "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "dependencies": {
@@ -8764,7 +8783,7 @@
     },
     "node_modules/raw-body/node_modules/bytes": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
       "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "engines": {
@@ -8773,7 +8792,7 @@
     },
     "node_modules/read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "dependencies": {
@@ -8788,7 +8807,7 @@
     },
     "node_modules/read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
       "dependencies": {
@@ -8798,33 +8817,21 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/read-pkg-up/node_modules/type-fest": {
       "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
       "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/read-pkg/node_modules/type-fest": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "dependencies": {
         "inherits": "^2.0.3",
@@ -8837,7 +8844,7 @@
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "dependencies": {
@@ -8849,13 +8856,13 @@
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "resolved": "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "node_modules/regenerate-unicode-properties": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
       "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "dev": true,
       "dependencies": {
@@ -8866,55 +8873,49 @@
       }
     },
     "node_modules/regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==",
+      "version": "0.13.11",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
       "dev": true
     },
     "node_modules/regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
       }
     },
     "node_modules/regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true,
       "engines": {
-        "node": ">=6.5.0"
+        "node": ">=8"
       }
     },
     "node_modules/regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "dev": true,
       "dependencies": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
         "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==",
-      "dev": true
-    },
     "node_modules/regjsparser": {
       "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/regjsparser/-/regjsparser-0.9.1.tgz",
       "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "dev": true,
       "dependencies": {
@@ -8926,7 +8927,7 @@
     },
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz",
       "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
       "dev": true,
       "bin": {
@@ -8935,7 +8936,7 @@
     },
     "node_modules/relateurl": {
       "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "resolved": "https://registry.npmmirror.com/relateurl/-/relateurl-0.2.7.tgz",
       "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
       "dev": true,
       "engines": {
@@ -8944,7 +8945,7 @@
     },
     "node_modules/renderkid": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/renderkid/-/renderkid-3.0.0.tgz",
       "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
       "dev": true,
       "dependencies": {
@@ -8966,7 +8967,7 @@
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
       "engines": {
@@ -8975,17 +8976,17 @@
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dev": true,
       "dependencies": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -8995,7 +8996,7 @@
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
       "engines": {
@@ -9017,7 +9018,7 @@
     },
     "node_modules/retry": {
       "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "resolved": "https://registry.npmmirror.com/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true,
       "engines": {
@@ -9026,7 +9027,7 @@
     },
     "node_modules/reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
       "engines": {
@@ -9036,7 +9037,7 @@
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dev": true,
       "dependencies": {
@@ -9044,74 +9045,22 @@
       },
       "bin": {
         "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.12.0"
       }
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
-    "node_modules/rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "dependencies": {
-        "tslib": "^1.9.0"
-      },
-      "engines": {
-        "npm": ">=2.0.0"
-      }
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
+      "dev": true
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
@@ -9135,13 +9084,13 @@
     },
     "node_modules/select-hose": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
       "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
       "dev": true
     },
     "node_modules/selfsigned": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/selfsigned/-/selfsigned-2.1.1.tgz",
       "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
       "dev": true,
       "dependencies": {
@@ -9162,7 +9111,7 @@
     },
     "node_modules/send": {
       "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
       "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "dependencies": {
@@ -9186,7 +9135,7 @@
     },
     "node_modules/send/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -9195,19 +9144,19 @@
     },
     "node_modules/send/node_modules/debug/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/send/node_modules/ms": {
       "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
       "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
       "dev": true
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
       "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
       "dependencies": {
@@ -9216,7 +9165,7 @@
     },
     "node_modules/serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "dependencies": {
@@ -9234,7 +9183,7 @@
     },
     "node_modules/serve-index/node_modules/debug": {
       "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
       "dependencies": {
@@ -9243,7 +9192,7 @@
     },
     "node_modules/serve-index/node_modules/depd": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz",
       "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
       "dev": true,
       "engines": {
@@ -9252,7 +9201,7 @@
     },
     "node_modules/serve-index/node_modules/http-errors": {
       "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
       "dev": true,
       "dependencies": {
@@ -9267,25 +9216,25 @@
     },
     "node_modules/serve-index/node_modules/inherits": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz",
       "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
       "dev": true
     },
     "node_modules/serve-index/node_modules/ms": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "dev": true
     },
     "node_modules/serve-index/node_modules/setprototypeof": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.1.0.tgz",
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
       "dev": true
     },
     "node_modules/serve-index/node_modules/statuses": {
       "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
       "dev": true,
       "engines": {
@@ -9294,7 +9243,7 @@
     },
     "node_modules/serve-static": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
       "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "dependencies": {
@@ -9309,13 +9258,13 @@
     },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "node_modules/shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "dependencies": {
@@ -9347,23 +9296,20 @@
       }
     },
     "node_modules/shell-quote": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.7.4.tgz",
-      "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
       "dev": true
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
         "object-inspect": "^1.9.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/signal-exit": {
@@ -9374,7 +9320,7 @@
     },
     "node_modules/sirv": {
       "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
+      "resolved": "https://registry.npmmirror.com/sirv/-/sirv-1.0.19.tgz",
       "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
       "dev": true,
       "dependencies": {
@@ -9388,7 +9334,7 @@
     },
     "node_modules/slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
       "engines": {
@@ -9396,31 +9342,52 @@
       }
     },
     "node_modules/slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
       "dependencies": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
-    "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+    "node_modules/slice-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
+    "node_modules/slice-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/slice-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "resolved": "https://registry.npmmirror.com/sockjs/-/sockjs-0.3.24.tgz",
       "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
       "dependencies": {
@@ -9447,7 +9414,7 @@
     },
     "node_modules/source-map-support": {
       "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "dependencies": {
@@ -9456,9 +9423,9 @@
       }
     },
     "node_modules/spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
       "dependencies": {
         "spdx-expression-parse": "^3.0.0",
@@ -9467,13 +9434,13 @@
     },
     "node_modules/spdx-exceptions": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
       "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "dev": true
     },
     "node_modules/spdx-expression-parse": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "dependencies": {
@@ -9482,14 +9449,14 @@
       }
     },
     "node_modules/spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "version": "3.0.13",
+      "resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
       "dev": true
     },
     "node_modules/spdy": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/spdy/-/spdy-4.0.2.tgz",
       "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "dependencies": {
@@ -9505,7 +9472,7 @@
     },
     "node_modules/spdy-transport": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "dependencies": {
@@ -9525,7 +9492,7 @@
     },
     "node_modules/ssri": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
       "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
       "dev": true,
       "dependencies": {
@@ -9537,7 +9504,7 @@
     },
     "node_modules/stable": {
       "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "resolved": "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz",
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
       "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
       "dev": true
@@ -9550,7 +9517,7 @@
     },
     "node_modules/statuses": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true,
       "engines": {
@@ -9559,7 +9526,7 @@
     },
     "node_modules/string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "dependencies": {
@@ -9603,7 +9570,7 @@
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
       "engines": {
@@ -9629,12 +9596,12 @@
       }
     },
     "node_modules/stylehacks": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-      "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
       "dev": true,
       "dependencies": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "postcss-selector-parser": "^6.0.4"
       },
       "engines": {
@@ -9667,13 +9634,13 @@
     },
     "node_modules/svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
       "dev": true
     },
     "node_modules/svgo": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",
       "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
       "dev": true,
       "dependencies": {
@@ -9694,7 +9661,7 @@
     },
     "node_modules/svgo/node_modules/commander": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
       "engines": {
@@ -9702,73 +9669,42 @@
       }
     },
     "node_modules/table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmmirror.com/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmmirror.com/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
       "dependencies": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "engines": {
-        "node": ">=6.0.0"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/table/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+    "node_modules/table/node_modules/ajv": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
-      "engines": {
-        "node": ">=6"
+      "dependencies": {
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       }
     },
-    "node_modules/table/node_modules/emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+    "node_modules/table/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
-    "node_modules/table/node_modules/is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/table/node_modules/string-width": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
-      "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^7.0.1",
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^5.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/table/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/tapable": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
       "engines": {
@@ -9776,13 +9712,13 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
-      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+      "version": "5.18.1",
+      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.18.1.tgz",
+      "integrity": "sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==",
       "dev": true,
       "dependencies": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
@@ -9794,24 +9730,20 @@
       }
     },
     "node_modules/terser-webpack-plugin": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
-      "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
+      "version": "5.3.9",
+      "resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.5"
+        "terser": "^5.16.8"
       },
       "engines": {
         "node": ">= 10.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^5.1.0"
       },
@@ -9828,9 +9760,9 @@
       }
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -9839,27 +9771,11 @@
       },
       "engines": {
         "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
-    "node_modules/terser/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
       }
     },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
       "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true
     },
@@ -9892,7 +9808,7 @@
     },
     "node_modules/thread-loader": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/thread-loader/-/thread-loader-3.0.4.tgz",
       "integrity": "sha512-ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA==",
       "dev": true,
       "dependencies": {
@@ -9905,18 +9821,28 @@
       "engines": {
         "node": ">= 10.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^4.27.0 || ^5.0.0"
       }
     },
+    "node_modules/thread-loader/node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dev": true,
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
     "node_modules/thread-loader/node_modules/schema-utils": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-      "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -9925,36 +9851,14 @@
       },
       "engines": {
         "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmmirror.com/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
     "node_modules/thunky": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -9966,7 +9870,7 @@
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "dependencies": {
@@ -9978,7 +9882,7 @@
     },
     "node_modules/toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true,
       "engines": {
@@ -9987,7 +9891,7 @@
     },
     "node_modules/totalist": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/totalist/-/totalist-1.1.0.tgz",
       "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
       "dev": true,
       "engines": {
@@ -9996,40 +9900,40 @@
     },
     "node_modules/tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "dev": true
     },
     "node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
       "dev": true
     },
     "node_modules/type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "dependencies": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true,
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
     "node_modules/type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
       "dependencies": {
@@ -10042,7 +9946,7 @@
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
       "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true,
       "engines": {
@@ -10051,7 +9955,7 @@
     },
     "node_modules/unicode-match-property-ecmascript": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
       "dependencies": {
@@ -10063,9 +9967,9 @@
       }
     },
     "node_modules/unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
       "dev": true,
       "engines": {
         "node": ">=4"
@@ -10073,7 +9977,7 @@
     },
     "node_modules/unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true,
       "engines": {
@@ -10082,7 +9986,7 @@
     },
     "node_modules/universalify": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true,
       "engines": {
@@ -10091,7 +9995,7 @@
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true,
       "engines": {
@@ -10099,16 +10003,16 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "dev": true,
       "dependencies": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
       },
       "bin": {
-        "browserslist-lint": "cli.js"
+        "update-browserslist-db": "cli.js"
       },
       "peerDependencies": {
         "browserslist": ">= 4.21.0"
@@ -10125,19 +10029,19 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "node_modules/utila": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/utila/-/utila-0.4.0.tgz",
       "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
       "dev": true
     },
     "node_modules/utils-merge": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true,
       "engines": {
@@ -10146,7 +10050,7 @@
     },
     "node_modules/uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
       "bin": {
@@ -10161,7 +10065,7 @@
     },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "dependencies": {
@@ -10171,7 +10075,7 @@
     },
     "node_modules/vary": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true,
       "engines": {
@@ -10179,58 +10083,144 @@
       }
     },
     "node_modules/vue": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.13.tgz",
-      "integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==",
+      "version": "2.7.14",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz",
+      "integrity": "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==",
       "dependencies": {
-        "@vue/compiler-sfc": "2.7.13",
+        "@vue/compiler-sfc": "2.7.14",
         "csstype": "^3.1.0"
       }
     },
     "node_modules/vue-eslint-parser": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
-      "integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
+      "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
       "dev": true,
       "dependencies": {
-        "debug": "^4.1.1",
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.2.1",
+        "debug": "^4.3.2",
+        "eslint-scope": "^7.0.0",
+        "eslint-visitor-keys": "^3.1.0",
+        "espree": "^9.0.0",
         "esquery": "^1.4.0",
         "lodash": "^4.17.21",
-        "semver": "^6.3.0"
+        "semver": "^7.3.5"
       },
       "engines": {
-        "node": ">=8.10"
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "eslint": ">=5.0.0"
+        "eslint": ">=6.0.0"
       }
     },
+    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.0.tgz",
+      "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+      "dev": true,
+      "dependencies": {
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+      "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/espree": {
+      "version": "9.5.2",
+      "resolved": "https://registry.npmmirror.com/espree/-/espree-9.5.2.tgz",
+      "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+      "dev": true,
+      "dependencies": {
+        "acorn": "^8.8.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/semver": {
+      "version": "7.5.2",
+      "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/vue-hot-reload-api": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },
     "node_modules/vue-loader": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.0.tgz",
-      "integrity": "sha512-OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg==",
+      "version": "17.2.2",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-17.2.2.tgz",
+      "integrity": "sha512-aqNvKJvnz2A/6VWeJZodAo8XLoAlVwBv+2Z6dama+LHsAF+P/xijQ+OfWrxIs0wcGSJduvdzvTuATzXbNKkpiw==",
       "dev": true,
       "dependencies": {
         "chalk": "^4.1.0",
         "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
+        "watchpack": "^2.4.0"
       },
       "peerDependencies": {
         "webpack": "^4.1.0 || ^5.0.0-0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
       }
     },
     "node_modules/vue-loader/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -10238,14 +10228,11 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/vue-loader/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
@@ -10254,14 +10241,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/vue-loader/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -10273,13 +10257,13 @@
     },
     "node_modules/vue-loader/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/vue-loader/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -10288,7 +10272,7 @@
     },
     "node_modules/vue-loader/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -10305,7 +10289,7 @@
     },
     "node_modules/vue-style-loader": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
       "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
       "dev": true,
       "dependencies": {
@@ -10315,55 +10299,19 @@
     },
     "node_modules/vue-style-loader/node_modules/hash-sum": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
       "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
       "dev": true
     },
-    "node_modules/vue-style-loader/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      }
-    },
-    "node_modules/vue-style-loader/node_modules/loader-utils": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/vue-template-compiler": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
-      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
-      "dev": true,
-      "dependencies": {
-        "de-indent": "^1.0.2",
-        "he": "^1.2.0"
-      }
-    },
     "node_modules/vue-template-es2015-compiler": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
     "node_modules/watchpack": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
       "dependencies": {
@@ -10376,7 +10324,7 @@
     },
     "node_modules/wbuf": {
       "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "resolved": "https://registry.npmmirror.com/wbuf/-/wbuf-1.7.3.tgz",
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "dependencies": {
@@ -10385,7 +10333,7 @@
     },
     "node_modules/wcwidth": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/wcwidth/-/wcwidth-1.0.1.tgz",
       "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
       "dependencies": {
@@ -10394,14 +10342,14 @@
     },
     "node_modules/webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "dev": true
     },
     "node_modules/webpack": {
-      "version": "5.81.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz",
-      "integrity": "sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==",
+      "version": "5.87.0",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.87.0.tgz",
+      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
       "dev": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -10410,10 +10358,10 @@
         "@webassemblyjs/wasm-edit": "^1.11.5",
         "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
+        "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.13.0",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -10423,7 +10371,7 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
@@ -10435,10 +10383,6 @@
       "engines": {
         "node": ">=10.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependenciesMeta": {
         "webpack-cli": {
           "optional": true
@@ -10446,11 +10390,12 @@
       }
     },
     "node_modules/webpack-bundle-analyzer": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
-      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz",
+      "integrity": "sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==",
       "dev": true,
       "dependencies": {
+        "@discoveryjs/json-ext": "0.5.7",
         "acorn": "^8.0.4",
         "acorn-walk": "^8.0.0",
         "chalk": "^4.1.0",
@@ -10468,21 +10413,9 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/webpack-bundle-analyzer/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/webpack-bundle-analyzer/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -10490,14 +10423,11 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/chalk": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
       "dependencies": {
@@ -10506,14 +10436,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
       }
     },
     "node_modules/webpack-bundle-analyzer/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -10525,13 +10452,13 @@
     },
     "node_modules/webpack-bundle-analyzer/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
     "node_modules/webpack-bundle-analyzer/node_modules/commander": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
       "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "dev": true,
       "engines": {
@@ -10540,7 +10467,7 @@
     },
     "node_modules/webpack-bundle-analyzer/node_modules/has-flag": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
       "engines": {
@@ -10549,7 +10476,7 @@
     },
     "node_modules/webpack-bundle-analyzer/node_modules/supports-color": {
       "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
       "dependencies": {
@@ -10574,7 +10501,7 @@
     },
     "node_modules/webpack-dev-middleware": {
       "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
       "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dev": true,
       "dependencies": {
@@ -10587,33 +10514,25 @@
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
     "node_modules/webpack-dev-middleware/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "dependencies": {
@@ -10625,33 +10544,29 @@
     },
     "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
     "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/webpack-dev-server": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "dev": true,
       "dependencies": {
         "@types/bonjour": "^3.5.9",
@@ -10660,7 +10575,7 @@
         "@types/serve-index": "^1.9.1",
         "@types/serve-static": "^1.13.10",
         "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
+        "@types/ws": "^8.5.5",
         "ansi-html-community": "^0.0.8",
         "bonjour-service": "^1.0.11",
         "chokidar": "^3.5.3",
@@ -10673,6 +10588,7 @@
         "html-entities": "^2.3.2",
         "http-proxy-middleware": "^2.0.3",
         "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
         "open": "^8.0.9",
         "p-retry": "^4.5.0",
         "rimraf": "^3.0.2",
@@ -10682,7 +10598,7 @@
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
         "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
+        "ws": "^8.13.0"
       },
       "bin": {
         "webpack-dev-server": "bin/webpack-dev-server.js"
@@ -10690,38 +10606,33 @@
       "engines": {
         "node": ">= 12.13.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
       "peerDependencies": {
         "webpack": "^4.37.0 || ^5.0.0"
       },
       "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
         "webpack-cli": {
           "optional": true
         }
       }
     },
     "node_modules/webpack-dev-server/node_modules/ajv": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
         "require-from-string": "^2.0.2",
         "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
     "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
       "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
       "dependencies": {
@@ -10733,40 +10644,36 @@
     },
     "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true
     },
     "node_modules/webpack-dev-server/node_modules/schema-utils": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-      "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
-        "ajv": "^8.8.0",
+        "ajv": "^8.9.0",
         "ajv-formats": "^2.1.1",
-        "ajv-keywords": "^5.0.0"
+        "ajv-keywords": "^5.1.0"
       },
       "engines": {
         "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/webpack-dev-server/node_modules/ws": {
-      "version": "8.10.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.10.0.tgz",
-      "integrity": "sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -10778,9 +10685,9 @@
       }
     },
     "node_modules/webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-5.9.0.tgz",
+      "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==",
       "dev": true,
       "dependencies": {
         "clone-deep": "^4.0.1",
@@ -10792,7 +10699,7 @@
     },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
       "engines": {
@@ -10800,36 +10707,15 @@
       }
     },
     "node_modules/webpack-virtual-modules": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.5.tgz",
-      "integrity": "sha512-8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz",
+      "integrity": "sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==",
       "dev": true
     },
-    "node_modules/webpack/node_modules/acorn": {
-      "version": "8.8.1",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-      "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/webpack/node_modules/acorn-import-assertions": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-      "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "peerDependencies": {
-        "acorn": "^8"
-      }
-    },
     "node_modules/webpack/node_modules/schema-utils": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-      "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -10838,15 +10724,11 @@
       },
       "engines": {
         "node": ">= 10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
       }
     },
     "node_modules/websocket-driver": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "resolved": "https://registry.npmmirror.com/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
       "dependencies": {
@@ -10860,7 +10742,7 @@
     },
     "node_modules/websocket-extensions": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true,
       "engines": {
@@ -10869,13 +10751,13 @@
     },
     "node_modules/whatwg-fetch": {
       "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "resolved": "https://registry.npmmirror.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
       "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==",
       "dev": true
     },
     "node_modules/whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
       "dependencies": {
@@ -10896,9 +10778,9 @@
       }
     },
     "node_modules/wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true
     },
     "node_modules/word-wrap": {
@@ -10912,7 +10794,7 @@
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "dependencies": {
@@ -10922,14 +10804,11 @@
       },
       "engines": {
         "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
       "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
       "dependencies": {
@@ -10937,14 +10816,11 @@
       },
       "engines": {
         "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
       "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
       "dependencies": {
@@ -10956,7 +10832,7 @@
     },
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
       "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
       "dev": true
     },
@@ -10966,21 +10842,9 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
-    "node_modules/write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "dependencies": {
-        "mkdirp": "^0.5.1"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/ws": {
       "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
       "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "dev": true,
       "engines": {
@@ -10999,15 +10863,24 @@
         }
       }
     },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true
     },
     "node_modules/yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true,
       "engines": {
@@ -11041,15 +10914,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/yargs/node_modules/y18n": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
-      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/yorkie": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/yorkie/-/yorkie-2.0.0.tgz",
@@ -11133,7 +10997,7 @@
   "dependencies": {
     "@achrinza/node-ipc": {
       "version": "9.2.6",
-      "resolved": "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.6.tgz",
+      "resolved": "https://registry.npmmirror.com/@achrinza/node-ipc/-/node-ipc-9.2.6.tgz",
       "integrity": "sha512-ULSIYPy4ZPM301dfCxRz0l2GJjOwIo/PqmWonIu1bLml7UmnVQmH+juJcoyXp6E8gIRRNAjGYftJnNQlfy4vPg==",
       "dev": true,
       "requires": {
@@ -11143,137 +11007,139 @@
       }
     },
     "@ampproject/remapping": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz",
-      "integrity": "sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
       "requires": {
-        "@jridgewell/gen-mapping": "^0.1.0",
+        "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@babel/code-frame": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.18.6.tgz",
-      "integrity": "sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.22.5.tgz",
+      "integrity": "sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==",
       "dev": true,
       "requires": {
-        "@babel/highlight": "^7.18.6"
+        "@babel/highlight": "^7.22.5"
       }
     },
     "@babel/compat-data": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.19.4.tgz",
-      "integrity": "sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/compat-data/-/compat-data-7.22.5.tgz",
+      "integrity": "sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==",
       "dev": true
     },
     "@babel/core": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.19.6.tgz",
-      "integrity": "sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/core/-/core-7.22.5.tgz",
+      "integrity": "sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==",
       "dev": true,
       "requires": {
-        "@ampproject/remapping": "^2.1.0",
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helpers": "^7.19.4",
-        "@babel/parser": "^7.19.6",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4",
+        "@ampproject/remapping": "^2.2.0",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helpers": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
-        "json5": "^2.2.1",
+        "json5": "^2.2.2",
+        "semver": "^6.3.0"
+      }
+    },
+    "@babel/eslint-parser": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/eslint-parser/-/eslint-parser-7.22.5.tgz",
+      "integrity": "sha512-C69RWYNYtrgIRE5CmTd77ZiLDXqgBipahJc/jHP3sLcAGj6AJzxNIuKNpVnICqbyK7X3pFUfEvL++rvtbQpZkQ==",
+      "dev": true,
+      "requires": {
+        "@nicolo-ribaudo/eslint-scope-5-internals": "5.1.1-v1",
+        "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
       }
     },
     "@babel/generator": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.19.6.tgz",
-      "integrity": "sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/generator/-/generator-7.22.5.tgz",
+      "integrity": "sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.19.4",
+        "@babel/types": "^7.22.5",
         "@jridgewell/gen-mapping": "^0.3.2",
+        "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
       }
     },
     "@babel/helper-annotate-as-pure": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz",
-      "integrity": "sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz",
-      "integrity": "sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.5.tgz",
+      "integrity": "sha512-m1EP3lVOPptR+2DwD125gziZNcmoNSHGmJROKoy87loWUQyJaVXDgpmruWqDARZSmtYQ+Dl25okU8+qhVzuykw==",
       "dev": true,
       "requires": {
-        "@babel/helper-explode-assignable-expression": "^7.18.6",
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.19.3",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz",
-      "integrity": "sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.5.tgz",
+      "integrity": "sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.19.3",
-        "@babel/helper-validator-option": "^7.18.6",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.3",
+        "lru-cache": "^5.1.1",
         "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-NRz8DwF4jT3UfrmUoZjd0Uph9HQnP30t7Ash+weACcyNkiYTywpIjDBgReJMKgr+n86sn2nPVVmJ28Dm053Kqw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-xkb58MyOYIslxu3gKmVXmjTtUPvBU4odYzbiIQbWwLKIHCsx6UGZGX6F1IznMFVnDdirseUZopzN+ZRt8Xb33Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.19.0.tgz",
-      "integrity": "sha512-htnV+mHX32DF81amCDrwIDr8nrp1PTm+3wfBN9/v8QJOLEioOCOG7qNyq0nHeFiWbT3Eb7gsPwEmV64UCQ1jzw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.5.tgz",
+      "integrity": "sha512-1VpEFOIbMRaXyDeUwUfmTIxExLwQ+zkW+Bh5zXpApA3oQedBx9v/updixWxnx/bZpKw7u8VxWjb/qWpIcmPq8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "regexpu-core": "^5.1.0"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "regexpu-core": "^5.3.1",
+        "semver": "^6.3.0"
       }
     },
     "@babel/helper-define-polyfill-provider": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz",
-      "integrity": "sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.0.tgz",
+      "integrity": "sha512-RnanLx5ETe6aybRi1cO/edaRH+bNYWaryCEmjDDYyNr4wnSzyOp8T0dWipmqVHKEY3AbVKUom50AKSlj1zmKbg==",
       "dev": true,
       "requires": {
         "@babel/helper-compilation-targets": "^7.17.7",
@@ -11285,232 +11151,212 @@
       }
     },
     "@babel/helper-environment-visitor": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz",
-      "integrity": "sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true
     },
-    "@babel/helper-explode-assignable-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz",
-      "integrity": "sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==",
-      "dev": true,
-      "requires": {
-        "@babel/types": "^7.18.6"
-      }
-    },
     "@babel/helper-function-name": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz",
-      "integrity": "sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/types": "^7.19.0"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-hoist-variables": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz",
-      "integrity": "sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-member-expression-to-functions": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz",
-      "integrity": "sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz",
-      "integrity": "sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz",
-      "integrity": "sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.5.tgz",
+      "integrity": "sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-simple-access": "^7.19.4",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/helper-validator-identifier": "^7.19.1",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.6",
-        "@babel/types": "^7.19.4"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-optimise-call-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz",
-      "integrity": "sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-plugin-utils": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz",
-      "integrity": "sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "dev": true
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz",
-      "integrity": "sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-cU0Sq1Rf4Z55fgz7haOakIyM7+x/uCFwXpLPaeRzfoUtAEAuUZjZvFPjL/rk5rW693dIgn2hng1W7xbT7lWT4g==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-wrap-function": "^7.18.9",
-        "@babel/types": "^7.18.9"
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-replace-supers": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.19.1.tgz",
-      "integrity": "sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.5.tgz",
+      "integrity": "sha512-aLdNM5I3kdI/V9xGNyKSF3X/gTyMUBohTZ+/3QdQKAA9vxIiy12E+8E2HoOP1/DjeqU+g6as35QHJNMDDYpuCg==",
       "dev": true,
       "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-member-expression-to-functions": "^7.18.9",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/traverse": "^7.19.1",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz",
-      "integrity": "sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.19.4"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz",
-      "integrity": "sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.9"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-split-export-declaration": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz",
-      "integrity": "sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.5.tgz",
+      "integrity": "sha512-thqK5QFghPKWLhAV321lxF95yCg2K3Ob5yw+M3VHWfdia0IkPXUtoLH8x/6Fh486QUvzhb8YOWHChTVen2/PoQ==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.18.6"
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helper-string-parser": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz",
-      "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true
     },
     "@babel/helper-validator-identifier": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz",
-      "integrity": "sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "dev": true
     },
     "@babel/helper-validator-option": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz",
-      "integrity": "sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "dev": true
     },
     "@babel/helper-wrap-function": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.19.0.tgz",
-      "integrity": "sha512-txX8aN8CZyYGTwcLhlk87KRqncAzhh5TpQamZUa0/u3an36NtDpUP6bQgBCBcLeBs09R/OwQu3OjK0k/HwfNDg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.5.tgz",
+      "integrity": "sha512-bYqLIBSEshYcYQyfks8ewYA8S30yaGSeRslcvKMvoUk6HHPySbxHq9YRi6ghhzEU+yhQv9bP/jXnygkStOcqZw==",
       "dev": true,
       "requires": {
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.0",
-        "@babel/types": "^7.19.0"
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/helpers": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.19.4.tgz",
-      "integrity": "sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/helpers/-/helpers-7.22.5.tgz",
+      "integrity": "sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.18.10",
-        "@babel/traverse": "^7.19.4",
-        "@babel/types": "^7.19.4"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/highlight": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.18.6.tgz",
-      "integrity": "sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/highlight/-/highlight-7.22.5.tgz",
+      "integrity": "sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==",
       "dev": true,
       "requires": {
-        "@babel/helper-validator-identifier": "^7.18.6",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.0.0",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.19.6.tgz",
-      "integrity": "sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA=="
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/parser/-/parser-7.22.5.tgz",
+      "integrity": "sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q=="
     },
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz",
-      "integrity": "sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9"
-      }
-    },
-    "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.19.1.tgz",
-      "integrity": "sha512-0yu8vNATgLy4ivqMNBIwb1HebCelqN7YX8SL3FDXORv/RqT0zEEWUCH4GH44JsSrvCu6GqnAdR5EBFAPeNBB4Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-class-properties": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
       "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==",
       "dev": true,
       "requires": {
@@ -11518,149 +11364,29 @@
         "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
-    "@babel/plugin-proposal-class-static-block": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz",
-      "integrity": "sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-class-static-block": "^7.14.5"
-      }
-    },
     "@babel/plugin-proposal-decorators": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.19.6.tgz",
-      "integrity": "sha512-PKWforYpkVkogpOW0RaPuh7eQ7AoFgBJP+d87tQCRY2LVbvyGtfRM7RtrhCBsNgZb+2EY28SeWB6p2xe1Z5oAw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.5.tgz",
+      "integrity": "sha512-h8hlezQ4dl6ixodgXkH8lUfcD7x+WAuIqPUjwGoItynrXOAv4a4Tci1zA/qjzQjjcl0v3QpLdc2LM6ZACQuY7A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.19.1",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/plugin-syntax-decorators": "^7.19.0"
-      }
-    },
-    "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz",
-      "integrity": "sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz",
-      "integrity": "sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-json-strings": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz",
-      "integrity": "sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-json-strings": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz",
-      "integrity": "sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz",
-      "integrity": "sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz",
-      "integrity": "sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
-      }
-    },
-    "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.19.4.tgz",
-      "integrity": "sha512-wHmj6LDxVDnL+3WhXteUBaoM1aVILZODAUjg11kHqG4cOlfgMQGxw6aCgvrXrmaJR3Bn14oZhImyCPZzRpC93Q==",
-      "dev": true,
-      "requires": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.18.8"
-      }
-    },
-    "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz",
-      "integrity": "sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
-      }
-    },
-    "@babel/plugin-proposal-private-methods": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz",
-      "integrity": "sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/plugin-syntax-decorators": "^7.22.5"
       }
     },
     "@babel/plugin-proposal-private-property-in-object": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz",
-      "integrity": "sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==",
+      "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-create-class-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
-      }
+      "requires": {}
     },
     "@babel/plugin-proposal-unicode-property-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz",
       "integrity": "sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==",
       "dev": true,
       "requires": {
@@ -11670,7 +11396,7 @@
     },
     "@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
       "requires": {
@@ -11679,7 +11405,7 @@
     },
     "@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
       "requires": {
@@ -11688,7 +11414,7 @@
     },
     "@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
       "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
       "requires": {
@@ -11696,17 +11422,17 @@
       }
     },
     "@babel/plugin-syntax-decorators": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.19.0.tgz",
-      "integrity": "sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.5.tgz",
+      "integrity": "sha512-avpUOBS7IU6al8MmF1XpAyj9QYeLPuSDJI5D4pVMSMdL7xQokKqJPYQC67RCT0aCTashUXPiGwMJ0DEXXCEmMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
       "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
       "requires": {
@@ -11715,7 +11441,7 @@
     },
     "@babel/plugin-syntax-export-namespace-from": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
       "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
       "requires": {
@@ -11723,17 +11449,35 @@
       }
     },
     "@babel/plugin-syntax-import-assertions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz",
-      "integrity": "sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-import-attributes": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.10.4"
       }
     },
     "@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
       "requires": {
@@ -11741,17 +11485,17 @@
       }
     },
     "@babel/plugin-syntax-jsx": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz",
-      "integrity": "sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz",
+      "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
       "requires": {
@@ -11760,7 +11504,7 @@
     },
     "@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
       "requires": {
@@ -11769,7 +11513,7 @@
     },
     "@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
       "requires": {
@@ -11778,7 +11522,7 @@
     },
     "@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
       "requires": {
@@ -11787,7 +11531,7 @@
     },
     "@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
       "requires": {
@@ -11796,7 +11540,7 @@
     },
     "@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
       "requires": {
@@ -11805,7 +11549,7 @@
     },
     "@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
       "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
       "requires": {
@@ -11814,374 +11558,542 @@
     },
     "@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
       }
     },
-    "@babel/plugin-transform-arrow-functions": {
+    "@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz",
-      "integrity": "sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
       "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
         "@babel/helper-plugin-utils": "^7.18.6"
       }
     },
+    "@babel/plugin-transform-arrow-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-async-generator-functions": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.5.tgz",
+      "integrity": "sha512-gGOEvFzm3fWoyD5uZq7vVTD57pPJ3PczPUD/xCFGjzBpUosnklmXyKnGQbbbGs1NPNPskFex0j93yKbHt0cHyg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      }
+    },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz",
-      "integrity": "sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-remap-async-to-generator": "^7.18.6"
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-remap-async-to-generator": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz",
-      "integrity": "sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.19.4.tgz",
-      "integrity": "sha512-934S2VLLlt2hRJwPf4MczaOr4hYF0z+VKPwqTNxyKX7NthTiPfhuKFWQZHXRM0vh/wo/VyXB3s4bZUNA08l+tQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.5.tgz",
+      "integrity": "sha512-EcACl1i5fSQ6bt+YGuU/XGCeZKStLmyVGytWkpyhCLeQVA0eu6Wtiw92V+I1T/hnezUv7j74dA/Ro69gWcU+hg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-class-properties": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-class-static-block": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.5.tgz",
+      "integrity": "sha512-SPToJ5eYZLxlnp1UzdARpOGeC2GbHvr9d/UV0EukuVx8atktg194oe+C5BqQ8jRTkgLRVOPYeXRSBg1IlMoVRA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5"
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.19.0.tgz",
-      "integrity": "sha512-YfeEE9kCjqTS9IitkgfJuxjcEtLUHMqa8yUJ6zdz8vR7hKuo6mOy2C05P0F1tdMmDCeuyidKnlrw/iTppHcr2A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.5.tgz",
+      "integrity": "sha512-2edQhLfibpWpsVBx2n/GKOz6JdGQvLruZQfGr9l1qes2KQaWswjBzhQF7UDUZMNaMMQeYnQzxwOMPsbYF7wqPQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.18.6",
-        "@babel/helper-compilation-targets": "^7.19.0",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-optimise-call-expression": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-replace-supers": "^7.18.9",
-        "@babel/helper-split-export-declaration": "^7.18.6",
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-optimise-call-expression": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
         "globals": "^11.1.0"
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz",
-      "integrity": "sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/template": "^7.22.5"
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.19.4.tgz",
-      "integrity": "sha512-t0j0Hgidqf0aM86dF8U+vXYReUgJnlv4bZLsyoPnwZNrGY+7/38o8YjaELrvHeVfTZao15kjR0PVv0nju2iduA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.5.tgz",
+      "integrity": "sha512-GfqcFuGW8vnEqTUBM7UtPd5A4q797LTvvwKxXTgRsFjoqaJiEg9deBG6kWeQYkVEL569NpnmpC0Pkr/8BLKGnQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz",
-      "integrity": "sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz",
-      "integrity": "sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-dynamic-import": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.5.tgz",
+      "integrity": "sha512-0MC3ppTB1AMxd8fXjSrbPa7LT9hrImt+/fcj+Pg5YMD7UQyWp/02+JWpdnCymmsXwIx5Z+sYn1bwCn4ZJNvhqQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3"
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz",
-      "integrity": "sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dev": true,
       "requires": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-export-namespace-from": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.5.tgz",
+      "integrity": "sha512-X4hhm7FRnPgd4nDA4b/5V280xCx6oL7Oob5+9qVS5C13Zq4bh1qq7LU0GgRU6b5dBWBvhGaXYVB4AcN6+ol6vg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-export-namespace-from": "^7.8.3"
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz",
-      "integrity": "sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz",
-      "integrity": "sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
       "requires": {
-        "@babel/helper-compilation-targets": "^7.18.9",
-        "@babel/helper-function-name": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-json-strings": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.5.tgz",
+      "integrity": "sha512-DuCRB7fu8MyTLbEQd1ew3R85nx/88yMoqo2uPSjevMj3yoN7CDM8jkgrY0wmVxfJZyJ/B9fE1iq7EQppWQmR5A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-json-strings": "^7.8.3"
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz",
-      "integrity": "sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-logical-assignment-operators": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.5.tgz",
+      "integrity": "sha512-MQQOUW1KL8X0cDWfbwYP+TbVbZm16QmQXJQ+vndPtH/BoO0lOKpVoEDMI7+PskYxH+IiE0tS8xZye0qr1lGzSA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4"
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz",
-      "integrity": "sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz",
-      "integrity": "sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz",
-      "integrity": "sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.5.tgz",
+      "integrity": "sha512-B4pzOXj+ONRmuaQTg05b3y/4DuFz3WcCNAXPLb2Q0GT0TrGKGxNKV4jwsXts+StaM0LQczZbOpj8o1DLPDJIiA==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-simple-access": "^7.19.4"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-simple-access": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz",
-      "integrity": "sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.5.tgz",
+      "integrity": "sha512-emtEpoaTMsOs6Tzz+nbmcePl6AKVtS1yC4YNAeMun9U8YCsgadPNxnOPQ8GhHFB2qdx+LZu9LgoC0Lthuu05DQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-module-transforms": "^7.19.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-identifier": "^7.19.1"
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz",
-      "integrity": "sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-module-transforms": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.19.1",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.19.1.tgz",
-      "integrity": "sha512-oWk9l9WItWBQYS4FgXD4Uyy5kq898lvkXpXQxoJEY1RnvPk4R/Dvu2ebXU9q8lP+rlMwUQTFf2Ok6d78ODa0kw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.19.0",
-        "@babel/helper-plugin-utils": "^7.19.0"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz",
-      "integrity": "sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-nullish-coalescing-operator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.5.tgz",
+      "integrity": "sha512-6CF8g6z1dNYZ/VXok5uYkkBBICHZPiGEl7oDnAx2Mt1hlHVHOSIKWJaXHjQJA5VB43KZnXZDIexMchY4y2PGdA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-numeric-separator": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.5.tgz",
+      "integrity": "sha512-NbslED1/6M+sXiwwtcAB/nieypGw02Ejf4KtDeMkCEpP6gWFMX1wI9WKYua+4oBneCCEmulOkRpwywypVZzs/g==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4"
+      }
+    },
+    "@babel/plugin-transform-object-rest-spread": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.5.tgz",
+      "integrity": "sha512-Kk3lyDmEslH9DnvCDA1s1kkd3YWQITiBOHngOtDL9Pt6BZjzqb6hiOlb8VfjiiQJ2unmegBqZu0rx5RxJb5vmQ==",
+      "dev": true,
+      "requires": {
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.22.5"
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz",
-      "integrity": "sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/helper-replace-supers": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-optional-catch-binding": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.5.tgz",
+      "integrity": "sha512-pH8orJahy+hzZje5b8e2QIlBWQvGpelS76C63Z+jhZKsmzfNaPQ+LaW6dcJ9bxTpo1mtXbgHwy765Ro3jftmUg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      }
+    },
+    "@babel/plugin-transform-optional-chaining": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-AconbMKOMkyG+xCng2JogMCDcqW8wedQAqpVIL4cOSescZ7+iW8utC6YDZLMCSUIReEA733gzRSaOSXMAt/4WQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.18.8",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz",
-      "integrity": "sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-private-methods": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-private-property-in-object": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.5.tgz",
+      "integrity": "sha512-/9xnaTTJcVoBtSSmrVyhtSvO3kbqS2ODoh2juEU72c3aYonNF0OMGiaz2gjukyKM2wBBYJP38S4JiE0Wfb5VMQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-annotate-as-pure": "^7.22.5",
+        "@babel/helper-create-class-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5"
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz",
-      "integrity": "sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz",
-      "integrity": "sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.5.tgz",
+      "integrity": "sha512-rR7KePOE7gfEtNTh9Qw+iO3Q/e4DEsoQ+hdvM6QUDH7JRJ5qxq5AA52ZzBWbI5i9lfNuvySgOGP8ZN7LAmaiPw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "regenerator-transform": "^0.15.0"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "regenerator-transform": "^0.15.1"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz",
-      "integrity": "sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-runtime": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz",
-      "integrity": "sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.5.tgz",
+      "integrity": "sha512-bg4Wxd1FWeFx3daHFTWk1pkSWK/AyQuiyAoeZAOkAOUBjnZPH6KT7eMxouV47tQ6hl6ax2zyAWBdWZXbrvXlaw==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
+        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
         "semver": "^6.3.0"
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz",
-      "integrity": "sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.19.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz",
-      "integrity": "sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5"
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz",
-      "integrity": "sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz",
-      "integrity": "sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.18.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz",
-      "integrity": "sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz",
-      "integrity": "sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.5.tgz",
+      "integrity": "sha512-biEmVg1IYB/raUO5wT1tgfacCef15Fbzhkx493D3urBI++6hpJ+RFG4SrWMn0NEZLfvilqKf3QDrRVZHo08FYg==",
       "dev": true,
       "requires": {
-        "@babel/helper-plugin-utils": "^7.18.9"
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-property-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz",
-      "integrity": "sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.18.6",
-        "@babel/helper-plugin-utils": "^7.18.6"
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
+      }
+    },
+    "@babel/plugin-transform-unicode-sets-regex": {
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-create-regexp-features-plugin": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5"
       }
     },
     "@babel/preset-env": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.19.4.tgz",
-      "integrity": "sha512-5QVOTXUdqTCjQuh2GGtdd7YEhoRXBMVGROAtsBeLGIbIz3obCBIfRMT1I3ZKkMgNzwkyCkftDXSSkHxnfVf4qg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/preset-env/-/preset-env-7.22.5.tgz",
+      "integrity": "sha512-fj06hw89dpiZzGZtxn+QybifF07nNiZjZ7sazs2aVDcysAZVGjW7+7iFYxg6GLNM47R/thYfLdrXc+2f11Vi9A==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.19.4",
-        "@babel/helper-compilation-targets": "^7.19.3",
-        "@babel/helper-plugin-utils": "^7.19.0",
-        "@babel/helper-validator-option": "^7.18.6",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.18.6",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-async-generator-functions": "^7.19.1",
-        "@babel/plugin-proposal-class-properties": "^7.18.6",
-        "@babel/plugin-proposal-class-static-block": "^7.18.6",
-        "@babel/plugin-proposal-dynamic-import": "^7.18.6",
-        "@babel/plugin-proposal-export-namespace-from": "^7.18.9",
-        "@babel/plugin-proposal-json-strings": "^7.18.6",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.18.9",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
-        "@babel/plugin-proposal-numeric-separator": "^7.18.6",
-        "@babel/plugin-proposal-object-rest-spread": "^7.19.4",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.18.6",
-        "@babel/plugin-proposal-optional-chaining": "^7.18.9",
-        "@babel/plugin-proposal-private-methods": "^7.18.6",
-        "@babel/plugin-proposal-private-property-in-object": "^7.18.6",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.18.6",
+        "@babel/compat-data": "^7.22.5",
+        "@babel/helper-compilation-targets": "^7.22.5",
+        "@babel/helper-plugin-utils": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
         "@babel/plugin-syntax-class-static-block": "^7.14.5",
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
-        "@babel/plugin-syntax-import-assertions": "^7.18.6",
+        "@babel/plugin-syntax-import-assertions": "^7.22.5",
+        "@babel/plugin-syntax-import-attributes": "^7.22.5",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
         "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
@@ -12191,50 +12103,67 @@
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
         "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
-        "@babel/plugin-transform-arrow-functions": "^7.18.6",
-        "@babel/plugin-transform-async-to-generator": "^7.18.6",
-        "@babel/plugin-transform-block-scoped-functions": "^7.18.6",
-        "@babel/plugin-transform-block-scoping": "^7.19.4",
-        "@babel/plugin-transform-classes": "^7.19.0",
-        "@babel/plugin-transform-computed-properties": "^7.18.9",
-        "@babel/plugin-transform-destructuring": "^7.19.4",
-        "@babel/plugin-transform-dotall-regex": "^7.18.6",
-        "@babel/plugin-transform-duplicate-keys": "^7.18.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.18.6",
-        "@babel/plugin-transform-for-of": "^7.18.8",
-        "@babel/plugin-transform-function-name": "^7.18.9",
-        "@babel/plugin-transform-literals": "^7.18.9",
-        "@babel/plugin-transform-member-expression-literals": "^7.18.6",
-        "@babel/plugin-transform-modules-amd": "^7.18.6",
-        "@babel/plugin-transform-modules-commonjs": "^7.18.6",
-        "@babel/plugin-transform-modules-systemjs": "^7.19.0",
-        "@babel/plugin-transform-modules-umd": "^7.18.6",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.19.1",
-        "@babel/plugin-transform-new-target": "^7.18.6",
-        "@babel/plugin-transform-object-super": "^7.18.6",
-        "@babel/plugin-transform-parameters": "^7.18.8",
-        "@babel/plugin-transform-property-literals": "^7.18.6",
-        "@babel/plugin-transform-regenerator": "^7.18.6",
-        "@babel/plugin-transform-reserved-words": "^7.18.6",
-        "@babel/plugin-transform-shorthand-properties": "^7.18.6",
-        "@babel/plugin-transform-spread": "^7.19.0",
-        "@babel/plugin-transform-sticky-regex": "^7.18.6",
-        "@babel/plugin-transform-template-literals": "^7.18.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.18.9",
-        "@babel/plugin-transform-unicode-escapes": "^7.18.10",
-        "@babel/plugin-transform-unicode-regex": "^7.18.6",
+        "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+        "@babel/plugin-transform-arrow-functions": "^7.22.5",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.5",
+        "@babel/plugin-transform-async-to-generator": "^7.22.5",
+        "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
+        "@babel/plugin-transform-block-scoping": "^7.22.5",
+        "@babel/plugin-transform-class-properties": "^7.22.5",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.5",
+        "@babel/plugin-transform-computed-properties": "^7.22.5",
+        "@babel/plugin-transform-destructuring": "^7.22.5",
+        "@babel/plugin-transform-dotall-regex": "^7.22.5",
+        "@babel/plugin-transform-duplicate-keys": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-function-name": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-literals": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-member-expression-literals": "^7.22.5",
+        "@babel/plugin-transform-modules-amd": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-umd": "^7.22.5",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+        "@babel/plugin-transform-new-target": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-object-super": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.5",
+        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-private-methods": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-property-literals": "^7.22.5",
+        "@babel/plugin-transform-regenerator": "^7.22.5",
+        "@babel/plugin-transform-reserved-words": "^7.22.5",
+        "@babel/plugin-transform-shorthand-properties": "^7.22.5",
+        "@babel/plugin-transform-spread": "^7.22.5",
+        "@babel/plugin-transform-sticky-regex": "^7.22.5",
+        "@babel/plugin-transform-template-literals": "^7.22.5",
+        "@babel/plugin-transform-typeof-symbol": "^7.22.5",
+        "@babel/plugin-transform-unicode-escapes": "^7.22.5",
+        "@babel/plugin-transform-unicode-property-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-regex": "^7.22.5",
+        "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "^0.1.5",
-        "@babel/types": "^7.19.4",
-        "babel-plugin-polyfill-corejs2": "^0.3.3",
-        "babel-plugin-polyfill-corejs3": "^0.6.0",
-        "babel-plugin-polyfill-regenerator": "^0.4.1",
-        "core-js-compat": "^3.25.1",
+        "@babel/types": "^7.22.5",
+        "babel-plugin-polyfill-corejs2": "^0.4.3",
+        "babel-plugin-polyfill-corejs3": "^0.8.1",
+        "babel-plugin-polyfill-regenerator": "^0.5.0",
+        "core-js-compat": "^3.30.2",
         "semver": "^6.3.0"
       }
     },
     "@babel/preset-modules": {
       "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz",
       "integrity": "sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==",
       "dev": true,
       "requires": {
@@ -12245,78 +12174,148 @@
         "esutils": "^2.0.2"
       }
     },
+    "@babel/regjsgen": {
+      "version": "0.8.0",
+      "resolved": "https://registry.npmmirror.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
+      "dev": true
+    },
     "@babel/runtime": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.4.tgz",
-      "integrity": "sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.22.5.tgz",
+      "integrity": "sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA==",
       "dev": true,
       "requires": {
-        "regenerator-runtime": "^0.13.4"
+        "regenerator-runtime": "^0.13.11"
       }
     },
     "@babel/template": {
-      "version": "7.18.10",
-      "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.18.10.tgz",
-      "integrity": "sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/parser": "^7.18.10",
-        "@babel/types": "^7.18.10"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       }
     },
     "@babel/traverse": {
-      "version": "7.19.6",
-      "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.19.6.tgz",
-      "integrity": "sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/traverse/-/traverse-7.22.5.tgz",
+      "integrity": "sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.18.6",
-        "@babel/generator": "^7.19.6",
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-function-name": "^7.19.0",
-        "@babel/helper-hoist-variables": "^7.18.6",
-        "@babel/helper-split-export-declaration": "^7.18.6",
-        "@babel/parser": "^7.19.6",
-        "@babel/types": "^7.19.4",
+        "@babel/code-frame": "^7.22.5",
+        "@babel/generator": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-function-name": "^7.22.5",
+        "@babel/helper-hoist-variables": "^7.22.5",
+        "@babel/helper-split-export-declaration": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       }
     },
     "@babel/types": {
-      "version": "7.19.4",
-      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.19.4.tgz",
-      "integrity": "sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmmirror.com/@babel/types/-/types-7.22.5.tgz",
+      "integrity": "sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==",
       "dev": true,
       "requires": {
-        "@babel/helper-string-parser": "^7.19.4",
-        "@babel/helper-validator-identifier": "^7.19.1",
+        "@babel/helper-string-parser": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       }
     },
+    "@discoveryjs/json-ext": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmmirror.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz",
+      "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==",
+      "dev": true
+    },
+    "@eslint/eslintrc": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz",
+      "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==",
+      "dev": true,
+      "requires": {
+        "ajv": "^6.12.4",
+        "debug": "^4.1.1",
+        "espree": "^7.3.0",
+        "globals": "^13.9.0",
+        "ignore": "^4.0.6",
+        "import-fresh": "^3.2.1",
+        "js-yaml": "^3.13.1",
+        "minimatch": "^3.0.4",
+        "strip-json-comments": "^3.1.1"
+      },
+      "dependencies": {
+        "globals": {
+          "version": "13.20.0",
+          "resolved": "https://registry.npmmirror.com/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
+          "dev": true,
+          "requires": {
+            "type-fest": "^0.20.2"
+          }
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "type-fest": {
+          "version": "0.20.2",
+          "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        }
+      }
+    },
     "@hapi/hoek": {
       "version": "9.3.0",
-      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@hapi/hoek/-/hoek-9.3.0.tgz",
       "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
       "dev": true
     },
     "@hapi/topo": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@hapi/topo/-/topo-5.1.0.tgz",
       "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
       "requires": {
         "@hapi/hoek": "^9.0.0"
       }
     },
-    "@jridgewell/gen-mapping": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz",
-      "integrity": "sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==",
+    "@humanwhocodes/config-array": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmmirror.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz",
+      "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==",
       "dev": true,
       "requires": {
-        "@jridgewell/set-array": "^1.0.0",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
+        "@humanwhocodes/object-schema": "^1.2.0",
+        "debug": "^4.1.1",
+        "minimatch": "^3.0.4"
+      }
+    },
+    "@humanwhocodes/object-schema": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
+    },
+    "@jridgewell/gen-mapping": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
+      "dev": true,
+      "requires": {
+        "@jridgewell/set-array": "^1.0.1",
+        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/trace-mapping": "^0.3.9"
       }
     },
     "@jridgewell/resolve-uri": {
@@ -12332,53 +12331,57 @@
       "dev": true
     },
     "@jridgewell/source-map": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz",
-      "integrity": "sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/source-map/-/source-map-0.3.3.tgz",
+      "integrity": "sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==",
       "dev": true,
       "requires": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
-      },
-      "dependencies": {
-        "@jridgewell/gen-mapping": {
-          "version": "0.3.2",
-          "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz",
-          "integrity": "sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==",
-          "dev": true,
-          "requires": {
-            "@jridgewell/set-array": "^1.0.1",
-            "@jridgewell/sourcemap-codec": "^1.4.10",
-            "@jridgewell/trace-mapping": "^0.3.9"
-          }
-        }
       }
     },
     "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+      "version": "1.4.15",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==",
       "dev": true
     },
     "@jridgewell/trace-mapping": {
-      "version": "0.3.17",
-      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz",
-      "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==",
+      "version": "0.3.18",
+      "resolved": "https://registry.npmmirror.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz",
+      "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==",
       "dev": true,
       "requires": {
         "@jridgewell/resolve-uri": "3.1.0",
         "@jridgewell/sourcemap-codec": "1.4.14"
+      },
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": {
+          "version": "1.4.14",
+          "resolved": "https://registry.npmmirror.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
+          "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
+          "dev": true
+        }
       }
     },
     "@leichtgewicht/ip-codec": {
       "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz",
       "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==",
       "dev": true
     },
+    "@nicolo-ribaudo/eslint-scope-5-internals": {
+      "version": "5.1.1-v1",
+      "resolved": "https://registry.npmmirror.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
+      "integrity": "sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==",
+      "dev": true,
+      "requires": {
+        "eslint-scope": "5.1.1"
+      }
+    },
     "@node-ipc/js-queue": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/@node-ipc/js-queue/-/js-queue-2.0.3.tgz",
       "integrity": "sha512-fL1wpr8hhD5gT2dA1qifeVaoDFlQR5es8tFuKqjHX+kdOtdNHnxkVZbtIrR2rxnMFvehkjaZRNV2H/gPXlb0hw==",
       "dev": true,
       "requires": {
@@ -12387,7 +12390,7 @@
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
       "requires": {
@@ -12397,13 +12400,13 @@
     },
     "@nodelib/fs.stat": {
       "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true
     },
     "@nodelib/fs.walk": {
       "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
       "requires": {
@@ -12413,13 +12416,13 @@
     },
     "@polka/url": {
       "version": "1.0.0-next.21",
-      "resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz",
+      "resolved": "https://registry.npmmirror.com/@polka/url/-/url-1.0.0-next.21.tgz",
       "integrity": "sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==",
       "dev": true
     },
     "@sideway/address": {
       "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@sideway/address/-/address-4.1.4.tgz",
       "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
       "dev": true,
       "requires": {
@@ -12428,13 +12431,13 @@
     },
     "@sideway/formula": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@sideway/formula/-/formula-3.0.1.tgz",
       "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
       "dev": true
     },
     "@sideway/pinpoint": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
       "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
       "dev": true
     },
@@ -12509,13 +12512,13 @@
     },
     "@trysound/sax": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
       "dev": true
     },
     "@types/body-parser": {
       "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/body-parser/-/body-parser-1.19.2.tgz",
       "integrity": "sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==",
       "dev": true,
       "requires": {
@@ -12525,7 +12528,7 @@
     },
     "@types/bonjour": {
       "version": "3.5.10",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/bonjour/-/bonjour-3.5.10.tgz",
       "integrity": "sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==",
       "dev": true,
       "requires": {
@@ -12534,7 +12537,7 @@
     },
     "@types/connect": {
       "version": "3.4.35",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/connect/-/connect-3.4.35.tgz",
       "integrity": "sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==",
       "dev": true,
       "requires": {
@@ -12542,9 +12545,9 @@
       }
     },
     "@types/connect-history-api-fallback": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz",
-      "integrity": "sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz",
+      "integrity": "sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==",
       "dev": true,
       "requires": {
         "@types/express-serve-static-core": "*",
@@ -12552,9 +12555,9 @@
       }
     },
     "@types/eslint": {
-      "version": "8.4.8",
-      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.8.tgz",
-      "integrity": "sha512-zUCKQI1bUCTi+0kQs5ZQzQ/XILWRLIlh15FXWNykJ+NG3TMKMVvwwC6GP3DR1Ylga15fB7iAExSzc4PNlR5i3w==",
+      "version": "8.40.2",
+      "resolved": "https://registry.npmmirror.com/@types/eslint/-/eslint-8.40.2.tgz",
+      "integrity": "sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==",
       "dev": true,
       "requires": {
         "@types/estree": "*",
@@ -12563,7 +12566,7 @@
     },
     "@types/eslint-scope": {
       "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
       "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
       "requires": {
@@ -12573,105 +12576,116 @@
     },
     "@types/estree": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/estree/-/estree-1.0.1.tgz",
       "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
       "dev": true
     },
     "@types/express": {
-      "version": "4.17.14",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.14.tgz",
-      "integrity": "sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==",
+      "version": "4.17.17",
+      "resolved": "https://registry.npmmirror.com/@types/express/-/express-4.17.17.tgz",
+      "integrity": "sha512-Q4FmmuLGBG58btUnfS1c1r/NQdlp3DMfGDGig8WhfpA2YRUtEkxAjkZb0yvplJGYdF1fsQ81iMDcH24sSCNC/Q==",
       "dev": true,
       "requires": {
         "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.18",
+        "@types/express-serve-static-core": "^4.17.33",
         "@types/qs": "*",
         "@types/serve-static": "*"
       }
     },
     "@types/express-serve-static-core": {
-      "version": "4.17.31",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz",
-      "integrity": "sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==",
+      "version": "4.17.35",
+      "resolved": "https://registry.npmmirror.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz",
+      "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==",
       "dev": true,
       "requires": {
         "@types/node": "*",
         "@types/qs": "*",
-        "@types/range-parser": "*"
+        "@types/range-parser": "*",
+        "@types/send": "*"
       }
     },
     "@types/html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==",
       "dev": true
     },
     "@types/http-proxy": {
-      "version": "1.17.9",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
-      "integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
+      "version": "1.17.11",
+      "resolved": "https://registry.npmmirror.com/@types/http-proxy/-/http-proxy-1.17.11.tgz",
+      "integrity": "sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==",
       "dev": true,
       "requires": {
         "@types/node": "*"
       }
     },
     "@types/json-schema": {
-      "version": "7.0.11",
-      "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.11.tgz",
-      "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==",
+      "version": "7.0.12",
+      "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
       "dev": true
     },
     "@types/mime": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz",
-      "integrity": "sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmmirror.com/@types/mime/-/mime-1.3.2.tgz",
+      "integrity": "sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==",
       "dev": true
     },
     "@types/minimist": {
       "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/minimist/-/minimist-1.2.2.tgz",
       "integrity": "sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==",
       "dev": true
     },
     "@types/node": {
-      "version": "18.11.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.11.7.tgz",
-      "integrity": "sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ==",
+      "version": "20.3.1",
+      "resolved": "https://registry.npmmirror.com/@types/node/-/node-20.3.1.tgz",
+      "integrity": "sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==",
       "dev": true
     },
     "@types/normalize-package-data": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
       "integrity": "sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==",
       "dev": true
     },
     "@types/parse-json": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/parse-json/-/parse-json-4.0.0.tgz",
       "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
       "dev": true
     },
     "@types/qs": {
       "version": "6.9.7",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/qs/-/qs-6.9.7.tgz",
       "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
       "dev": true
     },
     "@types/range-parser": {
       "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/range-parser/-/range-parser-1.2.4.tgz",
       "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==",
       "dev": true
     },
     "@types/retry": {
       "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/retry/-/retry-0.12.0.tgz",
       "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
       "dev": true
     },
+    "@types/send": {
+      "version": "0.17.1",
+      "resolved": "https://registry.npmmirror.com/@types/send/-/send-0.17.1.tgz",
+      "integrity": "sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==",
+      "dev": true,
+      "requires": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
     "@types/serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==",
       "dev": true,
       "requires": {
@@ -12679,9 +12693,9 @@
       }
     },
     "@types/serve-static": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz",
-      "integrity": "sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==",
+      "version": "1.15.1",
+      "resolved": "https://registry.npmmirror.com/@types/serve-static/-/serve-static-1.15.1.tgz",
+      "integrity": "sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==",
       "dev": true,
       "requires": {
         "@types/mime": "*",
@@ -12690,7 +12704,7 @@
     },
     "@types/sockjs": {
       "version": "0.3.33",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz",
+      "resolved": "https://registry.npmmirror.com/@types/sockjs/-/sockjs-0.3.33.tgz",
       "integrity": "sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==",
       "dev": true,
       "requires": {
@@ -12698,9 +12712,9 @@
       }
     },
     "@types/ws": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz",
-      "integrity": "sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==",
+      "version": "8.5.5",
+      "resolved": "https://registry.npmmirror.com/@types/ws/-/ws-8.5.5.tgz",
+      "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -12708,19 +12722,19 @@
     },
     "@vue/babel-helper-vue-jsx-merge-props": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.4.0.tgz",
       "integrity": "sha512-JkqXfCkUDp4PIlFdDQ0TdXoIejMtTHP67/pvxlgeY+u5k3LEdKuWZ3LK6xkxo52uDoABIVyRwqVkfLQJhk7VBA==",
       "dev": true
     },
     "@vue/babel-helper-vue-transform-on": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.0.2.tgz",
       "integrity": "sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==",
       "dev": true
     },
     "@vue/babel-plugin-jsx": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-jsx/-/babel-plugin-jsx-1.1.1.tgz",
       "integrity": "sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==",
       "dev": true,
       "requires": {
@@ -12737,7 +12751,7 @@
     },
     "@vue/babel-plugin-transform-vue-jsx": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-1.4.0.tgz",
       "integrity": "sha512-Fmastxw4MMx0vlgLS4XBX0XiBbUFzoMGeVXuMV08wyOfXdikAFqBTuYPR0tlk+XskL19EzHc39SgjrPGY23JnA==",
       "dev": true,
       "requires": {
@@ -12751,7 +12765,7 @@
       "dependencies": {
         "html-tags": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-2.0.0.tgz",
           "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
           "dev": true
         }
@@ -12759,7 +12773,7 @@
     },
     "@vue/babel-preset-app": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-preset-app/-/babel-preset-app-5.0.8.tgz",
       "integrity": "sha512-yl+5qhpjd8e1G4cMXfORkkBlvtPCIgmRf3IYCWYDKIQ7m+PPa5iTm4feiNmCMD6yGqQWMhhK/7M3oWGL9boKwg==",
       "dev": true,
       "requires": {
@@ -12781,20 +12795,35 @@
         "semver": "^7.3.4"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
     "@vue/babel-preset-jsx": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-preset-jsx/-/babel-preset-jsx-1.4.0.tgz",
       "integrity": "sha512-QmfRpssBOPZWL5xw7fOuHNifCQcNQC1PrOo/4fu6xlhlKJJKSA3HqX92Nvgyx8fqHZTUGMPHmFA+IDqwXlqkSA==",
       "dev": true,
       "requires": {
@@ -12810,7 +12839,7 @@
     },
     "@vue/babel-sugar-composition-api-inject-h": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-inject-h/-/babel-sugar-composition-api-inject-h-1.4.0.tgz",
       "integrity": "sha512-VQq6zEddJHctnG4w3TfmlVp5FzDavUSut/DwR0xVoe/mJKXyMcsIibL42wPntozITEoY90aBV0/1d2KjxHU52g==",
       "dev": true,
       "requires": {
@@ -12819,7 +12848,7 @@
     },
     "@vue/babel-sugar-composition-api-render-instance": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-composition-api-render-instance/-/babel-sugar-composition-api-render-instance-1.4.0.tgz",
       "integrity": "sha512-6ZDAzcxvy7VcnCjNdHJ59mwK02ZFuP5CnucloidqlZwVQv5CQLijc3lGpR7MD3TWFi78J7+a8J56YxbCtHgT9Q==",
       "dev": true,
       "requires": {
@@ -12828,7 +12857,7 @@
     },
     "@vue/babel-sugar-functional-vue": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-functional-vue/-/babel-sugar-functional-vue-1.4.0.tgz",
       "integrity": "sha512-lTEB4WUFNzYt2In6JsoF9sAYVTo84wC4e+PoZWSgM6FUtqRJz7wMylaEhSRgG71YF+wfLD6cc9nqVeXN2rwBvw==",
       "dev": true,
       "requires": {
@@ -12837,7 +12866,7 @@
     },
     "@vue/babel-sugar-inject-h": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-inject-h/-/babel-sugar-inject-h-1.4.0.tgz",
       "integrity": "sha512-muwWrPKli77uO2fFM7eA3G1lAGnERuSz2NgAxuOLzrsTlQl8W4G+wwbM4nB6iewlKbwKRae3nL03UaF5ffAPMA==",
       "dev": true,
       "requires": {
@@ -12846,7 +12875,7 @@
     },
     "@vue/babel-sugar-v-model": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-v-model/-/babel-sugar-v-model-1.4.0.tgz",
       "integrity": "sha512-0t4HGgXb7WHYLBciZzN5s0Hzqan4Ue+p/3FdQdcaHAb7s5D9WZFGoSxEZHrR1TFVZlAPu1bejTKGeAzaaG3NCQ==",
       "dev": true,
       "requires": {
@@ -12860,13 +12889,13 @@
       "dependencies": {
         "camelcase": {
           "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
           "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         },
         "html-tags": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-2.0.0.tgz",
           "integrity": "sha512-+Il6N8cCo2wB/Vd3gqy/8TZhTD3QvcVeQLCnZiGkGCH3JP28IgGAY41giccp2W4R3jfyJPAP318FQTa1yU7K7g==",
           "dev": true
         }
@@ -12874,7 +12903,7 @@
     },
     "@vue/babel-sugar-v-on": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/babel-sugar-v-on/-/babel-sugar-v-on-1.4.0.tgz",
       "integrity": "sha512-m+zud4wKLzSKgQrWwhqRObWzmTuyzl6vOP7024lrpeJM4x2UhQtRDLgYjXAw9xBXjCwS0pP9kXjg91F9ZNo9JA==",
       "dev": true,
       "requires": {
@@ -12885,7 +12914,7 @@
       "dependencies": {
         "camelcase": {
           "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+          "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-5.3.1.tgz",
           "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
           "dev": true
         }
@@ -12893,13 +12922,13 @@
     },
     "@vue/cli-overlay": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-overlay/-/cli-overlay-5.0.8.tgz",
       "integrity": "sha512-KmtievE/B4kcXp6SuM2gzsnSd8WebkQpg3XaB6GmFh1BJGRqa1UiW9up7L/Q67uOdTigHxr5Ar2lZms4RcDjwQ==",
       "dev": true
     },
     "@vue/cli-plugin-babel": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-babel/-/cli-plugin-babel-5.0.8.tgz",
       "integrity": "sha512-a4qqkml3FAJ3auqB2kN2EMPocb/iu0ykeELwed+9B1c1nQ1HKgslKMHMPavYx3Cd/QAx2mBD4hwKBqZXEI/CsQ==",
       "dev": true,
       "requires": {
@@ -12913,7 +12942,7 @@
     },
     "@vue/cli-plugin-eslint": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-eslint/-/cli-plugin-eslint-5.0.8.tgz",
       "integrity": "sha512-d11+I5ONYaAPW1KyZj9GlrV/E6HZePq5L5eAF5GgoVdu6sxr6bDgEoxzhcS1Pk2eh8rn1MxG/FyyR+eCBj/CNg==",
       "dev": true,
       "requires": {
@@ -12922,91 +12951,11 @@
         "globby": "^11.0.2",
         "webpack": "^5.54.0",
         "yorkie": "^2.0.0"
-      },
-      "dependencies": {
-        "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.1",
-            "json-schema-traverse": "^1.0.0",
-            "require-from-string": "^2.0.2",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "ajv-keywords": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^3.1.3"
-          }
-        },
-        "eslint-webpack-plugin": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
-          "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
-          "dev": true,
-          "requires": {
-            "@types/eslint": "^7.29.0 || ^8.4.1",
-            "jest-worker": "^28.0.2",
-            "micromatch": "^4.0.5",
-            "normalize-path": "^3.0.0",
-            "schema-utils": "^4.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "jest-worker": {
-          "version": "28.1.3",
-          "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz",
-          "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
-          "dev": true,
-          "requires": {
-            "@types/node": "*",
-            "merge-stream": "^2.0.0",
-            "supports-color": "^8.0.0"
-          }
-        },
-        "json-schema-traverse": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-          "dev": true
-        },
-        "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
-          "dev": true,
-          "requires": {
-            "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
-            "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
       }
     },
     "@vue/cli-plugin-router": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-router/-/cli-plugin-router-5.0.8.tgz",
       "integrity": "sha512-Gmv4dsGdAsWPqVijz3Ux2OS2HkMrWi1ENj2cYL75nUeL+Xj5HEstSqdtfZ0b1q9NCce+BFB6QnHfTBXc/fCvMg==",
       "dev": true,
       "requires": {
@@ -13015,14 +12964,14 @@
     },
     "@vue/cli-plugin-vuex": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-plugin-vuex/-/cli-plugin-vuex-5.0.8.tgz",
       "integrity": "sha512-HSYWPqrunRE5ZZs8kVwiY6oWcn95qf/OQabwLfprhdpFWAGtLStShjsGED2aDpSSeGAskQETrtR/5h7VqgIlBA==",
       "dev": true,
       "requires": {}
     },
     "@vue/cli-service": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-service/-/cli-service-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-service/-/cli-service-5.0.8.tgz",
       "integrity": "sha512-nV7tYQLe7YsTtzFrfOMIHc5N2hp5lHG2rpYr0aNja9rNljdgcPZLyQRb2YRivTHqTv7lI962UXFURcpStHgyFw==",
       "dev": true,
       "requires": {
@@ -13081,19 +13030,11 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        }
       }
     },
     "@vue/cli-shared-utils": {
       "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/cli-shared-utils/-/cli-shared-utils-5.0.8.tgz",
       "integrity": "sha512-uK2YB7bBVuQhjOJF+O52P9yFMXeJVj7ozqJkwYE9PlMHL1LMHjtCYm4cSdOebuPzyP+/9p0BimM/OqxsevIopQ==",
       "dev": true,
       "requires": {
@@ -13113,7 +13054,7 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -13122,7 +13063,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
@@ -13132,7 +13073,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -13141,20 +13082,29 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
@@ -13162,19 +13112,25 @@
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
             "has-flag": "^4.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
     "@vue/compiler-sfc": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.13.tgz",
-      "integrity": "sha512-zzu2rLRZlgIU+OT3Atbr7Y6PG+LW4wVQpPfNRrGDH3dM9PsrcVfa+1pKb8bW467bGM3aDOvAnsYLWVpYIv3GRg==",
+      "version": "2.7.14",
+      "resolved": "https://registry.npmmirror.com/@vue/compiler-sfc/-/compiler-sfc-2.7.14.tgz",
+      "integrity": "sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==",
       "requires": {
         "@babel/parser": "^7.18.4",
         "postcss": "^8.4.14",
@@ -13183,7 +13139,7 @@
     },
     "@vue/component-compiler-utils": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz",
       "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==",
       "dev": true,
       "requires": {
@@ -13200,13 +13156,13 @@
       "dependencies": {
         "hash-sum": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
           "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
           "dev": true
         },
         "lru-cache": {
           "version": "4.1.5",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-4.1.5.tgz",
           "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
           "dev": true,
           "requires": {
@@ -13216,13 +13172,13 @@
         },
         "picocolors": {
           "version": "0.2.1",
-          "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz",
+          "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-0.2.1.tgz",
           "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
           "dev": true
         },
         "postcss": {
           "version": "7.0.39",
-          "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz",
+          "resolved": "https://registry.npmmirror.com/postcss/-/postcss-7.0.39.tgz",
           "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==",
           "dev": true,
           "requires": {
@@ -13232,16 +13188,16 @@
         },
         "yallist": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-2.1.2.tgz",
           "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==",
           "dev": true
         }
       }
     },
     "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.0.tgz",
-      "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
+      "version": "npm:vue-loader@15.10.1",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
+      "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
       "dev": true,
       "requires": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -13253,29 +13209,9 @@
       "dependencies": {
         "hash-sum": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
           "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
           "dev": true
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
         }
       }
     },
@@ -13286,166 +13222,166 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.5.tgz",
-      "integrity": "sha512-LHY/GSAZZRpsNQH+/oHqhRQ5FT7eoULcBqgfyTB5nQHogFnK3/7QoN7dLnwSE/JkUAF0SrRuclT7ODqMFtWxxQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-numbers": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5"
+        "@webassemblyjs/helper-numbers": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.5.tgz",
-      "integrity": "sha512-1j1zTIC5EZOtCplMBG/IEwLtUojtwFVwdyVMbL/hwWqbzlQoJsWCOavrdnLkemwNoC/EOwtUFch3fuo+cbcXYQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.5.tgz",
-      "integrity": "sha512-L65bDPmfpY0+yFrsgz8b6LhXmbbs38OnwDCf6NpnMUYqa+ENfE5Dq9E42ny0qz/PdR0LJyq/T5YijPnU8AXEpA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.5.tgz",
-      "integrity": "sha512-fDKo1gstwFFSfacIeH5KfwzjykIE6ldh1iH9Y/8YkAZrhmu4TctqYjSh7t0K2VyDSXOZJ1MLhht/k9IvYGcIxg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
       "dev": true
     },
     "@webassemblyjs/helper-numbers": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.5.tgz",
-      "integrity": "sha512-DhykHXM0ZABqfIGYNv93A5KKDw/+ywBFnuWybZZWcuzWHfbp21wUfRkbtz7dMGwGgT4iXjWuhRMA2Mzod6W4WA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/floating-point-hex-parser": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
+        "@webassemblyjs/floating-point-hex-parser": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.5.tgz",
-      "integrity": "sha512-oC4Qa0bNcqnjAowFn7MPCETQgDYytpsfvz4ujZz63Zu/a/v71HeCAAmZsgZ3YVKec3zSPYytG3/PrRCqbtcAvA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.5.tgz",
-      "integrity": "sha512-uEoThA1LN2NA+K3B9wDo3yKlBfVtC6rh0i4/6hvbz071E8gTNZD/pT0MsBf7MeD6KbApMSkaAK0XeKyOZC7CIA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.5.tgz",
-      "integrity": "sha512-37aGq6qVL8A8oPbPrSGMBcp38YZFXcHfiROflJn9jxSdSMMM5dS5P/9e2/TpaJuhE+wFrbukN2WI6Hw9MH5acg==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.5.tgz",
-      "integrity": "sha512-ajqrRSXaTJoPW+xmkfYN6l8VIeNnR4vBOTQO9HzR7IygoCcKWkICbKFbVTNMjMgMREqXEr0+2M6zukzM47ZUfQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.5.tgz",
-      "integrity": "sha512-WiOhulHKTZU5UPlRl53gHR8OxdGsSOxqfpqWeA2FmcwBMaoEdz6b2x2si3IwC9/fSPLfe8pBMRTHVMk5nlwnFQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.5.tgz",
-      "integrity": "sha512-C0p9D2fAu3Twwqvygvf42iGCQ4av8MFBLiTb+08SZ4cEdwzWx9QeAHDo1E2k+9s/0w1DM40oflJOpkZ8jW4HCQ==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/helper-wasm-section": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-opt": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5",
-        "@webassemblyjs/wast-printer": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/helper-wasm-section": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-opt": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6",
+        "@webassemblyjs/wast-printer": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.5.tgz",
-      "integrity": "sha512-14vteRlRjxLK9eSyYFvw1K8Vv+iPdZU0Aebk3j6oB8TQiQYuO6hj9s4d7qf6f2HJr2khzvNldAFG13CgdkAIfA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.5.tgz",
-      "integrity": "sha512-tcKwlIXstBQgbKy1MlbDMlXaxpucn42eb17H29rawYLxm5+MsEmgPzeCP8B1Cl69hCice8LeKgZpRUAPtqYPgw==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-buffer": "1.11.5",
-        "@webassemblyjs/wasm-gen": "1.11.5",
-        "@webassemblyjs/wasm-parser": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-buffer": "1.11.6",
+        "@webassemblyjs/wasm-gen": "1.11.6",
+        "@webassemblyjs/wasm-parser": "1.11.6"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.5.tgz",
-      "integrity": "sha512-SVXUIwsLQlc8srSD7jejsfTU83g7pIGr2YYNb9oHdtldSxaOhvA5xwvIiWIfcX8PlSakgqMXsLpLfbbJ4cBYew==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
-        "@webassemblyjs/helper-api-error": "1.11.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.11.5",
-        "@webassemblyjs/ieee754": "1.11.5",
-        "@webassemblyjs/leb128": "1.11.5",
-        "@webassemblyjs/utf8": "1.11.5"
+        "@webassemblyjs/ast": "1.11.6",
+        "@webassemblyjs/helper-api-error": "1.11.6",
+        "@webassemblyjs/helper-wasm-bytecode": "1.11.6",
+        "@webassemblyjs/ieee754": "1.11.6",
+        "@webassemblyjs/leb128": "1.11.6",
+        "@webassemblyjs/utf8": "1.11.6"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.11.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.5.tgz",
-      "integrity": "sha512-f7Pq3wvg3GSPUPzR0F6bmI89Hdb+u9WXrSKc4v+N0aV0q6r42WoF92Jp2jEorBEBRoRNXgjp53nBniDXcqZYPA==",
+      "version": "1.11.6",
+      "resolved": "https://registry.npmmirror.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.11.5",
+        "@webassemblyjs/ast": "1.11.6",
         "@xtuc/long": "4.2.2"
       }
     },
     "@xtuc/ieee754": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
       "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true
     },
     "@xtuc/long": {
       "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "resolved": "https://registry.npmmirror.com/@xtuc/long/-/long-4.2.2.tgz",
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true
     },
     "accepts": {
       "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "resolved": "https://registry.npmmirror.com/accepts/-/accepts-1.3.8.tgz",
       "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
       "dev": true,
       "requires": {
@@ -13454,11 +13390,18 @@
       }
     },
     "acorn": {
-      "version": "7.4.1",
-      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
-      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "version": "8.9.0",
+      "resolved": "https://registry.npmmirror.com/acorn/-/acorn-8.9.0.tgz",
+      "integrity": "sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==",
       "dev": true
     },
+    "acorn-import-assertions": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
+      "dev": true,
+      "requires": {}
+    },
     "acorn-jsx": {
       "version": "5.3.2",
       "resolved": "https://registry.npmmirror.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@@ -13468,14 +13411,14 @@
     },
     "acorn-walk": {
       "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/acorn-walk/-/acorn-walk-8.2.0.tgz",
       "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true
     },
     "address": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/address/-/address-1.2.1.tgz",
-      "integrity": "sha512-B+6bi5D34+fDYENiH5qOlA0cV2rAGKuWZ9LeyUUehbXy8e0VS9e498yO0Jeeh+iM+6KbfudHTFjXw2MmJD4QRA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/address/-/address-1.2.2.tgz",
+      "integrity": "sha512-4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==",
       "dev": true
     },
     "ajv": {
@@ -13492,7 +13435,7 @@
     },
     "ajv-formats": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ajv-formats/-/ajv-formats-2.1.1.tgz",
       "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
       "requires": {
@@ -13500,9 +13443,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -13513,7 +13456,7 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
         }
@@ -13526,18 +13469,21 @@
       "dev": true,
       "requires": {}
     },
+    "ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmmirror.com/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true
+    },
     "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dev": true,
-      "requires": {
-        "type-fest": "^0.21.3"
-      }
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+      "dev": true
     },
     "ansi-html-community": {
       "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "resolved": "https://registry.npmmirror.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
       "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
       "dev": true
     },
@@ -13563,9 +13509,9 @@
       "dev": true
     },
     "anymatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
-      "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "dev": true,
       "requires": {
         "normalize-path": "^3.0.0",
@@ -13589,25 +13535,25 @@
     },
     "array-flatten": {
       "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-2.1.2.tgz",
       "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
       "dev": true
     },
     "array-union": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/array-union/-/array-union-2.1.0.tgz",
       "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true
     },
     "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmmirror.com/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true
     },
     "async": {
       "version": "2.6.4",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+      "resolved": "https://registry.npmmirror.com/async/-/async-2.6.4.tgz",
       "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
       "dev": true,
       "requires": {
@@ -13621,18 +13567,18 @@
     },
     "at-least-node": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/at-least-node/-/at-least-node-1.0.0.tgz",
       "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true
     },
     "autoprefixer": {
-      "version": "10.4.12",
-      "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.12.tgz",
-      "integrity": "sha512-WrCGV9/b97Pa+jtwf5UGaRjgQIg7OK3D06GnoYoZNcG1Xb8Gt3EfuKjlhh9i/VtT16g6PYjZ69jdJ2g8FxSC4Q==",
+      "version": "10.4.14",
+      "resolved": "https://registry.npmmirror.com/autoprefixer/-/autoprefixer-10.4.14.tgz",
+      "integrity": "sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.21.4",
-        "caniuse-lite": "^1.0.30001407",
+        "browserslist": "^4.21.5",
+        "caniuse-lite": "^1.0.30001464",
         "fraction.js": "^4.2.0",
         "normalize-range": "^0.1.2",
         "picocolors": "^1.0.0",
@@ -13640,56 +13586,43 @@
       }
     },
     "axios": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.1.3.tgz",
-      "integrity": "sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/axios/-/axios-1.4.0.tgz",
+      "integrity": "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==",
       "requires": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
-      },
-      "dependencies": {
-        "form-data": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
-          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
-          "requires": {
-            "asynckit": "^0.4.0",
-            "combined-stream": "^1.0.8",
-            "mime-types": "^2.1.12"
-          }
-        }
-      }
-    },
-    "babel-eslint": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmmirror.com/babel-eslint/-/babel-eslint-10.1.0.tgz",
-      "integrity": "sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "@babel/parser": "^7.7.0",
-        "@babel/traverse": "^7.7.0",
-        "@babel/types": "^7.7.0",
-        "eslint-visitor-keys": "^1.0.0",
-        "resolve": "^1.12.0"
       }
     },
     "babel-loader": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.2.5.tgz",
-      "integrity": "sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.3.0.tgz",
+      "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==",
       "dev": true,
       "requires": {
         "find-cache-dir": "^3.3.1",
         "loader-utils": "^2.0.0",
         "make-dir": "^3.1.0",
         "schema-utils": "^2.6.5"
+      },
+      "dependencies": {
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        }
       }
     },
     "babel-plugin-dynamic-import-node": {
       "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz",
       "integrity": "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==",
       "dev": true,
       "requires": {
@@ -13697,33 +13630,33 @@
       }
     },
     "babel-plugin-polyfill-corejs2": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz",
-      "integrity": "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.3.tgz",
+      "integrity": "sha512-bM3gHc337Dta490gg+/AseNB9L4YLHxq1nGKZZSHbhXv4aTYU2MD2cjza1Ru4S6975YLTaL1K8uJf6ukJhhmtw==",
       "dev": true,
       "requires": {
         "@babel/compat-data": "^7.17.7",
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
         "semver": "^6.1.1"
       }
     },
     "babel-plugin-polyfill-corejs3": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz",
-      "integrity": "sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==",
+      "version": "0.8.1",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.1.tgz",
+      "integrity": "sha512-ikFrZITKg1xH6pLND8zT14UPgjKHiGLqex7rGEZCH2EvhsneJaJPemmpQaIZV5AL03II+lXylw3UmddDK8RU5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3",
-        "core-js-compat": "^3.25.1"
+        "@babel/helper-define-polyfill-provider": "^0.4.0",
+        "core-js-compat": "^3.30.1"
       }
     },
     "babel-plugin-polyfill-regenerator": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz",
-      "integrity": "sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==",
+      "version": "0.5.0",
+      "resolved": "https://registry.npmmirror.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.0.tgz",
+      "integrity": "sha512-hDJtKjMLVa7Z+LwnTCxoDLQj6wdc+B8dun7ayF2fYieI6OzfuvcLMB32ihJZ4UhCBwNYGl5bg/x/P9cMdnkc2g==",
       "dev": true,
       "requires": {
-        "@babel/helper-define-polyfill-provider": "^0.3.3"
+        "@babel/helper-define-polyfill-provider": "^0.4.0"
       }
     },
     "balanced-match": {
@@ -13734,13 +13667,13 @@
     },
     "base64-js": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "resolved": "https://registry.npmmirror.com/base64-js/-/base64-js-1.5.1.tgz",
       "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true
     },
     "batch": {
       "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "resolved": "https://registry.npmmirror.com/batch/-/batch-0.6.1.tgz",
       "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==",
       "dev": true
     },
@@ -13752,13 +13685,13 @@
     },
     "binary-extensions": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/binary-extensions/-/binary-extensions-2.2.0.tgz",
       "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "dev": true
     },
     "bl": {
       "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/bl/-/bl-4.1.0.tgz",
       "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
       "dev": true,
       "requires": {
@@ -13769,13 +13702,13 @@
     },
     "bluebird": {
       "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "resolved": "https://registry.npmmirror.com/bluebird/-/bluebird-3.7.2.tgz",
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
     "body-parser": {
       "version": "1.20.1",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+      "resolved": "https://registry.npmmirror.com/body-parser/-/body-parser-1.20.1.tgz",
       "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
       "dev": true,
       "requires": {
@@ -13795,13 +13728,13 @@
       "dependencies": {
         "bytes": {
           "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
           "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
           "dev": true
         },
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -13810,16 +13743,16 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
     },
     "bonjour-service": {
-      "version": "1.0.14",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.14.tgz",
-      "integrity": "sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmmirror.com/bonjour-service/-/bonjour-service-1.1.1.tgz",
+      "integrity": "sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==",
       "dev": true,
       "requires": {
         "array-flatten": "^2.1.2",
@@ -13830,7 +13763,7 @@
     },
     "boolbase": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/boolbase/-/boolbase-1.0.0.tgz",
       "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
       "dev": true
     },
@@ -13846,7 +13779,7 @@
     },
     "braces": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/braces/-/braces-3.0.2.tgz",
       "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "dev": true,
       "requires": {
@@ -13854,20 +13787,20 @@
       }
     },
     "browserslist": {
-      "version": "4.21.4",
-      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.4.tgz",
-      "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==",
+      "version": "4.21.9",
+      "resolved": "https://registry.npmmirror.com/browserslist/-/browserslist-4.21.9.tgz",
+      "integrity": "sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001400",
-        "electron-to-chromium": "^1.4.251",
-        "node-releases": "^2.0.6",
-        "update-browserslist-db": "^1.0.9"
+        "caniuse-lite": "^1.0.30001503",
+        "electron-to-chromium": "^1.4.431",
+        "node-releases": "^2.0.12",
+        "update-browserslist-db": "^1.0.11"
       }
     },
     "buffer": {
       "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "resolved": "https://registry.npmmirror.com/buffer/-/buffer-5.7.1.tgz",
       "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
       "requires": {
@@ -13877,19 +13810,19 @@
     },
     "buffer-from": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
       "dev": true
     },
     "bytes": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.0.0.tgz",
       "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true
     },
     "call-bind": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dev": true,
       "requires": {
@@ -13897,33 +13830,31 @@
         "get-intrinsic": "^1.0.2"
       }
     },
+    "callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true
+    },
     "camel-case": {
       "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/camel-case/-/camel-case-4.1.2.tgz",
       "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
       "dev": true,
       "requires": {
         "pascal-case": "^3.1.2",
         "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "camelcase": {
       "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true
     },
     "caniuse-api": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz",
       "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
       "dev": true,
       "requires": {
@@ -13934,9 +13865,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001426",
-      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz",
-      "integrity": "sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A==",
+      "version": "1.0.30001505",
+      "resolved": "https://registry.npmmirror.com/caniuse-lite/-/caniuse-lite-1.0.30001505.tgz",
+      "integrity": "sha512-jaAOR5zVtxHfL0NjZyflVTtXm3D3J9P15zSJ7HmQF8dSKGA6tqzQq+0ZI3xkjyQj46I4/M0K2GbMpcAFOcbr3A==",
       "dev": true
     },
     "case-sensitive-paths-webpack-plugin": {
@@ -13956,15 +13887,9 @@
         "supports-color": "^5.3.0"
       }
     },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmmirror.com/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
     "chokidar": {
       "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
       "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "dev": true,
       "requires": {
@@ -13980,7 +13905,7 @@
       "dependencies": {
         "glob-parent": {
           "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
           "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
           "dev": true,
           "requires": {
@@ -14002,9 +13927,9 @@
       "dev": true
     },
     "clean-css": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.1.tgz",
-      "integrity": "sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmmirror.com/clean-css/-/clean-css-5.3.2.tgz",
+      "integrity": "sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==",
       "dev": true,
       "requires": {
         "source-map": "~0.6.0"
@@ -14085,15 +14010,9 @@
       }
     },
     "cli-spinners": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
-      "dev": true
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmmirror.com/cli-spinners/-/cli-spinners-2.9.0.tgz",
+      "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==",
       "dev": true
     },
     "clipboardy": {
@@ -14109,7 +14028,7 @@
     },
     "cliui": {
       "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/cliui/-/cliui-7.0.4.tgz",
       "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
       "requires": {
@@ -14120,13 +14039,13 @@
     },
     "clone": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/clone/-/clone-1.0.4.tgz",
       "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
       "dev": true
     },
     "clone-deep": {
       "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/clone-deep/-/clone-deep-4.0.1.tgz",
       "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
       "dev": true,
       "requires": {
@@ -14152,14 +14071,14 @@
     },
     "colord": {
       "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "resolved": "https://registry.npmmirror.com/colord/-/colord-2.9.3.tgz",
       "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "dev": true
     },
     "colorette": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz",
-      "integrity": "sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==",
+      "version": "2.0.20",
+      "resolved": "https://registry.npmmirror.com/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
       "dev": true
     },
     "combined-stream": {
@@ -14172,7 +14091,7 @@
     },
     "commander": {
       "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/commander/-/commander-8.3.0.tgz",
       "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "dev": true
     },
@@ -14184,7 +14103,7 @@
     },
     "compressible": {
       "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "resolved": "https://registry.npmmirror.com/compressible/-/compressible-2.0.18.tgz",
       "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dev": true,
       "requires": {
@@ -14193,7 +14112,7 @@
     },
     "compression": {
       "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+      "resolved": "https://registry.npmmirror.com/compression/-/compression-1.7.4.tgz",
       "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
       "dev": true,
       "requires": {
@@ -14208,7 +14127,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -14217,13 +14136,13 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "dev": true
         }
@@ -14237,13 +14156,13 @@
     },
     "connect-history-api-fallback": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
       "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
       "dev": true
     },
     "consolidate": {
       "version": "0.15.1",
-      "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz",
+      "resolved": "https://registry.npmmirror.com/consolidate/-/consolidate-0.15.1.tgz",
       "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==",
       "dev": true,
       "requires": {
@@ -14252,7 +14171,7 @@
     },
     "content-disposition": {
       "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "resolved": "https://registry.npmmirror.com/content-disposition/-/content-disposition-0.5.4.tgz",
       "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
       "dev": true,
       "requires": {
@@ -14260,9 +14179,9 @@
       }
     },
     "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
       "dev": true
     },
     "convert-source-map": {
@@ -14273,19 +14192,19 @@
     },
     "cookie": {
       "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cookie/-/cookie-0.5.0.tgz",
       "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
       "dev": true
     },
     "cookie-signature": {
       "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "resolved": "https://registry.npmmirror.com/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
       "dev": true
     },
     "copy-webpack-plugin": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz",
       "integrity": "sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA==",
       "dev": true,
       "requires": {
@@ -14298,9 +14217,9 @@
       },
       "dependencies": {
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -14311,29 +14230,29 @@
       }
     },
     "core-js": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.26.0.tgz",
-      "integrity": "sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw=="
+      "version": "3.31.0",
+      "resolved": "https://registry.npmmirror.com/core-js/-/core-js-3.31.0.tgz",
+      "integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
     },
     "core-js-compat": {
-      "version": "3.26.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.26.0.tgz",
-      "integrity": "sha512-piOX9Go+Z4f9ZiBFLnZ5VrOpBl0h7IGCkiFUN11QTe6LjAvOT3ifL/5TdoizMh99hcGy5SoLyWbapIY/PIb/3A==",
+      "version": "3.31.0",
+      "resolved": "https://registry.npmmirror.com/core-js-compat/-/core-js-compat-3.31.0.tgz",
+      "integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.21.4"
+        "browserslist": "^4.21.5"
       }
     },
     "core-util-is": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/core-util-is/-/core-util-is-1.0.3.tgz",
       "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
       "dev": true
     },
     "cosmiconfig": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz",
-      "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmmirror.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
       "dev": true,
       "requires": {
         "@types/parse-json": "^4.0.0",
@@ -14365,42 +14284,57 @@
       }
     },
     "css-declaration-sorter": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz",
-      "integrity": "sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmmirror.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz",
+      "integrity": "sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==",
       "dev": true,
       "requires": {}
     },
     "css-loader": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz",
-      "integrity": "sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmmirror.com/css-loader/-/css-loader-6.8.1.tgz",
+      "integrity": "sha512-xDAXtEVGlD0gJ07iclwWVkLoZOpEvAWaSyf6W18S2pOC//K8+qUDIx8IIT3D+HjnmkJPQeesOPv5aiUaJsCM2g==",
       "dev": true,
       "requires": {
         "icss-utils": "^5.1.0",
-        "postcss": "^8.4.7",
+        "postcss": "^8.4.21",
         "postcss-modules-extract-imports": "^3.0.0",
-        "postcss-modules-local-by-default": "^4.0.0",
+        "postcss-modules-local-by-default": "^4.0.3",
         "postcss-modules-scope": "^3.0.0",
         "postcss-modules-values": "^4.0.0",
         "postcss-value-parser": "^4.2.0",
-        "semver": "^7.3.5"
+        "semver": "^7.3.8"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
     "css-minimizer-webpack-plugin": {
       "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
       "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
       "dev": true,
       "requires": {
@@ -14413,9 +14347,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -14426,7 +14360,7 @@
         },
         "ajv-keywords": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
           "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "dev": true,
           "requires": {
@@ -14435,27 +14369,27 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
         }
       }
     },
     "css-select": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/css-select/-/css-select-4.3.0.tgz",
       "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dev": true,
       "requires": {
@@ -14468,7 +14402,7 @@
     },
     "css-tree": {
       "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/css-tree/-/css-tree-1.1.3.tgz",
       "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dev": true,
       "requires": {
@@ -14478,47 +14412,47 @@
     },
     "css-what": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/css-what/-/css-what-6.1.0.tgz",
       "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
       "dev": true
     },
     "cssesc": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true
     },
     "cssnano": {
-      "version": "5.1.13",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.13.tgz",
-      "integrity": "sha512-S2SL2ekdEz6w6a2epXn4CmMKU4K3KpcyXLKfAYc9UQQqJRkD/2eLUG0vJ3Db/9OvO5GuAdgXw3pFbR6abqghDQ==",
+      "version": "5.1.15",
+      "resolved": "https://registry.npmmirror.com/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "dev": true,
       "requires": {
-        "cssnano-preset-default": "^5.2.12",
+        "cssnano-preset-default": "^5.2.14",
         "lilconfig": "^2.0.3",
         "yaml": "^1.10.2"
       }
     },
     "cssnano-preset-default": {
-      "version": "5.2.12",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz",
-      "integrity": "sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==",
+      "version": "5.2.14",
+      "resolved": "https://registry.npmmirror.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
       "dev": true,
       "requires": {
-        "css-declaration-sorter": "^6.3.0",
+        "css-declaration-sorter": "^6.3.1",
         "cssnano-utils": "^3.1.0",
         "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.0",
-        "postcss-convert-values": "^5.1.2",
+        "postcss-colormin": "^5.3.1",
+        "postcss-convert-values": "^5.1.3",
         "postcss-discard-comments": "^5.1.2",
         "postcss-discard-duplicates": "^5.1.0",
         "postcss-discard-empty": "^5.1.1",
         "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.6",
-        "postcss-merge-rules": "^5.1.2",
+        "postcss-merge-longhand": "^5.1.7",
+        "postcss-merge-rules": "^5.1.4",
         "postcss-minify-font-values": "^5.1.0",
         "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.3",
+        "postcss-minify-params": "^5.1.4",
         "postcss-minify-selectors": "^5.2.1",
         "postcss-normalize-charset": "^5.1.0",
         "postcss-normalize-display-values": "^5.1.0",
@@ -14526,11 +14460,11 @@
         "postcss-normalize-repeat-style": "^5.1.1",
         "postcss-normalize-string": "^5.1.0",
         "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.0",
+        "postcss-normalize-unicode": "^5.1.1",
         "postcss-normalize-url": "^5.1.0",
         "postcss-normalize-whitespace": "^5.1.1",
         "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.0",
+        "postcss-reduce-initial": "^5.1.2",
         "postcss-reduce-transforms": "^5.1.0",
         "postcss-svgo": "^5.1.0",
         "postcss-unique-selectors": "^5.1.1"
@@ -14538,14 +14472,14 @@
     },
     "cssnano-utils": {
       "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
       "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
       "dev": true,
       "requires": {}
     },
     "csso": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/csso/-/csso-4.2.0.tgz",
       "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "dev": true,
       "requires": {
@@ -14553,15 +14487,9 @@
       }
     },
     "csstype": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.1.tgz",
-      "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
-    },
-    "de-indent": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/de-indent/-/de-indent-1.0.2.tgz",
-      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
-      "dev": true
+      "version": "3.1.2",
+      "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "debug": {
       "version": "4.3.4",
@@ -14586,7 +14514,7 @@
     },
     "default-gateway": {
       "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/default-gateway/-/default-gateway-6.0.3.tgz",
       "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
       "dev": true,
       "requires": {
@@ -14595,7 +14523,7 @@
       "dependencies": {
         "cross-spawn": {
           "version": "7.0.3",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
           "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
           "dev": true,
           "requires": {
@@ -14606,7 +14534,7 @@
         },
         "execa": {
           "version": "5.1.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+          "resolved": "https://registry.npmmirror.com/execa/-/execa-5.1.1.tgz",
           "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
           "dev": true,
           "requires": {
@@ -14623,19 +14551,19 @@
         },
         "get-stream": {
           "version": "6.0.1",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/get-stream/-/get-stream-6.0.1.tgz",
           "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
           "dev": true
         },
         "is-stream": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-2.0.1.tgz",
           "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
           "dev": true
         },
         "npm-run-path": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/npm-run-path/-/npm-run-path-4.0.1.tgz",
           "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
           "dev": true,
           "requires": {
@@ -14644,13 +14572,13 @@
         },
         "path-key": {
           "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
           "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
           "dev": true
         },
         "shebang-command": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
           "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
           "dev": true,
           "requires": {
@@ -14659,13 +14587,13 @@
         },
         "shebang-regex": {
           "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
           "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
           "dev": true
         },
         "which": {
           "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
           "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
           "dev": true,
           "requires": {
@@ -14676,7 +14604,7 @@
     },
     "defaults": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/defaults/-/defaults-1.0.4.tgz",
       "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dev": true,
       "requires": {
@@ -14685,14 +14613,14 @@
     },
     "define-lazy-prop": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
       "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "dev": true
     },
     "define-properties": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-      "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
       "requires": {
         "has-property-descriptors": "^1.0.0",
@@ -14706,25 +14634,25 @@
     },
     "depd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/depd/-/depd-2.0.0.tgz",
       "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true
     },
     "destroy": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/destroy/-/destroy-1.2.0.tgz",
       "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "dev": true
     },
     "detect-node": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/detect-node/-/detect-node-2.1.0.tgz",
       "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
       "dev": true
     },
     "dir-glob": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/dir-glob/-/dir-glob-3.0.1.tgz",
       "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
       "requires": {
@@ -14733,14 +14661,14 @@
     },
     "dns-equal": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/dns-equal/-/dns-equal-1.0.0.tgz",
       "integrity": "sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==",
       "dev": true
     },
     "dns-packet": {
-      "version": "5.4.0",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz",
-      "integrity": "sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmmirror.com/dns-packet/-/dns-packet-5.6.0.tgz",
+      "integrity": "sha512-rza3UH1LwdHh9qyPXp8lkwpjSNk/AMD3dPytUoRoqnypDUhY0xvbdmVhWOfxO68frEfV9BU8V12Ez7ZsHGZpCQ==",
       "dev": true,
       "requires": {
         "@leichtgewicht/ip-codec": "^2.0.1"
@@ -14757,7 +14685,7 @@
     },
     "dom-converter": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/dom-converter/-/dom-converter-0.2.0.tgz",
       "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
       "dev": true,
       "requires": {
@@ -14766,7 +14694,7 @@
     },
     "dom-serializer": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/dom-serializer/-/dom-serializer-1.4.1.tgz",
       "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dev": true,
       "requires": {
@@ -14777,13 +14705,13 @@
     },
     "domelementtype": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/domelementtype/-/domelementtype-2.3.0.tgz",
       "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true
     },
     "domhandler": {
       "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/domhandler/-/domhandler-4.3.1.tgz",
       "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dev": true,
       "requires": {
@@ -14792,7 +14720,7 @@
     },
     "domutils": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "resolved": "https://registry.npmmirror.com/domutils/-/domutils-2.8.0.tgz",
       "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dev": true,
       "requires": {
@@ -14803,25 +14731,17 @@
     },
     "dot-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/dot-case/-/dot-case-3.0.4.tgz",
       "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
       "dev": true,
       "requires": {
         "no-case": "^3.0.4",
         "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "dotenv": {
       "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-10.0.0.tgz",
       "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==",
       "dev": true
     },
@@ -14833,26 +14753,26 @@
     },
     "duplexer": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/duplexer/-/duplexer-0.1.2.tgz",
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "dev": true
     },
     "easy-stack": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/easy-stack/-/easy-stack-1.0.1.tgz",
       "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
       "dev": true
     },
     "ee-first": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
       "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==",
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.4.284",
-      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz",
-      "integrity": "sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==",
+      "version": "1.4.434",
+      "resolved": "https://registry.npmmirror.com/electron-to-chromium/-/electron-to-chromium-1.4.434.tgz",
+      "integrity": "sha512-5Gvm09UZTQRaWrimRtWRO5rvaX6Kpk5WHAPKDa7A4Gj6NIPuJ8w8WNpnxCXdd+CJJt6RBU6tUw0KyULoW6XuHw==",
       "dev": true
     },
     "emoji-regex": {
@@ -14869,7 +14789,7 @@
     },
     "encodeurl": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/encodeurl/-/encodeurl-1.0.2.tgz",
       "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "dev": true
     },
@@ -14883,24 +14803,33 @@
       }
     },
     "enhanced-resolve": {
-      "version": "5.13.0",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.13.0.tgz",
-      "integrity": "sha512-eyV8f0y1+bzyfh8xAwW/WTSZpLbjhqc4ne9eGSH4Zo2ejdyiNG9pU6mf9DG8a7+Auk6MFTlNOT4Y2y/9k8GKVg==",
+      "version": "5.15.0",
+      "resolved": "https://registry.npmmirror.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
       }
     },
+    "enquirer": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/enquirer/-/enquirer-2.3.6.tgz",
+      "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==",
+      "dev": true,
+      "requires": {
+        "ansi-colors": "^4.1.1"
+      }
+    },
     "entities": {
       "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/entities/-/entities-2.2.0.tgz",
       "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true
     },
     "error-ex": {
       "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/error-ex/-/error-ex-1.3.2.tgz",
       "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dev": true,
       "requires": {
@@ -14917,9 +14846,9 @@
       }
     },
     "es-module-lexer": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.2.1.tgz",
-      "integrity": "sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
       "dev": true
     },
     "escalade": {
@@ -14930,7 +14859,7 @@
     },
     "escape-html": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
       "dev": true
     },
@@ -14941,54 +14870,111 @@
       "dev": true
     },
     "eslint": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmmirror.com/eslint/-/eslint-6.8.0.tgz",
-      "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==",
+      "version": "7.32.0",
+      "resolved": "https://registry.npmmirror.com/eslint/-/eslint-7.32.0.tgz",
+      "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==",
       "dev": true,
       "requires": {
-        "@babel/code-frame": "^7.0.0",
+        "@babel/code-frame": "7.12.11",
+        "@eslint/eslintrc": "^0.4.3",
+        "@humanwhocodes/config-array": "^0.5.0",
         "ajv": "^6.10.0",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
-        "eslint-scope": "^5.0.0",
-        "eslint-utils": "^1.4.3",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.1.2",
-        "esquery": "^1.0.1",
+        "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^5.1.1",
+        "eslint-utils": "^2.1.0",
+        "eslint-visitor-keys": "^2.0.0",
+        "espree": "^7.3.1",
+        "esquery": "^1.4.0",
         "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
-        "glob-parent": "^5.0.0",
-        "globals": "^12.1.0",
+        "glob-parent": "^5.1.2",
+        "globals": "^13.6.0",
         "ignore": "^4.0.6",
         "import-fresh": "^3.0.0",
         "imurmurhash": "^0.1.4",
-        "inquirer": "^7.0.0",
         "is-glob": "^4.0.0",
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.14",
+        "levn": "^0.4.1",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
         "natural-compare": "^1.4.0",
-        "optionator": "^0.8.3",
+        "optionator": "^0.9.1",
         "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^6.1.2",
-        "strip-ansi": "^5.2.0",
-        "strip-json-comments": "^3.0.1",
-        "table": "^5.2.3",
+        "regexpp": "^3.1.0",
+        "semver": "^7.2.1",
+        "strip-ansi": "^6.0.0",
+        "strip-json-comments": "^3.1.0",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+        "@babel/code-frame": {
+          "version": "7.12.11",
+          "resolved": "https://registry.npmmirror.com/@babel/code-frame/-/code-frame-7.12.11.tgz",
+          "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
+          "dev": true,
+          "requires": {
+            "@babel/highlight": "^7.10.4"
+          }
+        },
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
           "dev": true
         },
         "glob-parent": {
@@ -15001,46 +14987,142 @@
           }
         },
         "globals": {
-          "version": "12.4.0",
-          "resolved": "https://registry.npmmirror.com/globals/-/globals-12.4.0.tgz",
-          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
+          "version": "13.20.0",
+          "resolved": "https://registry.npmmirror.com/globals/-/globals-13.20.0.tgz",
+          "integrity": "sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==",
           "dev": true,
           "requires": {
-            "type-fest": "^0.8.1"
+            "type-fest": "^0.20.2"
           }
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "ignore": {
+          "version": "4.0.6",
+          "resolved": "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
           "dev": true,
           "requires": {
-            "ansi-regex": "^4.1.0"
+            "yallist": "^4.0.0"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmmirror.com/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmmirror.com/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
+          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         },
         "type-fest": {
-          "version": "0.8.1",
-          "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
-          "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+          "version": "0.20.2",
+          "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.20.2.tgz",
+          "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmmirror.com/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "dev": true
         }
       }
     },
     "eslint-plugin-vue": {
-      "version": "6.2.2",
-      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-6.2.2.tgz",
-      "integrity": "sha512-Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ==",
+      "version": "8.7.1",
+      "resolved": "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz",
+      "integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==",
       "dev": true,
       "requires": {
+        "eslint-utils": "^3.0.0",
         "natural-compare": "^1.4.0",
-        "semver": "^5.6.0",
-        "vue-eslint-parser": "^7.0.0"
+        "nth-check": "^2.0.1",
+        "postcss-selector-parser": "^6.0.9",
+        "semver": "^7.3.5",
+        "vue-eslint-parser": "^8.0.1"
       },
       "dependencies": {
+        "eslint-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-3.0.0.tgz",
+          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
           "dev": true
         }
       }
@@ -15056,29 +15138,131 @@
       }
     },
     "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/eslint-utils/-/eslint-utils-2.1.0.tgz",
+      "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
+      },
+      "dependencies": {
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
-    "espree": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmmirror.com/espree/-/espree-6.2.1.tgz",
-      "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==",
+    "eslint-webpack-plugin": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz",
+      "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==",
       "dev": true,
       "requires": {
-        "acorn": "^7.1.1",
-        "acorn-jsx": "^5.2.0",
-        "eslint-visitor-keys": "^1.1.0"
+        "@types/eslint": "^7.29.0 || ^8.4.1",
+        "jest-worker": "^28.0.2",
+        "micromatch": "^4.0.5",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0"
+      },
+      "dependencies": {
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
+          }
+        },
+        "ajv-keywords": {
+          "version": "5.1.0",
+          "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+          "dev": true,
+          "requires": {
+            "fast-deep-equal": "^3.1.3"
+          }
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "jest-worker": {
+          "version": "28.1.3",
+          "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-28.1.3.tgz",
+          "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==",
+          "dev": true,
+          "requires": {
+            "@types/node": "*",
+            "merge-stream": "^2.0.0",
+            "supports-color": "^8.0.0"
+          }
+        },
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
+        },
+        "schema-utils": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
+          "dev": true,
+          "requires": {
+            "@types/json-schema": "^7.0.9",
+            "ajv": "^8.9.0",
+            "ajv-formats": "^2.1.1",
+            "ajv-keywords": "^5.1.0"
+          }
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "espree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmmirror.com/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
+      "dev": true,
+      "requires": {
+        "acorn": "^7.4.0",
+        "acorn-jsx": "^5.3.1",
+        "eslint-visitor-keys": "^1.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "7.4.1",
+          "resolved": "https://registry.npmmirror.com/acorn/-/acorn-7.4.1.tgz",
+          "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+          "dev": true
+        },
+        "eslint-visitor-keys": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
+          "dev": true
+        }
       }
     },
     "esprima": {
@@ -15088,9 +15272,9 @@
       "dev": true
     },
     "esquery": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmmirror.com/esquery/-/esquery-1.4.0.tgz",
-      "integrity": "sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmmirror.com/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
       "requires": {
         "estraverse": "^5.1.0"
@@ -15135,25 +15319,25 @@
     },
     "etag": {
       "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "resolved": "https://registry.npmmirror.com/etag/-/etag-1.8.1.tgz",
       "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "dev": true
     },
     "event-pubsub": {
       "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/event-pubsub/-/event-pubsub-4.3.0.tgz",
       "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==",
       "dev": true
     },
     "eventemitter3": {
       "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-4.0.7.tgz",
       "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
       "dev": true
     },
     "events": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/events/-/events-3.3.0.tgz",
       "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true
     },
@@ -15174,7 +15358,7 @@
     },
     "express": {
       "version": "4.18.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+      "resolved": "https://registry.npmmirror.com/express/-/express-4.18.2.tgz",
       "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
       "dev": true,
       "requires": {
@@ -15213,13 +15397,13 @@
       "dependencies": {
         "array-flatten": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+          "resolved": "https://registry.npmmirror.com/array-flatten/-/array-flatten-1.1.1.tgz",
           "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
           "dev": true
         },
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -15228,23 +15412,12 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
       }
     },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmmirror.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -15253,7 +15426,7 @@
     },
     "fast-glob": {
       "version": "3.2.12",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz",
+      "resolved": "https://registry.npmmirror.com/fast-glob/-/fast-glob-3.2.12.tgz",
       "integrity": "sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==",
       "dev": true,
       "requires": {
@@ -15266,7 +15439,7 @@
       "dependencies": {
         "glob-parent": {
           "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-5.1.2.tgz",
           "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
           "dev": true,
           "requires": {
@@ -15288,9 +15461,9 @@
       "dev": true
     },
     "fastq": {
-      "version": "1.13.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
-      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
       "requires": {
         "reusify": "^1.0.4"
@@ -15298,7 +15471,7 @@
     },
     "faye-websocket": {
       "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "resolved": "https://registry.npmmirror.com/faye-websocket/-/faye-websocket-0.11.4.tgz",
       "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dev": true,
       "requires": {
@@ -15306,26 +15479,26 @@
       }
     },
     "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmmirror.com/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/figures/-/figures-2.0.0.tgz",
+      "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
       "dev": true,
       "requires": {
         "escape-string-regexp": "^1.0.5"
       }
     },
     "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmmirror.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
       "requires": {
-        "flat-cache": "^2.0.1"
+        "flat-cache": "^3.0.4"
       }
     },
     "fill-range": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/fill-range/-/fill-range-7.0.1.tgz",
       "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "dev": true,
       "requires": {
@@ -15334,7 +15507,7 @@
     },
     "finalhandler": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/finalhandler/-/finalhandler-1.2.0.tgz",
       "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
       "dev": true,
       "requires": {
@@ -15349,7 +15522,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -15358,7 +15531,7 @@
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         }
@@ -15386,31 +15559,19 @@
       }
     },
     "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+      "version": "3.0.4",
+      "resolved": "https://registry.npmmirror.com/flat-cache/-/flat-cache-3.0.4.tgz",
+      "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==",
       "dev": true,
       "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      },
-      "dependencies": {
-        "rimraf": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-2.6.3.tgz",
-          "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        }
+        "flatted": "^3.1.0",
+        "rimraf": "^3.0.2"
       }
     },
     "flatted": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmmirror.com/flatted/-/flatted-2.0.2.tgz",
-      "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmmirror.com/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "follow-redirects": {
@@ -15418,27 +15579,37 @@
       "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz",
       "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
     },
+    "form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      }
+    },
     "forwarded": {
       "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/forwarded/-/forwarded-0.2.0.tgz",
       "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "dev": true
     },
     "fraction.js": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.2.0.tgz",
       "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
       "dev": true
     },
     "fresh": {
       "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "resolved": "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz",
       "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "dev": true
     },
     "fs-extra": {
       "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/fs-extra/-/fs-extra-9.1.0.tgz",
       "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
       "requires": {
@@ -15449,9 +15620,9 @@
       }
     },
     "fs-monkey": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz",
-      "integrity": "sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==",
+      "version": "1.0.4",
+      "resolved": "https://registry.npmmirror.com/fs-monkey/-/fs-monkey-1.0.4.tgz",
+      "integrity": "sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==",
       "dev": true
     },
     "fs.realpath": {
@@ -15462,7 +15633,7 @@
     },
     "fsevents": {
       "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz",
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "dev": true,
       "optional": true
@@ -15492,13 +15663,14 @@
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
-      "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
       "requires": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
+        "has-proto": "^1.0.1",
         "has-symbols": "^1.0.3"
       }
     },
@@ -15527,7 +15699,7 @@
     },
     "glob-parent": {
       "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
       "requires": {
@@ -15536,7 +15708,7 @@
     },
     "glob-to-regexp": {
       "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
       "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true
     },
@@ -15548,7 +15720,7 @@
     },
     "globby": {
       "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/globby/-/globby-11.1.0.tgz",
       "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
       "requires": {
@@ -15558,25 +15730,17 @@
         "ignore": "^5.2.0",
         "merge2": "^1.4.1",
         "slash": "^3.0.0"
-      },
-      "dependencies": {
-        "ignore": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz",
-          "integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==",
-          "dev": true
-        }
       }
     },
     "graceful-fs": {
-      "version": "4.2.10",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+      "version": "4.2.11",
+      "resolved": "https://registry.npmmirror.com/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
     "gzip-size": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/gzip-size/-/gzip-size-6.0.0.tgz",
       "integrity": "sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==",
       "dev": true,
       "requires": {
@@ -15585,7 +15749,7 @@
     },
     "handle-thing": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==",
       "dev": true
     },
@@ -15606,16 +15770,22 @@
     },
     "has-property-descriptors": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
       "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
       "dev": true,
       "requires": {
         "get-intrinsic": "^1.1.1"
       }
     },
+    "has-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "dev": true
+    },
     "has-symbols": {
       "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true
     },
@@ -15639,13 +15809,13 @@
     },
     "hosted-git-info": {
       "version": "2.8.9",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "resolved": "https://registry.npmmirror.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
       "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
       "dev": true
     },
     "hpack.js": {
       "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "resolved": "https://registry.npmmirror.com/hpack.js/-/hpack.js-2.1.6.tgz",
       "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
       "dev": true,
       "requires": {
@@ -15656,9 +15826,9 @@
       },
       "dependencies": {
         "readable-stream": {
-          "version": "2.3.7",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
-          "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
+          "version": "2.3.8",
+          "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-2.3.8.tgz",
+          "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
           "dev": true,
           "requires": {
             "core-util-is": "~1.0.0",
@@ -15672,13 +15842,13 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.1.2.tgz",
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
           "dev": true
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.1.1.tgz",
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "requires": {
@@ -15688,14 +15858,14 @@
       }
     },
     "html-entities": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz",
-      "integrity": "sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==",
+      "version": "2.3.6",
+      "resolved": "https://registry.npmmirror.com/html-entities/-/html-entities-2.3.6.tgz",
+      "integrity": "sha512-9o0+dcpIw2/HxkNuYKxSJUF/MMRZQECK4GnF+oQOmJ83yCVHTWgCH5aOXxK5bozNRmM8wtgryjHD3uloPBDEGw==",
       "dev": true
     },
     "html-minifier-terser": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
       "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
       "dev": true,
       "requires": {
@@ -15709,15 +15879,15 @@
       }
     },
     "html-tags": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz",
-      "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmmirror.com/html-tags/-/html-tags-3.3.1.tgz",
+      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
       "dev": true
     },
     "html-webpack-plugin": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz",
-      "integrity": "sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==",
+      "version": "5.5.3",
+      "resolved": "https://registry.npmmirror.com/html-webpack-plugin/-/html-webpack-plugin-5.5.3.tgz",
+      "integrity": "sha512-6YrDKTuqaP/TquFH7h4srYWsZx+x6k6+FbsTm0ziCwGHDP78Unr1r9F/H4+sGmMbX08GQcJ+K64x55b+7VM/jg==",
       "dev": true,
       "requires": {
         "@types/html-minifier-terser": "^6.0.0",
@@ -15729,7 +15899,7 @@
     },
     "htmlparser2": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/htmlparser2/-/htmlparser2-6.1.0.tgz",
       "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
       "dev": true,
       "requires": {
@@ -15741,13 +15911,13 @@
     },
     "http-deceiver": {
       "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "resolved": "https://registry.npmmirror.com/http-deceiver/-/http-deceiver-1.2.7.tgz",
       "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==",
       "dev": true
     },
     "http-errors": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-2.0.0.tgz",
       "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dev": true,
       "requires": {
@@ -15760,13 +15930,13 @@
     },
     "http-parser-js": {
       "version": "0.5.8",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz",
+      "resolved": "https://registry.npmmirror.com/http-parser-js/-/http-parser-js-0.5.8.tgz",
       "integrity": "sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==",
       "dev": true
     },
     "http-proxy": {
       "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "resolved": "https://registry.npmmirror.com/http-proxy/-/http-proxy-1.18.1.tgz",
       "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
       "dev": true,
       "requires": {
@@ -15777,7 +15947,7 @@
     },
     "http-proxy-middleware": {
       "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
+      "resolved": "https://registry.npmmirror.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
       "integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
       "dev": true,
       "requires": {
@@ -15790,7 +15960,7 @@
     },
     "human-signals": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true
     },
@@ -15805,26 +15975,26 @@
     },
     "icss-utils": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
       "dev": true,
       "requires": {}
     },
     "ieee754": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ieee754/-/ieee754-1.2.1.tgz",
       "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true
     },
     "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmmirror.com/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+      "version": "5.2.4",
+      "resolved": "https://registry.npmmirror.com/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true
     },
     "import-fresh": {
       "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
       "requires": {
@@ -15854,25 +16024,414 @@
       "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
       "dev": true
     },
-    "inquirer": {
-      "version": "7.3.3",
-      "resolved": "https://registry.npmmirror.com/inquirer/-/inquirer-7.3.3.tgz",
-      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+    "ipaddr.js": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz",
+      "integrity": "sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==",
+      "dev": true
+    },
+    "is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmmirror.com/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "^2.0.0"
+      }
+    },
+    "is-ci": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz",
+      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
+      "dev": true,
+      "requires": {
+        "ci-info": "^1.5.0"
+      }
+    },
+    "is-core-module": {
+      "version": "2.12.1",
+      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.12.1.tgz",
+      "integrity": "sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "dev": true
+    },
+    "is-file-esm": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/is-file-esm/-/is-file-esm-1.0.0.tgz",
+      "integrity": "sha512-rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA==",
+      "dev": true,
+      "requires": {
+        "read-pkg-up": "^7.0.1"
+      }
+    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dev": true,
+      "requires": {
+        "is-extglob": "^2.1.1"
+      }
+    },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true
+    },
+    "is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmmirror.com/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true
+    },
+    "is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmmirror.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "dev": true
+    },
+    "is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmmirror.com/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "requires": {
+        "isobject": "^3.0.1"
+      }
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true
+    },
+    "is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true
+    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmmirror.com/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
+    },
+    "isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmmirror.com/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true
+    },
+    "javascript-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
+      "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
+      "dev": true
+    },
+    "jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmmirror.com/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "dev": true,
+      "requires": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "dependencies": {
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "8.1.1",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-8.1.1.tgz",
+          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
+      }
+    },
+    "joi": {
+      "version": "17.9.2",
+      "resolved": "https://registry.npmmirror.com/joi/-/joi-17.9.2.tgz",
+      "integrity": "sha512-Itk/r+V4Dx0V3c7RLFdRh12IOjySm2/WGPMubBT92cQvRfYZhPM2W0hZlctjj72iES8jsRCwp7S/cRmWBnJ4nw==",
+      "dev": true,
+      "requires": {
+        "@hapi/hoek": "^9.0.0",
+        "@hapi/topo": "^5.0.0",
+        "@sideway/address": "^4.1.3",
+        "@sideway/formula": "^3.0.1",
+        "@sideway/pinpoint": "^2.0.0"
+      }
+    },
+    "js-message": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmmirror.com/js-message/-/js-message-1.0.7.tgz",
+      "integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==",
+      "dev": true
+    },
+    "js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "requires": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      }
+    },
+    "jsesc": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+      "dev": true
+    },
+    "json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+      "dev": true
+    },
+    "json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmmirror.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmmirror.com/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^2.0.0"
+      }
+    },
+    "kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmmirror.com/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true
+    },
+    "klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmmirror.com/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "dev": true
+    },
+    "launch-editor": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.6.0.tgz",
+      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
+      "dev": true,
+      "requires": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.7.3"
+      }
+    },
+    "launch-editor-middleware": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmmirror.com/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz",
+      "integrity": "sha512-K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA==",
+      "dev": true,
+      "requires": {
+        "launch-editor": "^2.6.0"
+      }
+    },
+    "levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmmirror.com/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      }
+    },
+    "lilconfig": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
+      "dev": true
+    },
+    "lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmmirror.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true
+    },
+    "loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmmirror.com/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "dev": true
+    },
+    "loader-utils": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+      "dev": true,
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^1.0.1"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        }
+      }
+    },
+    "locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "requires": {
+        "p-locate": "^4.1.0"
+      }
+    },
+    "lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmmirror.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true
+    },
+    "lodash.defaultsdeep": {
+      "version": "4.6.1",
+      "resolved": "https://registry.npmmirror.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
+      "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
+      "dev": true
+    },
+    "lodash.kebabcase": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmmirror.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
+      "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
+      "dev": true
+    },
+    "lodash.mapvalues": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmmirror.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
+      "integrity": "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==",
+      "dev": true
+    },
+    "lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmmirror.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true
+    },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmmirror.com/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmmirror.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
+      "dev": true
+    },
+    "lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
+      "dev": true
+    },
+    "log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmmirror.com/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
       "requires": {
-        "ansi-escapes": "^4.2.1",
         "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.19",
-        "mute-stream": "0.0.8",
-        "run-async": "^2.4.0",
-        "rxjs": "^6.6.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6"
+        "is-unicode-supported": "^0.1.0"
       },
       "dependencies": {
         "ansi-styles": {
@@ -15926,447 +16485,9 @@
         }
       }
     },
-    "ipaddr.js": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz",
-      "integrity": "sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==",
-      "dev": true
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^2.0.0"
-      }
-    },
-    "is-ci": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmmirror.com/is-ci/-/is-ci-1.2.1.tgz",
-      "integrity": "sha512-s6tfsaQaQi3JNciBH6shVqEDvhGut0SUXr31ag8Pd8BBbVVlcGfWhpPmEOoM6RJ5TFhbypvf5yyRw/VXW1IiWg==",
-      "dev": true,
-      "requires": {
-        "ci-info": "^1.5.0"
-      }
-    },
-    "is-core-module": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmmirror.com/is-core-module/-/is-core-module-2.11.0.tgz",
-      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
-      "dev": true,
-      "requires": {
-        "has": "^1.0.3"
-      }
-    },
-    "is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmmirror.com/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmmirror.com/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true
-    },
-    "is-file-esm": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-file-esm/-/is-file-esm-1.0.0.tgz",
-      "integrity": "sha512-rZlaNKb4Mr8WlRu2A9XdeoKgnO5aA53XdPHgCKVyCrQ/rWi89RET1+bq37Ru46obaQXeiX4vmFIm1vks41hoSA==",
-      "dev": true,
-      "requires": {
-        "read-pkg-up": "^7.0.1"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmmirror.com/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "dev": true
-    },
-    "is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true
-    },
-    "is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "dev": true
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmmirror.com/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-      "dev": true
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmmirror.com/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dev": true,
-      "requires": {
-        "is-docker": "^2.0.0"
-      }
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
-      "dev": true
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "dev": true
-    },
-    "javascript-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz",
-      "integrity": "sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==",
-      "dev": true
-    },
-    "jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "dependencies": {
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "8.1.1",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-          "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
-    "joi": {
-      "version": "17.6.4",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.6.4.tgz",
-      "integrity": "sha512-tPzkTJHZQjSFCc842QpdVpOZ9LI2txApboNUbW70qgnRB14Lzl+oWQOPdF2N4yqyiY14wBGe8lc7f/2hZxbGmw==",
-      "dev": true,
-      "requires": {
-        "@hapi/hoek": "^9.0.0",
-        "@hapi/topo": "^5.0.0",
-        "@sideway/address": "^4.1.3",
-        "@sideway/formula": "^3.0.0",
-        "@sideway/pinpoint": "^2.0.0"
-      }
-    },
-    "js-message": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.7.tgz",
-      "integrity": "sha512-efJLHhLjIyKRewNS9EGZ4UpI8NguuL6fKkhRxVuMmrGV2xN/0APGdQYwLFky5w9naebSZ0OwAGp0G6/2Cg90rA==",
-      "dev": true
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmmirror.com/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmmirror.com/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsesc": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-2.5.2.tgz",
-      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
-      "dev": true
-    },
-    "json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6",
-        "universalify": "^2.0.0"
-      }
-    },
-    "kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true
-    },
-    "klona": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz",
-      "integrity": "sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==",
-      "dev": true
-    },
-    "launch-editor": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmmirror.com/launch-editor/-/launch-editor-2.6.0.tgz",
-      "integrity": "sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==",
-      "dev": true,
-      "requires": {
-        "picocolors": "^1.0.0",
-        "shell-quote": "^1.7.3"
-      }
-    },
-    "launch-editor-middleware": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmmirror.com/launch-editor-middleware/-/launch-editor-middleware-2.6.0.tgz",
-      "integrity": "sha512-K2yxgljj5TdCeRN1lBtO3/J26+AIDDDw+04y6VAiZbWcTdBwsYN6RrZBnW5DN/QiSIdKNjKdATLUUluWWFYTIA==",
-      "dev": true,
-      "requires": {
-        "launch-editor": "^2.6.0"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmmirror.com/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "lilconfig": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz",
-      "integrity": "sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==",
-      "dev": true
-    },
-    "lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "dev": true
-    },
-    "loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
-      "dev": true,
-      "requires": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      }
-    },
-    "locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^4.1.0"
-      }
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
-    },
-    "lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
-      "dev": true
-    },
-    "lodash.defaultsdeep": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmmirror.com/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz",
-      "integrity": "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA==",
-      "dev": true
-    },
-    "lodash.kebabcase": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz",
-      "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==",
-      "dev": true
-    },
-    "lodash.mapvalues": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmmirror.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-      "integrity": "sha512-JPFqXFeZQ7BfS00H58kClY7SPVeHertPE0lNuCyZ26/XlN8TvakYD7b9bGyNmXbT/D3BbtPAAmq90gPWqLkxlQ==",
-      "dev": true
-    },
-    "lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
-      "dev": true
-    },
-    "lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
-      "dev": true
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "log-update": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/log-update/-/log-update-2.3.0.tgz",
       "integrity": "sha512-vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==",
       "dev": true,
       "requires": {
@@ -16375,21 +16496,15 @@
         "wrap-ansi": "^3.0.1"
       },
       "dependencies": {
-        "ansi-escapes": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-          "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-          "dev": true
-        },
         "ansi-regex": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-3.0.1.tgz",
           "integrity": "sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==",
           "dev": true
         },
         "cli-cursor": {
           "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/cli-cursor/-/cli-cursor-2.1.0.tgz",
           "integrity": "sha512-8lgKz8LmCRYZZQDpRyT2m5rKJ08TnU4tR9FFFW2rxpxR1FzWi4PQ/NfyODchAatHaUgnSPVcx/R5w6NuTBzFiw==",
           "dev": true,
           "requires": {
@@ -16398,19 +16513,19 @@
         },
         "is-fullwidth-code-point": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
           "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
           "dev": true
         },
         "mimic-fn": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/mimic-fn/-/mimic-fn-1.2.0.tgz",
           "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
           "dev": true
         },
         "onetime": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/onetime/-/onetime-2.0.1.tgz",
           "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
           "dev": true,
           "requires": {
@@ -16419,7 +16534,7 @@
         },
         "restore-cursor": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/restore-cursor/-/restore-cursor-2.0.0.tgz",
           "integrity": "sha512-6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q==",
           "dev": true,
           "requires": {
@@ -16429,7 +16544,7 @@
         },
         "string-width": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-2.1.1.tgz",
           "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
           "dev": true,
           "requires": {
@@ -16439,7 +16554,7 @@
         },
         "strip-ansi": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-4.0.0.tgz",
           "integrity": "sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==",
           "dev": true,
           "requires": {
@@ -16448,7 +16563,7 @@
         },
         "wrap-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
           "integrity": "sha512-iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==",
           "dev": true,
           "requires": {
@@ -16460,28 +16575,20 @@
     },
     "lower-case": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/lower-case/-/lower-case-2.0.2.tgz",
       "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
       "dev": true,
       "requires": {
         "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
       "requires": {
-        "yallist": "^4.0.0"
+        "yallist": "^3.0.2"
       }
     },
     "make-dir": {
@@ -16495,34 +16602,34 @@
     },
     "mdn-data": {
       "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "resolved": "https://registry.npmmirror.com/mdn-data/-/mdn-data-2.0.14.tgz",
       "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
       "dev": true
     },
     "media-typer": {
       "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/media-typer/-/media-typer-0.3.0.tgz",
       "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
       "dev": true
     },
     "memfs": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz",
-      "integrity": "sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmmirror.com/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
       "dev": true,
       "requires": {
-        "fs-monkey": "^1.0.3"
+        "fs-monkey": "^1.0.4"
       }
     },
     "merge-descriptors": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
       "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==",
       "dev": true
     },
     "merge-source-map": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/merge-source-map/-/merge-source-map-1.1.0.tgz",
       "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==",
       "dev": true,
       "requires": {
@@ -16531,25 +16638,25 @@
     },
     "merge-stream": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
       "dev": true
     },
     "merge2": {
       "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true
     },
     "methods": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/methods/-/methods-1.1.2.tgz",
       "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
       "dev": true
     },
     "micromatch": {
       "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "resolved": "https://registry.npmmirror.com/micromatch/-/micromatch-4.0.5.tgz",
       "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "requires": {
@@ -16559,7 +16666,7 @@
     },
     "mime": {
       "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "resolved": "https://registry.npmmirror.com/mime/-/mime-1.6.0.tgz",
       "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
       "dev": true
     },
@@ -16583,18 +16690,18 @@
       "dev": true
     },
     "mini-css-extract-plugin": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz",
-      "integrity": "sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==",
+      "version": "2.7.6",
+      "resolved": "https://registry.npmmirror.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.6.tgz",
+      "integrity": "sha512-Qk7HcgaPkGG6eD77mLvZS1nmxlao3j+9PkrT9Uc7HAE1id3F41+DdBRYRYkbyfNRGzm8/YWtzhw7nVPmwhqTQw==",
       "dev": true,
       "requires": {
         "schema-utils": "^4.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -16605,7 +16712,7 @@
         },
         "ajv-keywords": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
           "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "dev": true,
           "requires": {
@@ -16614,27 +16721,27 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
         }
       }
     },
     "minimalistic-assert": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
       "dev": true
     },
@@ -16648,18 +16755,26 @@
       }
     },
     "minimist": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.7.tgz",
-      "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmmirror.com/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true
     },
     "minipass": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz",
-      "integrity": "sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmmirror.com/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dev": true,
       "requires": {
         "yallist": "^4.0.0"
+      },
+      "dependencies": {
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
     "mkdirp": {
@@ -16672,14 +16787,14 @@
       }
     },
     "module-alias": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz",
-      "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmmirror.com/module-alias/-/module-alias-2.2.3.tgz",
+      "integrity": "sha512-23g5BFj4zdQL/b6tor7Ji+QY4pEfNH784BMslY9Qb0UnJWRAt+lQGLYmRaM0KDBwIG23ffEBELhZDP2rhi9f/Q==",
       "dev": true
     },
     "mrmime": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/mrmime/-/mrmime-1.0.1.tgz",
       "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
       "dev": true
     },
@@ -16691,7 +16806,7 @@
     },
     "multicast-dns": {
       "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "resolved": "https://registry.npmmirror.com/multicast-dns/-/multicast-dns-7.2.5.tgz",
       "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dev": true,
       "requires": {
@@ -16699,12 +16814,6 @@
         "thunky": "^1.0.2"
       }
     },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
-      "dev": true
-    },
     "mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmmirror.com/mz/-/mz-2.7.0.tgz",
@@ -16717,9 +16826,9 @@
       }
     },
     "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+      "version": "3.3.6",
+      "resolved": "https://registry.npmmirror.com/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
     },
     "natural-compare": {
       "version": "1.4.0",
@@ -16729,7 +16838,7 @@
     },
     "negotiator": {
       "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "resolved": "https://registry.npmmirror.com/negotiator/-/negotiator-0.6.3.tgz",
       "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "dev": true
     },
@@ -16747,26 +16856,18 @@
     },
     "no-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/no-case/-/no-case-3.0.4.tgz",
       "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
       "dev": true,
       "requires": {
         "lower-case": "^2.0.2",
         "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "node-fetch": {
-      "version": "2.6.7",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
-      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
+      "version": "2.6.11",
+      "resolved": "https://registry.npmmirror.com/node-fetch/-/node-fetch-2.6.11.tgz",
+      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
       "dev": true,
       "requires": {
         "whatwg-url": "^5.0.0"
@@ -16774,19 +16875,19 @@
     },
     "node-forge": {
       "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/node-forge/-/node-forge-1.3.1.tgz",
       "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "dev": true
     },
     "node-releases": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.6.tgz",
-      "integrity": "sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmmirror.com/node-releases/-/node-releases-2.0.12.tgz",
+      "integrity": "sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==",
       "dev": true
     },
     "normalize-package-data": {
       "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
       "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
       "dev": true,
       "requires": {
@@ -16798,7 +16899,7 @@
       "dependencies": {
         "semver": {
           "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-5.7.1.tgz",
           "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
           "dev": true
         }
@@ -16806,19 +16907,19 @@
     },
     "normalize-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-path/-/normalize-path-3.0.0.tgz",
       "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "dev": true
     },
     "normalize-range": {
       "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true
     },
     "normalize-url": {
       "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/normalize-url/-/normalize-url-6.1.0.tgz",
       "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
       "dev": true
     },
@@ -16833,7 +16934,7 @@
     },
     "nth-check": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/nth-check/-/nth-check-2.1.1.tgz",
       "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
       "requires": {
@@ -16847,20 +16948,20 @@
       "dev": true
     },
     "object-inspect": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
-      "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+      "version": "1.12.3",
+      "resolved": "https://registry.npmmirror.com/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
       "dev": true
     },
     "object-keys": {
       "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
       "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true
     },
     "object.assign": {
       "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/object.assign/-/object.assign-4.1.4.tgz",
       "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
       "requires": {
@@ -16872,13 +16973,13 @@
     },
     "obuf": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/obuf/-/obuf-1.1.2.tgz",
       "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
       "dev": true
     },
     "on-finished": {
       "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/on-finished/-/on-finished-2.4.1.tgz",
       "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dev": true,
       "requires": {
@@ -16887,7 +16988,7 @@
     },
     "on-headers": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/on-headers/-/on-headers-1.0.2.tgz",
       "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "dev": true
     },
@@ -16910,9 +17011,9 @@
       }
     },
     "open": {
-      "version": "8.4.0",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
-      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "version": "8.4.2",
+      "resolved": "https://registry.npmmirror.com/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
       "dev": true,
       "requires": {
         "define-lazy-prop": "^2.0.0",
@@ -16922,27 +17023,27 @@
     },
     "opener": {
       "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.2.tgz",
+      "resolved": "https://registry.npmmirror.com/opener/-/opener-1.5.2.tgz",
       "integrity": "sha512-ur5UIdyw5Y7yEj9wLzhqXiy6GZ3Mwx0yGI+5sMn2r0N0v3cKJvUmFH5yPP+WXh9e0xfyzyJX95D8l088DNFj7A==",
       "dev": true
     },
     "optionator": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmmirror.com/optionator/-/optionator-0.8.3.tgz",
-      "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+      "version": "0.9.1",
+      "resolved": "https://registry.npmmirror.com/optionator/-/optionator-0.9.1.tgz",
+      "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==",
       "dev": true,
       "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.6",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "word-wrap": "~1.2.3"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.3"
       }
     },
     "ora": {
       "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ora/-/ora-5.4.1.tgz",
       "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
       "dev": true,
       "requires": {
@@ -16959,7 +17060,7 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -16968,7 +17069,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
@@ -16978,7 +17079,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -16987,19 +17088,19 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -17008,12 +17109,6 @@
         }
       }
     },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "dev": true
-    },
     "p-finally": {
       "version": "1.0.0",
       "resolved": "https://registry.npmmirror.com/p-finally/-/p-finally-1.0.0.tgz",
@@ -17040,7 +17135,7 @@
     },
     "p-retry": {
       "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "resolved": "https://registry.npmmirror.com/p-retry/-/p-retry-4.6.2.tgz",
       "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
       "dev": true,
       "requires": {
@@ -17056,20 +17151,12 @@
     },
     "param-case": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/param-case/-/param-case-3.0.4.tgz",
       "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
       "dev": true,
       "requires": {
         "dot-case": "^3.0.4",
         "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "parent-module": {
@@ -17079,19 +17166,11 @@
       "dev": true,
       "requires": {
         "callsites": "^3.0.0"
-      },
-      "dependencies": {
-        "callsites": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmmirror.com/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-          "dev": true
-        }
       }
     },
     "parse-json": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/parse-json/-/parse-json-5.2.0.tgz",
       "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dev": true,
       "requires": {
@@ -17126,26 +17205,18 @@
     },
     "parseurl": {
       "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/parseurl/-/parseurl-1.3.3.tgz",
       "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "dev": true
     },
     "pascal-case": {
       "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/pascal-case/-/pascal-case-3.1.2.tgz",
       "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
       "dev": true,
       "requires": {
         "no-case": "^3.0.4",
         "tslib": "^2.0.3"
-      },
-      "dependencies": {
-        "tslib": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-          "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==",
-          "dev": true
-        }
       }
     },
     "path-exists": {
@@ -17174,24 +17245,24 @@
     },
     "path-to-regexp": {
       "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+      "resolved": "https://registry.npmmirror.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
       "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==",
       "dev": true
     },
     "path-type": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/path-type/-/path-type-4.0.0.tgz",
       "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true
     },
     "picocolors": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "picomatch": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "resolved": "https://registry.npmmirror.com/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "dev": true
     },
@@ -17206,7 +17277,7 @@
     },
     "portfinder": {
       "version": "1.0.32",
-      "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz",
+      "resolved": "https://registry.npmmirror.com/portfinder/-/portfinder-1.0.32.tgz",
       "integrity": "sha512-on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==",
       "dev": true,
       "requires": {
@@ -17217,7 +17288,7 @@
       "dependencies": {
         "debug": {
           "version": "3.2.7",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-3.2.7.tgz",
           "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
           "dev": true,
           "requires": {
@@ -17227,18 +17298,18 @@
       }
     },
     "postcss": {
-      "version": "8.4.18",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
-      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "version": "8.4.24",
+      "resolved": "https://registry.npmmirror.com/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
       "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
         "source-map-js": "^1.0.2"
       }
     },
     "postcss-calc": {
       "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-calc/-/postcss-calc-8.2.4.tgz",
       "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "dev": true,
       "requires": {
@@ -17247,58 +17318,58 @@
       }
     },
     "postcss-colormin": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz",
-      "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmmirror.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "colord": "^2.9.1",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-convert-values": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz",
-      "integrity": "sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==",
+      "version": "5.1.3",
+      "resolved": "https://registry.npmmirror.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.20.3",
+        "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-discard-comments": {
       "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
       "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-duplicates": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
       "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-empty": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
       "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "dev": true,
       "requires": {}
     },
     "postcss-discard-overridden": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
       "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
       "dev": true,
       "requires": {}
     },
     "postcss-loader": {
       "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-6.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-loader/-/postcss-loader-6.2.1.tgz",
       "integrity": "sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==",
       "dev": true,
       "requires": {
@@ -17307,34 +17378,49 @@
         "semver": "^7.3.5"
       },
       "dependencies": {
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
         "semver": {
-          "version": "7.3.8",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-          "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
           "dev": true,
           "requires": {
             "lru-cache": "^6.0.0"
           }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
         }
       }
     },
     "postcss-merge-longhand": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz",
-      "integrity": "sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==",
+      "version": "5.1.7",
+      "resolved": "https://registry.npmmirror.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
       "dev": true,
       "requires": {
         "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.0"
+        "stylehacks": "^5.1.1"
       }
     },
     "postcss-merge-rules": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz",
-      "integrity": "sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmmirror.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0",
         "cssnano-utils": "^3.1.0",
         "postcss-selector-parser": "^6.0.5"
@@ -17342,7 +17428,7 @@
     },
     "postcss-minify-font-values": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
       "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "dev": true,
       "requires": {
@@ -17351,7 +17437,7 @@
     },
     "postcss-minify-gradients": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
       "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "dev": true,
       "requires": {
@@ -17361,19 +17447,19 @@
       }
     },
     "postcss-minify-params": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz",
-      "integrity": "sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==",
+      "version": "5.1.4",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "cssnano-utils": "^3.1.0",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-minify-selectors": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
       "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "dev": true,
       "requires": {
@@ -17382,15 +17468,15 @@
     },
     "postcss-modules-extract-imports": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
       "dev": true,
       "requires": {}
     },
     "postcss-modules-local-by-default": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz",
-      "integrity": "sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz",
+      "integrity": "sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==",
       "dev": true,
       "requires": {
         "icss-utils": "^5.0.0",
@@ -17400,7 +17486,7 @@
     },
     "postcss-modules-scope": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz",
       "integrity": "sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==",
       "dev": true,
       "requires": {
@@ -17409,7 +17495,7 @@
     },
     "postcss-modules-values": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
       "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dev": true,
       "requires": {
@@ -17418,14 +17504,14 @@
     },
     "postcss-normalize-charset": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
       "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "dev": true,
       "requires": {}
     },
     "postcss-normalize-display-values": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
       "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "dev": true,
       "requires": {
@@ -17434,7 +17520,7 @@
     },
     "postcss-normalize-positions": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
       "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
       "dev": true,
       "requires": {
@@ -17443,7 +17529,7 @@
     },
     "postcss-normalize-repeat-style": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
       "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
       "dev": true,
       "requires": {
@@ -17452,7 +17538,7 @@
     },
     "postcss-normalize-string": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
       "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
       "dev": true,
       "requires": {
@@ -17461,7 +17547,7 @@
     },
     "postcss-normalize-timing-functions": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
       "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
       "dev": true,
       "requires": {
@@ -17469,18 +17555,18 @@
       }
     },
     "postcss-normalize-unicode": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz",
-      "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "postcss-value-parser": "^4.2.0"
       }
     },
     "postcss-normalize-url": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
       "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "dev": true,
       "requires": {
@@ -17490,7 +17576,7 @@
     },
     "postcss-normalize-whitespace": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
       "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "dev": true,
       "requires": {
@@ -17499,7 +17585,7 @@
     },
     "postcss-ordered-values": {
       "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
       "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "dev": true,
       "requires": {
@@ -17508,18 +17594,18 @@
       }
     },
     "postcss-reduce-initial": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz",
-      "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmmirror.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "caniuse-api": "^3.0.0"
       }
     },
     "postcss-reduce-transforms": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
       "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "dev": true,
       "requires": {
@@ -17527,9 +17613,9 @@
       }
     },
     "postcss-selector-parser": {
-      "version": "6.0.10",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz",
-      "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==",
+      "version": "6.0.13",
+      "resolved": "https://registry.npmmirror.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
       "requires": {
         "cssesc": "^3.0.0",
@@ -17538,7 +17624,7 @@
     },
     "postcss-svgo": {
       "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
       "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
       "dev": true,
       "requires": {
@@ -17548,7 +17634,7 @@
     },
     "postcss-unique-selectors": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
       "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
       "dev": true,
       "requires": {
@@ -17557,26 +17643,26 @@
     },
     "postcss-value-parser": {
       "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
       "dev": true
     },
     "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true
     },
     "prettier": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz",
-      "integrity": "sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==",
+      "version": "2.8.8",
+      "resolved": "https://registry.npmmirror.com/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
       "optional": true
     },
     "pretty-error": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/pretty-error/-/pretty-error-4.0.0.tgz",
       "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
       "dev": true,
       "requires": {
@@ -17586,7 +17672,7 @@
     },
     "process-nextick-args": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
       "dev": true
     },
@@ -17598,29 +17684,18 @@
     },
     "progress-webpack-plugin": {
       "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz",
+      "resolved": "https://registry.npmmirror.com/progress-webpack-plugin/-/progress-webpack-plugin-1.0.16.tgz",
       "integrity": "sha512-sdiHuuKOzELcBANHfrupYo+r99iPRyOnw15qX+rNlVUqXGfjXdH4IgxriKwG1kNJwVswKQHMdj1hYZMcb9jFaA==",
       "dev": true,
       "requires": {
         "chalk": "^2.1.0",
         "figures": "^2.0.0",
         "log-update": "^2.3.0"
-      },
-      "dependencies": {
-        "figures": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-          "integrity": "sha512-Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA==",
-          "dev": true,
-          "requires": {
-            "escape-string-regexp": "^1.0.5"
-          }
-        }
       }
     },
     "proxy-addr": {
       "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "resolved": "https://registry.npmmirror.com/proxy-addr/-/proxy-addr-2.0.7.tgz",
       "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
       "dev": true,
       "requires": {
@@ -17630,7 +17705,7 @@
       "dependencies": {
         "ipaddr.js": {
           "version": "1.9.1",
-          "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+          "resolved": "https://registry.npmmirror.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
           "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
           "dev": true
         }
@@ -17658,14 +17733,14 @@
       }
     },
     "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmmirror.com/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true
     },
     "qs": {
       "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+      "resolved": "https://registry.npmmirror.com/qs/-/qs-6.11.0.tgz",
       "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
       "dev": true,
       "requires": {
@@ -17674,13 +17749,13 @@
     },
     "queue-microtask": {
       "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "resolved": "https://registry.npmmirror.com/queue-microtask/-/queue-microtask-1.2.3.tgz",
       "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true
     },
     "randombytes": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
       "requires": {
@@ -17689,13 +17764,13 @@
     },
     "range-parser": {
       "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/range-parser/-/range-parser-1.2.1.tgz",
       "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
       "dev": true
     },
     "raw-body": {
       "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+      "resolved": "https://registry.npmmirror.com/raw-body/-/raw-body-2.5.1.tgz",
       "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
       "dev": true,
       "requires": {
@@ -17707,7 +17782,7 @@
       "dependencies": {
         "bytes": {
           "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/bytes/-/bytes-3.1.2.tgz",
           "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
           "dev": true
         }
@@ -17715,7 +17790,7 @@
     },
     "read-pkg": {
       "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/read-pkg/-/read-pkg-5.2.0.tgz",
       "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
       "dev": true,
       "requires": {
@@ -17723,19 +17798,11 @@
         "normalize-package-data": "^2.5.0",
         "parse-json": "^5.0.0",
         "type-fest": "^0.6.0"
-      },
-      "dependencies": {
-        "type-fest": {
-          "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
-          "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
-          "dev": true
-        }
       }
     },
     "read-pkg-up": {
       "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
       "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
       "dev": true,
       "requires": {
@@ -17746,16 +17813,16 @@
       "dependencies": {
         "type-fest": {
           "version": "0.8.1",
-          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+          "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz",
           "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
           "dev": true
         }
       }
     },
     "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmmirror.com/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "dev": true,
       "requires": {
         "inherits": "^2.0.3",
@@ -17765,7 +17832,7 @@
     },
     "readdirp": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "resolved": "https://registry.npmmirror.com/readdirp/-/readdirp-3.6.0.tgz",
       "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "dev": true,
       "requires": {
@@ -17774,13 +17841,13 @@
     },
     "regenerate": {
       "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "resolved": "https://registry.npmmirror.com/regenerate/-/regenerate-1.4.2.tgz",
       "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true
     },
     "regenerate-unicode-properties": {
       "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
       "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "dev": true,
       "requires": {
@@ -17788,49 +17855,43 @@
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.10",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz",
-      "integrity": "sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw==",
+      "version": "0.13.11",
+      "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
+      "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.15.0",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz",
-      "integrity": "sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==",
+      "version": "0.15.1",
+      "resolved": "https://registry.npmmirror.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz",
+      "integrity": "sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.4"
       }
     },
     "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmmirror.com/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/regexpp/-/regexpp-3.2.0.tgz",
+      "integrity": "sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==",
       "dev": true
     },
     "regexpu-core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.2.1.tgz",
-      "integrity": "sha512-HrnlNtpvqP1Xkb28tMhBUO2EbyUHdQlsnlAhzWcwHy8WJR53UWr7/MAvqrsQKMbV4qdpv03oTMG8iIhfsPFktQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmmirror.com/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "dev": true,
       "requires": {
+        "@babel/regjsgen": "^0.8.0",
         "regenerate": "^1.4.2",
         "regenerate-unicode-properties": "^10.1.0",
-        "regjsgen": "^0.7.1",
         "regjsparser": "^0.9.1",
         "unicode-match-property-ecmascript": "^2.0.0",
-        "unicode-match-property-value-ecmascript": "^2.0.0"
+        "unicode-match-property-value-ecmascript": "^2.1.0"
       }
     },
-    "regjsgen": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.7.1.tgz",
-      "integrity": "sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==",
-      "dev": true
-    },
     "regjsparser": {
       "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/regjsparser/-/regjsparser-0.9.1.tgz",
       "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "dev": true,
       "requires": {
@@ -17839,7 +17900,7 @@
       "dependencies": {
         "jsesc": {
           "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+          "resolved": "https://registry.npmmirror.com/jsesc/-/jsesc-0.5.0.tgz",
           "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
           "dev": true
         }
@@ -17847,13 +17908,13 @@
     },
     "relateurl": {
       "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "resolved": "https://registry.npmmirror.com/relateurl/-/relateurl-0.2.7.tgz",
       "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
       "dev": true
     },
     "renderkid": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/renderkid/-/renderkid-3.0.0.tgz",
       "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
       "dev": true,
       "requires": {
@@ -17872,30 +17933,30 @@
     },
     "require-from-string": {
       "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/require-from-string/-/require-from-string-2.0.2.tgz",
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
     "requires-port": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/requires-port/-/requires-port-1.0.0.tgz",
       "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
       "dev": true
     },
     "resolve": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.1.tgz",
-      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmmirror.com/resolve/-/resolve-1.22.2.tgz",
+      "integrity": "sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==",
       "dev": true,
       "requires": {
-        "is-core-module": "^2.9.0",
+        "is-core-module": "^2.11.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       }
     },
     "resolve-from": {
       "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true
     },
@@ -17911,52 +17972,37 @@
     },
     "retry": {
       "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "resolved": "https://registry.npmmirror.com/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "dev": true
     },
     "reusify": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true
     },
     "rimraf": {
       "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dev": true,
       "requires": {
         "glob": "^7.1.3"
       }
     },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmmirror.com/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "dev": true
-    },
     "run-parallel": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/run-parallel/-/run-parallel-1.2.0.tgz",
       "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "requires": {
         "queue-microtask": "^1.2.2"
       }
     },
-    "rxjs": {
-      "version": "6.6.7",
-      "resolved": "https://registry.npmmirror.com/rxjs/-/rxjs-6.6.7.tgz",
-      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/safe-buffer/-/safe-buffer-5.2.1.tgz",
       "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true
     },
@@ -17979,13 +18025,13 @@
     },
     "select-hose": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
       "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==",
       "dev": true
     },
     "selfsigned": {
       "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz",
+      "resolved": "https://registry.npmmirror.com/selfsigned/-/selfsigned-2.1.1.tgz",
       "integrity": "sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==",
       "dev": true,
       "requires": {
@@ -18000,7 +18046,7 @@
     },
     "send": {
       "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "resolved": "https://registry.npmmirror.com/send/-/send-0.18.0.tgz",
       "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
       "dev": true,
       "requires": {
@@ -18021,7 +18067,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -18030,7 +18076,7 @@
           "dependencies": {
             "ms": {
               "version": "2.0.0",
-              "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+              "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
               "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
               "dev": true
             }
@@ -18038,7 +18084,7 @@
         },
         "ms": {
           "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.3.tgz",
           "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
           "dev": true
         }
@@ -18046,7 +18092,7 @@
     },
     "serialize-javascript": {
       "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
       "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
       "requires": {
@@ -18055,7 +18101,7 @@
     },
     "serve-index": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/serve-index/-/serve-index-1.9.1.tgz",
       "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
       "dev": true,
       "requires": {
@@ -18070,7 +18116,7 @@
       "dependencies": {
         "debug": {
           "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+          "resolved": "https://registry.npmmirror.com/debug/-/debug-2.6.9.tgz",
           "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
           "dev": true,
           "requires": {
@@ -18079,13 +18125,13 @@
         },
         "depd": {
           "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/depd/-/depd-1.1.2.tgz",
           "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
           "dev": true
         },
         "http-errors": {
           "version": "1.6.3",
-          "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+          "resolved": "https://registry.npmmirror.com/http-errors/-/http-errors-1.6.3.tgz",
           "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
           "dev": true,
           "requires": {
@@ -18097,25 +18143,25 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz",
           "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==",
           "dev": true
         },
         "ms": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
           "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
           "dev": true
         },
         "setprototypeof": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.1.0.tgz",
           "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
           "dev": true
         },
         "statuses": {
           "version": "1.5.0",
-          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+          "resolved": "https://registry.npmmirror.com/statuses/-/statuses-1.5.0.tgz",
           "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==",
           "dev": true
         }
@@ -18123,7 +18169,7 @@
     },
     "serve-static": {
       "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+      "resolved": "https://registry.npmmirror.com/serve-static/-/serve-static-1.15.0.tgz",
       "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
       "dev": true,
       "requires": {
@@ -18135,13 +18181,13 @@
     },
     "setprototypeof": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+      "resolved": "https://registry.npmmirror.com/setprototypeof/-/setprototypeof-1.2.0.tgz",
       "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
       "dev": true
     },
     "shallow-clone": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/shallow-clone/-/shallow-clone-3.0.1.tgz",
       "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
       "dev": true,
       "requires": {
@@ -18164,14 +18210,14 @@
       "dev": true
     },
     "shell-quote": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.7.4.tgz",
-      "integrity": "sha512-8o/QEhSSRb1a5i7TFR0iM4G16Z0vYB2OQVs4G3aAFXjn3T6yEx8AZxy1PgDF7I00LZHYA3WxaSYIf5e5sAX8Rw==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmmirror.com/shell-quote/-/shell-quote-1.8.1.tgz",
+      "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==",
       "dev": true
     },
     "side-channel": {
       "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/side-channel/-/side-channel-1.0.4.tgz",
       "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
       "requires": {
@@ -18188,7 +18234,7 @@
     },
     "sirv": {
       "version": "1.0.19",
-      "resolved": "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz",
+      "resolved": "https://registry.npmmirror.com/sirv/-/sirv-1.0.19.tgz",
       "integrity": "sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==",
       "dev": true,
       "requires": {
@@ -18199,32 +18245,50 @@
     },
     "slash": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/slash/-/slash-3.0.0.tgz",
       "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true
     },
     "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmmirror.com/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
       "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
       },
       "dependencies": {
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
       }
     },
     "sockjs": {
       "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "resolved": "https://registry.npmmirror.com/sockjs/-/sockjs-0.3.24.tgz",
       "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
       "dev": true,
       "requires": {
@@ -18245,7 +18309,7 @@
     },
     "source-map-support": {
       "version": "0.5.21",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "resolved": "https://registry.npmmirror.com/source-map-support/-/source-map-support-0.5.21.tgz",
       "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
       "requires": {
@@ -18254,9 +18318,9 @@
       }
     },
     "spdx-correct": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz",
-      "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
       "dev": true,
       "requires": {
         "spdx-expression-parse": "^3.0.0",
@@ -18265,13 +18329,13 @@
     },
     "spdx-exceptions": {
       "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
       "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
       "dev": true
     },
     "spdx-expression-parse": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
       "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
       "dev": true,
       "requires": {
@@ -18280,14 +18344,14 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.12",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz",
-      "integrity": "sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA==",
+      "version": "3.0.13",
+      "resolved": "https://registry.npmmirror.com/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz",
+      "integrity": "sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==",
       "dev": true
     },
     "spdy": {
       "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/spdy/-/spdy-4.0.2.tgz",
       "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
       "dev": true,
       "requires": {
@@ -18300,7 +18364,7 @@
     },
     "spdy-transport": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/spdy-transport/-/spdy-transport-3.0.0.tgz",
       "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
       "dev": true,
       "requires": {
@@ -18320,7 +18384,7 @@
     },
     "ssri": {
       "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/ssri/-/ssri-8.0.1.tgz",
       "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
       "dev": true,
       "requires": {
@@ -18329,7 +18393,7 @@
     },
     "stable": {
       "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "resolved": "https://registry.npmmirror.com/stable/-/stable-0.1.8.tgz",
       "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
       "dev": true
     },
@@ -18341,13 +18405,13 @@
     },
     "statuses": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/statuses/-/statuses-2.0.1.tgz",
       "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "dev": true
     },
     "string_decoder": {
       "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "dev": true,
       "requires": {
@@ -18382,7 +18446,7 @@
     },
     "strip-final-newline": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true
     },
@@ -18399,12 +18463,12 @@
       "dev": true
     },
     "stylehacks": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz",
-      "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmmirror.com/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.16.6",
+        "browserslist": "^4.21.4",
         "postcss-selector-parser": "^6.0.4"
       }
     },
@@ -18425,13 +18489,13 @@
     },
     "svg-tags": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/svg-tags/-/svg-tags-1.0.0.tgz",
       "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
       "dev": true
     },
     "svgo": {
       "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "resolved": "https://registry.npmmirror.com/svgo/-/svgo-2.8.0.tgz",
       "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
       "dev": true,
       "requires": {
@@ -18446,113 +18510,88 @@
       "dependencies": {
         "commander": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
           "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
           "dev": true
         }
       }
     },
     "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmmirror.com/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+      "version": "6.8.1",
+      "resolved": "https://registry.npmmirror.com/table/-/table-6.8.1.tgz",
+      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
       "dev": true,
       "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
+        "ajv": "^8.0.1",
+        "lodash.truncate": "^4.4.2",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.2.3",
+        "strip-ansi": "^6.0.1"
       },
       "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmmirror.com/ansi-regex/-/ansi-regex-4.1.1.tgz",
-          "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
-          "dev": true
-        },
-        "emoji-regex": {
-          "version": "7.0.3",
-          "resolved": "https://registry.npmmirror.com/emoji-regex/-/emoji-regex-7.0.3.tgz",
-          "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmmirror.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-          "integrity": "sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmmirror.com/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+        "ajv": {
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "fast-deep-equal": "^3.1.1",
+            "json-schema-traverse": "^1.0.0",
+            "require-from-string": "^2.0.2",
+            "uri-js": "^4.2.2"
           }
         },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
+        "json-schema-traverse": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+          "dev": true
         }
       }
     },
     "tapable": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "resolved": "https://registry.npmmirror.com/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true
     },
     "terser": {
-      "version": "5.17.1",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.17.1.tgz",
-      "integrity": "sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==",
+      "version": "5.18.1",
+      "resolved": "https://registry.npmmirror.com/terser/-/terser-5.18.1.tgz",
+      "integrity": "sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==",
       "dev": true,
       "requires": {
-        "@jridgewell/source-map": "^0.3.2",
-        "acorn": "^8.5.0",
+        "@jridgewell/source-map": "^0.3.3",
+        "acorn": "^8.8.2",
         "commander": "^2.20.0",
         "source-map-support": "~0.5.20"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        },
         "commander": {
           "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-2.20.3.tgz",
           "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
           "dev": true
         }
       }
     },
     "terser-webpack-plugin": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz",
-      "integrity": "sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==",
+      "version": "5.3.9",
+      "resolved": "https://registry.npmmirror.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
       "requires": {
         "@jridgewell/trace-mapping": "^0.3.17",
         "jest-worker": "^27.4.5",
         "schema-utils": "^3.1.1",
         "serialize-javascript": "^6.0.1",
-        "terser": "^5.16.5"
+        "terser": "^5.16.8"
       },
       "dependencies": {
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -18588,7 +18627,7 @@
     },
     "thread-loader": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/thread-loader/-/thread-loader-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/thread-loader/-/thread-loader-3.0.4.tgz",
       "integrity": "sha512-ByaL2TPb+m6yArpqQUZvP+5S1mZtXsEP7nWKKlAUTm7fCml8kB5s1uI3+eHRP2bk5mVYfRSBI7FFf+tWEyLZwA==",
       "dev": true,
       "requires": {
@@ -18599,10 +18638,21 @@
         "schema-utils": "^3.0.0"
       },
       "dependencies": {
+        "loader-utils": {
+          "version": "2.0.4",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-2.0.4.tgz",
+          "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
         "schema-utils": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz",
-          "integrity": "sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -18612,27 +18662,12 @@
         }
       }
     },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmmirror.com/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-      "dev": true
-    },
     "thunky": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/thunky/-/thunky-1.1.0.tgz",
       "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
       "dev": true
     },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmmirror.com/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
     "to-fast-properties": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
@@ -18641,7 +18676,7 @@
     },
     "to-regex-range": {
       "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
@@ -18650,46 +18685,46 @@
     },
     "toidentifier": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/toidentifier/-/toidentifier-1.0.1.tgz",
       "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
       "dev": true
     },
     "totalist": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/totalist/-/totalist-1.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/totalist/-/totalist-1.1.0.tgz",
       "integrity": "sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==",
       "dev": true
     },
     "tr46": {
       "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "resolved": "https://registry.npmmirror.com/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "dev": true
     },
     "tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.5.3.tgz",
+      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
       "dev": true
     },
     "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmmirror.com/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
       "requires": {
-        "prelude-ls": "~1.1.2"
+        "prelude-ls": "^1.2.1"
       }
     },
     "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmmirror.com/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
       "dev": true
     },
     "type-is": {
       "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "resolved": "https://registry.npmmirror.com/type-is/-/type-is-1.6.18.tgz",
       "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
       "dev": true,
       "requires": {
@@ -18699,13 +18734,13 @@
     },
     "unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
       "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true
     },
     "unicode-match-property-ecmascript": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
       "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
       "requires": {
@@ -18714,33 +18749,33 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz",
-      "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmmirror.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
       "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true
     },
     "universalify": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/universalify/-/universalify-2.0.0.tgz",
       "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true
     },
     "unpipe": {
       "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/unpipe/-/unpipe-1.0.0.tgz",
       "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
       "dev": true
     },
     "update-browserslist-db": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz",
-      "integrity": "sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmmirror.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "dev": true,
       "requires": {
         "escalade": "^3.1.1",
@@ -18758,25 +18793,25 @@
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "resolved": "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
     "utila": {
       "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/utila/-/utila-0.4.0.tgz",
       "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
       "dev": true
     },
     "utils-merge": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/utils-merge/-/utils-merge-1.0.1.tgz",
       "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
       "dev": true
     },
     "uuid": {
       "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "resolved": "https://registry.npmmirror.com/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true
     },
@@ -18788,7 +18823,7 @@
     },
     "validate-npm-package-license": {
       "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "resolved": "https://registry.npmmirror.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
       "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
       "dev": true,
       "requires": {
@@ -18798,54 +18833,113 @@
     },
     "vary": {
       "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "resolved": "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz",
       "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
       "dev": true
     },
     "vue": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.13.tgz",
-      "integrity": "sha512-QnM6ULTNnPmn71eUO+4hdjfBIA3H0GLsBnchnI/kS678tjI45GOUZhXd0oP/gX9isikXz1PAzSnkPspp9EUNfQ==",
+      "version": "2.7.14",
+      "resolved": "https://registry.npmmirror.com/vue/-/vue-2.7.14.tgz",
+      "integrity": "sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==",
       "requires": {
-        "@vue/compiler-sfc": "2.7.13",
+        "@vue/compiler-sfc": "2.7.14",
         "csstype": "^3.1.0"
       }
     },
     "vue-eslint-parser": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
-      "integrity": "sha512-qh3VhDLeh773wjgNTl7ss0VejY9bMMa0GoDG2fQVyDzRFdiU3L7fw74tWZDHNQXdZqxO3EveQroa9ct39D2nqg==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz",
+      "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==",
       "dev": true,
       "requires": {
-        "debug": "^4.1.1",
-        "eslint-scope": "^5.1.1",
-        "eslint-visitor-keys": "^1.1.0",
-        "espree": "^6.2.1",
+        "debug": "^4.3.2",
+        "eslint-scope": "^7.0.0",
+        "eslint-visitor-keys": "^3.1.0",
+        "espree": "^9.0.0",
         "esquery": "^1.4.0",
         "lodash": "^4.17.21",
-        "semver": "^6.3.0"
+        "semver": "^7.3.5"
+      },
+      "dependencies": {
+        "eslint-scope": {
+          "version": "7.2.0",
+          "resolved": "https://registry.npmmirror.com/eslint-scope/-/eslint-scope-7.2.0.tgz",
+          "integrity": "sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==",
+          "dev": true,
+          "requires": {
+            "esrecurse": "^4.3.0",
+            "estraverse": "^5.2.0"
+          }
+        },
+        "eslint-visitor-keys": {
+          "version": "3.4.1",
+          "resolved": "https://registry.npmmirror.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz",
+          "integrity": "sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==",
+          "dev": true
+        },
+        "espree": {
+          "version": "9.5.2",
+          "resolved": "https://registry.npmmirror.com/espree/-/espree-9.5.2.tgz",
+          "integrity": "sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==",
+          "dev": true,
+          "requires": {
+            "acorn": "^8.8.0",
+            "acorn-jsx": "^5.3.2",
+            "eslint-visitor-keys": "^3.4.1"
+          }
+        },
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmmirror.com/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmmirror.com/lru-cache/-/lru-cache-6.0.0.tgz",
+          "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+          "dev": true,
+          "requires": {
+            "yallist": "^4.0.0"
+          }
+        },
+        "semver": {
+          "version": "7.5.2",
+          "resolved": "https://registry.npmmirror.com/semver/-/semver-7.5.2.tgz",
+          "integrity": "sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==",
+          "dev": true,
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        },
+        "yallist": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmmirror.com/yallist/-/yallist-4.0.0.tgz",
+          "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+          "dev": true
+        }
       }
     },
     "vue-hot-reload-api": {
       "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
       "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==",
       "dev": true
     },
     "vue-loader": {
-      "version": "17.0.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-17.0.0.tgz",
-      "integrity": "sha512-OWSXjrzIvbF2LtOUmxT3HYgwwubbfFelN8PAP9R9dwpIkj48TVioHhWWSx7W7fk+iF5cgg3CBJRxwTdtLU4Ecg==",
+      "version": "17.2.2",
+      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-17.2.2.tgz",
+      "integrity": "sha512-aqNvKJvnz2A/6VWeJZodAo8XLoAlVwBv+2Z6dama+LHsAF+P/xijQ+OfWrxIs0wcGSJduvdzvTuATzXbNKkpiw==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",
         "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
+        "watchpack": "^2.4.0"
       },
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -18854,7 +18948,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
@@ -18864,7 +18958,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -18873,19 +18967,19 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -18901,7 +18995,7 @@
     },
     "vue-style-loader": {
       "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz",
       "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==",
       "dev": true,
       "requires": {
@@ -18911,51 +19005,21 @@
       "dependencies": {
         "hash-sum": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
+          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
           "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
           "dev": true
-        },
-        "json5": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
-          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
         }
       }
     },
-    "vue-template-compiler": {
-      "version": "2.7.13",
-      "resolved": "https://registry.npmmirror.com/vue-template-compiler/-/vue-template-compiler-2.7.13.tgz",
-      "integrity": "sha512-jYM6TClwDS9YqP48gYrtAtaOhRKkbYmbzE+Q51gX5YDr777n7tNI/IZk4QV4l/PjQPNh/FVa/E92sh/RqKMrog==",
-      "dev": true,
-      "requires": {
-        "de-indent": "^1.0.2",
-        "he": "^1.2.0"
-      }
-    },
     "vue-template-es2015-compiler": {
       "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
+      "resolved": "https://registry.npmmirror.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
       "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==",
       "dev": true
     },
     "watchpack": {
       "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "resolved": "https://registry.npmmirror.com/watchpack/-/watchpack-2.4.0.tgz",
       "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
       "requires": {
@@ -18965,7 +19029,7 @@
     },
     "wbuf": {
       "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "resolved": "https://registry.npmmirror.com/wbuf/-/wbuf-1.7.3.tgz",
       "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
       "dev": true,
       "requires": {
@@ -18974,7 +19038,7 @@
     },
     "wcwidth": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/wcwidth/-/wcwidth-1.0.1.tgz",
       "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
       "dev": true,
       "requires": {
@@ -18983,14 +19047,14 @@
     },
     "webidl-conversions": {
       "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
+      "resolved": "https://registry.npmmirror.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
       "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
       "dev": true
     },
     "webpack": {
-      "version": "5.81.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.81.0.tgz",
-      "integrity": "sha512-AAjaJ9S4hYCVODKLQTgG5p5e11hiMawBwV2v8MYLE0C/6UAGLuAF4n1qa9GOwdxnicaP+5k6M5HrLmD4+gIB8Q==",
+      "version": "5.87.0",
+      "resolved": "https://registry.npmmirror.com/webpack/-/webpack-5.87.0.tgz",
+      "integrity": "sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==",
       "dev": true,
       "requires": {
         "@types/eslint-scope": "^3.7.3",
@@ -18999,10 +19063,10 @@
         "@webassemblyjs/wasm-edit": "^1.11.5",
         "@webassemblyjs/wasm-parser": "^1.11.5",
         "acorn": "^8.7.1",
-        "acorn-import-assertions": "^1.7.6",
+        "acorn-import-assertions": "^1.9.0",
         "browserslist": "^4.14.5",
         "chrome-trace-event": "^1.0.2",
-        "enhanced-resolve": "^5.13.0",
+        "enhanced-resolve": "^5.15.0",
         "es-module-lexer": "^1.2.1",
         "eslint-scope": "5.1.1",
         "events": "^3.2.0",
@@ -19012,30 +19076,17 @@
         "loader-runner": "^4.2.0",
         "mime-types": "^2.1.27",
         "neo-async": "^2.6.2",
-        "schema-utils": "^3.1.2",
+        "schema-utils": "^3.2.0",
         "tapable": "^2.1.1",
         "terser-webpack-plugin": "^5.3.7",
         "watchpack": "^2.4.0",
         "webpack-sources": "^3.2.3"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        },
-        "acorn-import-assertions": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
-          "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-          "dev": true,
-          "requires": {}
-        },
         "schema-utils": {
-          "version": "3.1.2",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.2.tgz",
-          "integrity": "sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==",
+          "version": "3.3.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-3.3.0.tgz",
+          "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.8",
@@ -19046,11 +19097,12 @@
       }
     },
     "webpack-bundle-analyzer": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.7.0.tgz",
-      "integrity": "sha512-j9b8ynpJS4K+zfO5GGwsAcQX4ZHpWV+yRiHDiL+bE0XHJ8NiPYLTNVQdlFYWxtpg9lfAQNlwJg16J9AJtFSXRg==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.0.tgz",
+      "integrity": "sha512-+bXGmO1LyiNx0i9enBu3H8mv42sj/BJWhZNFwjz92tVnBa9J3JMGo2an2IXlEleoDOPn/Hofl5hr/xCpObUDtw==",
       "dev": true,
       "requires": {
+        "@discoveryjs/json-ext": "0.5.7",
         "acorn": "^8.0.4",
         "acorn-walk": "^8.0.0",
         "chalk": "^4.1.0",
@@ -19062,15 +19114,9 @@
         "ws": "^7.3.1"
       },
       "dependencies": {
-        "acorn": {
-          "version": "8.8.1",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz",
-          "integrity": "sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==",
-          "dev": true
-        },
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -19079,7 +19125,7 @@
         },
         "chalk": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "resolved": "https://registry.npmmirror.com/chalk/-/chalk-4.1.2.tgz",
           "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
           "dev": true,
           "requires": {
@@ -19089,7 +19135,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -19098,25 +19144,25 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         },
         "commander": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-7.2.0.tgz",
           "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
           "dev": true
         },
         "has-flag": {
           "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/has-flag/-/has-flag-4.0.0.tgz",
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
         "supports-color": {
           "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+          "resolved": "https://registry.npmmirror.com/supports-color/-/supports-color-7.2.0.tgz",
           "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
           "dev": true,
           "requires": {
@@ -19137,7 +19183,7 @@
     },
     "webpack-dev-middleware": {
       "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
+      "resolved": "https://registry.npmmirror.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
       "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
       "dev": true,
       "requires": {
@@ -19149,9 +19195,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -19162,7 +19208,7 @@
         },
         "ajv-keywords": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
           "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "dev": true,
           "requires": {
@@ -19171,28 +19217,28 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
         }
       }
     },
     "webpack-dev-server": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz",
-      "integrity": "sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==",
+      "version": "4.15.1",
+      "resolved": "https://registry.npmmirror.com/webpack-dev-server/-/webpack-dev-server-4.15.1.tgz",
+      "integrity": "sha512-5hbAst3h3C3L8w6W4P96L5vaV0PxSmJhxZvWKYIdgxOQm8pNZ5dEOmmSLBVpP85ReeyRt6AS1QJNyo/oFFPeVA==",
       "dev": true,
       "requires": {
         "@types/bonjour": "^3.5.9",
@@ -19201,7 +19247,7 @@
         "@types/serve-index": "^1.9.1",
         "@types/serve-static": "^1.13.10",
         "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.1",
+        "@types/ws": "^8.5.5",
         "ansi-html-community": "^0.0.8",
         "bonjour-service": "^1.0.11",
         "chokidar": "^3.5.3",
@@ -19214,6 +19260,7 @@
         "html-entities": "^2.3.2",
         "http-proxy-middleware": "^2.0.3",
         "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
         "open": "^8.0.9",
         "p-retry": "^4.5.0",
         "rimraf": "^3.0.2",
@@ -19223,13 +19270,13 @@
         "sockjs": "^0.3.24",
         "spdy": "^4.0.2",
         "webpack-dev-middleware": "^5.3.1",
-        "ws": "^8.4.2"
+        "ws": "^8.13.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "8.11.0",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
-          "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+          "version": "8.12.0",
+          "resolved": "https://registry.npmmirror.com/ajv/-/ajv-8.12.0.tgz",
+          "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -19240,7 +19287,7 @@
         },
         "ajv-keywords": {
           "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
           "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
           "dev": true,
           "requires": {
@@ -19249,35 +19296,35 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "resolved": "https://registry.npmmirror.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
           "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
         },
         "schema-utils": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz",
-          "integrity": "sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-4.2.0.tgz",
+          "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
           "dev": true,
           "requires": {
             "@types/json-schema": "^7.0.9",
-            "ajv": "^8.8.0",
+            "ajv": "^8.9.0",
             "ajv-formats": "^2.1.1",
-            "ajv-keywords": "^5.0.0"
+            "ajv-keywords": "^5.1.0"
           }
         },
         "ws": {
-          "version": "8.10.0",
-          "resolved": "https://registry.npmjs.org/ws/-/ws-8.10.0.tgz",
-          "integrity": "sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw==",
+          "version": "8.13.0",
+          "resolved": "https://registry.npmmirror.com/ws/-/ws-8.13.0.tgz",
+          "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
           "dev": true,
           "requires": {}
         }
       }
     },
     "webpack-merge": {
-      "version": "5.8.0",
-      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
-      "integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
+      "version": "5.9.0",
+      "resolved": "https://registry.npmmirror.com/webpack-merge/-/webpack-merge-5.9.0.tgz",
+      "integrity": "sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==",
       "dev": true,
       "requires": {
         "clone-deep": "^4.0.1",
@@ -19286,19 +19333,19 @@
     },
     "webpack-sources": {
       "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "resolved": "https://registry.npmmirror.com/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true
     },
     "webpack-virtual-modules": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.4.5.tgz",
-      "integrity": "sha512-8bWq0Iluiv9lVf9YaqWQ9+liNgXSHICm+rg544yRgGYaR8yXZTVBaHZkINZSB2yZSWo4b0F6MIxqJezVfOEAlg==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmmirror.com/webpack-virtual-modules/-/webpack-virtual-modules-0.4.6.tgz",
+      "integrity": "sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==",
       "dev": true
     },
     "websocket-driver": {
       "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "resolved": "https://registry.npmmirror.com/websocket-driver/-/websocket-driver-0.7.4.tgz",
       "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
       "dev": true,
       "requires": {
@@ -19309,19 +19356,19 @@
     },
     "websocket-extensions": {
       "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "resolved": "https://registry.npmmirror.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
       "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
       "dev": true
     },
     "whatwg-fetch": {
       "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
+      "resolved": "https://registry.npmmirror.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz",
       "integrity": "sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==",
       "dev": true
     },
     "whatwg-url": {
       "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/whatwg-url/-/whatwg-url-5.0.0.tgz",
       "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
       "dev": true,
       "requires": {
@@ -19339,9 +19386,9 @@
       }
     },
     "wildcard": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
-      "integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmmirror.com/wildcard/-/wildcard-2.0.1.tgz",
+      "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
       "dev": true
     },
     "word-wrap": {
@@ -19352,7 +19399,7 @@
     },
     "wrap-ansi": {
       "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "resolved": "https://registry.npmmirror.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
       "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
       "requires": {
@@ -19363,7 +19410,7 @@
       "dependencies": {
         "ansi-styles": {
           "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "resolved": "https://registry.npmmirror.com/ansi-styles/-/ansi-styles-4.3.0.tgz",
           "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
@@ -19372,7 +19419,7 @@
         },
         "color-convert": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "resolved": "https://registry.npmmirror.com/color-convert/-/color-convert-2.0.1.tgz",
           "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
           "dev": true,
           "requires": {
@@ -19381,7 +19428,7 @@
         },
         "color-name": {
           "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "resolved": "https://registry.npmmirror.com/color-name/-/color-name-1.1.4.tgz",
           "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
           "dev": true
         }
@@ -19393,31 +19440,28 @@
       "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
       "dev": true
     },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmmirror.com/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
     "ws": {
       "version": "7.5.9",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz",
+      "resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
       "integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
       "dev": true,
       "requires": {}
     },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
+    },
     "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmmirror.com/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
       "dev": true
     },
     "yaml": {
       "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "resolved": "https://registry.npmmirror.com/yaml/-/yaml-1.10.2.tgz",
       "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "dev": true
     },
@@ -19434,14 +19478,6 @@
         "string-width": "^4.2.0",
         "y18n": "^5.0.5",
         "yargs-parser": "^20.2.2"
-      },
-      "dependencies": {
-        "y18n": {
-          "version": "5.0.8",
-          "resolved": "https://registry.npmmirror.com/y18n/-/y18n-5.0.8.tgz",
-          "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-          "dev": true
-        }
       }
     },
     "yargs-parser": {
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package.json b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package.json
index 18343f43..4629083a 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package.json
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/package.json
@@ -14,13 +14,13 @@
     "vue-router": "^3.6.5"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "vue-template-compiler": "^2.6.11"
+    "@babel/core": "^7.12.16",
+    "@babel/eslint-parser": "^7.12.16",
+    "@vue/cli-plugin-babel": "~5.0.0",
+    "@vue/cli-plugin-eslint": "~5.0.0",
+    "@vue/cli-service": "~5.0.0",
+    "eslint": "^7.32.0",
+    "eslint-plugin-vue": "^8.0.3"
   },
   "eslintConfig": {
     "root": true,
@@ -28,17 +28,18 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
+      "plugin:vue/vue3-essential",
       "eslint:recommended"
     ],
     "parserOptions": {
-      "parser": "babel-eslint"
+      "parser": "@babel/eslint-parser"
     },
     "rules": {}
   },
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not dead"
+    "not dead",
+    "not ie 11"
   ]
 }
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/index.html b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/index.html
index e0ce93a8..58dff640 100644
--- a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/index.html
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/public/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/vue.config.js b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/vue.config.js
new file mode 100644
index 00000000..910e297e
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-sso/sa-token-demo-sso-client-vue2/vue.config.js
@@ -0,0 +1,4 @@
+const { defineConfig } = require('@vue/cli-service')
+module.exports = defineConfig({
+  transpileDependencies: true
+})

From 1b5b0d8775c566999cb1c8fced1450e12ead78b9 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 03:33:50 +0800
Subject: [PATCH 124/129] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20sa-token-dubbo=20?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9B=B8=E5=85=B3=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml | 12 +++++++-----
 sa-token-demo/sa-token-demo-dubbo-provider/pom.xml | 12 +++++++-----
 sa-token-dependencies/pom.xml                      |  2 +-
 sa-token-plugin/sa-token-dubbo/pom.xml             |  3 ++-
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
index c912a407..910dcd21 100644
--- a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
@@ -9,8 +9,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<!--<version>2.3.3.RELEASE</version>-->
-		<version>2.5.14</version>
+		<!--<version>2.3.1.RELEASE</version>-->
+		<version>2.5.15</version>
 	</parent>
 
 	<!-- 指定一些属性 -->
@@ -18,6 +18,8 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<sa-token.version>1.34.1</sa-token.version>
+		<dubbo.version>2.7.21</dubbo.version>
+		<nacos.version>1.4.2</nacos.version>
 	</properties>
 	
 	<dependencies>
@@ -50,19 +52,19 @@
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-spring-boot-starter</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		
 		<!-- Dubbo 注册到 Nacos -->
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-registry-nacos</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-client</artifactId>
-			<version>1.4.1</version>
+			<version>${nacos.version}</version>
 		</dependency>
 		
 		<!-- Sa-Token 整合 Dubbo -->
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
index 58f8ffb8..026c80ce 100644
--- a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
@@ -9,8 +9,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<!--<version>2.3.3.RELEASE</version>-->
-		<version>2.5.14</version>
+		<!--<version>2.3.1.RELEASE</version>-->
+		<version>2.5.15</version>
 	</parent>
 
 	<!-- 指定一些属性 -->
@@ -18,6 +18,8 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<sa-token.version>1.34.1</sa-token.version>
+		<dubbo.version>2.7.21</dubbo.version>
+		<nacos.version>1.4.2</nacos.version>
 	</properties>
 	
 	<dependencies>
@@ -50,19 +52,19 @@
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-spring-boot-starter</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		
 		<!-- Dubbo 注册到 Nacos -->
 		<dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-registry-nacos</artifactId>
-			<version>2.7.11</version>
+			<version>${dubbo.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba.nacos</groupId>
 			<artifactId>nacos-client</artifactId>
-			<version>1.4.1</version>
+			<version>${nacos.version}</version>
 		</dependency>
 		
 		<!-- Sa-Token 整合 Dubbo -->
diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index 64fbdf02..a5b95a55 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -29,7 +29,7 @@
 		<jfinal.version>4.9.17</jfinal.version>
 		<jboot.version>3.14.4</jboot.version>
 		<commons-pool2.version>2.5.0</commons-pool2.version>
-    <dubbo.version>2.7.21</dubbo.version>
+		<dubbo.version>2.7.21</dubbo.version>
 		<grpc-spring-boot-starter.version>2.10.1.RELEASE</grpc-spring-boot-starter.version>
 		<hutool-jwt.version>5.8.9</hutool-jwt.version>
 		<jjwt.version>0.9.1</jjwt.version>
diff --git a/sa-token-plugin/sa-token-dubbo/pom.xml b/sa-token-plugin/sa-token-dubbo/pom.xml
index a7ca941d..9a9687ae 100644
--- a/sa-token-plugin/sa-token-dubbo/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo/pom.xml
@@ -27,8 +27,9 @@
 	    <dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo</artifactId>
+			<optional>true</optional>
 		</dependency>
-	    
+
 		<!-- <dependency>
 			<groupId>org.apache.dubbo</groupId>
 			<artifactId>dubbo-spring-boot-starter</artifactId>

From 9ca214c016a5af65b55e6b9799e96abbe9598278 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 05:33:23 +0800
Subject: [PATCH 125/129] =?UTF-8?q?sa-token-dubbo3=20=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=20demo=20=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa-token-demo-dubbo-consumer/.gitignore   |  0
 .../sa-token-demo-dubbo-consumer/pom.xml      |  0
 .../com/pj/DubboConsumerApplication.java}     |  6 +-
 .../main/java/com/pj/more/DemoService.java    |  0
 .../main/java/com/pj/more/TestController.java |  0
 .../src/main/resources/application.yml        |  0
 .../sa-token-demo-dubbo-provider/.gitignore   |  0
 .../sa-token-demo-dubbo-provider/pom.xml      |  0
 .../com/pj/DubboProviderApplication.java}     |  6 +-
 .../main/java/com/pj/more/DemoService.java    |  0
 .../java/com/pj/more/DemoServiceImpl.java     |  0
 .../src/main/resources/application.yml        |  0
 .../sa-token-demo-dubbo3-consumer/.gitignore  | 13 +++
 .../sa-token-demo-dubbo3-consumer/pom.xml     | 79 +++++++++++++++++++
 .../com/pj/Dubbo3ConsumerApplication.java     | 22 ++++++
 .../main/java/com/pj/more/DemoService.java    | 16 ++++
 .../main/java/com/pj/more/TestController.java | 72 +++++++++++++++++
 .../src/main/resources/application.yml        | 24 ++++++
 .../sa-token-demo-dubbo3-provider/.gitignore  | 13 +++
 .../sa-token-demo-dubbo3-provider/pom.xml     | 79 +++++++++++++++++++
 .../com/pj/Dubbo3ProviderApplication.java     | 22 ++++++
 .../main/java/com/pj/more/DemoService.java    | 16 ++++
 .../java/com/pj/more/DemoServiceImpl.java     | 23 ++++++
 .../src/main/resources/application.yml        | 38 +++++++++
 24 files changed, 423 insertions(+), 6 deletions(-)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-consumer/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-consumer/pom.xml (100%)
 rename sa-token-demo/{sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java => sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/DubboConsumerApplication.java} (68%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/DemoService.java (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/TestController.java (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-consumer/src/main/resources/application.yml (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-provider/.gitignore (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-provider/pom.xml (100%)
 rename sa-token-demo/{sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java => sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/DubboProviderApplication.java} (68%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoService.java (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoServiceImpl.java (100%)
 rename sa-token-demo/{ => sa-token-demo-dubbo}/sa-token-demo-dubbo-provider/src/main/resources/application.yml (100%)
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/.gitignore
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/Dubbo3ConsumerApplication.java
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/DemoService.java
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/TestController.java
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/resources/application.yml
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/.gitignore
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/Dubbo3ProviderApplication.java
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoService.java
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoServiceImpl.java
 create mode 100644 sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/resources/application.yml

diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/.gitignore b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-consumer/.gitignore
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/.gitignore
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-consumer/pom.xml
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/pom.xml
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/DubboConsumerApplication.java
similarity index 68%
rename from sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/DubboConsumerApplication.java
index 9aac0a84..f4088e60 100644
--- a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/ConsumerApplication.java
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/DubboConsumerApplication.java
@@ -12,11 +12,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 @EnableDubbo
 @SpringBootApplication
-public class ConsumerApplication {
+public class DubboConsumerApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(ConsumerApplication.class, args);
-		System.out.println("ConsumerApplication 启动成功");
+		SpringApplication.run(DubboConsumerApplication.class, args);
+		System.out.println("DubboConsumerApplication 启动成功");
 	}
 
 }
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/DemoService.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/DemoService.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/DemoService.java
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/DemoService.java
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/TestController.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/TestController.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/TestController.java
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/java/com/pj/more/TestController.java
diff --git a/sa-token-demo/sa-token-demo-dubbo-consumer/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-consumer/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-consumer/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/.gitignore b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/.gitignore
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-provider/.gitignore
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/.gitignore
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-provider/pom.xml
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/pom.xml
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/DubboProviderApplication.java
similarity index 68%
rename from sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/DubboProviderApplication.java
index 05afb4fc..728f998e 100644
--- a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/ProviderApplication.java
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/DubboProviderApplication.java
@@ -12,11 +12,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 @EnableDubbo
 @SpringBootApplication
-public class ProviderApplication {
+public class DubboProviderApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(ProviderApplication.class, args);
-		System.out.println("ProviderApplication 启动成功");
+		SpringApplication.run(DubboProviderApplication.class, args);
+		System.out.println("DubboProviderApplication 启动成功");
 	}
 	
 }
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoService.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoService.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoService.java
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoService.java
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoServiceImpl.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoServiceImpl.java
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoServiceImpl.java
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/java/com/pj/more/DemoServiceImpl.java
diff --git a/sa-token-demo/sa-token-demo-dubbo-provider/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/resources/application.yml
similarity index 100%
rename from sa-token-demo/sa-token-demo-dubbo-provider/src/main/resources/application.yml
rename to sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo-provider/src/main/resources/application.yml
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/.gitignore b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/.gitignore
new file mode 100644
index 00000000..304e8d54
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/.gitignore
@@ -0,0 +1,13 @@
+target/
+.project
+.classpath
+.settings
+
+/.idea/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
new file mode 100644
index 00000000..2b5e2b26
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.pj</groupId>
+	<artifactId>sa-token-demo-dubbo3-consumer</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+
+	<!-- SpringBoot -->
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<!--<version>2.3.1.RELEASE</version>-->
+		<version>2.5.15</version>
+	</parent>
+
+	<!-- 指定一些属性 -->
+	<properties> 
+		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<sa-token.version>1.34.1</sa-token.version>
+		<dubbo.version>3.1.5</dubbo.version>
+		<nacos.version>2.1.2</nacos.version>
+	</properties>
+	
+	<dependencies>
+
+		<!-- SpringBoot Web模块 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		
+		<!-- Sa-Token -->
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>${sa-token.version}</version>
+		</dependency>
+		
+		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
+		<dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-redis-jackson</artifactId>
+            <version>${sa-token.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        
+		<!-- Dubbo -->
+		<dependency>
+			<groupId>org.apache.dubbo</groupId>
+			<artifactId>dubbo-spring-boot-starter</artifactId>
+			<version>${dubbo.version}</version>
+		</dependency>
+		
+		<!-- Dubbo 注册到 Nacos -->
+		<dependency>
+			<groupId>org.apache.dubbo</groupId>
+			<artifactId>dubbo-registry-nacos</artifactId>
+			<version>${dubbo.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-client</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
+		
+		<!-- Sa-Token 整合 Dubbo -->
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-dubbo3</artifactId>
+            <version>${sa-token.version}</version>
+		</dependency>
+		
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/Dubbo3ConsumerApplication.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/Dubbo3ConsumerApplication.java
new file mode 100644
index 00000000..1df58fca
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/Dubbo3ConsumerApplication.java
@@ -0,0 +1,22 @@
+package com.pj;
+
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Dubbo3 服务消费端
+ * 
+ * @author click33
+ *
+ */
+@EnableDubbo
+@SpringBootApplication
+public class Dubbo3ConsumerApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(Dubbo3ConsumerApplication.class, args);
+		System.out.println("Dubbo3ConsumerApplication 启动成功");
+	}
+
+}
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/DemoService.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/DemoService.java
new file mode 100644
index 00000000..392a2ead
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/DemoService.java
@@ -0,0 +1,16 @@
+package com.pj.more;
+
+public interface DemoService {
+	
+	/**
+	 * 登录 
+	 * @param loginId 账号id 
+	 */
+	void doLogin(Object loginId);
+	
+	/**
+	 * 判断是否登录，打印状态 
+	 */
+	void isLogin(String str); 
+	
+}
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/TestController.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/TestController.java
new file mode 100644
index 00000000..096afb38
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/java/com/pj/more/TestController.java
@@ -0,0 +1,72 @@
+package com.pj.more;
+
+import org.apache.dubbo.config.annotation.DubboReference;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import cn.dev33.satoken.stp.StpUtil;
+
+@RestController
+public class TestController {
+	
+	@DubboReference
+    private DemoService demoService;
+
+	// Consumer端登录，状态传播到Provider端 
+    @RequestMapping("test")
+    public String test() {
+		demoService.isLogin("----------- 登录前 ");
+		
+		StpUtil.login(10001);
+		
+		demoService.isLogin("----------- 登录后 ");
+		
+        return "ok";
+    }
+
+	// Provider端登录，状态回传到Consumer端 
+    @RequestMapping("test2")
+    public String test2() {
+    	System.out.println("----------- 登录前 ");
+		System.out.println("Token值：" + StpUtil.getTokenValue()); 
+		System.out.println("是否登录：" + StpUtil.isLogin()); 
+    	
+    	demoService.doLogin(10002);
+
+    	System.out.println("----------- 登录后 ");
+		System.out.println("Token值：" + StpUtil.getTokenValue()); 
+		System.out.println("是否登录：" + StpUtil.isLogin()); 
+		
+        return "ok";
+    }
+
+	// Consumer端登录，状态在Consumer端保持 
+    @RequestMapping("test3")
+    public String test3() {
+    	System.out.println("----------- 登录前 ");
+		System.out.println("Token值：" + StpUtil.getTokenValue()); 
+		System.out.println("是否登录：" + StpUtil.isLogin()); 
+
+		StpUtil.login(10003);
+		demoService.isLogin("----------- Provider状态");
+    	
+    	System.out.println("----------- 登录后 ");
+		System.out.println("Token值：" + StpUtil.getTokenValue()); 
+		System.out.println("是否登录：" + StpUtil.isLogin()); 
+		
+        return "ok";
+    }
+
+	// Provider端登录，状态在Provider端保持 
+    @RequestMapping("test4")
+    public String test4() {
+    	// 登录 
+    	demoService.doLogin(10004);
+		
+    	// 打印一下 
+		demoService.isLogin("----------- 会话信息 ");
+		
+        return "ok";
+    }
+    
+}
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/resources/application.yml
new file mode 100644
index 00000000..a877a366
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/src/main/resources/application.yml
@@ -0,0 +1,24 @@
+server:
+    # 端口号 
+    port: 8081
+
+spring: 
+    # redis配置 
+    redis: 
+        # Redis数据库索引（默认为0）
+        database: 0
+        # Redis服务器地址
+        host: 127.0.0.1
+        # Redis服务器连接端口
+        port: 6379
+        # Redis服务器连接密码（默认为空）
+        password: 
+        # 连接超时时间
+        
+dubbo: 
+    application: 
+        # 服务名称 
+        name: dubbo-consumer-demo
+    registry: 
+        # 注册中心地址 
+        address: nacos://127.0.0.1:8001
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/.gitignore b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/.gitignore
new file mode 100644
index 00000000..304e8d54
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/.gitignore
@@ -0,0 +1,13 @@
+target/
+.project
+.classpath
+.settings
+
+/.idea/
+
+node_modules/
+bin/
+.settings/
+unpackage/
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
new file mode 100644
index 00000000..2ceb1572
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
@@ -0,0 +1,79 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.pj</groupId>
+	<artifactId>sa-token-demo-dubbo3-provider</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+
+	<!-- SpringBoot -->
+	<parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<!--<version>2.3.1.RELEASE</version>-->
+		<version>2.5.15</version>
+	</parent>
+
+	<!-- 指定一些属性 -->
+	<properties> 
+		<java.version>1.8</java.version>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<sa-token.version>1.34.1</sa-token.version>
+		<dubbo.version>3.1.5</dubbo.version>
+		<nacos.version>2.1.2</nacos.version>
+	</properties>
+	
+	<dependencies>
+
+		<!-- SpringBoot Web模块 -->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		
+		<!-- Sa-Token -->
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-spring-boot-starter</artifactId>
+            <version>${sa-token.version}</version>
+		</dependency>
+		
+		<!-- Sa-Token整合 Redis (使用jackson序列化方式) -->
+		<dependency>
+            <groupId>cn.dev33</groupId>
+            <artifactId>sa-token-redis-jackson</artifactId>
+            <version>${sa-token.version}</version>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
+        
+		<!-- Dubbo -->
+		<dependency>
+			<groupId>org.apache.dubbo</groupId>
+			<artifactId>dubbo-spring-boot-starter</artifactId>
+			<version>${dubbo.version}</version>
+		</dependency>
+		
+		<!-- Dubbo 注册到 Nacos -->
+		<dependency>
+			<groupId>org.apache.dubbo</groupId>
+			<artifactId>dubbo-registry-nacos</artifactId>
+			<version>${dubbo.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba.nacos</groupId>
+			<artifactId>nacos-client</artifactId>
+			<version>${nacos.version}</version>
+		</dependency>
+		
+		<!-- Sa-Token 整合 Dubbo -->
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-dubbo3</artifactId>
+            <version>${sa-token.version}</version>
+		</dependency>
+		
+	</dependencies>
+
+</project>
\ No newline at end of file
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/Dubbo3ProviderApplication.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/Dubbo3ProviderApplication.java
new file mode 100644
index 00000000..69243e22
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/Dubbo3ProviderApplication.java
@@ -0,0 +1,22 @@
+package com.pj;
+
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * Dubbo3 服务提供端
+ * 
+ * @author click33
+ *
+ */
+@EnableDubbo
+@SpringBootApplication
+public class Dubbo3ProviderApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(Dubbo3ProviderApplication.class, args);
+		System.out.println("Dubbo3ProviderApplication 启动成功");
+	}
+	
+}
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoService.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoService.java
new file mode 100644
index 00000000..392a2ead
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoService.java
@@ -0,0 +1,16 @@
+package com.pj.more;
+
+public interface DemoService {
+	
+	/**
+	 * 登录 
+	 * @param loginId 账号id 
+	 */
+	void doLogin(Object loginId);
+	
+	/**
+	 * 判断是否登录，打印状态 
+	 */
+	void isLogin(String str); 
+	
+}
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoServiceImpl.java b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoServiceImpl.java
new file mode 100644
index 00000000..8cfe559c
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/java/com/pj/more/DemoServiceImpl.java
@@ -0,0 +1,23 @@
+package com.pj.more;
+
+import org.apache.dubbo.config.annotation.DubboService;
+
+import cn.dev33.satoken.stp.StpUtil;
+
+@DubboService()
+public class DemoServiceImpl implements DemoService {
+
+	@Override
+	public void doLogin(Object loginId) {
+		StpUtil.login(loginId);
+	}
+
+	@Override
+	public void isLogin(String str) {
+		System.out.println(str);
+		System.out.println("Token值：" + StpUtil.getTokenValue()); 
+		System.out.println("是否登录：" + StpUtil.isLogin()); 
+	}
+
+}
+
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/resources/application.yml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/resources/application.yml
new file mode 100644
index 00000000..1aac2ea7
--- /dev/null
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/src/main/resources/application.yml
@@ -0,0 +1,38 @@
+server:
+    # 端口号 
+    port: 8080
+    
+spring: 
+    # redis配置 
+    redis:
+        # Redis数据库索引（默认为0）
+        database: 0
+        # Redis服务器地址
+        host: 127.0.0.1
+        # Redis服务器连接端口
+        port: 6379
+        # Redis服务器连接密码（默认为空）
+        password: 
+        # 连接超时时间
+        timeout: 10s
+        
+# Dubbo
+dubbo: 
+    # 服务名 
+    application: 
+        name: dubbo-provider-demo
+    # 扫描包 
+    scan: 
+        base-packages: com.pj
+    # 注册中心地址 
+    registry: 
+        address: nacos://127.0.0.1:8001
+    # 协议
+    protocol: 
+        name: dubbo
+        port: 12345
+        
+        
+        
+        
+        
\ No newline at end of file

From 258c155487ab07ddc2d685f1b3aec0a68d965944 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 05:57:58 +0800
Subject: [PATCH 126/129] =?UTF-8?q?sa-token-dubbo3=20=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E5=8D=87=E7=BA=A7=E5=88=B0=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml | 4 ++--
 .../sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml | 4 ++--
 sa-token-plugin/sa-token-dubbo3/pom.xml                       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
index 2b5e2b26..07e0a39e 100644
--- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-consumer/pom.xml
@@ -18,8 +18,8 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<sa-token.version>1.34.1</sa-token.version>
-		<dubbo.version>3.1.5</dubbo.version>
-		<nacos.version>2.1.2</nacos.version>
+		<dubbo.version>3.2.2</dubbo.version>
+		<nacos.version>2.2.2</nacos.version>
 	</properties>
 	
 	<dependencies>
diff --git a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
index 2ceb1572..87bfb9d7 100644
--- a/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
+++ b/sa-token-demo/sa-token-demo-dubbo/sa-token-demo-dubbo3-provider/pom.xml
@@ -18,8 +18,8 @@
 		<java.version>1.8</java.version>
 		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
 		<sa-token.version>1.34.1</sa-token.version>
-		<dubbo.version>3.1.5</dubbo.version>
-		<nacos.version>2.1.2</nacos.version>
+		<dubbo.version>3.2.2</dubbo.version>
+		<nacos.version>2.2.2</nacos.version>
 	</properties>
 	
 	<dependencies>
diff --git a/sa-token-plugin/sa-token-dubbo3/pom.xml b/sa-token-plugin/sa-token-dubbo3/pom.xml
index a974692a..950cd0f6 100644
--- a/sa-token-plugin/sa-token-dubbo3/pom.xml
+++ b/sa-token-plugin/sa-token-dubbo3/pom.xml
@@ -16,7 +16,7 @@
 
 
     <properties>
-        <dubbo3.version>3.1.5</dubbo3.version>
+        <dubbo3.version>3.2.2</dubbo3.version>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 06f3f6612030933ab569154ccec7182ab17a1173 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 06:01:40 +0800
Subject: [PATCH 127/129] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mvn clean.bat                  | 9 +++++++--
 sa-token-doc/start/download.md | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/mvn clean.bat b/mvn clean.bat
index f2df64a4..d000e5b0 100644
--- a/mvn clean.bat	
+++ b/mvn clean.bat	
@@ -8,8 +8,6 @@ cd sa-token-demo
 cd sa-token-demo-alone-redis & call mvn clean & cd ..
 cd sa-token-demo-alone-redis-cluster & call mvn clean & cd ..
 cd sa-token-demo-case & call mvn clean & cd ..
-cd sa-token-demo-dubbo-consumer & call mvn clean & cd ..
-cd sa-token-demo-dubbo-provider & call mvn clean & cd ..
 cd sa-token-demo-grpc & call mvn clean & cd ..
 cd sa-token-demo-jwt & call mvn clean & cd ..
 cd sa-token-demo-oauth2-client & call mvn clean & cd ..
@@ -49,6 +47,13 @@ cd sa-token-demo-oauth2-client & call mvn clean & cd ..
 cd sa-token-demo-oauth2-server & call mvn clean & cd ..
 cd ..
 
+cd sa-token-demo-dubbo
+cd sa-token-demo-dubbo-consumer & call mvn clean & cd ..
+cd sa-token-demo-dubbo-provider & call mvn clean & cd ..
+cd sa-token-demo-dubbo3-consumer & call mvn clean & cd ..
+cd sa-token-demo-dubbo3-provider & call mvn clean & cd ..
+cd ..
+
 cd sa-token-demo-remember-me
 cd server_project & call mvn clean & cd ..
 cd ..
diff --git a/sa-token-doc/start/download.md b/sa-token-doc/start/download.md
index d7052f53..aa993ab7 100644
--- a/sa-token-doc/start/download.md
+++ b/sa-token-doc/start/download.md
@@ -219,8 +219,6 @@ Maven依赖一直无法加载成功？[参考解决方案](https://sa-token.cc/d
 		├── sa-token-demo-websocket               // [示例] Sa-Token 集成 Web-Socket 鉴权示例
 		├── sa-token-demo-websocket-spring        // [示例] Sa-Token 集成 Web-Socket（Spring封装版） 鉴权示例
 		├── sa-token-demo-thymeleaf               // [示例] Sa-Token 集成 Thymeleaf 标签方言
-		├── sa-token-demo-dubbo-consumer          // [示例] Sa-Token 集成 dubbo 鉴权，消费端（调用端）
-		├── sa-token-demo-dubbo-provider          // [示例] Sa-Token 集成 dubbo 鉴权，生产端（被调用端）
 		├── sa-token-demo-sso                     // [示例] Sa-Token 集成 SSO 单点登录
 			├── sa-token-demo-sso-server              // [示例] Sa-Token 集成 SSO单点登录-Server认证中心
 			├── sa-token-demo-sso1-client             // [示例] Sa-Token 集成 SSO单点登录-模式一 应用端 (同域、同Redis)
@@ -239,6 +237,11 @@ Maven依赖一直无法加载成功？[参考解决方案](https://sa-token.cc/d
 		├── sa-token-demo-oauth2                  // [示例] Sa-Token 集成 OAuth2.0
 			├── sa-token-demo-oauth2-server           // [示例] Sa-Token 集成 OAuth2.0 (服务端)
 			├── sa-token-demo-oauth2-client           // [示例] Sa-Token 集成 OAuth2.0 (客户端)
+		├── sa-token-demo-dubbo                   // [示例] Sa-Token 集成 dubbo
+			├── sa-token-demo-dubbo-consumer          // [示例] Sa-Token 集成 dubbo 鉴权，消费端（调用端）
+			├── sa-token-demo-dubbo-provider          // [示例] Sa-Token 集成 dubbo 鉴权，生产端（被调用端）
+			├── sa-token-demo-dubbo3-consumer         // [示例] Sa-Token 集成 dubbo3 鉴权，消费端（调用端）
+			├── sa-token-demo-dubbo3-provider         // [示例] Sa-Token 集成 dubbo3 鉴权，生产端（被调用端）
 		├── sa-token-demo-remember-me             // [示例] Sa-Token 实现 [ 记住我 ] 模式
 			├── page_project                          // [示例] Sa-Token 实现 [ 记住我 ] 模式、前端页面
 			├── server_project                        // [示例] Sa-Token 实现 [ 记住我 ] 模式、后端接口

From b55e7c9000f6c690be07d67a5d2340311ca851cc Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 06:16:40 +0800
Subject: [PATCH 128/129] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-doc/plugin/thymeleaf-extend.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/sa-token-doc/plugin/thymeleaf-extend.md b/sa-token-doc/plugin/thymeleaf-extend.md
index 9a17fd5c..076cea86 100644
--- a/sa-token-doc/plugin/thymeleaf-extend.md
+++ b/sa-token-doc/plugin/thymeleaf-extend.md
@@ -126,8 +126,25 @@ public class SaTokenConfigure{
 ```
 
 
-
-
+### 5、代码提示
+
+如果想在写标签属性时增加代码提示：
+
+![thymeleaf-code-tips.png](https://oss.dev33.cn/sa-token/doc/thymeleaf-code-tips.png 's-w')
+
+只需在头部声明增加上对应的命名空间即可：
+
+``` html
+<!DOCTYPE html>
+<html lang="zh" xmlns:sa="http://www.thymeleaf.org/extras/sa-token">
+	<head>
+		<!-- 代码 -->
+	</head>
+	<body>
+		<!-- 代码 -->
+	</body>
+</html>
+```
 
 
 

From 5e345ae0d6aaa7480f791f52a9109b80864f9d7f Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Wed, 21 Jun 2023 15:26:52 +0800
Subject: [PATCH 129/129] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20hutool-jwt=20?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sa-token-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sa-token-dependencies/pom.xml b/sa-token-dependencies/pom.xml
index a5b95a55..6af33c3a 100644
--- a/sa-token-dependencies/pom.xml
+++ b/sa-token-dependencies/pom.xml
@@ -31,7 +31,7 @@
 		<commons-pool2.version>2.5.0</commons-pool2.version>
 		<dubbo.version>2.7.21</dubbo.version>
 		<grpc-spring-boot-starter.version>2.10.1.RELEASE</grpc-spring-boot-starter.version>
-		<hutool-jwt.version>5.8.9</hutool-jwt.version>
+		<hutool-jwt.version>5.8.20</hutool-jwt.version>
 		<jjwt.version>0.9.1</jjwt.version>
 		<fastjson.version>1.2.83</fastjson.version>
 		<fastjson2.version>2.0.15</fastjson2.version>