diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml
index 1421909af..d75cfa8b2 100644
--- a/pigx-common/pigx-common-bom/pom.xml
+++ b/pigx-common/pigx-common-bom/pom.xml
@@ -47,6 +47,11 @@
 				<artifactId>pigx-common-gateway</artifactId>
 				<version>${pigx.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.pig4cloud</groupId>
+				<artifactId>pigx-common-datasource</artifactId>
+				<version>${pigx.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>com.pig4cloud</groupId>
 				<artifactId>pigx-common-job</artifactId>
diff --git a/pigx-common/pigx-common-datasource/pom.xml b/pigx-common/pigx-common-datasource/pom.xml
new file mode 100644
index 000000000..b2d9e0a6c
--- /dev/null
+++ b/pigx-common/pigx-common-datasource/pom.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>pigx-common</artifactId>
+		<groupId>com.pig4cloud</groupId>
+		<version>3.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>com.pig4cloud</groupId>
+	<artifactId>pigx-common-datasource</artifactId>
+
+	<packaging>jar</packaging>
+
+	<description>pigx 动态切换数据源，为后期提供Online在线开发、读写分离、数据同步做好准备 </description>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+		</dependency>
+		<!--common-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-core</artifactId>
+		</dependency>
+
+		<!--数据操作-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-data</artifactId>
+		</dependency>
+		<!--mybatis-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>mysql</groupId>
+			<artifactId>mysql-connector-java</artifactId>
+		</dependency>
+		<!-- druid 连接池 -->
+		<dependency>
+			<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>
+			<artifactId>pigx-common-swagger</artifactId>
+		</dependency>
+		<!--安全模块-->
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.pig4cloud</groupId>
+			<artifactId>pigx-common-log</artifactId>
+		</dependency>
+		<!--代码生成模板引擎-->
+		<dependency>
+			<artifactId>velocity</artifactId>
+			<groupId>org.apache.velocity</groupId>
+			<version>${velocity.version}</version>
+		</dependency>
+		<!--web 模块-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<!--undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>com.spotify</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+</project>
\ No newline at end of file
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
new file mode 100644
index 000000000..8729bc376
--- /dev/null
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/DataSourceAutoConfiguration.java
@@ -0,0 +1,16 @@
+package com.pig4cloud.pigx.common.datasource;
+
+import com.pig4cloud.pigx.common.datasource.config.DruidDataSourceProperties;
+import lombok.AllArgsConstructor;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+
+/**
+ * @author Lucky
+ * @date 2019-05-18
+ * <p>
+ * DbAcess 自动配置类
+ */
+@AllArgsConstructor
+@EnableConfigurationProperties({DruidDataSourceProperties.class})
+public class DataSourceAutoConfiguration {
+}
diff --git a/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/annotation/EnableDynamicDataSource.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/annotation/EnableDynamicDataSource.java
new file mode 100644
index 000000000..99ebdbd6d
--- /dev/null
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/annotation/EnableDynamicDataSource.java
@@ -0,0 +1,20 @@
+package com.pig4cloud.pigx.common.datasource.annotation;
+
+import com.pig4cloud.pigx.common.datasource.config.DynamicDataSourceConfig;
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.*;
+
+/**
+ * @author Lucky
+ * @date 2019-05-18
+ * <p>
+ * 开启动态数据源
+ */
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@Import({DynamicDataSourceConfig.class})
+public @interface EnableDynamicDataSource {
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DruidDataSourceProperties.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java
similarity index 89%
rename from pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DruidDataSourceProperties.java
rename to pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java
index d80228ef8..efb00821c 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DruidDataSourceProperties.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DruidDataSourceProperties.java
@@ -1,4 +1,4 @@
-package com.pig4cloud.pigx.codegen.config;
+package com.pig4cloud.pigx.common.datasource.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSource.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSource.java
similarity index 75%
rename from pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSource.java
rename to pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSource.java
index 252b8d87f..557b5d236 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSource.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSource.java
@@ -1,6 +1,6 @@
-package com.pig4cloud.pigx.codegen.config;
+package com.pig4cloud.pigx.common.datasource.config;
 
-import com.pig4cloud.pigx.codegen.util.DynamicDataSourceContextHolder;
+import com.pig4cloud.pigx.common.datasource.support.DynamicDataSourceContextHolder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java
similarity index 96%
rename from pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java
rename to pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java
index 88bf9ca93..b0d0d22df 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/DynamicDataSourceConfig.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDataSourceConfig.java
@@ -1,8 +1,13 @@
-package com.pig4cloud.pigx.codegen.config;
+package com.pig4cloud.pigx.common.datasource.config;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import javax.annotation.PostConstruct;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.mysql.cj.jdbc.Driver;
-import com.pig4cloud.pigx.codegen.util.DataSourceConstants;
+import com.pig4cloud.pigx.common.datasource.support.DataSourceConstants;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jasypt.encryption.StringEncryptor;
@@ -14,12 +19,6 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.TransactionManagementConfigurer;
 
-import javax.annotation.PostConstruct;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-
 /**
  * @author lengleng
  * @date 2019-03-31
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
new file mode 100644
index 000000000..af25dc51d
--- /dev/null
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/config/DynamicDatasourceInterceptor.java
@@ -0,0 +1,43 @@
+package com.pig4cloud.pigx.common.datasource.config;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.pig4cloud.pigx.common.datasource.support.DynamicDataSourceContextHolder;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.HashOperations;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.HandlerInterceptor;
+
+/**
+ * @author lengleng
+ * @date 2019-05-18
+ * <p>
+ * 动态数据源拦截器
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class DynamicDatasourceInterceptor implements HandlerInterceptor {
+	private final RedisTemplate redisTemplate;
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
+		redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(String.class));
+		HashOperations<String, String, String> vo = redisTemplate.opsForHash();
+//		String dbName = vo.get("db_route_key", 1);
+		DynamicDataSourceContextHolder.setDataSourceType(1);
+		log.info("数据源切换:{}", 1);
+		return true;
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
+								@Nullable Exception ex) {
+		DynamicDataSourceContextHolder.clearDataSourceType();
+	}
+
+}
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstants.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java
similarity index 90%
rename from pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstants.java
rename to pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java
index 9bc663d87..7c9502ad6 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DataSourceConstants.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DataSourceConstants.java
@@ -1,4 +1,4 @@
-package com.pig4cloud.pigx.codegen.util;
+package com.pig4cloud.pigx.common.datasource.support;
 
 /**
  * @author lengleng
diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DynamicDataSourceContextHolder.java b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DynamicDataSourceContextHolder.java
similarity index 54%
rename from pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DynamicDataSourceContextHolder.java
rename to pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DynamicDataSourceContextHolder.java
index 4e0c2d546..d082585d4 100644
--- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/util/DynamicDataSourceContextHolder.java
+++ b/pigx-common/pigx-common-datasource/src/main/java/com/pig4cloud/pigx/common/datasource/support/DynamicDataSourceContextHolder.java
@@ -1,25 +1,39 @@
-package com.pig4cloud.pigx.codegen.util;
+package com.pig4cloud.pigx.common.datasource.support;
 
 import lombok.experimental.UtilityClass;
 
 /**
  * @author lengleng
- * @date 2019-03-31
+ * @date 2019-05-18
  * <p>
- * 保存上线文中数据库路由
+ * 根据当前线程来选择具体的数据源
  */
 @UtilityClass
 public class DynamicDataSourceContextHolder {
 	private final ThreadLocal<Integer> CONTEXT_HOLDER = new ThreadLocal<>();
 
+	/**
+	 * 提供给AOP去设置当前的线程的数据源的信息
+	 *
+	 * @param dataSourceType
+	 */
 	public void setDataSourceType(Integer dataSourceType) {
 		CONTEXT_HOLDER.set(dataSourceType);
 	}
 
+	/**
+	 * 提供给AbstractRoutingDataSource的实现类，通过key选择数据源
+	 *
+	 * @return
+	 */
 	public Integer getDataSourceType() {
 		return CONTEXT_HOLDER.get();
 	}
 
+	/**
+	 * 使用默认的数据源
+	 *
+	 */
 	public void clearDataSourceType() {
 		CONTEXT_HOLDER.remove();
 	}
diff --git a/pigx-common/pigx-common-datasource/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-datasource/src/main/resources/META-INF/spring.factories
new file mode 100644
index 000000000..15efe41d9
--- /dev/null
+++ b/pigx-common/pigx-common-datasource/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+  com.pig4cloud.pigx.common.datasource.DataSourceAutoConfiguration
\ No newline at end of file
diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml
index e4603a538..4148d1937 100644
--- a/pigx-common/pom.xml
+++ b/pigx-common/pom.xml
@@ -44,5 +44,6 @@
 		<module>pigx-common-swagger</module>
 		<module>pigx-common-transaction</module>
 		<module>pigx-common-autopoi</module>
+		<module>pigx-common-datasource</module>
 	</modules>
 </project>