✨ Introducing new features. #2116 报表设计增加 spring security 安全控制 默认账户 pigx pigx

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>

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();
 	}

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>