更改代码生成器模块和数据源容器模块的结构

README.md

@@ -19,7 +19,6 @@
 | 模块名称 | 说明 |
 | 模块名称 | 说明 |
 | :---: | :---: |
 | :---: | :---: |
 | guns-base | guns的基础模块 | 
 | guns-base | guns的基础模块 | 
-| guns-base-db-container | 数据源容器 | 
 | guns-base-email | 邮件发送模块 | 
 | guns-base-email | 邮件发送模块 | 
 | guns-base-sms | 短信发送模块（对接阿里云短信） | 
 | guns-base-sms | 短信发送模块（对接阿里云短信） | 
 | guns-base-timers | 分布式任务调度执行器 | 
 | guns-base-timers | 分布式任务调度执行器 | 

guns-base-db-container/pom.xml

-<?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">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>cn.stylefeng</groupId>
-        <artifactId>guns-vip</artifactId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>guns-base-db-container</artifactId>
-
-    <packaging>jar</packaging>
-
-    <dependencies>
-
-        <!--基础组件-->
-        <dependency>
-            <groupId>cn.stylefeng</groupId>
-            <artifactId>guns-base</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jta-atomikos</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>

guns-base/pom.xml

@@ -144,6 +144,11 @@
             <artifactId>kaptcha</artifactId>
             <artifactId>kaptcha</artifactId>
         </dependency>
         </dependency>
 
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-jta-atomikos</artifactId>
+        </dependency>
+
         <!--需要分布式session的话需要放开注释-->
         <!--需要分布式session的话需要放开注释-->
         <!--<dependency>-->
         <!--<dependency>-->
         <!--<groupId>org.springframework.session</groupId>-->
         <!--<groupId>org.springframework.session</groupId>-->

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/collector/SqlSessionFactoryCreator.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/collector/SqlSessionFactoryCreator.java

-package cn.stylefeng.guns.dbcontainer.core.collector;
+package cn.stylefeng.guns.base.db.collector;
 
 
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusProperties;

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/context/DataSourceContext.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/context/DataSourceContext.java

-package cn.stylefeng.guns.dbcontainer.core.context;
+package cn.stylefeng.guns.base.db.context;
 
 
-import cn.stylefeng.guns.dbcontainer.core.dao.DataBaseInfoDao;
+import cn.stylefeng.guns.base.db.dao.DataBaseInfoDao;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import com.atomikos.jdbc.AtomikosDataSourceBean;
 import com.atomikos.jdbc.AtomikosDataSourceBean;
 
 

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/context/SqlSessionFactoryContext.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/context/SqlSessionFactoryContext.java

-package cn.stylefeng.guns.dbcontainer.core.context;
+package cn.stylefeng.guns.base.db.context;
 
 
-import cn.stylefeng.guns.dbcontainer.core.collector.SqlSessionFactoryCreator;
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.factory.DruidFactory;
+import cn.stylefeng.guns.base.db.collector.SqlSessionFactoryCreator;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
+import cn.stylefeng.guns.base.db.factory.DruidFactory;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import cn.stylefeng.roses.core.util.SpringContextHolder;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -11,7 +11,7 @@ import javax.sql.DataSource;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 
-import static cn.stylefeng.guns.dbcontainer.core.context.DataSourceContext.MASTER_DATASOURCE_NAME;
+import static cn.stylefeng.guns.base.db.context.DataSourceContext.MASTER_DATASOURCE_NAME;
 
 
 /**
 /**
  * mybatis的sqlSessionFactory的上下文容器(单例)
  * mybatis的sqlSessionFactory的上下文容器(单例)

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/dao/DataBaseInfoDao.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/dao/DataBaseInfoDao.java

-package cn.stylefeng.guns.dbcontainer.core.dao;
+package cn.stylefeng.guns.base.db.dao;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.stylefeng.guns.dbcontainer.core.exception.DataSourceInitException;
+import cn.stylefeng.guns.base.db.exception.DataSourceInitException;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -11,7 +11,7 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map;
 
 
-import static cn.stylefeng.guns.dbcontainer.core.context.DataSourceContext.MASTER_DATASOURCE_NAME;
+import static cn.stylefeng.guns.base.db.context.DataSourceContext.MASTER_DATASOURCE_NAME;
 
 
 /**
 /**
  * 操作数据源信息的dao
  * 操作数据源信息的dao

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/entity/DatabaseInfo.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/entity/DatabaseInfo.java

-package cn.stylefeng.guns.dbcontainer.modular.entity;
+package cn.stylefeng.guns.base.db.entity;
 
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.annotation.*;
 
 

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/exception/DataSourceInitException.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/exception/DataSourceInitException.java

-package cn.stylefeng.guns.dbcontainer.core.exception;
+package cn.stylefeng.guns.base.db.exception;
 
 
 import cn.stylefeng.roses.kernel.model.exception.AbstractBaseExceptionEnum;
 import cn.stylefeng.roses.kernel.model.exception.AbstractBaseExceptionEnum;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;
 import cn.stylefeng.roses.kernel.model.exception.ServiceException;

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/factory/DruidFactory.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/factory/DruidFactory.java

-package cn.stylefeng.guns.dbcontainer.modular.factory;
+package cn.stylefeng.guns.base.db.factory;
 
 
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 
 
 /**
 /**

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/core/util/DbUtil.java → guns-base/src/main/java/cn/stylefeng/guns/base/db/util/DbUtil.java

-package cn.stylefeng.guns.dbcontainer.core.util;
+package cn.stylefeng.guns.base.db.util;
 
 
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 
 
 import java.sql.Connection;
 import java.sql.Connection;

guns-sys/pom.xml

@@ -38,6 +38,13 @@
             <version>1.6.0-beta</version>
             <version>1.6.0-beta</version>
         </dependency>
         </dependency>
 
 
+        <!-- 最新代码生成模块 -->
+        <dependency>
+            <groupId>cn.stylefeng</groupId>
+            <artifactId>guns-vip-gen</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/controller/DatabaseInfoController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/controller/DatabaseInfoController.java

-package cn.stylefeng.guns.dbcontainer.modular.controller;
+package cn.stylefeng.guns.sys.modular.db.controller;
 
 
 import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.dbcontainer.core.util.DbUtil;
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam;
-import cn.stylefeng.guns.dbcontainer.modular.service.DatabaseInfoService;
+import cn.stylefeng.guns.base.db.util.DbUtil;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
+import cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam;
+import cn.stylefeng.guns.sys.modular.db.service.DatabaseInfoService;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.base.controller.BaseController;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
@@ -37,7 +37,7 @@ public class DatabaseInfoController extends BaseController {
      */
      */
     public static String CONDITION_FIELDS = "CONDITION_FIELDS";
     public static String CONDITION_FIELDS = "CONDITION_FIELDS";
 
 
-    private String PREFIX = "/databaseInfo";
+    private String PREFIX = "/modular/databaseInfo";
 
 
     @Autowired
     @Autowired
     private DatabaseInfoService databaseInfoService;
     private DatabaseInfoService databaseInfoService;

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/mapper/DatabaseInfoMapper.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/mapper/DatabaseInfoMapper.java

-package cn.stylefeng.guns.dbcontainer.modular.mapper;
+package cn.stylefeng.guns.sys.modular.db.mapper;
 
 
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam;
-import cn.stylefeng.guns.dbcontainer.modular.model.result.DatabaseInfoResult;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
+import cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam;
+import cn.stylefeng.guns.sys.modular.db.model.result.DatabaseInfoResult;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/mapper/mapping/DatabaseInfoMapper.xml → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/mapper/mapping/DatabaseInfoMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.stylefeng.guns.dbcontainer.modular.mapper.DatabaseInfoMapper">
+<mapper namespace="cn.stylefeng.guns.sys.modular.db.mapper.DatabaseInfoMapper">
 
 
     <!-- 通用查询映射结果 -->
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo">
+    <resultMap id="BaseResultMap" type="cn.stylefeng.guns.base.db.entity.DatabaseInfo">
         <id column="db_id" property="dbId" />
         <id column="db_id" property="dbId" />
         <result column="db_name" property="dbName" />
         <result column="db_name" property="dbName" />
         <result column="jdbc_driver" property="jdbcDriver" />
         <result column="jdbc_driver" property="jdbcDriver" />
@@ -20,7 +20,7 @@
     </sql>
     </sql>
 
 
 
 
-    <select id="customList" resultType="cn.stylefeng.guns.dbcontainer.modular.model.result.DatabaseInfoResult" parameterType="cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam">
+    <select id="customList" resultType="cn.stylefeng.guns.sys.modular.db.model.result.DatabaseInfoResult" parameterType="cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam">
         select
         select
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         from database_info where 1 = 1
         from database_info where 1 = 1
@@ -29,7 +29,7 @@
             </if>
             </if>
     </select>
     </select>
 
 
-    <select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam">
+    <select id="customMapList" resultType="map" parameterType="cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam">
         select
         select
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         from database_info where 1 = 1
         from database_info where 1 = 1
@@ -38,7 +38,7 @@
             </if>
             </if>
     </select>
     </select>
 
 
-    <select id="customPageList" resultType="cn.stylefeng.guns.dbcontainer.modular.model.result.DatabaseInfoResult" parameterType="cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam">
+    <select id="customPageList" resultType="cn.stylefeng.guns.sys.modular.db.model.result.DatabaseInfoResult" parameterType="cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam">
         select
         select
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         from database_info where 1 = 1
         from database_info where 1 = 1
@@ -47,7 +47,7 @@
             </if>
             </if>
     </select>
     </select>
 
 
-    <select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam">
+    <select id="customPageMapList" resultType="map" parameterType="cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam">
         select
         select
         <include refid="Base_Column_List"/>
         <include refid="Base_Column_List"/>
         from database_info where 1 = 1
         from database_info where 1 = 1

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/model/params/DatabaseInfoParam.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/model/params/DatabaseInfoParam.java

-package cn.stylefeng.guns.dbcontainer.modular.model.params;
+package cn.stylefeng.guns.sys.modular.db.model.params;
 
 
 import cn.stylefeng.roses.kernel.model.validator.BaseValidatingParam;
 import cn.stylefeng.roses.kernel.model.validator.BaseValidatingParam;
 import lombok.Data;
 import lombok.Data;

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/model/result/DatabaseInfoResult.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/model/result/DatabaseInfoResult.java

-package cn.stylefeng.guns.dbcontainer.modular.model.result;
+package cn.stylefeng.guns.sys.modular.db.model.result;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/service/DatabaseInfoService.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/service/DatabaseInfoService.java

-package cn.stylefeng.guns.dbcontainer.modular.service;
+package cn.stylefeng.guns.sys.modular.db.service;
 
 
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam;
-import cn.stylefeng.guns.dbcontainer.modular.model.result.DatabaseInfoResult;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
+import cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam;
+import cn.stylefeng.guns.sys.modular.db.model.result.DatabaseInfoResult;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 
 import java.util.List;
 import java.util.List;

guns-base-db-container/src/main/java/cn/stylefeng/guns/dbcontainer/modular/service/impl/DatabaseInfoServiceImpl.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/db/service/impl/DatabaseInfoServiceImpl.java

-package cn.stylefeng.guns.dbcontainer.modular.service.impl;
+package cn.stylefeng.guns.sys.modular.db.service.impl;
 
 
 import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageFactory;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.dbcontainer.core.context.SqlSessionFactoryContext;
-import cn.stylefeng.guns.dbcontainer.core.exception.DataSourceInitException;
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.mapper.DatabaseInfoMapper;
-import cn.stylefeng.guns.dbcontainer.modular.model.params.DatabaseInfoParam;
-import cn.stylefeng.guns.dbcontainer.modular.model.result.DatabaseInfoResult;
-import cn.stylefeng.guns.dbcontainer.modular.service.DatabaseInfoService;
+import cn.stylefeng.guns.base.db.context.SqlSessionFactoryContext;
+import cn.stylefeng.guns.base.db.exception.DataSourceInitException;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
+import cn.stylefeng.guns.sys.modular.db.mapper.DatabaseInfoMapper;
+import cn.stylefeng.guns.sys.modular.db.model.params.DatabaseInfoParam;
+import cn.stylefeng.guns.sys.modular.db.model.result.DatabaseInfoResult;
+import cn.stylefeng.guns.sys.modular.db.service.DatabaseInfoService;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import cn.stylefeng.roses.core.util.ToolUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/modular/controller/GeneratorController.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/gen/controller/GeneratorController.java

-package cn.stylefeng.guns.generator.modular.controller;
+package cn.stylefeng.guns.sys.modular.gen.controller;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.core.util.ZipUtil;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
 import cn.stylefeng.guns.base.pojo.page.LayuiPageInfo;
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.mapper.DatabaseInfoMapper;
-import cn.stylefeng.guns.generator.core.generator.base.model.ContextParam;
-import cn.stylefeng.guns.generator.core.generator.guns.GunsExecutor;
-import cn.stylefeng.guns.generator.core.generator.restful.mybatisplus.param.MpParam;
-import cn.stylefeng.guns.generator.core.util.ConcatUtil;
-import cn.stylefeng.guns.generator.core.util.MapperConditionMapHolder;
-import cn.stylefeng.guns.generator.modular.service.TableService;
+import cn.stylefeng.guns.generator.generator.base.model.ContextParam;
+import cn.stylefeng.guns.generator.generator.guns.GunsExecutor;
+import cn.stylefeng.guns.generator.generator.restful.mybatisplus.param.MpParam;
+import cn.stylefeng.guns.generator.util.ConcatUtil;
+import cn.stylefeng.guns.generator.util.MapperConditionMapHolder;
+import cn.stylefeng.guns.sys.modular.db.mapper.DatabaseInfoMapper;
+import cn.stylefeng.guns.sys.modular.gen.service.TableService;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.ResponseData;
 import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.reqres.response.SuccessResponseData;
 import cn.stylefeng.roses.core.util.HttpContext;
 import cn.stylefeng.roses.core.util.HttpContext;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/modular/service/TableService.java → guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/gen/service/TableService.java

-package cn.stylefeng.guns.generator.modular.service;
+package cn.stylefeng.guns.sys.modular.gen.service;
 
 
-import cn.stylefeng.guns.dbcontainer.core.util.DbUtil;
-import cn.stylefeng.guns.dbcontainer.modular.entity.DatabaseInfo;
-import cn.stylefeng.guns.dbcontainer.modular.mapper.DatabaseInfoMapper;
+import cn.stylefeng.guns.base.db.entity.DatabaseInfo;
+import cn.stylefeng.guns.base.db.util.DbUtil;
+import cn.stylefeng.guns.sys.modular.db.mapper.DatabaseInfoMapper;
 import cn.stylefeng.roses.core.util.HttpContext;
 import cn.stylefeng.roses.core.util.HttpContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -11,7 +11,7 @@ import javax.servlet.http.HttpSession;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
-import static cn.stylefeng.guns.generator.modular.controller.GeneratorController.CONDITION_FIELDS;
+import static cn.stylefeng.guns.sys.modular.gen.controller.GeneratorController.CONDITION_FIELDS;
 
 
 
 
 /**
 /**

guns-base-db-container/src/main/webapp/pages/databaseInfo/databaseInfo.html → guns-sys/src/main/webapp/pages/modular/databaseInfo/databaseInfo.html

-@layout("/common/_container.html",{js:["/assets/databaseInfo/databaseInfo.js"]}){
+@layout("/common/_container.html",{js:["/assets/modular/databaseInfo/databaseInfo.js"]}){
 
 
 <div class="layui-body-header">
 <div class="layui-body-header">
     <span class="layui-body-header-title">数据库信息表管理</span>
     <span class="layui-body-header-title">数据库信息表管理</span>

guns-base-db-container/src/main/webapp/pages/databaseInfo/databaseInfo_add.html → guns-sys/src/main/webapp/pages/modular/databaseInfo/databaseInfo_add.html

-@layout("/common/_container.html",{js:["/assets/databaseInfo/databaseInfo_add.js"]}){
+@layout("/common/_container.html",{js:["/assets/modular/databaseInfo/databaseInfo_add.js"]}){
 
 
 <div class="layui-body-header">
 <div class="layui-body-header">
     <span class="layui-body-header-title">添加</span>
     <span class="layui-body-header-title">添加</span>

guns-base-db-container/src/main/webapp/pages/databaseInfo/databaseInfo_edit.html → guns-sys/src/main/webapp/pages/modular/databaseInfo/databaseInfo_edit.html

-@layout("/common/_container.html",{js:["/assets/databaseInfo/databaseInfo_edit.js"]}){
+@layout("/common/_container.html",{js:["/assets/modular/databaseInfo/databaseInfo_edit.js"]}){
 
 
 <div class="layui-body-header">
 <div class="layui-body-header">
     <span class="layui-body-header-title">修改</span>
     <span class="layui-body-header-title">修改</span>

guns-vip-gen/pom.xml

@@ -24,13 +24,6 @@
             <version>1.0.0</version>
             <version>1.0.0</version>
         </dependency>
         </dependency>
 
 
-        <!--基础组件-->
-        <dependency>
-            <groupId>cn.stylefeng</groupId>
-            <artifactId>guns-base-db-container</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
         <!--mp代码生成器-->
         <!--mp代码生成器-->
         <dependency>
         <dependency>
             <groupId>com.baomidou</groupId>
             <groupId>com.baomidou</groupId>

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/engine/BeetlEngine.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/engine/BeetlEngine.java

-package cn.stylefeng.guns.generator.core.engine;
+package cn.stylefeng.guns.generator.engine;
 
 
-import cn.stylefeng.guns.generator.core.util.TemplateUtil;
+import cn.stylefeng.guns.generator.util.TemplateUtil;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.GroupTemplate;
 import org.beetl.core.resource.ClasspathResourceLoader;
 import org.beetl.core.resource.ClasspathResourceLoader;
 
 

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/engine/GunsMpVelocityTemplateEngine.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/engine/GunsMpVelocityTemplateEngine.java

@@ -13,11 +13,11 @@
  * License for the specific language governing permissions and limitations under
  * License for the specific language governing permissions and limitations under
  * the License.
  * the License.
  */
  */
-package cn.stylefeng.guns.generator.core.engine;
+package cn.stylefeng.guns.generator.engine;
 
 
-import cn.stylefeng.guns.generator.core.util.FieldUtil;
-import cn.stylefeng.guns.generator.core.util.MapperConditionMapHolder;
-import cn.stylefeng.guns.generator.core.util.TableInfoUtil;
+import cn.stylefeng.guns.generator.util.FieldUtil;
+import cn.stylefeng.guns.generator.util.MapperConditionMapHolder;
+import cn.stylefeng.guns.generator.util.TableInfoUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringPool;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.generator.config.ConstVal;
 import com.baomidou.mybatisplus.generator.config.ConstVal;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/base/AbstractCustomGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/base/AbstractCustomGenerator.java

-package cn.stylefeng.guns.generator.core.generator.base;
+package cn.stylefeng.guns.generator.generator.base;
 
 
 
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.generator.core.engine.BeetlEngine;
-import cn.stylefeng.guns.generator.core.util.OsUtil;
-import cn.stylefeng.guns.generator.core.util.TemplateUtil;
+import cn.stylefeng.guns.generator.engine.BeetlEngine;
+import cn.stylefeng.guns.generator.util.OsUtil;
+import cn.stylefeng.guns.generator.util.TemplateUtil;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/base/AbstractMpGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/base/AbstractMpGenerator.java

-package cn.stylefeng.guns.generator.core.generator.base;
+package cn.stylefeng.guns.generator.generator.base;
 
 
 
 
-import cn.stylefeng.guns.generator.core.engine.GunsMpVelocityTemplateEngine;
+import cn.stylefeng.guns.generator.engine.GunsMpVelocityTemplateEngine;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.AutoGenerator;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.InjectionConfig;
 import com.baomidou.mybatisplus.generator.config.*;
 import com.baomidou.mybatisplus.generator.config.*;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/base/Generator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/base/Generator.java

-package cn.stylefeng.guns.generator.core.generator.base;
+package cn.stylefeng.guns.generator.generator.base;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.model.ContextParam;
+import cn.stylefeng.guns.generator.generator.base.model.ContextParam;
 
 
 /**
 /**
  * 代码生成器
  * 代码生成器

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/base/model/ContextParam.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/base/model/ContextParam.java

-package cn.stylefeng.guns.generator.core.generator.base.model;
+package cn.stylefeng.guns.generator.generator.base.model;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/GunsExecutor.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/GunsExecutor.java

-package cn.stylefeng.guns.generator.core.generator.guns;
-
-import cn.stylefeng.guns.generator.core.generator.base.model.ContextParam;
-import cn.stylefeng.guns.generator.core.generator.guns.controller.GunsControllerGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.html.GunsPageAddGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.html.GunsPageEditGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.html.GunsPageIndexGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.js.GunsPageAddJsGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.js.GunsPageEditJsGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.js.GunsPageIndexJsGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.mybatisplus.GunsMpGenerator;
-import cn.stylefeng.guns.generator.core.generator.guns.sqls.GunsMenuSqlGenerator;
-import cn.stylefeng.guns.generator.core.generator.restful.mybatisplus.param.MpParam;
+package cn.stylefeng.guns.generator.generator.guns;
+
+import cn.stylefeng.guns.generator.generator.base.model.ContextParam;
+import cn.stylefeng.guns.generator.generator.guns.controller.GunsControllerGenerator;
+import cn.stylefeng.guns.generator.generator.guns.html.GunsPageAddGenerator;
+import cn.stylefeng.guns.generator.generator.guns.html.GunsPageEditGenerator;
+import cn.stylefeng.guns.generator.generator.guns.html.GunsPageIndexGenerator;
+import cn.stylefeng.guns.generator.generator.guns.js.GunsPageAddJsGenerator;
+import cn.stylefeng.guns.generator.generator.guns.js.GunsPageEditJsGenerator;
+import cn.stylefeng.guns.generator.generator.guns.js.GunsPageIndexJsGenerator;
+import cn.stylefeng.guns.generator.generator.guns.mybatisplus.GunsMpGenerator;
+import cn.stylefeng.guns.generator.generator.guns.sqls.GunsMenuSqlGenerator;
+import cn.stylefeng.guns.generator.generator.restful.mybatisplus.param.MpParam;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 
 
 import java.util.List;
 import java.util.List;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/controller/GunsControllerGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/controller/GunsControllerGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.controller;
+package cn.stylefeng.guns.generator.generator.guns.controller;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/html/GunsPageAddGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/html/GunsPageAddGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.html;
+package cn.stylefeng.guns.generator.generator.guns.html;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/html/GunsPageEditGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/html/GunsPageEditGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.html;
+package cn.stylefeng.guns.generator.generator.guns.html;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/html/GunsPageIndexGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/html/GunsPageIndexGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.html;
+package cn.stylefeng.guns.generator.generator.guns.html;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 
 
 import java.io.File;
 import java.io.File;
 import java.util.Map;
 import java.util.Map;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/js/GunsPageAddJsGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/js/GunsPageAddJsGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.js;
+package cn.stylefeng.guns.generator.generator.guns.js;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/js/GunsPageEditJsGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/js/GunsPageEditJsGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.js;
+package cn.stylefeng.guns.generator.generator.guns.js;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/js/GunsPageIndexJsGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/js/GunsPageIndexJsGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.js;
+package cn.stylefeng.guns.generator.generator.guns.js;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/mybatisplus/GunsMpGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/mybatisplus/GunsMpGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.mybatisplus;
+package cn.stylefeng.guns.generator.generator.guns.mybatisplus;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractMpGenerator;
-import cn.stylefeng.guns.generator.core.generator.restful.mybatisplus.param.MpParam;
+import cn.stylefeng.guns.generator.generator.base.AbstractMpGenerator;
+import cn.stylefeng.guns.generator.generator.restful.mybatisplus.param.MpParam;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.DbType;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.IdType;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/sqls/GunsMenuSqlGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/sqls/GunsMenuSqlGenerator.java

-package cn.stylefeng.guns.generator.core.generator.guns.sqls;
+package cn.stylefeng.guns.generator.generator.guns.sqls;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
-import cn.stylefeng.guns.generator.core.util.TemplateUtil;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.util.TemplateUtil;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import com.baomidou.mybatisplus.generator.config.po.TableInfo;
 import org.beetl.core.Template;
 import org.beetl.core.Template;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/guns/sqls/MenuModel.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/guns/sqls/MenuModel.java

-package cn.stylefeng.guns.generator.core.generator.guns.sqls;
+package cn.stylefeng.guns.generator.generator.guns.sqls;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import lombok.Data;
 import lombok.Data;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/restful/controller/RestfulControllerGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/restful/controller/RestfulControllerGenerator.java

-package cn.stylefeng.guns.generator.core.generator.restful.controller;
+package cn.stylefeng.guns.generator.generator.restful.controller;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/restful/feign/FeignApiGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/restful/feign/FeignApiGenerator.java

-package cn.stylefeng.guns.generator.core.generator.restful.feign;
+package cn.stylefeng.guns.generator.generator.restful.feign;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/restful/feign/FeignProviderGenerator.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/restful/feign/FeignProviderGenerator.java

-package cn.stylefeng.guns.generator.core.generator.restful.feign;
+package cn.stylefeng.guns.generator.generator.restful.feign;
 
 
-import cn.stylefeng.guns.generator.core.generator.base.AbstractCustomGenerator;
+import cn.stylefeng.guns.generator.generator.base.AbstractCustomGenerator;
 import org.beetl.core.Template;
 import org.beetl.core.Template;
 
 
 import java.io.File;
 import java.io.File;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/generator/restful/mybatisplus/param/MpParam.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/generator/restful/mybatisplus/param/MpParam.java

-package cn.stylefeng.guns.generator.core.generator.restful.mybatisplus.param;
+package cn.stylefeng.guns.generator.generator.restful.mybatisplus.param;
 
 
 import lombok.Data;
 import lombok.Data;
 
 

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/util/ConcatUtil.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/util/ConcatUtil.java

-package cn.stylefeng.guns.generator.core.util;
+package cn.stylefeng.guns.generator.util;
 
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 
 

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/util/FieldUtil.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/util/FieldUtil.java

-package cn.stylefeng.guns.generator.core.util;
+package cn.stylefeng.guns.generator.util;
 
 
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 import com.baomidou.mybatisplus.generator.config.po.TableField;
 
 

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/util/MapperConditionMapHolder.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/util/MapperConditionMapHolder.java

-package cn.stylefeng.guns.generator.core.util;
+package cn.stylefeng.guns.generator.util;
 
 
 import java.util.Map;
 import java.util.Map;
 
 

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/util/OsUtil.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/util/OsUtil.java

-package cn.stylefeng.guns.generator.core.util;
+package cn.stylefeng.guns.generator.util;
 
 
 /**
 /**
  * 判断操作系统的工具
  * 判断操作系统的工具

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/util/TableInfoUtil.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/util/TableInfoUtil.java

-package cn.stylefeng.guns.generator.core.util;
+package cn.stylefeng.guns.generator.util;
 
 
 
 
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;

guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/core/util/TemplateUtil.java → guns-vip-gen/src/main/java/cn/stylefeng/guns/generator/util/TemplateUtil.java

-package cn.stylefeng.guns.generator.core.util;
+package cn.stylefeng.guns.generator.util;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;

guns-vip-main/pom.xml

@@ -24,20 +24,6 @@
             <version>1.0.0</version>
             <version>1.0.0</version>
         </dependency>
         </dependency>
 
 
-        <!-- 最新代码生成模块 -->
-        <dependency>
-            <groupId>cn.stylefeng</groupId>
-            <artifactId>guns-vip-gen</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
-        <!-- 数据源容器-->
-        <dependency>
-            <groupId>cn.stylefeng</groupId>
-            <artifactId>guns-base-db-container</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
         <!-- 分布式job -->
         <!-- 分布式job -->
         <!--        <dependency>-->
         <!--        <dependency>-->
         <!--            <groupId>cn.stylefeng</groupId>-->
         <!--            <groupId>cn.stylefeng</groupId>-->

guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/DataSourceConfig.java

@@ -26,7 +26,7 @@ import org.springframework.context.annotation.Primary;
 
 
 import javax.sql.DataSource;
 import javax.sql.DataSource;
 
 
-import static cn.stylefeng.guns.dbcontainer.core.context.DataSourceContext.MASTER_DATASOURCE_NAME;
+import static cn.stylefeng.guns.base.db.context.DataSourceContext.MASTER_DATASOURCE_NAME;
 
 
 /**
 /**
  * 多数据源配置<br/>
  * 多数据源配置<br/>

guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/PluginsConfig.java

@@ -13,11 +13,10 @@ import org.springframework.context.annotation.Configuration;
  * @Date 2019/5/10 21:33
  * @Date 2019/5/10 21:33
  */
  */
 @Configuration
 @Configuration
-@MapperScan(basePackages = {"cn.stylefeng.guns.sys.modular.*.mapper",
+@MapperScan(basePackages = {
+        "cn.stylefeng.guns.sys.modular.*.mapper",
         "cn.stylefeng.guns.modular.*.mapper",
         "cn.stylefeng.guns.modular.*.mapper",
-        "cn.stylefeng.guns.sms.modular.mapper",
-        "cn.stylefeng.guns.oauth.modular.mapper",
-        "cn.stylefeng.guns.dbcontainer.modular.mapper"})
+        "cn.stylefeng.guns.sms.modular.mapper"})
 public class PluginsConfig {
 public class PluginsConfig {
 
 
     /**
     /**

guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/SqlSessionFactoryConfig.java

@@ -15,10 +15,10 @@
  */
  */
 package cn.stylefeng.guns.config.datasource;
 package cn.stylefeng.guns.config.datasource;
 
 
-import cn.stylefeng.guns.dbcontainer.core.collector.SqlSessionFactoryCreator;
-import cn.stylefeng.guns.dbcontainer.core.context.DataSourceContext;
-import cn.stylefeng.guns.dbcontainer.core.context.SqlSessionFactoryContext;
-import cn.stylefeng.guns.dbcontainer.core.exception.DataSourceInitException;
+import cn.stylefeng.guns.base.db.collector.SqlSessionFactoryCreator;
+import cn.stylefeng.guns.base.db.context.DataSourceContext;
+import cn.stylefeng.guns.base.db.context.SqlSessionFactoryContext;
+import cn.stylefeng.guns.base.db.exception.DataSourceInitException;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.mutidatasource.mybatis.OptionalSqlSessionTemplate;
 import cn.stylefeng.roses.core.mutidatasource.mybatis.OptionalSqlSessionTemplate;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -31,7 +31,7 @@ import org.springframework.context.annotation.Primary;
 
 
 import javax.sql.DataSource;
 import javax.sql.DataSource;
 
 
-import static cn.stylefeng.guns.dbcontainer.core.context.DataSourceContext.MASTER_DATASOURCE_NAME;
+import static cn.stylefeng.guns.base.db.context.DataSourceContext.MASTER_DATASOURCE_NAME;
 
 
 /**
 /**
  * 多数据源配置<br/>
  * 多数据源配置<br/>

pom.xml

@@ -21,7 +21,6 @@
 
 
     <modules>
     <modules>
         <module>guns-base</module>
         <module>guns-base</module>
-        <module>guns-base-db-container</module>
         <module>guns-base-sms</module>
         <module>guns-base-sms</module>
         <module>guns-base-email</module>
         <module>guns-base-email</module>
         <module>guns-base-timers</module>
         <module>guns-base-timers</module>