From ced4a056e5b74609e53c6637830d95e2e3cf6bc9 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Wed, 3 Feb 2021 19:27:28 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20Introducing=20new=20features.=20#2?=
 =?UTF-8?q?116=20=E6=8A=A5=E8=A1=A8=E8=AE=BE=E8=AE=A1=E5=A2=9E=E5=8A=A0=20?=
 =?UTF-8?q?spring=20security=20=E5=AE=89=E5=85=A8=E6=8E=A7=E5=88=B6=20=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=B4=A6=E6=88=B7=20pigx=20pigx?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-data/pom.xml                   |  1 +
 .../common/data/mybatis/MybatisPlusConfiguration.java  | 10 +++++++---
 pigx-visual/pigx-bi-platform/pom.xml                   |  4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pigx-common/pigx-common-data/pom.xml b/pigx-common/pigx-common-data/pom.xml
index 51ecd3fad..8e549e082 100644
--- a/pigx-common/pigx-common-data/pom.xml
+++ b/pigx-common/pigx-common-data/pom.xml
@@ -48,6 +48,7 @@
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
 			<artifactId>pigx-common-security</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<!--feign client-->
 		<dependency>
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
index 95839a2fb..160efafd4 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfiguration.java
@@ -17,6 +17,10 @@
 
 package com.pig4cloud.pigx.common.data.mybatis;
 
+import java.util.List;
+
+import javax.sql.DataSource;
+
 import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
@@ -26,8 +30,10 @@ import com.pig4cloud.pigx.common.data.datascope.DataScopeSqlInjector;
 import com.pig4cloud.pigx.common.data.datascope.PigxDefaultDatascopeHandle;
 import com.pig4cloud.pigx.common.data.resolver.SqlFilterArgumentResolver;
 import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler;
+import com.pig4cloud.pigx.common.security.service.PigxUser;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
@@ -35,9 +41,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.sql.DataSource;
-import java.util.List;
-
 /**
  * @author lengleng
  * @date 2020-02-08
@@ -62,6 +65,7 @@ public class MybatisPlusConfiguration implements WebMvcConfigurer {
 	 */
 	@Bean
 	@ConditionalOnMissingBean
+	@ConditionalOnClass(PigxUser.class)
 	public DataScopeHandle dataScopeHandle() {
 		return new PigxDefaultDatascopeHandle();
 	}
diff --git a/pigx-visual/pigx-bi-platform/pom.xml b/pigx-visual/pigx-bi-platform/pom.xml
index 97312ae4a..2f0851dce 100755
--- a/pigx-visual/pigx-bi-platform/pom.xml
+++ b/pigx-visual/pigx-bi-platform/pom.xml
@@ -57,8 +57,8 @@
 		</dependency>
 		<!--security-->
 		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-security</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-security</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>com.pig4cloud</groupId>