Merge branch 'dev' of 202306282026/pigx into dev

LGTM   感谢贡献~

pigx-common/pigx-common-idempotent/pom.xml

@@ -18,6 +18,10 @@
 	</properties>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-core</artifactId>
+		</dependency>
 		<!--aop-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

pigx-common/pigx-common-idempotent/src/main/java/com/pig4cloud/pigx/common/idempotent/aspect/IdempotentAspect.java

@@ -1,5 +1,6 @@
 package com.pig4cloud.pigx.common.idempotent.aspect;
 
+import com.pig4cloud.pigx.common.core.util.KeyStrResolver;
 import com.pig4cloud.pigx.common.idempotent.annotation.Idempotent;
 import com.pig4cloud.pigx.common.idempotent.exception.IdempotentException;
 import com.pig4cloud.pigx.common.idempotent.expression.KeyResolver;
@@ -51,6 +52,9 @@ public class IdempotentAspect {
 	@Autowired
 	private KeyResolver keyResolver;
 
+	@Autowired
+	private KeyStrResolver keyStrResolver;
+
 	@Pointcut("@annotation(com.pig4cloud.pigx.common.idempotent.annotation.Idempotent)")
 	public void pointCut() {
 	}
@@ -80,6 +84,7 @@ public class IdempotentAspect {
 			// 使用jstl 规则区分
 			key = keyResolver.resolver(idempotent, joinPoint);
 		}
+		key = keyStrResolver.extract(key,":");
 
 		long expireTime = idempotent.expireTime();
 		String info = idempotent.info();