diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java index 86f3f115..1be8a0e8 100644 --- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java +++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/dynamic/db/DynamicDBUtil.java @@ -1,300 +1,300 @@ -package org.jeecg.common.util.dynamic.db; - -import com.alibaba.druid.pool.DruidDataSource; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; -import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.exception.JeecgBootException; -import org.jeecg.common.system.vo.DynamicDataSourceModel; -import org.jeecg.common.util.ReflectHelper; -import org.jeecg.common.util.oConvertUtils; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; - -import javax.sql.DataSource; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Spring JDBC 实时数据库访问 - * - * @author chenguobin - * @version 1.0 - * @date 2014-09-05 - */ -@Slf4j -public class DynamicDBUtil { - - /** - * 获取数据源【最底层方法,不要随便调用】 - * - * @param dbSource - * @return - */ - private static DruidDataSource getJdbcDataSource(final DynamicDataSourceModel dbSource) { - DruidDataSource dataSource = new DruidDataSource(); - - String driverClassName = dbSource.getDbDriver(); - String url = dbSource.getDbUrl(); - String dbUser = dbSource.getDbUsername(); - String dbPassword = dbSource.getDbPassword(); - dataSource.setDriverClassName(driverClassName); - dataSource.setUrl(url); - //dataSource.setValidationQuery("SELECT 1 FROM DUAL"); - dataSource.setTestWhileIdle(true); - dataSource.setTestOnBorrow(false); - dataSource.setTestOnReturn(false); - dataSource.setBreakAfterAcquireFailure(true); - dataSource.setConnectionErrorRetryAttempts(0); - dataSource.setUsername(dbUser); - dataSource.setMaxWait(60000); - dataSource.setPassword(dbPassword); - - log.info("******************************************"); - log.info("* *"); - log.info("*====【"+dbSource.getCode()+"】=====Druid连接池已启用 ====*"); - log.info("* *"); - log.info("******************************************"); - return dataSource; - } - - /** - * 通过 dbKey ,获取数据源 - * - * @param dbKey - * @return - */ - public static DruidDataSource getDbSourceByDbKey(final String dbKey) { - //获取多数据源配置 - DynamicDataSourceModel dbSource = DataSourceCachePool.getCacheDynamicDataSourceModel(dbKey); - //先判断缓存中是否存在数据库链接 - DruidDataSource cacheDbSource = DataSourceCachePool.getCacheBasicDataSource(dbKey); - if (cacheDbSource != null && !cacheDbSource.isClosed()) { - log.debug("--------getDbSourceBydbKey------------------从缓存中获取DB连接-------------------"); - return cacheDbSource; - } else { - DruidDataSource dataSource = getJdbcDataSource(dbSource); - if(dataSource!=null && dataSource.isEnable()){ - DataSourceCachePool.putCacheBasicDataSource(dbKey, dataSource); - }else{ - throw new JeecgBootException("动态数据源连接失败,dbKey:"+dbKey); - } - log.info("--------getDbSourceBydbKey------------------创建DB数据库连接-------------------"); - return dataSource; - } - } - - /** - * 关闭数据库连接池 - * - * @param dbKey - * @return - */ - public static void closeDbKey(final String dbKey) { - DruidDataSource dataSource = getDbSourceByDbKey(dbKey); - try { - if (dataSource != null && !dataSource.isClosed()) { - dataSource.getConnection().commit(); - dataSource.getConnection().close(); - dataSource.close(); - } - } catch (SQLException e) { - e.printStackTrace(); - } - } - - - private static JdbcTemplate getJdbcTemplate(String dbKey) { - DruidDataSource dataSource = getDbSourceByDbKey(dbKey); - return new JdbcTemplate(dataSource); - } - - /** - * Executes the SQL statement in this PreparedStatement object, - * which must be an SQL Data Manipulation Language (DML) statement, such as INSERT, UPDATE or - * DELETE; or an SQL statement that returns nothing, - * such as a DDL statement. - */ - public static int update(final String dbKey, String sql, Object... param) { - int effectCount; - JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); - if (ArrayUtils.isEmpty(param)) { - effectCount = jdbcTemplate.update(sql); - } else { - effectCount = jdbcTemplate.update(sql, param); - } - return effectCount; - } - - /** - * 支持miniDao语法操作的Update - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持minidao语法逻辑 - * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 - * @return - */ - public static int updateByHash(final String dbKey, String sql, HashMap data) { - int effectCount; - JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); - //根据模板获取sql - sql = FreemarkerParseFactory.parseTemplateContent(sql, data); - NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource()); - effectCount = namedParameterJdbcTemplate.update(sql, data); - return effectCount; - } - - public static Object findOne(final String dbKey, String sql, Object... param) { - List> list; - list = findList(dbKey, sql, param); - if (oConvertUtils.listIsEmpty(list)) { - log.error("Except one, but not find actually"); - } - if (list.size() > 1) { - log.error("Except one, but more than one actually"); - } - return list.get(0); - } - - /** - * 支持miniDao语法操作的查询 返回HashMap - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持minidao语法逻辑 - * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 - * @return - */ - public static Object findOneByHash(final String dbKey, String sql, HashMap data) { - List> list; - list = findListByHash(dbKey, sql, data); - if (oConvertUtils.listIsEmpty(list)) { - log.error("Except one, but not find actually"); - } - if (list.size() > 1) { - log.error("Except one, but more than one actually"); - } - return list.get(0); - } - - /** - * 直接sql查询 根据clazz返回单个实例 - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句 - * @param clazz 返回实例的Class - * @param param - * @return - */ - @SuppressWarnings("unchecked") - public static Object findOne(final String dbKey, String sql, Class clazz, Object... param) { - Map map = (Map) findOne(dbKey, sql, param); - return ReflectHelper.setAll(clazz, map); - } - - /** - * 支持miniDao语法操作的查询 返回单个实例 - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持minidao语法逻辑 - * @param clazz 返回实例的Class - * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 - * @return - */ - @SuppressWarnings("unchecked") - public static Object findOneByHash(final String dbKey, String sql, Class clazz, HashMap data) { - Map map = (Map) findOneByHash(dbKey, sql, data); - return ReflectHelper.setAll(clazz, map); - } - - public static List> findList(final String dbKey, String sql, Object... param) { - List> list; - JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); - - if (ArrayUtils.isEmpty(param)) { - list = jdbcTemplate.queryForList(sql); - } else { - list = jdbcTemplate.queryForList(sql, param); - } - return list; - } - - /** - * 支持miniDao语法操作的查询 - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持minidao语法逻辑 - * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 - * @return - */ - public static List> findListByHash(final String dbKey, String sql, HashMap data) { - List> list; - JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); - //根据模板获取sql - sql = FreemarkerParseFactory.parseTemplateContent(sql, data); - NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource()); - list = namedParameterJdbcTemplate.queryForList(sql, data); - return list; - } - - //此方法只能返回单列,不能返回实体类 - public static List findList(final String dbKey, String sql, Class clazz, Object... param) { - List list; - JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); - - if (ArrayUtils.isEmpty(param)) { - list = jdbcTemplate.queryForList(sql, clazz); - } else { - list = jdbcTemplate.queryForList(sql, clazz, param); - } - return list; - } - - /** - * 支持miniDao语法操作的查询 返回单列数据list - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持minidao语法逻辑 - * @param clazz 类型Long、String等 - * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 - * @return - */ - public static List findListByHash(final String dbKey, String sql, Class clazz, HashMap data) { - List list; - JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); - //根据模板获取sql - sql = FreemarkerParseFactory.parseTemplateContent(sql, data); - NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource()); - list = namedParameterJdbcTemplate.queryForList(sql, data, clazz); - return list; - } - - /** - * 直接sql查询 返回实体类列表 - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持 minidao 语法逻辑 - * @param clazz 返回实体类列表的class - * @param param sql拼接注入中需要的数据 - * @return - */ - public static List findListEntities(final String dbKey, String sql, Class clazz, Object... param) { - List> queryList = findList(dbKey, sql, param); - return ReflectHelper.transList2Entrys(queryList, clazz); - } - - /** - * 支持miniDao语法操作的查询 返回实体类列表 - * - * @param dbKey 数据源标识 - * @param sql 执行sql语句,sql支持minidao语法逻辑 - * @param clazz 返回实体类列表的class - * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 - * @return - */ - public static List findListEntitiesByHash(final String dbKey, String sql, Class clazz, HashMap data) { - List> queryList = findListByHash(dbKey, sql, data); - return ReflectHelper.transList2Entrys(queryList, clazz); - } -} +//package org.jeecg.common.util.dynamic.db; +// +//import com.alibaba.druid.pool.DruidDataSource; +//import lombok.extern.slf4j.Slf4j; +//import org.apache.commons.lang3.ArrayUtils; +//import org.jeecg.common.exception.JeecgBootException; +//import org.jeecg.common.exception.JeecgBootException; +//import org.jeecg.common.system.vo.DynamicDataSourceModel; +//import org.jeecg.common.util.ReflectHelper; +//import org.jeecg.common.util.oConvertUtils; +//import org.springframework.jdbc.core.JdbcTemplate; +//import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +// +//import javax.sql.DataSource; +//import java.sql.SQLException; +//import java.util.HashMap; +//import java.util.List; +//import java.util.Map; +// +///** +// * Spring JDBC 实时数据库访问 +// * +// * @author chenguobin +// * @version 1.0 +// * @date 2014-09-05 +// */ +//@Slf4j +//public class DynamicDBUtil { +// +// /** +// * 获取数据源【最底层方法,不要随便调用】 +// * +// * @param dbSource +// * @return +// */ +// private static DruidDataSource getJdbcDataSource(final DynamicDataSourceModel dbSource) { +// DruidDataSource dataSource = new DruidDataSource(); +// +// String driverClassName = dbSource.getDbDriver(); +// String url = dbSource.getDbUrl(); +// String dbUser = dbSource.getDbUsername(); +// String dbPassword = dbSource.getDbPassword(); +// dataSource.setDriverClassName(driverClassName); +// dataSource.setUrl(url); +// //dataSource.setValidationQuery("SELECT 1 FROM DUAL"); +// dataSource.setTestWhileIdle(true); +// dataSource.setTestOnBorrow(false); +// dataSource.setTestOnReturn(false); +// dataSource.setBreakAfterAcquireFailure(true); +// dataSource.setConnectionErrorRetryAttempts(0); +// dataSource.setUsername(dbUser); +// dataSource.setMaxWait(60000); +// dataSource.setPassword(dbPassword); +// +// log.info("******************************************"); +// log.info("* *"); +// log.info("*====【"+dbSource.getCode()+"】=====Druid连接池已启用 ====*"); +// log.info("* *"); +// log.info("******************************************"); +// return dataSource; +// } +// +// /** +// * 通过 dbKey ,获取数据源 +// * +// * @param dbKey +// * @return +// */ +// public static DruidDataSource getDbSourceByDbKey(final String dbKey) { +// //获取多数据源配置 +// DynamicDataSourceModel dbSource = DataSourceCachePool.getCacheDynamicDataSourceModel(dbKey); +// //先判断缓存中是否存在数据库链接 +// DruidDataSource cacheDbSource = DataSourceCachePool.getCacheBasicDataSource(dbKey); +// if (cacheDbSource != null && !cacheDbSource.isClosed()) { +// log.debug("--------getDbSourceBydbKey------------------从缓存中获取DB连接-------------------"); +// return cacheDbSource; +// } else { +// DruidDataSource dataSource = getJdbcDataSource(dbSource); +// if(dataSource!=null && dataSource.isEnable()){ +// DataSourceCachePool.putCacheBasicDataSource(dbKey, dataSource); +// }else{ +// throw new JeecgBootException("动态数据源连接失败,dbKey:"+dbKey); +// } +// log.info("--------getDbSourceBydbKey------------------创建DB数据库连接-------------------"); +// return dataSource; +// } +// } +// +// /** +// * 关闭数据库连接池 +// * +// * @param dbKey +// * @return +// */ +// public static void closeDbKey(final String dbKey) { +// DruidDataSource dataSource = getDbSourceByDbKey(dbKey); +// try { +// if (dataSource != null && !dataSource.isClosed()) { +// dataSource.getConnection().commit(); +// dataSource.getConnection().close(); +// dataSource.close(); +// } +// } catch (SQLException e) { +// e.printStackTrace(); +// } +// } +// +// +// private static JdbcTemplate getJdbcTemplate(String dbKey) { +// DruidDataSource dataSource = getDbSourceByDbKey(dbKey); +// return new JdbcTemplate(dataSource); +// } +// +// /** +// * Executes the SQL statement in this PreparedStatement object, +// * which must be an SQL Data Manipulation Language (DML) statement, such as INSERT, UPDATE or +// * DELETE; or an SQL statement that returns nothing, +// * such as a DDL statement. +// */ +// public static int update(final String dbKey, String sql, Object... param) { +// int effectCount; +// JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); +// if (ArrayUtils.isEmpty(param)) { +// effectCount = jdbcTemplate.update(sql); +// } else { +// effectCount = jdbcTemplate.update(sql, param); +// } +// return effectCount; +// } +// +// /** +// * 支持miniDao语法操作的Update +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持minidao语法逻辑 +// * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 +// * @return +// */ +// public static int updateByHash(final String dbKey, String sql, HashMap data) { +// int effectCount; +// JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); +// //根据模板获取sql +// sql = FreemarkerParseFactory.parseTemplateContent(sql, data); +// NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource()); +// effectCount = namedParameterJdbcTemplate.update(sql, data); +// return effectCount; +// } +// +// public static Object findOne(final String dbKey, String sql, Object... param) { +// List> list; +// list = findList(dbKey, sql, param); +// if (oConvertUtils.listIsEmpty(list)) { +// log.error("Except one, but not find actually"); +// } +// if (list.size() > 1) { +// log.error("Except one, but more than one actually"); +// } +// return list.get(0); +// } +// +// /** +// * 支持miniDao语法操作的查询 返回HashMap +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持minidao语法逻辑 +// * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 +// * @return +// */ +// public static Object findOneByHash(final String dbKey, String sql, HashMap data) { +// List> list; +// list = findListByHash(dbKey, sql, data); +// if (oConvertUtils.listIsEmpty(list)) { +// log.error("Except one, but not find actually"); +// } +// if (list.size() > 1) { +// log.error("Except one, but more than one actually"); +// } +// return list.get(0); +// } +// +// /** +// * 直接sql查询 根据clazz返回单个实例 +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句 +// * @param clazz 返回实例的Class +// * @param param +// * @return +// */ +// @SuppressWarnings("unchecked") +// public static Object findOne(final String dbKey, String sql, Class clazz, Object... param) { +// Map map = (Map) findOne(dbKey, sql, param); +// return ReflectHelper.setAll(clazz, map); +// } +// +// /** +// * 支持miniDao语法操作的查询 返回单个实例 +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持minidao语法逻辑 +// * @param clazz 返回实例的Class +// * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 +// * @return +// */ +// @SuppressWarnings("unchecked") +// public static Object findOneByHash(final String dbKey, String sql, Class clazz, HashMap data) { +// Map map = (Map) findOneByHash(dbKey, sql, data); +// return ReflectHelper.setAll(clazz, map); +// } +// +// public static List> findList(final String dbKey, String sql, Object... param) { +// List> list; +// JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); +// +// if (ArrayUtils.isEmpty(param)) { +// list = jdbcTemplate.queryForList(sql); +// } else { +// list = jdbcTemplate.queryForList(sql, param); +// } +// return list; +// } +// +// /** +// * 支持miniDao语法操作的查询 +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持minidao语法逻辑 +// * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 +// * @return +// */ +// public static List> findListByHash(final String dbKey, String sql, HashMap data) { +// List> list; +// JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); +// //根据模板获取sql +// sql = FreemarkerParseFactory.parseTemplateContent(sql, data); +// NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource()); +// list = namedParameterJdbcTemplate.queryForList(sql, data); +// return list; +// } +// +// //此方法只能返回单列,不能返回实体类 +// public static List findList(final String dbKey, String sql, Class clazz, Object... param) { +// List list; +// JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); +// +// if (ArrayUtils.isEmpty(param)) { +// list = jdbcTemplate.queryForList(sql, clazz); +// } else { +// list = jdbcTemplate.queryForList(sql, clazz, param); +// } +// return list; +// } +// +// /** +// * 支持miniDao语法操作的查询 返回单列数据list +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持minidao语法逻辑 +// * @param clazz 类型Long、String等 +// * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 +// * @return +// */ +// public static List findListByHash(final String dbKey, String sql, Class clazz, HashMap data) { +// List list; +// JdbcTemplate jdbcTemplate = getJdbcTemplate(dbKey); +// //根据模板获取sql +// sql = FreemarkerParseFactory.parseTemplateContent(sql, data); +// NamedParameterJdbcTemplate namedParameterJdbcTemplate = new NamedParameterJdbcTemplate(jdbcTemplate.getDataSource()); +// list = namedParameterJdbcTemplate.queryForList(sql, data, clazz); +// return list; +// } +// +// /** +// * 直接sql查询 返回实体类列表 +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持 minidao 语法逻辑 +// * @param clazz 返回实体类列表的class +// * @param param sql拼接注入中需要的数据 +// * @return +// */ +// public static List findListEntities(final String dbKey, String sql, Class clazz, Object... param) { +// List> queryList = findList(dbKey, sql, param); +// return ReflectHelper.transList2Entrys(queryList, clazz); +// } +// +// /** +// * 支持miniDao语法操作的查询 返回实体类列表 +// * +// * @param dbKey 数据源标识 +// * @param sql 执行sql语句,sql支持minidao语法逻辑 +// * @param clazz 返回实体类列表的class +// * @param data sql语法中需要判断的数据及sql拼接注入中需要的数据 +// * @return +// */ +// public static List findListEntitiesByHash(final String dbKey, String sql, Class clazz, HashMap data) { +// List> queryList = findListByHash(dbKey, sql, data); +// return ReflectHelper.transList2Entrys(queryList, clazz); +// } +//} diff --git a/jeecg-boot/jeecg-boot-module-demo/pom.xml b/jeecg-boot/jeecg-boot-module-demo/pom.xml index e5b89e98..f81f2437 100644 --- a/jeecg-boot/jeecg-boot-module-demo/pom.xml +++ b/jeecg-boot/jeecg-boot-module-demo/pom.xml @@ -13,12 +13,12 @@ - org.jeecgframework.boot + com.jero.boot jeecg-boot-base-core diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/pom.xml b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/pom.xml index 9117620e..568f44a2 100644 --- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/pom.xml +++ b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/pom.xml @@ -12,7 +12,7 @@ - org.jeecgframework.boot + com.jero.boot jeecg-system-cloud-api diff --git a/jeecg-boot/jeecg-boot-starter/pom.xml b/jeecg-boot/jeecg-boot-starter/pom.xml index 86bb0af7..fd1d4ec5 100644 --- a/jeecg-boot/jeecg-boot-starter/pom.xml +++ b/jeecg-boot/jeecg-boot-starter/pom.xml @@ -25,7 +25,7 @@ - org.jeecgframework.boot + com.jero.boot jeecg-boot-base-tools diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml index 1bc39a61..d5d15f0a 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/pom.xml @@ -13,18 +13,18 @@ - org.jeecgframework.boot + com.jero.boot jeecg-boot-starter-cloud - org.jeecgframework.boot + com.jero.boot jeecg-system-cloud-api - org.jeecgframework.boot + com.jero.boot jeecg-boot-starter-redis diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml index 6efe2bdb..6bca330b 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-system-start/pom.xml @@ -14,35 +14,35 @@ - org.jeecgframework.boot + com.jero.boot jeecg-boot-starter-cloud - org.jeecgframework.boot + com.jero.boot jeecg-system-cloud-api - org.jeecgframework.boot + com.jero.boot jeecg-boot-module-system - org.jeecgframework.boot + com.jero.boot jeecg-boot-starter-rabbitmq - org.jeecgframework.boot + com.jero.boot jeecg-boot-starter-job - org.jeecgframework.boot + com.jero.boot jeecg-boot-starter-lock diff --git a/jeecg-boot/jeecg-cloud-module/pom.xml b/jeecg-boot/jeecg-cloud-module/pom.xml index 7281014f..30d3da89 100644 --- a/jeecg-boot/jeecg-cloud-module/pom.xml +++ b/jeecg-boot/jeecg-cloud-module/pom.xml @@ -18,6 +18,4 @@ jeecg-cloud-xxljob - - \ No newline at end of file diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index cde79848..4b9cc0d2 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -52,10 +52,10 @@ jeecg-boot-module-demo jeecg-boot-module-system - jeecg-boot-starter jeecg-cloud-module - --> +