增加 SaHttpDigestTemplate 自动注入

sa-token-core/src/main/java/cn/dev33/satoken/httpauth/digest/SaHttpDigestUtil.java

@@ -43,17 +43,7 @@ public class SaHttpDigestUtil {
 	 * @return 值
 	 */
 	public static String getAuthorizationValue() {
-
+		return saHttpDigestTemplate.getAuthorizationValue();
-		// 获取前端提交的请求头 Authorization 参数
-		String authorization = SaHolder.getRequest().getHeader("Authorization");
-
-		// 如果不是以 Digest 作为前缀，则视为无效
-		if(authorization == null || ! authorization.startsWith("Digest ")) {
-			return null;
-		}
-
-		// 裁剪前缀并解码
-		return authorization.substring(7);
 	}
 
 	/**
@@ -61,52 +51,7 @@ public class SaHttpDigestUtil {
 	 * @return /
 	 */
 	public static SaHttpDigestModel getAuthorizationValueToModel() {
-
+		return saHttpDigestTemplate.getAuthorizationValueToModel();
-		// 先获取字符串值
-		String authorization = getAuthorizationValue();
-		if(authorization == null) {
-			//            throw new SaTokenException("请求头中未携带 Digest 认证参数");
-			return null;
-		}
-
-		// 根据逗号分割，解析为 Map
-		Map<String, String> map = new LinkedHashMap<>();
-		String[] arr = authorization.split(",");
-		for (String s : arr) {
-			String[] kv = s.split("=");
-			if (kv.length == 2) {
-				map.put(kv[0].trim(), kv[1].trim().replace("\"", ""));
-			}
-		}
-
-        /*
-            参考样例：
-                username=sa,
-                realm=Sa-Token,
-                nonce=dcd98b7102dd2f0e8b11d0f600bfb0c093,
-                uri=/test/testDigest,
-                response=a32023c128e142163dd4856a2f511c70,
-                opaque=5ccc069c403ebaf9f0171e9517f40e41,
-                qop=auth,
-                nc=00000002,
-                cnonce=f3ca6bfc0b2f59c4
-         */
-
-		// 转化为 Model
-		SaHttpDigestModel model = new SaHttpDigestModel();
-		model.username = map.get("username");
-		model.realm = map.get("realm");
-		model.nonce = map.get("nonce");
-		model.uri = map.get("uri");
-		model.method = SaHolder.getRequest().getMethod();
-		model.qop = map.get("qop");
-		model.nc = map.get("nc");
-		model.cnonce = map.get("cnonce");
-		model.opaque = map.get("opaque");
-		model.response = map.get("response");
-
-		//
-		return model;
 	}
 
 	// ---------- 校验 ----------

sa-token-starter/sa-token-spring-boot-autoconfig/src/main/java/cn/dev33/satoken/spring/SaBeanInject.java

@@ -15,30 +15,31 @@
  */
 package cn.dev33.satoken.spring;
 
-import java.util.List;
-
-import cn.dev33.satoken.spring.pathmatch.SaPathMatcherHolder;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.util.PathMatcher;
-
 import cn.dev33.satoken.SaManager;
-import cn.dev33.satoken.httpauth.basic.SaHttpBasicTemplate;
-import cn.dev33.satoken.httpauth.basic.SaHttpBasicUtil;
 import cn.dev33.satoken.config.SaTokenConfig;
 import cn.dev33.satoken.context.SaTokenContext;
 import cn.dev33.satoken.context.second.SaTokenSecondContextCreator;
 import cn.dev33.satoken.dao.SaTokenDao;
+import cn.dev33.satoken.httpauth.basic.SaHttpBasicTemplate;
+import cn.dev33.satoken.httpauth.basic.SaHttpBasicUtil;
+import cn.dev33.satoken.httpauth.digest.SaHttpDigestTemplate;
+import cn.dev33.satoken.httpauth.digest.SaHttpDigestUtil;
 import cn.dev33.satoken.json.SaJsonTemplate;
 import cn.dev33.satoken.listener.SaTokenEventCenter;
 import cn.dev33.satoken.listener.SaTokenListener;
 import cn.dev33.satoken.log.SaLog;
 import cn.dev33.satoken.same.SaSameTemplate;
 import cn.dev33.satoken.sign.SaSignTemplate;
+import cn.dev33.satoken.spring.pathmatch.SaPathMatcherHolder;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.temp.SaTempInterface;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.util.PathMatcher;
+
+import java.util.List;
 
 /**
  * 注入 Sa-Token 所需要的 Bean
@@ -143,10 +144,20 @@ public class SaBeanInject {
 	 * @param saBasicTemplate saBasicTemplate对象 
 	 */
 	@Autowired(required = false)
-	public void setSaBasicTemplate(SaHttpBasicTemplate saBasicTemplate) {
+	public void setSaHttpBasicTemplate(SaHttpBasicTemplate saBasicTemplate) {
 		SaHttpBasicUtil.saHttpBasicTemplate = saBasicTemplate;
 	}
 
+	/**
+	 * 注入 Sa-Token Digest Basic 认证模块
+	 *
+	 * @param saHttpDigestTemplate saHttpDigestTemplate 对象
+	 */
+	@Autowired(required = false)
+	public void setSaHttpBasicTemplate(SaHttpDigestTemplate saHttpDigestTemplate) {
+		SaHttpDigestUtil.saHttpDigestTemplate = saHttpDigestTemplate;
+	}
+
 	/**
 	 * 注入自定义的 JSON 转换器 Bean 
 	 *