From 1391956c515aebfb4ff10fdea20f4be5e195509a Mon Sep 17 00:00:00 2001
From: JeeLowCode <jeelowcode@139.com>
Date: Mon, 17 Mar 2025 10:57:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E5=88=87=E9=9D=A2?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../global/JeeLowCodeBaseConstant.java        |  1 +
 .../defaultval/DefaultValAspect.java          | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jeelowcode-framework/jeelowcode-global/src/main/java/com/jeelowcode/framework/global/JeeLowCodeBaseConstant.java b/jeelowcode-framework/jeelowcode-global/src/main/java/com/jeelowcode/framework/global/JeeLowCodeBaseConstant.java
index f6214d3..ef9643b 100644
--- a/jeelowcode-framework/jeelowcode-global/src/main/java/com/jeelowcode/framework/global/JeeLowCodeBaseConstant.java
+++ b/jeelowcode-framework/jeelowcode-global/src/main/java/com/jeelowcode/framework/global/JeeLowCodeBaseConstant.java
@@ -20,4 +20,5 @@ public interface JeeLowCodeBaseConstant {
     String REQUEST_URL_START="/admin-api/jeelowcode";//公共请求
     String BASE_PACKAGES="com.jeelowcode";//公共包名称
     String BASE_PACKAGES_CODE=BASE_PACKAGES+".core";//核心包名
+    String BASE_PACKAGES_MODULE = BASE_PACKAGES+".module";//低代码模块
 }
diff --git a/jeelowcode-framework/jeelowcode-utils/src/main/java/com/jeelowcode/framework/utils/component/defaultval/DefaultValAspect.java b/jeelowcode-framework/jeelowcode-utils/src/main/java/com/jeelowcode/framework/utils/component/defaultval/DefaultValAspect.java
index 97e1d9c..21f0762 100644
--- a/jeelowcode-framework/jeelowcode-utils/src/main/java/com/jeelowcode/framework/utils/component/defaultval/DefaultValAspect.java
+++ b/jeelowcode-framework/jeelowcode-utils/src/main/java/com/jeelowcode/framework/utils/component/defaultval/DefaultValAspect.java
@@ -42,10 +42,10 @@ public class DefaultValAspect {
 
     private final IJeeLowCodeAdapter proxyAdapter;
 
-    public final static String JEELOWCODE_EXPRESSION = "execution(* "+ JeeLowCodeBaseConstant.BASE_PACKAGES_CODE+".framework.service.impl.FrameServiceImpl.*(..))";//jeelowcode
-    public final static String MYBATIS_EXPRESSION = "execution(* "+JeeLowCodeBaseConstant.BASE_PACKAGES_CODE+".*.mapper..*.*(..))";//mybatis
-    public final static String SERVICE_EXPRESSION = "execution(* "+ JeeLowCodeBaseConstant.BASE_PACKAGES_CODE+".framework.service..*.*(..))";//mybatis
-
+    public final static String MYBATIS_EXPRESSION = "execution(* "+JeeLowCodeBaseConstant.BASE_PACKAGES_CODE+"..mapper..*.*(..))";
+    public final static String SERVICE_EXPRESSION = "execution(* "+ JeeLowCodeBaseConstant.BASE_PACKAGES_CODE+"..service..*.*(..))";
+    public final static String MODULE_SERVICE_EXPRESSION = "execution(* "+ JeeLowCodeBaseConstant.BASE_PACKAGES_MODULE+"..service..*.*(..))";
+    public final static String MODULE_MYBATIS_EXPRESSION = "execution(* "+JeeLowCodeBaseConstant.BASE_PACKAGES_MODULE+"..mapper..*.*(..))";
 
     //需要拦截的方法名称
     private static Map<String, String> aspectMethodNameMapp = new HashMap<>();
@@ -84,16 +84,19 @@ public class DefaultValAspect {
     private void aspectServicePlus() {
     }
 
-    @Pointcut(value = JEELOWCODE_EXPRESSION)
-    private void aspectJeeLowCode() {
-    }
-
     @Pointcut(value = MYBATIS_EXPRESSION)
     private void aspectPlus() {
     }
 
+    @Pointcut(value = MODULE_SERVICE_EXPRESSION)
+    private void aspectModelServicePlus() {
+    }
 
-    @Around("aspectJeeLowCode() || aspectPlus() || aspectServicePlus()")
+    @Pointcut(value = MODULE_MYBATIS_EXPRESSION)
+    private void aspectModelMapperPlus() {
+    }
+
+    @Around("aspectPlus() || aspectServicePlus() || aspectModelServicePlus() || aspectModelMapperPlus()")
     public Object all(ProceedingJoinPoint joinPoint) throws Throwable {
         // 获取方法签名
         MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();