Browse Source

【修改】迁移DbIdEnum和DruidProperties到基础core模块中

fengshuonan 4 years ago
parent
commit
bbddd40f20

+ 1 - 1
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/mybatis/dbid/DbIdEnum.java

@ -22,7 +22,7 @@ Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意
5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns-separation
6.若您的项目无法满足以上几点,可申请商业授权,获取Guns商业授权许可,请在官网购买授权,地址为 https://www.stylefeng.cn
 */
package cn.stylefeng.guns.sys.core.mybatis.dbid;
package cn.stylefeng.guns.core.enums;
import lombok.Getter;

+ 2 - 3
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/config/properties/DruidProperties.java

@ -1,4 +1,3 @@
/*
Copyright [2020] [https://www.stylefeng.cn]
@ -23,10 +22,10 @@ Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意
5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns-separation
6.若您的项目无法满足以上几点,可申请商业授权,获取Guns商业授权许可,请在官网购买授权,地址为 https://www.stylefeng.cn
 */
package cn.stylefeng.guns.sys.config.properties;
package cn.stylefeng.guns.core.pojo.druid;
import cn.hutool.log.Log;
import cn.stylefeng.guns.sys.core.mybatis.dbid.DbIdEnum;
import cn.stylefeng.guns.core.enums.DbIdEnum;
import com.alibaba.druid.pool.DruidDataSource;
import lombok.Data;

+ 1 - 1
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/config/DataSourceConfig.java

@ -26,7 +26,7 @@ package cn.stylefeng.guns.sys.config;
import cn.hutool.core.collection.CollectionUtil;
import cn.stylefeng.guns.core.context.constant.ConstantContextHolder;
import cn.stylefeng.guns.sys.config.properties.DruidProperties;
import cn.stylefeng.guns.core.pojo.druid.DruidProperties;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.http.StatViewServlet;
import org.springframework.boot.context.properties.ConfigurationProperties;

+ 1 - 0
guns-base-support/guns-system/src/main/java/cn/stylefeng/guns/sys/core/mybatis/dbid/GunsDatabaseIdProvider.java

@ -24,6 +24,7 @@ Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意
 */
package cn.stylefeng.guns.sys.core.mybatis.dbid;
import cn.stylefeng.guns.core.enums.DbIdEnum;
import org.apache.ibatis.mapping.DatabaseIdProvider;
import javax.sql.DataSource;