diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DomainService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DomainService.java index 69388d595ed6c357a6f5ee5414bf2c6aae8d409f..a4fc4d02916753394788ff6ea83c688aee2526ad 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DomainService.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/DomainService.java @@ -1,6 +1,6 @@ package cn.icanci.rec.admin.biz.service; -import cn.icanci.rec.admin.dal.mongodb.dateobject.DomainDO; +import cn.icanci.rec.common.model.config.DomainVO; import java.util.List; @@ -10,5 +10,17 @@ import java.util.List; */ public interface DomainService { - List queryAll(); + /** + * 查询所有Domain + * + * @return 返回所有Domain + */ + List queryAll(); + + /** + * 保存或者更新一条信息 + * + * @param domain domain + */ + void save(DomainVO domain); } diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DomainServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DomainServiceImpl.java index 65a4cd2ce88bcf50f8696f92af057ebc39e28703..36ba0d521e9e9734866175342fcda4c8924d786e 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DomainServiceImpl.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DomainServiceImpl.java @@ -1,8 +1,9 @@ package cn.icanci.rec.admin.biz.service.impl; +import cn.icanci.rec.admin.biz.mapper.DomainMapper; import cn.icanci.rec.admin.biz.service.DomainService; import cn.icanci.rec.admin.dal.mongodb.daointerface.DomainDAO; -import cn.icanci.rec.admin.dal.mongodb.dateobject.DomainDO; +import cn.icanci.rec.common.model.config.DomainVO; import java.util.List; @@ -19,10 +20,17 @@ import org.springframework.stereotype.Service; @Service public class DomainServiceImpl implements DomainService { @Resource - private DomainDAO domainDAO; + private DomainDAO domainDAO; + @Resource + private DomainMapper domainMapper; @Override - public List queryAll() { - return domainDAO.queryAll(); + public List queryAll() { + return domainMapper.dos2vos(domainDAO.queryAll()); + } + + @Override + public void save(DomainVO domain) { + } } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/LogOperateDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/LogOperateDAO.java index c570f66b5bb13830df99c2ab73ea61f29fae7fd8..50618193152624ba30667953560ea7cce432ef6a 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/LogOperateDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/LogOperateDAO.java @@ -19,11 +19,6 @@ public interface LogOperateDAO { */ Class COLLECTION_CLASS = LogOperateDO.class; - /** - * 默认环境 - */ - String DEFAULT_ENV = "test"; - /** * 插入文档一条记录 * diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java index 27e85be956e724c6ab28566443ddb5425f09705c..198118d95899d48d0140093a562b1ebd4a948f9e 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java @@ -2,17 +2,20 @@ package cn.icanci.rec.admin.dal.mongodb.mongo; import cn.icanci.rec.admin.dal.mongodb.daointerface.BaseDAO; import cn.icanci.rec.admin.dal.mongodb.dateobject.BaseDO; +import cn.icanci.rec.admin.dal.utils.EnvUtils; import cn.icanci.rec.admin.dal.utils.IDHolder; import java.util.Date; +import org.springframework.beans.factory.InitializingBean; + /** * @author icanci * @since 1.0 Created in 2022/10/24 22:47 */ -public abstract class AbstractBaseDAO extends MongoPageHelper implements BaseDAO { +public abstract class AbstractBaseDAO extends MongoPageHelper implements BaseDAO, InitializingBean { - protected String DEFAULT_ENV = "test"; + protected String DEFAULT_ENV; @Override public void insert(T t) { @@ -29,4 +32,9 @@ public abstract class AbstractBaseDAO extends MongoPageHelper public void update(T t) { t.setUpdateTime(new Date()); } + + @Override + public void afterPropertiesSet() throws Exception { + DEFAULT_ENV = EnvUtils.getEnv(); + } } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoLogOperateDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoLogOperateDAO.java index bc1b082b17e3cd657f7d586d3845c721d8e8a4c3..d0195ee0656cce1842d02d40b0a4a92e153fb6a9 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoLogOperateDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoLogOperateDAO.java @@ -3,6 +3,7 @@ package cn.icanci.rec.admin.dal.mongodb.mongo; import cn.icanci.rec.admin.dal.mongodb.common.PageList; import cn.icanci.rec.admin.dal.mongodb.daointerface.LogOperateDAO; import cn.icanci.rec.admin.dal.mongodb.dateobject.LogOperateDO; +import cn.icanci.rec.admin.dal.utils.EnvUtils; import java.util.List; @@ -20,6 +21,7 @@ import org.springframework.stereotype.Service; public class MongoLogOperateDAO extends MongoPageHelper implements LogOperateDAO { @Override public void insert(LogOperateDO t) { + t.setEnv(EnvUtils.getEnv()); mongoTemplate.insert(t); } @@ -30,7 +32,7 @@ public class MongoLogOperateDAO extends MongoPageHelper implements LogOperateDAO @Override public List queryAll() { - Criteria criteria = Criteria.where(LogColumn.env).is(DEFAULT_ENV); + Criteria criteria = Criteria.where(LogColumn.env).is(EnvUtils.getEnv()); Query query = new Query(criteria); return mongoTemplate.find(query, COLLECTION_CLASS, COLLECTION_NAME); @@ -38,7 +40,7 @@ public class MongoLogOperateDAO extends MongoPageHelper implements LogOperateDAO @Override public PageList pageQuery(LogOperateDO t, int pageNum, int pageSize) { - Criteria criteria = Criteria.where(LogColumn.env).is(DEFAULT_ENV); + Criteria criteria = Criteria.where(LogColumn.env).is(EnvUtils.getEnv()); if (StringUtils.isNotBlank(t.getModule())) { // 不分区大小写查询，其中操作符"i"：表示不分区大小写 criteria.and(LogColumn.module).is(t.getModule()); @@ -54,7 +56,7 @@ public class MongoLogOperateDAO extends MongoPageHelper implements LogOperateDAO @Override public LogOperateDO queryOneById(String _id) { Criteria criteria = Criteria.where(LogColumn._id).is(_id); - criteria.and(LogColumn.env).is(DEFAULT_ENV); + criteria.and(LogColumn.env).is(EnvUtils.getEnv()); Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/EnvUtils.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/EnvUtils.java new file mode 100644 index 0000000000000000000000000000000000000000..fe6db4e2e691ea33836fad6600e04bc7d8fece17 --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/EnvUtils.java @@ -0,0 +1,33 @@ +package cn.icanci.rec.admin.dal.utils; + +import cn.icanci.rec.admin.dal.utils.service.EnvService; +import cn.icanci.rec.admin.dal.utils.service.impl.EnvServiceImpl; + +import org.apache.commons.lang3.StringUtils; + +/** + * 环境标识 + * + * @author icanci + * @since 1.0 Created in 2022/11/12 08:26 + */ +public class EnvUtils { + + private static final String DEFAULT_ENV = "test"; + + private static EnvService envService; + + private static String currEnv; + + public static String getEnv() { + if (StringUtils.isBlank(currEnv)) { + String env = envService.getEnv(); + currEnv = StringUtils.isBlank(env) ? DEFAULT_ENV : env; + } + return currEnv; + } + + public static void setEnvService(EnvServiceImpl envService) { + EnvUtils.envService = envService; + } +} diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDHolder.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDHolder.java index 474f973b50c080ce27e8f679a1435b1bab859a76..f211addfef1322607807c7d4922a337fec4054fb 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDHolder.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDHolder.java @@ -1,5 +1,7 @@ package cn.icanci.rec.admin.dal.utils; +import cn.icanci.rec.admin.dal.utils.service.IDGeneratorService; + /** * Id 生成器 * diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/EnvService.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/EnvService.java new file mode 100644 index 0000000000000000000000000000000000000000..81e5a871be6c0945b88990ef89a53d2ab00deedb --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/EnvService.java @@ -0,0 +1,14 @@ +package cn.icanci.rec.admin.dal.utils.service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 08:28 + */ +public interface EnvService { + /** + * 获取当前的环境信息 + * + * @return 返回当前的环境信息 + */ + String getEnv(); +} diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDGeneratorService.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/IDGeneratorService.java similarity index 84% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDGeneratorService.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/IDGeneratorService.java index 331f5a0bdd7a9654c01544a47e23ffd03f6c7306..610f20557b7550f31996f4a58f8a17bdb192ebbc 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDGeneratorService.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/IDGeneratorService.java @@ -1,4 +1,4 @@ -package cn.icanci.rec.admin.dal.utils; +package cn.icanci.rec.admin.dal.utils.service; /** * @author icanci diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/SnowFlake.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/SnowFlake.java similarity index 98% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/SnowFlake.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/SnowFlake.java index 7a079c7d9dc8566cd2825a07660f618ef5b219f0..10bdd65c57e56563ad3253fef94e3f13643d8aee 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/SnowFlake.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/SnowFlake.java @@ -1,4 +1,4 @@ -package cn.icanci.rec.admin.dal.utils; +package cn.icanci.rec.admin.dal.utils.service; /** * id生成器-雪花算法 diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/impl/EnvServiceImpl.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/impl/EnvServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..8e3d825434e60fe1aba9e011a182e79b9f8ee390 --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/impl/EnvServiceImpl.java @@ -0,0 +1,30 @@ +package cn.icanci.rec.admin.dal.utils.service.impl; + +import cn.icanci.rec.admin.dal.utils.EnvUtils; +import cn.icanci.rec.admin.dal.utils.service.EnvService; + +import org.springframework.beans.BeansException; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.stereotype.Service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 08:29 + */ +@Service("envService") +public class EnvServiceImpl implements EnvService, BeanPostProcessor { + @Value("${rec.env}") + private String env; + + @Override + public String getEnv() { + return env; + } + + @Override + public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { + EnvUtils.setEnvService(this); + return BeanPostProcessor.super.postProcessAfterInitialization(bean, beanName); + } +} diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDGeneratorServiceImpl.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/impl/IDGeneratorServiceImpl.java similarity index 77% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDGeneratorServiceImpl.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/impl/IDGeneratorServiceImpl.java index 535726177813098b1930863257e40a1ed1f3f97b..1548f8eb9b4267759fea11c20e324abc37e1a9ba 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/IDGeneratorServiceImpl.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/utils/service/impl/IDGeneratorServiceImpl.java @@ -1,4 +1,8 @@ -package cn.icanci.rec.admin.dal.utils; +package cn.icanci.rec.admin.dal.utils.service.impl; + +import cn.icanci.rec.admin.dal.utils.IDHolder; +import cn.icanci.rec.admin.dal.utils.service.IDGeneratorService; +import cn.icanci.rec.admin.dal.utils.service.SnowFlake; import org.apache.commons.lang3.RandomUtils; import org.springframework.beans.factory.InitializingBean; diff --git a/rec-admin/rec-admin-views/src/main/resources/application.yml b/rec-admin/rec-admin-views/src/main/resources/application.yml index 8f0941f33c0b714a579697c69c519e7652f88577..5f7ace161c9d1b1506d5d78447a6c819b73ee6c7 100644 --- a/rec-admin/rec-admin-views/src/main/resources/application.yml +++ b/rec-admin/rec-admin-views/src/main/resources/application.yml @@ -9,6 +9,9 @@ server: logging: config: classpath:log4j2.xml +rec: + env: test + spring: # datasource: # driverClassName: com.mysql.cj.jdbc.Driver