From 86b0cd228e87adc6f4b0bb5f5c815c021dbb1f58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= <wangiegie@gmail.com>
Date: Fri, 12 Jul 2019 08:57:42 +0800
Subject: [PATCH] =?UTF-8?q?:green=5Fheart:=20=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=96=87=E6=A1=88=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-common/pigx-common-bom/pom.xml           |  2 +-
 .../data/mybatis/MybatisPlusConfig.java       |  3 ++
 pigx-common/pigx-common-datasource/pom.xml    |  5 ----
 .../DataSourceAutoConfiguration.java          |  2 +-
 .../config/DynamicDatasourceInterceptor.java  |  2 +-
 .../pigx/gateway/config/GlobalCorsConfig.java | 28 -------------------
 .../main/resources/template/Entity.java.vm    |  1 +
 pom.xml                                       |  2 +-
 8 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GlobalCorsConfig.java

diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 15da96a7d..5f7cca2ef 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<pigx.version>3.2</pigx.version>
-		<mybatis-plus.version>3.1.2</mybatis-plus.version>
+		<mybatis-plus.version>3.1.0</mybatis-plus.version>
 		<druid.version>1.1.16</druid.version>
 		<mysql.connector.version>8.0.16</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java
index 1af2d3a0a..2abef06fd 100644
--- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java
+++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/mybatis/MybatisPlusConfig.java
@@ -25,9 +25,11 @@ import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser;
 import com.pig4cloud.pigx.common.data.datascope.DataScopeInterceptor;
 import com.pig4cloud.pigx.common.data.tenant.PigxTenantHandler;
 import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
@@ -41,6 +43,7 @@ import java.util.List;
  */
 @Configuration
 @ConditionalOnBean(DataSource.class)
+@AutoConfigureAfter(DataSourceAutoConfiguration.class)
 @MapperScan("com.pig4cloud.pigx.**.mapper")
 public class MybatisPlusConfig {
 
diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml
index fb661eab4..672e26194 100644
--- a/pigx-common/pigx-common-datasource/pom.xml
+++ b/pigx-common/pigx-common-datasource/pom.xml
@@ -54,11 +54,6 @@
 			<groupId>com.alibaba</groupId>
 			<artifactId>druid-spring-boot-starter</artifactId>
 		</dependency>
-		<!--common-->
-		<dependency>
-			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-core</artifactId>
-		</dependency>
 		<!--swagger-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DataSourceAutoConfiguration.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DataSourceAutoConfiguration.java
index 8729bc376..011876df7 100644
--- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DataSourceAutoConfiguration.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DataSourceAutoConfiguration.java
@@ -8,7 +8,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
  * @author Lucky
  * @date 2019-05-18
  * <p>
- * DbAcess 自动配置类
+ * 自动配置类
  */
 @AllArgsConstructor
 @EnableConfigurationProperties({DruidDataSourceProperties.class})
diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java
index 6d9338f10..d10d0fac5 100644
--- a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java
@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 public class DynamicDatasourceInterceptor implements HandlerInterceptor {
 
 	/**
-	 * TODO 根据上线文判断路由哪个数据库
+	 * TODO 根据上下文判断路由哪个数据库
 	 *
 	 * @param request
 	 * @param response
diff --git a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GlobalCorsConfig.java b/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GlobalCorsConfig.java
deleted file mode 100644
index e1d506624..000000000
--- a/pigx-gateway/src/main/java/com/pig4cloud/pigx/gateway/config/GlobalCorsConfig.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.pig4cloud.pigx.gateway.config;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.cloud.gateway.config.GlobalCorsProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.cors.reactive.CorsWebFilter;
-import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource;
-
-
-/**
- * Spring Cloud Gateway 跨域配置
- *
- * @author jclazz
- * @date 7/5/2019
- * @since 3.1.0
- */
-@Configuration
-public class GlobalCorsConfig {
-	@ConditionalOnBean(GlobalCorsProperties.class)
-	@Bean
-	CorsWebFilter corsWebFilter(GlobalCorsProperties globalCorsProperties) {
-		UrlBasedCorsConfigurationSource source =
-				new UrlBasedCorsConfigurationSource();
-		source.setCorsConfigurations(globalCorsProperties.getCorsConfigurations());
-		return new CorsWebFilter(source);
-	}
-}
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
index 25ab57382..eb9a71379 100755
--- a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm
@@ -21,6 +21,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 #if(${hasBigDecimal})
diff --git a/pom.xml b/pom.xml
index e6067c7f6..a9849ceec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<spring-boot-admin.version>2.1.6</spring-boot-admin.version>
-		<hutool.version>4.5.15</hutool.version>
+		<hutool.version>4.5.16</hutool.version>
 		<kaptcha.version>0.0.9</kaptcha.version>
 		<swagger.fox.version>2.9.2</swagger.fox.version>
 		<swagger-bootstrap-ui.version>1.9.4</swagger-bootstrap-ui.version>