v1.30.0.RC up

2025-09-19 01:58:05 +08:00 · 2022-05-01 13:34:46 +08:00
parent 21147043f2
commit abba41b6f7
30 changed files with 38 additions and 35 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,4 @@ unpackage/

 .idea/

-
+.flattened-pom.xml
--- 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
@@ -50,7 +50,7 @@ public class NotPermissionException extends SaTokenException {
 	}

 	/**
-	 * <h1> 警告：自 v1.30+ 版本起，获取异常权限码由 getCode() 更改为 getPermission()，请及时更换！ 
+	 * <h1> 警告：自 v1.30+ 版本起，获取异常权限码由 getCode() 更改为 getPermission()，请及时更换！ </h1> 
 	 * @return 获得权限码
 	 */
 	@Deprecated
--- a/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaExceptionCode.java
+++ b/sa-token-core/src/main/java/cn/dev33/satoken/exception/SaExceptionCode.java
@@ -4,7 +4,7 @@ package cn.dev33.satoken.exception;
 * 定义所有异常细分状态码 
 * 
 * @author kong
- * @date: 2022-4-25
+ * @since: 2022-4-25
 */
 public class SaExceptionCode {
 	
--- 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
@@ -14,9 +14,10 @@ public class SaJsonConvertException extends SaTokenException {
 	
 	/**
 	 * 一个异常：代表 JSON 转换失败 
+	 * @param cause 异常对象
 	 */
-	public SaJsonConvertException(Throwable e) {
-		super(e);
+	public SaJsonConvertException(Throwable cause) {
+		super(cause);
 	}

 }
--- 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
@@ -72,6 +72,7 @@ public class SaTokenException extends RuntimeException {
 	}

 	/**
+	 * 获取异常细分状态码
 	 * @return 异常细分状态码
 	 */
 	public int getCode() {
--- 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
@@ -19,10 +19,9 @@ public interface SaJsonTemplate {
 	public String toJsonString(Object obj);

 	/**
-	 * 将 json 字符串解析为 Map
-	 * 
+	 * 解析 json 字符串为map对象 
 	 * @param jsonStr json字符串 
-	 * @return 转换后的 Map 对象
+	 * @return map对象
 	 */
 	public Map<String, Object> parseJsonToMap(String jsonStr);
 	
--- 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
@@ -10,12 +10,12 @@ import cn.dev33.satoken.util.SaFoxUtil;
 * 参数签名算法 
 * 
 * @author kong
- * @date: 2022-4-27
+ * @since: 2022-4-27
 */
 public interface SaSignTemplate {

 	/**
-	 * 将所有参数连接成一个字符串，形如： k1=v1&k2=v2&k3=v3
+	 * 将所有参数连接成一个字符串 
 	 * @param paramsMap 参数列表
 	 * @return 字符串
 	 */
@@ -47,7 +47,7 @@ public interface SaSignTemplate {
 	 * 创建签名：md5(paramsStr + keyStr)
 	 * @param paramsMap 参数列表 
 	 * @param key 秘钥 
-	 * @return
+	 * @return 签名 
 	 */
 	public default String createSign(Map<String, Object> paramsMap, String key) {
 		String paramsStr = joinParams(paramsMap);
--- 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
@@ -4,7 +4,7 @@ package cn.dev33.satoken.sign;
 * 参数签名算法 [默认实现类]
 * 
 * @author kong
- * @date: 2022-4-27
+ * @since: 2022-4-27
 */
 public class SaSignTemplateDefaultImpl implements SaSignTemplate {

--- 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-sso3-client-nosdk/src/main/java/com/pj/sso/SsoRequestUtil.java
@@ -13,7 +13,7 @@ import com.pj.sso.util.AjaxJson;
 * 封装一些 sso 共用方法 
 * 
 * @author kong
- * @date: 2022-4-30
+ * @since: 2022-4-30
 */
 public class SsoRequestUtil {

--- 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-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 kong
- * @date: 2022-4-30
+ * @since: 2022-4-30
 */
@Component
 public class MyHttpSessionHolder implements HttpSessionListener {
--- 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 kong
- * @date: 2022-2-11
+ * @since: 2022-2-11
 */
 public class MyWebSocketHandler extends TextWebSocketHandler {

--- 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 kong
- * @date: 2022-2-11
+ * @since: 2022-2-11
 */
@Configuration
@EnableWebSocket
--- 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 kong
- * @date: 2022-2-11
+ * @since: 2022-2-11
 */
 public class WebSocketInterceptor implements HandshakeInterceptor {

--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMix.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForMix.java
@@ -4,7 +4,7 @@ package cn.dev33.satoken.jwt;
 * 已更名为 StpLogicJwtForMixin，请更换 
 * 
 * @author kong
- * @date: 2022-5-1
+ * @since: 2022-5-1
 */
@Deprecated
 public class StpLogicJwtForMix extends StpLogicJwtForMixin {
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStyle.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/StpLogicJwtForStyle.java
@@ -4,7 +4,7 @@ package cn.dev33.satoken.jwt;
 * 已更名为 StpLogicJwtForSimple，请更换 
 * 
 * @author kong
- * @date: 2022-5-1
+ * @since: 2022-5-1
 */
@Deprecated
 public class StpLogicJwtForStyle extends StpLogicJwtForSimple {
--- a/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtExceptionCode.java
+++ b/sa-token-plugin/sa-token-jwt/src/main/java/cn/dev33/satoken/jwt/exception/SaJwtExceptionCode.java
@@ -4,7 +4,7 @@ package cn.dev33.satoken.jwt.exception;
 * 定义所有 JWT 异常细分状态码 
 * 
 * @author kong
- * @date: 2022-5-1 
+ * @since: 2022-5-1 
 */
 public class SaJwtExceptionCode {

--- 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
@@ -441,7 +441,8 @@ public class SaSsoTemplate {

 	/**
 	 * 给 url 追加 sign 等参数 
-	 * @param loginId
+	 * @param url 连接
+	 * @param loginId 账号id 
 	 * @return 加工后的url 
 	 */
 	public String addSignParams(String url, Object loginId) {
--- 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
@@ -204,7 +204,8 @@ public class SaSsoUtil {

 	/**
 	 * 给 url 追加 sign 等参数 
-	 * @param loginId
+	 * @param url 连接
+	 * @param loginId 账号id 
 	 * @return 加工后的url 
 	 */
 	public static String addSignParams(String url, Object loginId) {
--- a/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoExceptionCode.java
+++ b/sa-token-plugin/sa-token-sso/src/main/java/cn/dev33/satoken/sso/exception/SaSsoExceptionCode.java
@@ -4,7 +4,7 @@ package cn.dev33.satoken.sso.exception;
 * 定义所有 SSO 异常细分状态码 
 * 
 * @author kong
- * @date: 2022-4-25
+ * @since: 2022-4-25
 */
 public class SaSsoExceptionCode {

--- a/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/json/SaJsonTemplateForJackson.java
+++ b/sa-token-starter/sa-token-reactor-spring-boot-starter/src/main/java/cn/dev33/satoken/reactor/spring/json/SaJsonTemplateForJackson.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.json.SaJsonTemplate;
 *  JSON 转换器， Jackson 版实现 
 * 
 * @author kong
- * @date: 2022-4-26
+ * @since: 2022-4-26
 */
 public class SaJsonTemplateForJackson implements SaJsonTemplate {

--- a/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
+++ b/sa-token-starter/sa-token-spring-boot-starter/src/main/java/cn/dev33/satoken/spring/json/SaJsonTemplateForJackson.java
@@ -12,7 +12,7 @@ import cn.dev33.satoken.json.SaJsonTemplate;
 *  JSON 转换器， Jackson 版实现 
 * 
 * @author kong
- * @date: 2022-4-26
+ * @since: 2022-4-26
 */
 public class SaJsonTemplateForJackson implements SaJsonTemplate {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/context/model/SaCookieTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/context/model/SaCookieTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * SaFoxUtil 工具类测试 
 * 
 * @author kong
- * @date: 2022-2-8 22:14:25
+ * @since: 2022-2-8 22:14:25
 */
 public class SaCookieTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/dao/SaTokenDaoTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/dao/SaTokenDaoTest.java
@@ -9,7 +9,7 @@ import cn.dev33.satoken.session.SaSession;
 * SaTokenDao 持久层 测试 
 * 
 * @author kong
- * @date: 2022-2-9 15:39:38
+ * @since: 2022-2-9 15:39:38
 */
 public class SaTokenDaoTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/fun/IsRunFunctionTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/fun/IsRunFunctionTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * IsRunFunction 测试 
 * 
 * @author kong
- * @date: 2022-2-9 16:11:10
+ * @since: 2022-2-9 16:11:10
 */
 public class IsRunFunctionTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/secure/BCryptTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/secure/BCryptTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * BCrypt 加密测试
 * 
 * @author dream.
- * @date 2022/1/20
+ * @since 2022/1/20
 */
 public class BCryptTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/secure/SaBase64UtilTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/secure/SaBase64UtilTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * SaBase64Util 测试 
 * 
 * @author kong
- * @date: 2022-2-9
+ * @since: 2022-2-9
 */
 public class SaBase64UtilTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/secure/SaSecureUtilTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/secure/SaSecureUtilTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * SaSecureUtil 加密工具类 测试 
 * 
 * @author kong
- * @date: 2022-2-9
+ * @since: 2022-2-9
 */
 public class SaSecureUtilTest {
 	
--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/session/SaSessionTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/session/SaSessionTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * SaSession 测试 
 * 
 * @author kong
- * @date: 2022-2-9 
+ * @since: 2022-2-9 
 */
 public class SaSessionTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/util/SaFoxUtilTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/util/SaFoxUtilTest.java
@@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test;
 * SaFoxUtil 工具类测试 
 * 
 * @author kong
- * @date: 2022-2-8 22:14:25
+ * @since: 2022-2-8 22:14:25
 */
 public class SaFoxUtilTest {

--- a/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/util/SaResultTest.java
+++ b/sa-token-test/sa-token-core-test/src/test/java/cn/dev33/satoken/util/SaResultTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
 * SaResult 结果集 测试 
 * 
 * @author kong
- * @date: 2022-2-8 22:14:25
+ * @since: 2022-2-8 22:14:25
 */
 public class SaResultTest {