refactor: 优化部分类名，更语义化

sa-token-starter/sa-token-jakarta-servlet/src/main/java/cn/dev33/satoken/servlet/util/SaTokenContextJakartaServletUtil.java

@@ -21,6 +21,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.context.model.SaStorage;
 import cn.dev33.satoken.context.model.SaTokenContextModelBox;
 import cn.dev33.satoken.fun.SaFunction;
+import cn.dev33.satoken.fun.SaRetGenericFunction;
 import cn.dev33.satoken.servlet.model.SaRequestForServlet;
 import cn.dev33.satoken.servlet.model.SaResponseForServlet;
 import cn.dev33.satoken.servlet.model.SaStorageForServlet;
@@ -34,7 +35,7 @@ import jakarta.servlet.http.HttpServletResponse;
  * @author click33
  * @since 1.42.0
  */
-public class SaTokenContextUtil {
+public class SaTokenContextJakartaServletUtil {
 
 	/**
 	 * 写入当前上下文
@@ -48,13 +49,6 @@ public class SaTokenContextUtil {
 		SaManager.getSaTokenContext().setContext(req, res, stg);
 	}
 
-	/**
-	 * 清除当前上下文
-	 */
-	public static void clearContext() {
-		SaManager.getSaTokenContext().clearContext();
-	}
-
 	/**
 	 * 写入上下文对象, 并在执行函数后将其清除
 	 * @param request /
@@ -70,6 +64,31 @@ public class SaTokenContextUtil {
 		}
 	}
 
+	/**
+	 * 写入上下文对象, 并在执行函数后将其清除
+	 *
+	 * @param request /
+	 * @param response /
+	 * @param fun /
+	 * @return /
+	 * @param <T> /
+	 */
+	public static <T> T setContext(HttpServletRequest request, HttpServletResponse response, SaRetGenericFunction<T> fun) {
+		try {
+			setContext(request, response);
+			return fun.run();
+		} finally {
+			clearContext();
+		}
+	}
+
+	/**
+	 * 清除当前上下文
+	 */
+	public static void clearContext() {
+		SaManager.getSaTokenContext().clearContext();
+	}
+
 	/**
 	 * 获取当前 ModelBox
 	 * @return /

sa-token-starter/sa-token-servlet/src/main/java/cn/dev33/satoken/servlet/util/SaTokenContextServletUtil.java

@@ -21,6 +21,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.context.model.SaStorage;
 import cn.dev33.satoken.context.model.SaTokenContextModelBox;
 import cn.dev33.satoken.fun.SaFunction;
+import cn.dev33.satoken.fun.SaRetGenericFunction;
 import cn.dev33.satoken.servlet.model.SaRequestForServlet;
 import cn.dev33.satoken.servlet.model.SaResponseForServlet;
 import cn.dev33.satoken.servlet.model.SaStorageForServlet;
@@ -34,7 +35,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author click33
  * @since 1.42.0
  */
-public class SaTokenContextUtil {
+public class SaTokenContextServletUtil {
 
 	/**
 	 * 写入当前上下文
@@ -48,13 +49,6 @@ public class SaTokenContextUtil {
 		SaManager.getSaTokenContext().setContext(req, res, stg);
 	}
 
-	/**
-	 * 清除当前上下文
-	 */
-	public static void clearContext() {
-		SaManager.getSaTokenContext().clearContext();
-	}
-
 	/**
 	 * 写入上下文对象, 并在执行函数后将其清除
 	 * @param request /
@@ -70,6 +64,31 @@ public class SaTokenContextUtil {
 		}
 	}
 
+	/**
+	 * 写入上下文对象, 并在执行函数后将其清除
+	 *
+	 * @param request /
+	 * @param response /
+	 * @param fun /
+	 * @return /
+	 * @param <T> /
+	 */
+	public static <T> T setContext(HttpServletRequest request, HttpServletResponse response, SaRetGenericFunction<T> fun) {
+		try {
+			setContext(request, response);
+			return fun.run();
+		} finally {
+			clearContext();
+		}
+	}
+
+	/**
+	 * 清除当前上下文
+	 */
+	public static void clearContext() {
+		SaManager.getSaTokenContext().clearContext();
+	}
+
 	/**
 	 * 获取当前 ModelBox
 	 * @return /

sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/integration/SaTokenContextFilterForSolon.java

@@ -15,7 +15,7 @@
  */
 package cn.dev33.satoken.solon.integration;
 
-import cn.dev33.satoken.solon.util.SaTokenContextUtil;
+import cn.dev33.satoken.solon.util.SaTokenContextSolonUtil;
 import org.noear.solon.core.handle.Context;
 import org.noear.solon.core.handle.Filter;
 import org.noear.solon.core.handle.FilterChain;
@@ -31,10 +31,10 @@ public class SaTokenContextFilterForSolon implements Filter {
 	@Override
 	public void doFilter(Context ctx, FilterChain chain) throws Throwable {
 		try {
-			SaTokenContextUtil.setContext(ctx);
+			SaTokenContextSolonUtil.setContext(ctx);
 			chain.doFilter(ctx);
 		} finally {
-			SaTokenContextUtil.clearContext();
+			SaTokenContextSolonUtil.clearContext();
 		}
 	}
 

sa-token-starter/sa-token-solon-plugin/src/main/java/cn/dev33/satoken/solon/util/SaTokenContextSolonUtil.java

@@ -21,6 +21,7 @@ import cn.dev33.satoken.context.model.SaResponse;
 import cn.dev33.satoken.context.model.SaStorage;
 import cn.dev33.satoken.context.model.SaTokenContextModelBox;
 import cn.dev33.satoken.fun.SaFunction;
+import cn.dev33.satoken.fun.SaRetGenericFunction;
 import cn.dev33.satoken.solon.model.SaRequestForSolon;
 import cn.dev33.satoken.solon.model.SaResponseForSolon;
 import cn.dev33.satoken.solon.model.SaStorageForSolon;
@@ -32,7 +33,7 @@ import org.noear.solon.core.handle.Context;
  * @author click33
  * @since 1.42.0
  */
-public class SaTokenContextUtil {
+public class SaTokenContextSolonUtil {
 
 	/**
 	 * 写入当前上下文
@@ -44,13 +45,6 @@ public class SaTokenContextUtil {
 		SaManager.getSaTokenContext().setContext(req, res, stg);
 	}
 
-	/**
-	 * 清除当前上下文
-	 */
-	public static void clearContext() {
-		SaManager.getSaTokenContext().clearContext();
-	}
-
 	/**
 	 * 写入上下文对象, 并在执行函数后将其清除
 	 * @param ctx /
@@ -65,6 +59,30 @@ public class SaTokenContextUtil {
 		}
 	}
 
+	/**
+	 * 写入上下文对象, 并在执行函数后将其清除
+	 *
+	 * @param ctx /
+	 * @param fun /
+	 * @return /
+	 * @param <T> /
+	 */
+	public static <T> T setContext(Context ctx, SaRetGenericFunction<T> fun) {
+		try {
+			setContext(ctx);
+			return fun.run();
+		} finally {
+			clearContext();
+		}
+	}
+
+	/**
+	 * 清除当前上下文
+	 */
+	public static void clearContext() {
+		SaManager.getSaTokenContext().clearContext();
+	}
+
 	/**
 	 * 获取当前 ModelBox
 	 * @return /

sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/filter/SaTokenContextFilterForServlet.java

@@ -15,7 +15,7 @@
  */
 package cn.dev33.satoken.filter;
 
-import cn.dev33.satoken.servlet.util.SaTokenContextUtil;
+import cn.dev33.satoken.servlet.util.SaTokenContextServletUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 import org.springframework.core.annotation.Order;
 
@@ -36,10 +36,10 @@ public class SaTokenContextFilterForServlet implements Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		try {
-			SaTokenContextUtil.setContext((HttpServletRequest) request, (HttpServletResponse) response);
+			SaTokenContextServletUtil.setContext((HttpServletRequest) request, (HttpServletResponse) response);
 			chain.doFilter(request, response);
 		} finally {
-			SaTokenContextUtil.clearContext();
+			SaTokenContextServletUtil.clearContext();
 		}
 	}
 

sa-token-starter/sa-token-spring-boot3-starter/src/main/java/cn/dev33/satoken/filter/SaTokenContextFilterForJakartaServlet.java

@@ -15,7 +15,7 @@
  */
 package cn.dev33.satoken.filter;
 
-import cn.dev33.satoken.servlet.util.SaTokenContextUtil;
+import cn.dev33.satoken.servlet.util.SaTokenContextJakartaServletUtil;
 import cn.dev33.satoken.util.SaTokenConsts;
 import jakarta.servlet.*;
 import jakarta.servlet.http.HttpServletRequest;
@@ -36,10 +36,10 @@ public class SaTokenContextFilterForJakartaServlet implements Filter {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
 		try {
-			SaTokenContextUtil.setContext((HttpServletRequest) request, (HttpServletResponse) response);
+			SaTokenContextJakartaServletUtil.setContext((HttpServletRequest) request, (HttpServletResponse) response);
 			chain.doFilter(request, response);
 		} finally {
-			SaTokenContextUtil.clearContext();
+			SaTokenContextJakartaServletUtil.clearContext();
 		}
 	}