diff --git a/sa-token-doc/api/stp-util.md b/sa-token-doc/api/stp-util.md
index 2e492673..5f665c6c 100644
--- a/sa-token-doc/api/stp-util.md
+++ b/sa-token-doc/api/stp-util.md
@@ -135,7 +135,7 @@ StpUtil.hasPermission(permission);   // 判断：当前账号是否拥有指定
 StpUtil.hasPermission(loginId, permission);   // 判断：指定账号是否含有指定权限标识, 返回true或false 
 StpUtil.hasPermissionAnd(...permissionArray);   // 判断：当前账号是否含有指定权限标识 [指定多个，必须全部验证通过] 
 StpUtil.hasPermissionOr(...permissionArray);   // 判断：当前账号是否含有指定权限标识 [指定多个，只要其一验证通过即可] 
-StpUtil.checkPermission(permission);   // 校验：当前账号是否含有指定权限标识, 如果验证未通过，则抛出异常: NotRPermissionException 
+StpUtil.checkPermission(permission);   // 校验：当前账号是否含有指定权限标识, 如果验证未通过，则抛出异常: NotPermissionException 
 StpUtil.checkPermissionAnd(...permissionArray);   // 校验：当前账号是否含有指定权限标识 [指定多个，必须全部验证通过] 
 StpUtil.checkPermissionOr(...permissionArray);   // 校验：当前账号是否含有指定权限标识 [指定多个，只要其一验证通过即可] 
 ```
diff --git a/sa-token-doc/more/common-action.md b/sa-token-doc/more/common-action.md
index a0511ab0..7310b58a 100644
--- a/sa-token-doc/more/common-action.md
+++ b/sa-token-doc/more/common-action.md
@@ -9,9 +9,7 @@ SaManager 负责管理 Sa-Token 所有全局组件。
 SaManager.getConfig();                 // 获取全局配置对象 
 SaManager.getSaTokenDao();             // 获取数据持久化对象 
 SaManager.getStpInterface();           // 获取权限认证对象 
-SaManager.getSaTokenContext();         // 获取一级Context处理对象
-SaManager.getSaTokenSecondContext();   // 获取二级Context处理对象
-SaManager.getSaTokenContextOrSecond(); // 获取一个可用的 Context 处理对象
+SaManager.getSaTokenContext();         // 获取SaTokenContext上下文处理对象
 SaManager.getSaTokenListener();        // 获取侦听器对象 
 SaManager.getSaTemp();                 // 获取临时令牌认证模块对象 
 SaManager.getSaJsonTemplate();         // 获取 JSON 转换器 Bean
diff --git a/sa-token-test/sa-token-springboot-test/pom.xml b/sa-token-test/sa-token-springboot-test/pom.xml
index 628ee136..8dd4aa5d 100644
--- a/sa-token-test/sa-token-springboot-test/pom.xml
+++ b/sa-token-test/sa-token-springboot-test/pom.xml
@@ -31,6 +31,11 @@
 			<artifactId>sa-token-oauth2</artifactId>
             <scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>cn.dev33</groupId>
+			<artifactId>sa-token-sign</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<!-- 冗余（生成单元测试报告） -->
 		<dependency>
 			<groupId>cn.dev33</groupId>
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 c1acf473..a116609d 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,8 +15,8 @@
  */
 package cn.dev33.satoken.core.sign;
 
-import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.config.SaSignConfig;
+import cn.dev33.satoken.sign.SaSignManager;
+import cn.dev33.satoken.sign.config.SaSignConfig;
 import cn.dev33.satoken.util.SoMap;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -38,7 +38,7 @@ public class SaSignTemplateTest {
 				.set("name", "zhang")
 				.set("age", 18)
 				.set("sex", "女");
-		String str = SaManager.getSaSignTemplate().joinParamsDictSort(map);
+		String str = SaSignManager.getSaSignTemplate().joinParamsDictSort(map);
 
 		// 按照音序排列 
 		Assertions.assertEquals(str, "age=18&name=zhang&sex=女");
@@ -51,12 +51,12 @@ public class SaSignTemplateTest {
 				.set("name", "zhang")
 				.set("age", 18)
 				.set("sex", "女");
-		SaManager.getSaSignTemplate().setSignConfig(new SaSignConfig().setSecretKey(key));
-		String sign = SaManager.getSaSignTemplate().createSign(map);
+		SaSignManager.getSaSignTemplate().setSignConfig(new SaSignConfig().setSecretKey(key));
+		String sign = SaSignManager.getSaSignTemplate().createSign(map);
 		Assertions.assertEquals(sign, "6f5e844a53e74363c2f6b24f64c4f0ff");
 		
 		// 多次签名，结果一致  
-		String sign2 = SaManager.getSaSignTemplate().createSign(map);
+		String sign2 = SaSignManager.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 d32be935..891e993e 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,7 +15,7 @@
  */
 package cn.dev33.satoken.integrate.configure.inject;
 
-import cn.dev33.satoken.sign.SaSignTemplate;
+import cn.dev33.satoken.sign.template.SaSignTemplate;
 import org.springframework.stereotype.Component;
 
 @Component