From 23babe67a92ac48776f428fe528e6cabe7c03e08 Mon Sep 17 00:00:00 2001
From: Lucky <641787296@qq.com>
Date: Tue, 21 May 2019 23:59:10 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20=E9=87=8D=E6=9E=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20.=20=E5=8A=A8=E6=80=81=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E4=B8=BA=E4=BE=9D=E8=B5=96=E5=8C=85=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pigx-visual/pigx-codegen/pom.xml                              | 4 ++--
 .../com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java    | 2 ++
 .../codegen/service/impl/SysDatasourceConfServiceImpl.java    | 2 +-
 .../pigx/codegen/service/impl/SysGeneratorServiceImpl.java    | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml
index 0d3abe201..c2e9352f7 100755
--- a/pigx-visual/pigx-codegen/pom.xml
+++ b/pigx-visual/pigx-codegen/pom.xml
@@ -25,10 +25,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
 		</dependency>
-		<!--数据操作-->
+		<!--动态数据源 数据操作-->
 		<dependency>
 			<groupId>com.pig4cloud</groupId>
-			<artifactId>pigx-common-data</artifactId>
+			<artifactId>pigx-common-datasource</artifactId>
 		</dependency>
 		<!--mybatis-->
 		<dependency>
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java
index 25a8ae599..7fc8ef8a8 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/PigxCodeGenApplication.java
@@ -17,6 +17,7 @@
 
 package com.pig4cloud.pigx.codegen;
 
+import com.pig4cloud.pigx.common.datasource.annotation.EnableDynamicDataSource;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxFeignClients;
 import com.pig4cloud.pigx.common.security.annotation.EnablePigxResourceServer;
 import com.pig4cloud.pigx.common.swagger.annotation.EnablePigxSwagger2;
@@ -28,6 +29,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
  * @date 2018/07/29
  * 代码生成模块
  */
+@EnableDynamicDataSource //开启动态数据源
 @EnablePigxSwagger2
 @SpringCloudApplication
 @EnablePigxFeignClients
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysDatasourceConfServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysDatasourceConfServiceImpl.java
index 74e923eb3..384ce0479 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysDatasourceConfServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysDatasourceConfServiceImpl.java
@@ -18,10 +18,10 @@ package com.pig4cloud.pigx.codegen.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pig4cloud.pigx.codegen.config.DynamicDataSourceConfig;
 import com.pig4cloud.pigx.codegen.entity.SysDatasourceConf;
 import com.pig4cloud.pigx.codegen.mapper.SysDatasourceConfMapper;
 import com.pig4cloud.pigx.codegen.service.SysDatasourceConfService;
+import com.pig4cloud.pigx.common.datasource.config.DynamicDataSourceConfig;
 import lombok.AllArgsConstructor;
 import org.jasypt.encryption.StringEncryptor;
 import org.springframework.stereotype.Service;
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java
index ec5a5a8ee..6ca497974 100755
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java
+++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java
@@ -23,8 +23,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.pig4cloud.pigx.codegen.entity.GenConfig;
 import com.pig4cloud.pigx.codegen.mapper.SysGeneratorMapper;
 import com.pig4cloud.pigx.codegen.service.SysGeneratorService;
-import com.pig4cloud.pigx.codegen.util.DynamicDataSourceContextHolder;
 import com.pig4cloud.pigx.codegen.util.GenUtils;
+import com.pig4cloud.pigx.common.datasource.support.DynamicDataSourceContextHolder;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;