From cee572f237cb293e4a9070ef458356bc6daa2105 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 19 七月 2020 10:25:40 +0800
Subject: [PATCH] 若依 3.0
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
similarity index 88%
rename from ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
rename to ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
index bc85073..4648fcd 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
@@ -11,8 +11,8 @@
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.DataSource;
import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder;
/**
@@ -27,8 +27,8 @@
{
protected Logger logger = LoggerFactory.getLogger(getClass());
- @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)"
- + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)")
+ @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)"
+ + "|| @within(com.ruoyi.common.annotation.DataSource)")
public void dsPointCut()
{
--
Gitblit v1.9.2