From dba50d9fb59a34489686bc048f0af32643575ff2 Mon Sep 17 00:00:00 2001
From: 202306282026 <202306282026@qq.com>
Date: Wed, 12 Jul 2023 18:00:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=82=E7=AD=89=E7=BC=93=E5=AD=98key?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-idempotent/pom.xml                   | 4 ++++
 .../pigx/common/idempotent/aspect/IdempotentAspect.java      | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/pigx-common/pigx-common-idempotent/pom.xml b/pigx-common/pigx-common-idempotent/pom.xml
index bf9728c5b..82abd36a0 100644
--- a/pigx-common/pigx-common-idempotent/pom.xml
+++ b/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>
diff --git a/pigx-common/pigx-common-idempotent/src/main/java/com/pig4cloud/pigx/common/idempotent/aspect/IdempotentAspect.java b/pigx-common/pigx-common-idempotent/src/main/java/com/pig4cloud/pigx/common/idempotent/aspect/IdempotentAspect.java
index 25b9b8420..682e5213b 100644
--- a/pigx-common/pigx-common-idempotent/src/main/java/com/pig4cloud/pigx/common/idempotent/aspect/IdempotentAspect.java
+++ b/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();