From 82b4284ebc847629f25221919f59eef7ad8da735 Mon Sep 17 00:00:00 2001 From: fuhouyin Date: Wed, 26 Mar 2025 09:16:42 +0800 Subject: [PATCH] :art: init project --- pom.xml | 8 +- .../Application.java} | 8 +- .../api/mapper/base/DicMapper.java | 4 +- .../api/mapper/base/DicTypeMapper.java | 4 +- .../cecilia/api/service/demo/DemoService.java | 4 + .../cecilia/api/service/test/TestService.java | 4 + .../common/PublicConst.java | 4 +- .../common/base/ControllerBase.java | 6 +- .../common/base/RuntimeErrorException.java | 2 +- .../common/base/WebRequestSequence.java | 2 +- .../common/filter/CeciliaKeywordFilter.java | 17 ++++ .../common/util/Base64Utils.java | 2 +- .../common/util/CamelCaseUtil.java | 2 +- .../common/util/ConvertUtils.java | 2 +- .../common/util/CryptoUtils.java | 2 +- .../common/util/DateTimeUtils.java | 2 +- .../common/util/EntityUtil.java | 2 +- .../common/util/FileUtils.java | 2 +- .../common/util/HandlePage.java | 2 +- .../common/util/MethodGetAndSet.java | 2 +- .../common/util/SM2Util.java | 2 +- .../common/util/SpringUtils.java | 2 +- .../common/util/page/PageHelper.java | 2 +- .../common/util/page/PageReq.java | 2 +- .../common/util/page/PageReqCmd.java | 2 +- .../common/util/page/PageResp.java | 2 +- .../common/util/redis/RedisCacheUtils.java | 2 +- .../util/redis/RedisTemplateProvider.java | 2 +- .../util/redis/RedisTemplateProviderImpl.java | 2 +- .../common/util/response/RestResponse.java | 2 +- .../common/util/response/ResultEnums.java | 2 +- .../common/util/response/VoResult.java | 2 +- .../cecilia/engine/demo/DemoController.java | 16 ++++ .../engine/demo/DemoServiceImpl.java | 2 +- .../engine/kafkademo/KafkaDemoController.java | 2 +- .../engine/kafkademo/KafkaDemoService.java | 4 +- .../cecilia/pojo/cmd/demo/DemoCommand.java | 4 + .../cecilia/pojo/cmd/test/TestCommand.java | 4 + .../com/cecilia/pojo/dto/demo/DemoDto.java | 4 + .../com/cecilia/pojo/dto/test/TestDto.java | 4 + .../pojo/entity/Darkness.java | 8 +- .../pojo/entity/DefaultCatalog.java | 2 +- .../pojo/entity/Indexes.java | 4 +- .../pojo/entity/Keys.java | 14 +-- .../pojo/entity/Tables.java | 8 +- .../pojo/entity/tables/BaseDataHoliday.java | 10 +-- .../pojo/entity/tables/BaseDic.java | 8 +- .../pojo/entity/tables/BaseDicType.java | 8 +- .../tables/daos/BaseDataHolidayDao.java | 76 ++++++++-------- .../pojo/entity/tables/daos/BaseDicDao.java | 88 +++++++++---------- .../entity/tables/daos/BaseDicTypeDao.java | 60 ++++++------- .../entity/tables/pojos/BaseDataHoliday.java | 2 +- .../pojo/entity/tables/pojos/BaseDic.java | 2 +- .../pojo/entity/tables/pojos/BaseDicType.java | 2 +- .../tables/records/BaseDataHolidayRecord.java | 4 +- .../entity/tables/records/BaseDicRecord.java | 4 +- .../tables/records/BaseDicTypeRecord.java | 4 +- .../cecilia/pojo/response/demo/DemoRsp.java | 4 + .../cecilia/pojo/response/test/TestRsp.java | 4 + .../api/service/demo/DemoService.java | 4 - .../api/service/test/TestService.java | 4 - .../darkness/engine/demo/DemoController.java | 4 - .../darkness/engine/test/TestController.java | 4 - .../darkness/engine/test/TestServiceImpl.java | 4 - .../darkness/pojo/cmd/demo/DemoCommand.java | 4 - .../darkness/pojo/cmd/test/TestCommand.java | 4 - .../com/darkness/pojo/dto/demo/DemoDto.java | 4 - .../com/darkness/pojo/dto/test/TestDto.java | 4 - .../darkness/pojo/response/demo/DemoRsp.java | 4 - .../darkness/pojo/response/test/TestRsp.java | 4 - src/main/resources/application.yml | 6 +- .../{darkness-base.sql => cecilia-base.sql} | 0 src/main/resources/deploy/logback.xml | 21 ++++- src/main/resources/deploy/server | 28 +++--- src/main/resources/jooq-config.xml | 6 +- 75 files changed, 300 insertions(+), 262 deletions(-) rename src/main/java/com/{darkness/DarknessApplication.java => cecilia/Application.java} (60%) rename src/main/java/com/{darkness => cecilia}/api/mapper/base/DicMapper.java (55%) rename src/main/java/com/{darkness => cecilia}/api/mapper/base/DicTypeMapper.java (56%) create mode 100644 src/main/java/com/cecilia/api/service/demo/DemoService.java create mode 100644 src/main/java/com/cecilia/api/service/test/TestService.java rename src/main/java/com/{darkness => cecilia}/common/PublicConst.java (94%) rename src/main/java/com/{darkness => cecilia}/common/base/ControllerBase.java (95%) rename src/main/java/com/{darkness => cecilia}/common/base/RuntimeErrorException.java (99%) rename src/main/java/com/{darkness => cecilia}/common/base/WebRequestSequence.java (98%) create mode 100644 src/main/java/com/cecilia/common/filter/CeciliaKeywordFilter.java rename src/main/java/com/{darkness => cecilia}/common/util/Base64Utils.java (98%) rename src/main/java/com/{darkness => cecilia}/common/util/CamelCaseUtil.java (97%) rename src/main/java/com/{darkness => cecilia}/common/util/ConvertUtils.java (97%) rename src/main/java/com/{darkness => cecilia}/common/util/CryptoUtils.java (98%) rename src/main/java/com/{darkness => cecilia}/common/util/DateTimeUtils.java (99%) rename src/main/java/com/{darkness => cecilia}/common/util/EntityUtil.java (98%) rename src/main/java/com/{darkness => cecilia}/common/util/FileUtils.java (99%) rename src/main/java/com/{darkness => cecilia}/common/util/HandlePage.java (91%) rename src/main/java/com/{darkness => cecilia}/common/util/MethodGetAndSet.java (98%) rename src/main/java/com/{darkness => cecilia}/common/util/SM2Util.java (99%) rename src/main/java/com/{darkness => cecilia}/common/util/SpringUtils.java (96%) rename src/main/java/com/{darkness => cecilia}/common/util/page/PageHelper.java (98%) rename src/main/java/com/{darkness => cecilia}/common/util/page/PageReq.java (84%) rename src/main/java/com/{darkness => cecilia}/common/util/page/PageReqCmd.java (85%) rename src/main/java/com/{darkness => cecilia}/common/util/page/PageResp.java (83%) rename src/main/java/com/{darkness => cecilia}/common/util/redis/RedisCacheUtils.java (99%) rename src/main/java/com/{darkness => cecilia}/common/util/redis/RedisTemplateProvider.java (89%) rename src/main/java/com/{darkness => cecilia}/common/util/redis/RedisTemplateProviderImpl.java (98%) rename src/main/java/com/{darkness => cecilia}/common/util/response/RestResponse.java (94%) rename src/main/java/com/{darkness => cecilia}/common/util/response/ResultEnums.java (96%) rename src/main/java/com/{darkness => cecilia}/common/util/response/VoResult.java (98%) create mode 100644 src/main/java/com/cecilia/engine/demo/DemoController.java rename src/main/java/com/{darkness => cecilia}/engine/demo/DemoServiceImpl.java (50%) rename src/main/java/com/{darkness => cecilia}/engine/kafkademo/KafkaDemoController.java (93%) rename src/main/java/com/{darkness => cecilia}/engine/kafkademo/KafkaDemoService.java (87%) create mode 100644 src/main/java/com/cecilia/pojo/cmd/demo/DemoCommand.java create mode 100644 src/main/java/com/cecilia/pojo/cmd/test/TestCommand.java create mode 100644 src/main/java/com/cecilia/pojo/dto/demo/DemoDto.java create mode 100644 src/main/java/com/cecilia/pojo/dto/test/TestDto.java rename src/main/java/com/{darkness => cecilia}/pojo/entity/Darkness.java (87%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/DefaultCatalog.java (96%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/Indexes.java (88%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/Keys.java (75%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/Tables.java (73%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/BaseDataHoliday.java (97%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/BaseDic.java (97%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/BaseDicType.java (97%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/daos/BaseDataHolidayDao.java (61%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/daos/BaseDicDao.java (59%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/daos/BaseDicTypeDao.java (60%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/pojos/BaseDataHoliday.java (99%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/pojos/BaseDic.java (99%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/pojos/BaseDicType.java (99%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/records/BaseDataHolidayRecord.java (99%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/records/BaseDicRecord.java (99%) rename src/main/java/com/{darkness => cecilia}/pojo/entity/tables/records/BaseDicTypeRecord.java (99%) create mode 100644 src/main/java/com/cecilia/pojo/response/demo/DemoRsp.java create mode 100644 src/main/java/com/cecilia/pojo/response/test/TestRsp.java delete mode 100644 src/main/java/com/darkness/api/service/demo/DemoService.java delete mode 100644 src/main/java/com/darkness/api/service/test/TestService.java delete mode 100644 src/main/java/com/darkness/engine/demo/DemoController.java delete mode 100644 src/main/java/com/darkness/engine/test/TestController.java delete mode 100644 src/main/java/com/darkness/engine/test/TestServiceImpl.java delete mode 100644 src/main/java/com/darkness/pojo/cmd/demo/DemoCommand.java delete mode 100644 src/main/java/com/darkness/pojo/cmd/test/TestCommand.java delete mode 100644 src/main/java/com/darkness/pojo/dto/demo/DemoDto.java delete mode 100644 src/main/java/com/darkness/pojo/dto/test/TestDto.java delete mode 100644 src/main/java/com/darkness/pojo/response/demo/DemoRsp.java delete mode 100644 src/main/java/com/darkness/pojo/response/test/TestRsp.java rename src/main/resources/deploy/{darkness-base.sql => cecilia-base.sql} (100%) diff --git a/pom.xml b/pom.xml index 5f872d8..3a8b845 100644 --- a/pom.xml +++ b/pom.xml @@ -9,10 +9,10 @@ com - darkness + cecilia 0.0.1-SNAPSHOT - darkness - darkness + cecilia + cecilia 1.8 @@ -114,7 +114,7 @@ - darkness + cecilia org.springframework.boot diff --git a/src/main/java/com/darkness/DarknessApplication.java b/src/main/java/com/cecilia/Application.java similarity index 60% rename from src/main/java/com/darkness/DarknessApplication.java rename to src/main/java/com/cecilia/Application.java index aaa07ba..f44003a 100644 --- a/src/main/java/com/darkness/DarknessApplication.java +++ b/src/main/java/com/cecilia/Application.java @@ -1,15 +1,15 @@ -package com.darkness; +package com.cecilia; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @SpringBootApplication -@MapperScan("com.darkness.api.mapper") -public class DarknessApplication { +@MapperScan("com.cecilia.api.mapper") +public class Application { public static void main(String[] args) { - SpringApplication.run(DarknessApplication.class, args); + SpringApplication.run(Application.class, args); } } diff --git a/src/main/java/com/darkness/api/mapper/base/DicMapper.java b/src/main/java/com/cecilia/api/mapper/base/DicMapper.java similarity index 55% rename from src/main/java/com/darkness/api/mapper/base/DicMapper.java rename to src/main/java/com/cecilia/api/mapper/base/DicMapper.java index 7d70d24..0d20bbb 100644 --- a/src/main/java/com/darkness/api/mapper/base/DicMapper.java +++ b/src/main/java/com/cecilia/api/mapper/base/DicMapper.java @@ -1,7 +1,7 @@ -package com.darkness.api.mapper.base; +package com.cecilia.api.mapper.base; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.darkness.pojo.entity.tables.pojos.BaseDic; +import com.cecilia.pojo.entity.tables.pojos.BaseDic; public interface DicMapper extends BaseMapper { } diff --git a/src/main/java/com/darkness/api/mapper/base/DicTypeMapper.java b/src/main/java/com/cecilia/api/mapper/base/DicTypeMapper.java similarity index 56% rename from src/main/java/com/darkness/api/mapper/base/DicTypeMapper.java rename to src/main/java/com/cecilia/api/mapper/base/DicTypeMapper.java index c74014b..4428f21 100644 --- a/src/main/java/com/darkness/api/mapper/base/DicTypeMapper.java +++ b/src/main/java/com/cecilia/api/mapper/base/DicTypeMapper.java @@ -1,7 +1,7 @@ -package com.darkness.api.mapper.base; +package com.cecilia.api.mapper.base; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.darkness.pojo.entity.tables.pojos.BaseDicType; +import com.cecilia.pojo.entity.tables.pojos.BaseDicType; public interface DicTypeMapper extends BaseMapper { } diff --git a/src/main/java/com/cecilia/api/service/demo/DemoService.java b/src/main/java/com/cecilia/api/service/demo/DemoService.java new file mode 100644 index 0000000..911f567 --- /dev/null +++ b/src/main/java/com/cecilia/api/service/demo/DemoService.java @@ -0,0 +1,4 @@ +package com.cecilia.api.service.demo; + +public interface DemoService { +} diff --git a/src/main/java/com/cecilia/api/service/test/TestService.java b/src/main/java/com/cecilia/api/service/test/TestService.java new file mode 100644 index 0000000..cf5f6da --- /dev/null +++ b/src/main/java/com/cecilia/api/service/test/TestService.java @@ -0,0 +1,4 @@ +package com.cecilia.api.service.test; + +public interface TestService { +} diff --git a/src/main/java/com/darkness/common/PublicConst.java b/src/main/java/com/cecilia/common/PublicConst.java similarity index 94% rename from src/main/java/com/darkness/common/PublicConst.java rename to src/main/java/com/cecilia/common/PublicConst.java index 68922cb..ac4e3b7 100644 --- a/src/main/java/com/darkness/common/PublicConst.java +++ b/src/main/java/com/cecilia/common/PublicConst.java @@ -1,4 +1,4 @@ -package com.darkness.common; +package com.cecilia.common; /** * 公共常量类 @@ -55,7 +55,7 @@ public class PublicConst { // 项目名 - public static final String PROJECT_NAME = "darkness"; + public static final String PROJECT_NAME = "cecilia"; diff --git a/src/main/java/com/darkness/common/base/ControllerBase.java b/src/main/java/com/cecilia/common/base/ControllerBase.java similarity index 95% rename from src/main/java/com/darkness/common/base/ControllerBase.java rename to src/main/java/com/cecilia/common/base/ControllerBase.java index 9eb65d9..3782a61 100644 --- a/src/main/java/com/darkness/common/base/ControllerBase.java +++ b/src/main/java/com/cecilia/common/base/ControllerBase.java @@ -1,7 +1,7 @@ -package com.darkness.common.base; +package com.cecilia.common.base; -import com.darkness.common.PublicConst; -import com.darkness.common.util.response.RestResponse; +import com.cecilia.common.PublicConst; +import com.cecilia.common.util.response.RestResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/darkness/common/base/RuntimeErrorException.java b/src/main/java/com/cecilia/common/base/RuntimeErrorException.java similarity index 99% rename from src/main/java/com/darkness/common/base/RuntimeErrorException.java rename to src/main/java/com/cecilia/common/base/RuntimeErrorException.java index 8d91c7c..84f49e1 100644 --- a/src/main/java/com/darkness/common/base/RuntimeErrorException.java +++ b/src/main/java/com/cecilia/common/base/RuntimeErrorException.java @@ -1,4 +1,4 @@ -package com.darkness.common.base; +package com.cecilia.common.base; import lombok.Data; diff --git a/src/main/java/com/darkness/common/base/WebRequestSequence.java b/src/main/java/com/cecilia/common/base/WebRequestSequence.java similarity index 98% rename from src/main/java/com/darkness/common/base/WebRequestSequence.java rename to src/main/java/com/cecilia/common/base/WebRequestSequence.java index a853e7c..2a8b796 100644 --- a/src/main/java/com/darkness/common/base/WebRequestSequence.java +++ b/src/main/java/com/cecilia/common/base/WebRequestSequence.java @@ -1,4 +1,4 @@ -package com.darkness.common.base; +package com.cecilia.common.base; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/cecilia/common/filter/CeciliaKeywordFilter.java b/src/main/java/com/cecilia/common/filter/CeciliaKeywordFilter.java new file mode 100644 index 0000000..1e53f32 --- /dev/null +++ b/src/main/java/com/cecilia/common/filter/CeciliaKeywordFilter.java @@ -0,0 +1,17 @@ +package com.cecilia.common.filter; + +import ch.qos.logback.classic.spi.ILoggingEvent; +import ch.qos.logback.core.filter.Filter; +import ch.qos.logback.core.spi.FilterReply; + +public class CeciliaKeywordFilter extends Filter { + + @Override + public FilterReply decide(ILoggingEvent event) { + if (event.getFormattedMessage().contains("ceciliaLog")) { + return FilterReply.ACCEPT; + } else { + return FilterReply.DENY; + } + } +} diff --git a/src/main/java/com/darkness/common/util/Base64Utils.java b/src/main/java/com/cecilia/common/util/Base64Utils.java similarity index 98% rename from src/main/java/com/darkness/common/util/Base64Utils.java rename to src/main/java/com/cecilia/common/util/Base64Utils.java index 83bd8a6..e376214 100644 --- a/src/main/java/com/darkness/common/util/Base64Utils.java +++ b/src/main/java/com/cecilia/common/util/Base64Utils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import org.apache.commons.codec.binary.Base64; diff --git a/src/main/java/com/darkness/common/util/CamelCaseUtil.java b/src/main/java/com/cecilia/common/util/CamelCaseUtil.java similarity index 97% rename from src/main/java/com/darkness/common/util/CamelCaseUtil.java rename to src/main/java/com/cecilia/common/util/CamelCaseUtil.java index dade93f..bc2c5a5 100644 --- a/src/main/java/com/darkness/common/util/CamelCaseUtil.java +++ b/src/main/java/com/cecilia/common/util/CamelCaseUtil.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/darkness/common/util/ConvertUtils.java b/src/main/java/com/cecilia/common/util/ConvertUtils.java similarity index 97% rename from src/main/java/com/darkness/common/util/ConvertUtils.java rename to src/main/java/com/cecilia/common/util/ConvertUtils.java index 2063317..b79ee16 100644 --- a/src/main/java/com/darkness/common/util/ConvertUtils.java +++ b/src/main/java/com/cecilia/common/util/ConvertUtils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/darkness/common/util/CryptoUtils.java b/src/main/java/com/cecilia/common/util/CryptoUtils.java similarity index 98% rename from src/main/java/com/darkness/common/util/CryptoUtils.java rename to src/main/java/com/cecilia/common/util/CryptoUtils.java index 069fa89..2bc801e 100644 --- a/src/main/java/com/darkness/common/util/CryptoUtils.java +++ b/src/main/java/com/cecilia/common/util/CryptoUtils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import org.apache.commons.codec.binary.Hex; diff --git a/src/main/java/com/darkness/common/util/DateTimeUtils.java b/src/main/java/com/cecilia/common/util/DateTimeUtils.java similarity index 99% rename from src/main/java/com/darkness/common/util/DateTimeUtils.java rename to src/main/java/com/cecilia/common/util/DateTimeUtils.java index 014e9c4..81136f9 100644 --- a/src/main/java/com/darkness/common/util/DateTimeUtils.java +++ b/src/main/java/com/cecilia/common/util/DateTimeUtils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import lombok.Data; diff --git a/src/main/java/com/darkness/common/util/EntityUtil.java b/src/main/java/com/cecilia/common/util/EntityUtil.java similarity index 98% rename from src/main/java/com/darkness/common/util/EntityUtil.java rename to src/main/java/com/cecilia/common/util/EntityUtil.java index f3faeb2..32ac591 100644 --- a/src/main/java/com/darkness/common/util/EntityUtil.java +++ b/src/main/java/com/cecilia/common/util/EntityUtil.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.util.LinkedMultiValueMap; diff --git a/src/main/java/com/darkness/common/util/FileUtils.java b/src/main/java/com/cecilia/common/util/FileUtils.java similarity index 99% rename from src/main/java/com/darkness/common/util/FileUtils.java rename to src/main/java/com/cecilia/common/util/FileUtils.java index edd273f..23fe597 100644 --- a/src/main/java/com/darkness/common/util/FileUtils.java +++ b/src/main/java/com/cecilia/common/util/FileUtils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import org.springframework.util.FileCopyUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/darkness/common/util/HandlePage.java b/src/main/java/com/cecilia/common/util/HandlePage.java similarity index 91% rename from src/main/java/com/darkness/common/util/HandlePage.java rename to src/main/java/com/cecilia/common/util/HandlePage.java index 6ffaaa2..a1985fa 100644 --- a/src/main/java/com/darkness/common/util/HandlePage.java +++ b/src/main/java/com/cecilia/common/util/HandlePage.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import java.util.List; diff --git a/src/main/java/com/darkness/common/util/MethodGetAndSet.java b/src/main/java/com/cecilia/common/util/MethodGetAndSet.java similarity index 98% rename from src/main/java/com/darkness/common/util/MethodGetAndSet.java rename to src/main/java/com/cecilia/common/util/MethodGetAndSet.java index 1262225..ec2ca5b 100644 --- a/src/main/java/com/darkness/common/util/MethodGetAndSet.java +++ b/src/main/java/com/cecilia/common/util/MethodGetAndSet.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import java.lang.reflect.Method; import java.math.BigDecimal; diff --git a/src/main/java/com/darkness/common/util/SM2Util.java b/src/main/java/com/cecilia/common/util/SM2Util.java similarity index 99% rename from src/main/java/com/darkness/common/util/SM2Util.java rename to src/main/java/com/cecilia/common/util/SM2Util.java index e06f4e5..ca8b0b1 100644 --- a/src/main/java/com/darkness/common/util/SM2Util.java +++ b/src/main/java/com/cecilia/common/util/SM2Util.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import org.bouncycastle.asn1.gm.GMNamedCurves; import org.bouncycastle.asn1.gm.GMObjectIdentifiers; diff --git a/src/main/java/com/darkness/common/util/SpringUtils.java b/src/main/java/com/cecilia/common/util/SpringUtils.java similarity index 96% rename from src/main/java/com/darkness/common/util/SpringUtils.java rename to src/main/java/com/cecilia/common/util/SpringUtils.java index 6f02560..ad34d61 100644 --- a/src/main/java/com/darkness/common/util/SpringUtils.java +++ b/src/main/java/com/cecilia/common/util/SpringUtils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util; +package com.cecilia.common.util; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/src/main/java/com/darkness/common/util/page/PageHelper.java b/src/main/java/com/cecilia/common/util/page/PageHelper.java similarity index 98% rename from src/main/java/com/darkness/common/util/page/PageHelper.java rename to src/main/java/com/cecilia/common/util/page/PageHelper.java index 0103201..d3f0ebe 100644 --- a/src/main/java/com/darkness/common/util/page/PageHelper.java +++ b/src/main/java/com/cecilia/common/util/page/PageHelper.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.page; +package com.cecilia.common.util.page; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/src/main/java/com/darkness/common/util/page/PageReq.java b/src/main/java/com/cecilia/common/util/page/PageReq.java similarity index 84% rename from src/main/java/com/darkness/common/util/page/PageReq.java rename to src/main/java/com/cecilia/common/util/page/PageReq.java index 694019a..573c478 100644 --- a/src/main/java/com/darkness/common/util/page/PageReq.java +++ b/src/main/java/com/cecilia/common/util/page/PageReq.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.page; +package com.cecilia.common.util.page; /** * @author fuhouyin diff --git a/src/main/java/com/darkness/common/util/page/PageReqCmd.java b/src/main/java/com/cecilia/common/util/page/PageReqCmd.java similarity index 85% rename from src/main/java/com/darkness/common/util/page/PageReqCmd.java rename to src/main/java/com/cecilia/common/util/page/PageReqCmd.java index d588874..6609590 100644 --- a/src/main/java/com/darkness/common/util/page/PageReqCmd.java +++ b/src/main/java/com/cecilia/common/util/page/PageReqCmd.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.page; +package com.cecilia.common.util.page; import lombok.Data; diff --git a/src/main/java/com/darkness/common/util/page/PageResp.java b/src/main/java/com/cecilia/common/util/page/PageResp.java similarity index 83% rename from src/main/java/com/darkness/common/util/page/PageResp.java rename to src/main/java/com/cecilia/common/util/page/PageResp.java index eb3fd0a..75c74bc 100644 --- a/src/main/java/com/darkness/common/util/page/PageResp.java +++ b/src/main/java/com/cecilia/common/util/page/PageResp.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.page; +package com.cecilia.common.util.page; import lombok.Data; diff --git a/src/main/java/com/darkness/common/util/redis/RedisCacheUtils.java b/src/main/java/com/cecilia/common/util/redis/RedisCacheUtils.java similarity index 99% rename from src/main/java/com/darkness/common/util/redis/RedisCacheUtils.java rename to src/main/java/com/cecilia/common/util/redis/RedisCacheUtils.java index 3dbad4d..57a1af4 100644 --- a/src/main/java/com/darkness/common/util/redis/RedisCacheUtils.java +++ b/src/main/java/com/cecilia/common/util/redis/RedisCacheUtils.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.redis; +package com.cecilia.common.util.redis; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/darkness/common/util/redis/RedisTemplateProvider.java b/src/main/java/com/cecilia/common/util/redis/RedisTemplateProvider.java similarity index 89% rename from src/main/java/com/darkness/common/util/redis/RedisTemplateProvider.java rename to src/main/java/com/cecilia/common/util/redis/RedisTemplateProvider.java index 9379af7..fdc1ee9 100644 --- a/src/main/java/com/darkness/common/util/redis/RedisTemplateProvider.java +++ b/src/main/java/com/cecilia/common/util/redis/RedisTemplateProvider.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.redis; +package com.cecilia.common.util.redis; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; diff --git a/src/main/java/com/darkness/common/util/redis/RedisTemplateProviderImpl.java b/src/main/java/com/cecilia/common/util/redis/RedisTemplateProviderImpl.java similarity index 98% rename from src/main/java/com/darkness/common/util/redis/RedisTemplateProviderImpl.java rename to src/main/java/com/cecilia/common/util/redis/RedisTemplateProviderImpl.java index b1646e9..b39f370 100644 --- a/src/main/java/com/darkness/common/util/redis/RedisTemplateProviderImpl.java +++ b/src/main/java/com/cecilia/common/util/redis/RedisTemplateProviderImpl.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.redis; +package com.cecilia.common.util.redis; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.RedisTemplate; diff --git a/src/main/java/com/darkness/common/util/response/RestResponse.java b/src/main/java/com/cecilia/common/util/response/RestResponse.java similarity index 94% rename from src/main/java/com/darkness/common/util/response/RestResponse.java rename to src/main/java/com/cecilia/common/util/response/RestResponse.java index 50eb930..d68cb13 100644 --- a/src/main/java/com/darkness/common/util/response/RestResponse.java +++ b/src/main/java/com/cecilia/common/util/response/RestResponse.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.response; +package com.cecilia.common.util.response; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/darkness/common/util/response/ResultEnums.java b/src/main/java/com/cecilia/common/util/response/ResultEnums.java similarity index 96% rename from src/main/java/com/darkness/common/util/response/ResultEnums.java rename to src/main/java/com/cecilia/common/util/response/ResultEnums.java index 27529c7..1b70692 100644 --- a/src/main/java/com/darkness/common/util/response/ResultEnums.java +++ b/src/main/java/com/cecilia/common/util/response/ResultEnums.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.response; +package com.cecilia.common.util.response; /** * @author fuhouyin diff --git a/src/main/java/com/darkness/common/util/response/VoResult.java b/src/main/java/com/cecilia/common/util/response/VoResult.java similarity index 98% rename from src/main/java/com/darkness/common/util/response/VoResult.java rename to src/main/java/com/cecilia/common/util/response/VoResult.java index 23d1bd1..5a02256 100644 --- a/src/main/java/com/darkness/common/util/response/VoResult.java +++ b/src/main/java/com/cecilia/common/util/response/VoResult.java @@ -1,4 +1,4 @@ -package com.darkness.common.util.response; +package com.cecilia.common.util.response; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/cecilia/engine/demo/DemoController.java b/src/main/java/com/cecilia/engine/demo/DemoController.java new file mode 100644 index 0000000..e630a6c --- /dev/null +++ b/src/main/java/com/cecilia/engine/demo/DemoController.java @@ -0,0 +1,16 @@ +package com.cecilia.engine.demo; + +import lombok.extern.slf4j.Slf4j; +import org.slf4j.MDC; + +@Slf4j +public class DemoController { + + public static void main(String[] args) { + System.out.println("Hello cecilia!"); + + MDC.put("totalNum", String.valueOf(1111)); + log.info("ceciliaLog：{}", "Hello cecilia!"); + MDC.clear(); + } +} diff --git a/src/main/java/com/darkness/engine/demo/DemoServiceImpl.java b/src/main/java/com/cecilia/engine/demo/DemoServiceImpl.java similarity index 50% rename from src/main/java/com/darkness/engine/demo/DemoServiceImpl.java rename to src/main/java/com/cecilia/engine/demo/DemoServiceImpl.java index 9244d2f..940eb23 100644 --- a/src/main/java/com/darkness/engine/demo/DemoServiceImpl.java +++ b/src/main/java/com/cecilia/engine/demo/DemoServiceImpl.java @@ -1,4 +1,4 @@ -package com.darkness.engine.demo; +package com.cecilia.engine.demo; public class DemoServiceImpl { } diff --git a/src/main/java/com/darkness/engine/kafkademo/KafkaDemoController.java b/src/main/java/com/cecilia/engine/kafkademo/KafkaDemoController.java similarity index 93% rename from src/main/java/com/darkness/engine/kafkademo/KafkaDemoController.java rename to src/main/java/com/cecilia/engine/kafkademo/KafkaDemoController.java index 9b1b994..8cd0d62 100644 --- a/src/main/java/com/darkness/engine/kafkademo/KafkaDemoController.java +++ b/src/main/java/com/cecilia/engine/kafkademo/KafkaDemoController.java @@ -1,4 +1,4 @@ -package com.darkness.engine.kafkademo; +package com.cecilia.engine.kafkademo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/darkness/engine/kafkademo/KafkaDemoService.java b/src/main/java/com/cecilia/engine/kafkademo/KafkaDemoService.java similarity index 87% rename from src/main/java/com/darkness/engine/kafkademo/KafkaDemoService.java rename to src/main/java/com/cecilia/engine/kafkademo/KafkaDemoService.java index 156e7e9..aa265b0 100644 --- a/src/main/java/com/darkness/engine/kafkademo/KafkaDemoService.java +++ b/src/main/java/com/cecilia/engine/kafkademo/KafkaDemoService.java @@ -1,4 +1,4 @@ -package com.darkness.engine.kafkademo; +package com.cecilia.engine.kafkademo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.annotation.KafkaListener; @@ -18,7 +18,7 @@ public class KafkaDemoService { ); } - @KafkaListener(topics = "my-topic", groupId = "darkness-group") + @KafkaListener(topics = "my-topic", groupId = "cecilia-group") public void consume(String message) { System.out.println("Received message: " + message); } diff --git a/src/main/java/com/cecilia/pojo/cmd/demo/DemoCommand.java b/src/main/java/com/cecilia/pojo/cmd/demo/DemoCommand.java new file mode 100644 index 0000000..c7a7036 --- /dev/null +++ b/src/main/java/com/cecilia/pojo/cmd/demo/DemoCommand.java @@ -0,0 +1,4 @@ +package com.cecilia.pojo.cmd.demo; + +public class DemoCommand { +} diff --git a/src/main/java/com/cecilia/pojo/cmd/test/TestCommand.java b/src/main/java/com/cecilia/pojo/cmd/test/TestCommand.java new file mode 100644 index 0000000..3e0ceed --- /dev/null +++ b/src/main/java/com/cecilia/pojo/cmd/test/TestCommand.java @@ -0,0 +1,4 @@ +package com.cecilia.pojo.cmd.test; + +public class TestCommand { +} diff --git a/src/main/java/com/cecilia/pojo/dto/demo/DemoDto.java b/src/main/java/com/cecilia/pojo/dto/demo/DemoDto.java new file mode 100644 index 0000000..c184510 --- /dev/null +++ b/src/main/java/com/cecilia/pojo/dto/demo/DemoDto.java @@ -0,0 +1,4 @@ +package com.cecilia.pojo.dto.demo; + +public class DemoDto { +} diff --git a/src/main/java/com/cecilia/pojo/dto/test/TestDto.java b/src/main/java/com/cecilia/pojo/dto/test/TestDto.java new file mode 100644 index 0000000..eb582c2 --- /dev/null +++ b/src/main/java/com/cecilia/pojo/dto/test/TestDto.java @@ -0,0 +1,4 @@ +package com.cecilia.pojo.dto.test; + +public class TestDto { +} diff --git a/src/main/java/com/darkness/pojo/entity/Darkness.java b/src/main/java/com/cecilia/pojo/entity/Darkness.java similarity index 87% rename from src/main/java/com/darkness/pojo/entity/Darkness.java rename to src/main/java/com/cecilia/pojo/entity/Darkness.java index e342af5..1e2d229 100644 --- a/src/main/java/com/darkness/pojo/entity/Darkness.java +++ b/src/main/java/com/cecilia/pojo/entity/Darkness.java @@ -1,12 +1,12 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity; +package com.cecilia.pojo.entity; -import com.darkness.pojo.entity.tables.BaseDataHoliday; -import com.darkness.pojo.entity.tables.BaseDic; -import com.darkness.pojo.entity.tables.BaseDicType; +import com.cecilia.pojo.entity.tables.BaseDataHoliday; +import com.cecilia.pojo.entity.tables.BaseDic; +import com.cecilia.pojo.entity.tables.BaseDicType; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/darkness/pojo/entity/DefaultCatalog.java b/src/main/java/com/cecilia/pojo/entity/DefaultCatalog.java similarity index 96% rename from src/main/java/com/darkness/pojo/entity/DefaultCatalog.java rename to src/main/java/com/cecilia/pojo/entity/DefaultCatalog.java index c8c0e4e..5f49c95 100644 --- a/src/main/java/com/darkness/pojo/entity/DefaultCatalog.java +++ b/src/main/java/com/cecilia/pojo/entity/DefaultCatalog.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity; +package com.cecilia.pojo.entity; import java.util.Arrays; diff --git a/src/main/java/com/darkness/pojo/entity/Indexes.java b/src/main/java/com/cecilia/pojo/entity/Indexes.java similarity index 88% rename from src/main/java/com/darkness/pojo/entity/Indexes.java rename to src/main/java/com/cecilia/pojo/entity/Indexes.java index 81cb706..cf98791 100644 --- a/src/main/java/com/darkness/pojo/entity/Indexes.java +++ b/src/main/java/com/cecilia/pojo/entity/Indexes.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity; +package com.cecilia.pojo.entity; -import com.darkness.pojo.entity.tables.BaseDataHoliday; +import com.cecilia.pojo.entity.tables.BaseDataHoliday; import org.jooq.Index; import org.jooq.OrderField; diff --git a/src/main/java/com/darkness/pojo/entity/Keys.java b/src/main/java/com/cecilia/pojo/entity/Keys.java similarity index 75% rename from src/main/java/com/darkness/pojo/entity/Keys.java rename to src/main/java/com/cecilia/pojo/entity/Keys.java index 80b6aa4..30435be 100644 --- a/src/main/java/com/darkness/pojo/entity/Keys.java +++ b/src/main/java/com/cecilia/pojo/entity/Keys.java @@ -1,15 +1,15 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity; +package com.cecilia.pojo.entity; -import com.darkness.pojo.entity.tables.BaseDataHoliday; -import com.darkness.pojo.entity.tables.BaseDic; -import com.darkness.pojo.entity.tables.BaseDicType; -import com.darkness.pojo.entity.tables.records.BaseDataHolidayRecord; -import com.darkness.pojo.entity.tables.records.BaseDicRecord; -import com.darkness.pojo.entity.tables.records.BaseDicTypeRecord; +import com.cecilia.pojo.entity.tables.BaseDataHoliday; +import com.cecilia.pojo.entity.tables.BaseDic; +import com.cecilia.pojo.entity.tables.BaseDicType; +import com.cecilia.pojo.entity.tables.records.BaseDataHolidayRecord; +import com.cecilia.pojo.entity.tables.records.BaseDicRecord; +import com.cecilia.pojo.entity.tables.records.BaseDicTypeRecord; import org.jooq.TableField; import org.jooq.UniqueKey; diff --git a/src/main/java/com/darkness/pojo/entity/Tables.java b/src/main/java/com/cecilia/pojo/entity/Tables.java similarity index 73% rename from src/main/java/com/darkness/pojo/entity/Tables.java rename to src/main/java/com/cecilia/pojo/entity/Tables.java index 880e3c0..021ab81 100644 --- a/src/main/java/com/darkness/pojo/entity/Tables.java +++ b/src/main/java/com/cecilia/pojo/entity/Tables.java @@ -1,12 +1,12 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity; +package com.cecilia.pojo.entity; -import com.darkness.pojo.entity.tables.BaseDataHoliday; -import com.darkness.pojo.entity.tables.BaseDic; -import com.darkness.pojo.entity.tables.BaseDicType; +import com.cecilia.pojo.entity.tables.BaseDataHoliday; +import com.cecilia.pojo.entity.tables.BaseDic; +import com.cecilia.pojo.entity.tables.BaseDicType; /** diff --git a/src/main/java/com/darkness/pojo/entity/tables/BaseDataHoliday.java b/src/main/java/com/cecilia/pojo/entity/tables/BaseDataHoliday.java similarity index 97% rename from src/main/java/com/darkness/pojo/entity/tables/BaseDataHoliday.java rename to src/main/java/com/cecilia/pojo/entity/tables/BaseDataHoliday.java index 97af9f4..f028f03 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/BaseDataHoliday.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/BaseDataHoliday.java @@ -1,13 +1,13 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables; +package com.cecilia.pojo.entity.tables; -import com.darkness.pojo.entity.Darkness; -import com.darkness.pojo.entity.Indexes; -import com.darkness.pojo.entity.Keys; -import com.darkness.pojo.entity.tables.records.BaseDataHolidayRecord; +import com.cecilia.pojo.entity.Darkness; +import com.cecilia.pojo.entity.Indexes; +import com.cecilia.pojo.entity.Keys; +import com.cecilia.pojo.entity.tables.records.BaseDataHolidayRecord; import java.time.LocalDate; import java.util.Arrays; diff --git a/src/main/java/com/darkness/pojo/entity/tables/BaseDic.java b/src/main/java/com/cecilia/pojo/entity/tables/BaseDic.java similarity index 97% rename from src/main/java/com/darkness/pojo/entity/tables/BaseDic.java rename to src/main/java/com/cecilia/pojo/entity/tables/BaseDic.java index 1af1c16..4b8ef37 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/BaseDic.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/BaseDic.java @@ -1,12 +1,12 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables; +package com.cecilia.pojo.entity.tables; -import com.darkness.pojo.entity.Darkness; -import com.darkness.pojo.entity.Keys; -import com.darkness.pojo.entity.tables.records.BaseDicRecord; +import com.cecilia.pojo.entity.Darkness; +import com.cecilia.pojo.entity.Keys; +import com.cecilia.pojo.entity.tables.records.BaseDicRecord; import java.time.LocalDateTime; import java.util.Arrays; diff --git a/src/main/java/com/darkness/pojo/entity/tables/BaseDicType.java b/src/main/java/com/cecilia/pojo/entity/tables/BaseDicType.java similarity index 97% rename from src/main/java/com/darkness/pojo/entity/tables/BaseDicType.java rename to src/main/java/com/cecilia/pojo/entity/tables/BaseDicType.java index b956651..9efb710 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/BaseDicType.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/BaseDicType.java @@ -1,12 +1,12 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables; +package com.cecilia.pojo.entity.tables; -import com.darkness.pojo.entity.Darkness; -import com.darkness.pojo.entity.Keys; -import com.darkness.pojo.entity.tables.records.BaseDicTypeRecord; +import com.cecilia.pojo.entity.Darkness; +import com.cecilia.pojo.entity.Keys; +import com.cecilia.pojo.entity.tables.records.BaseDicTypeRecord; import java.time.LocalDateTime; import java.util.Arrays; diff --git a/src/main/java/com/darkness/pojo/entity/tables/daos/BaseDataHolidayDao.java b/src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDataHolidayDao.java similarity index 61% rename from src/main/java/com/darkness/pojo/entity/tables/daos/BaseDataHolidayDao.java rename to src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDataHolidayDao.java index d44e42e..1565023 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/daos/BaseDataHolidayDao.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDataHolidayDao.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.daos; +package com.cecilia.pojo.entity.tables.daos; -import com.darkness.pojo.entity.tables.BaseDataHoliday; -import com.darkness.pojo.entity.tables.records.BaseDataHolidayRecord; +import com.cecilia.pojo.entity.tables.BaseDataHoliday; +import com.cecilia.pojo.entity.tables.records.BaseDataHolidayRecord; import java.time.LocalDate; import java.util.List; @@ -21,13 +21,13 @@ import org.springframework.stereotype.Repository; */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) @Repository -public class BaseDataHolidayDao extends DAOImpl { +public class BaseDataHolidayDao extends DAOImpl { /** * Create a new BaseDataHolidayDao without any configuration */ public BaseDataHolidayDao() { - super(BaseDataHoliday.BASE_DATA_HOLIDAY, com.darkness.pojo.entity.tables.pojos.BaseDataHoliday.class); + super(BaseDataHoliday.BASE_DATA_HOLIDAY, com.cecilia.pojo.entity.tables.pojos.BaseDataHoliday.class); } /** @@ -35,228 +35,228 @@ public class BaseDataHolidayDao extends DAOImplid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfId(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfId(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.ID, lowerInclusive, upperInclusive); } /** * Fetch records that have id IN (values) */ - public List fetchById(Integer... values) { + public List fetchById(Integer... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.ID, values); } /** * Fetch a unique record that has id = value */ - public com.darkness.pojo.entity.tables.pojos.BaseDataHoliday fetchOneById(Integer value) { + public com.cecilia.pojo.entity.tables.pojos.BaseDataHoliday fetchOneById(Integer value) { return fetchOne(BaseDataHoliday.BASE_DATA_HOLIDAY.ID, value); } /** * Fetch records that have date BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfDate(LocalDate lowerInclusive, LocalDate upperInclusive) { + public List fetchRangeOfDate(LocalDate lowerInclusive, LocalDate upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.DATE, lowerInclusive, upperInclusive); } /** * Fetch records that have date IN (values) */ - public List fetchByDate(LocalDate... values) { + public List fetchByDate(LocalDate... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.DATE, values); } /** * Fetch records that have week BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfWeek(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfWeek(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.WEEK, lowerInclusive, upperInclusive); } /** * Fetch records that have week IN (values) */ - public List fetchByWeek(String... values) { + public List fetchByWeek(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.WEEK, values); } /** * Fetch records that have nonglinian BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNonglinian(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfNonglinian(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLINIAN, lowerInclusive, upperInclusive); } /** * Fetch records that have nonglinian IN (values) */ - public List fetchByNonglinian(Integer... values) { + public List fetchByNonglinian(Integer... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLINIAN, values); } /** * Fetch records that have nongliyue BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNongliyue(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfNongliyue(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLIYUE, lowerInclusive, upperInclusive); } /** * Fetch records that have nongliyue IN (values) */ - public List fetchByNongliyue(String... values) { + public List fetchByNongliyue(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLIYUE, values); } /** * Fetch records that have nongliri BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNongliri(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfNongliri(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLIRI, lowerInclusive, upperInclusive); } /** * Fetch records that have nongliri IN (values) */ - public List fetchByNongliri(String... values) { + public List fetchByNongliri(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLIRI, values); } /** * Fetch records that have nianganzhi BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNianganzhi(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfNianganzhi(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.NIANGANZHI, lowerInclusive, upperInclusive); } /** * Fetch records that have nianganzhi IN (values) */ - public List fetchByNianganzhi(String... values) { + public List fetchByNianganzhi(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.NIANGANZHI, values); } /** * Fetch records that have shuxiang BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfShuxiang(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfShuxiang(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.SHUXIANG, lowerInclusive, upperInclusive); } /** * Fetch records that have shuxiang IN (values) */ - public List fetchByShuxiang(String... values) { + public List fetchByShuxiang(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.SHUXIANG, values); } /** * Fetch records that have str_descrip BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfStrDescrip(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfStrDescrip(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.STR_DESCRIP, lowerInclusive, upperInclusive); } /** * Fetch records that have str_descrip IN (values) */ - public List fetchByStrDescrip(String... values) { + public List fetchByStrDescrip(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.STR_DESCRIP, values); } /** * Fetch records that have towork BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfTowork(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfTowork(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.TOWORK, lowerInclusive, upperInclusive); } /** * Fetch records that have towork IN (values) */ - public List fetchByTowork(Integer... values) { + public List fetchByTowork(Integer... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.TOWORK, values); } /** * Fetch records that have gonglijieri BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfGonglijieri(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfGonglijieri(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.GONGLIJIERI, lowerInclusive, upperInclusive); } /** * Fetch records that have gonglijieri IN (values) */ - public List fetchByGonglijieri(String... values) { + public List fetchByGonglijieri(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.GONGLIJIERI, values); } /** * Fetch records that have nonglijieri BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNonglijieri(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfNonglijieri(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLIJIERI, lowerInclusive, upperInclusive); } /** * Fetch records that have nonglijieri IN (values) */ - public List fetchByNonglijieri(String... values) { + public List fetchByNonglijieri(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.NONGLIJIERI, values); } /** * Fetch records that have jieqi BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfJieqi(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfJieqi(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.JIEQI, lowerInclusive, upperInclusive); } /** * Fetch records that have jieqi IN (values) */ - public List fetchByJieqi(String... values) { + public List fetchByJieqi(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.JIEQI, values); } /** * Fetch records that have teshujieri BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfTeshujieri(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfTeshujieri(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.TESHUJIERI, lowerInclusive, upperInclusive); } /** * Fetch records that have teshujieri IN (values) */ - public List fetchByTeshujieri(String... values) { + public List fetchByTeshujieri(String... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.TESHUJIERI, values); } /** * Fetch records that have runyue BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfRunyue(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfRunyue(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDataHoliday.BASE_DATA_HOLIDAY.RUNYUE, lowerInclusive, upperInclusive); } /** * Fetch records that have runyue IN (values) */ - public List fetchByRunyue(Integer... values) { + public List fetchByRunyue(Integer... values) { return fetch(BaseDataHoliday.BASE_DATA_HOLIDAY.RUNYUE, values); } } diff --git a/src/main/java/com/darkness/pojo/entity/tables/daos/BaseDicDao.java b/src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDicDao.java similarity index 59% rename from src/main/java/com/darkness/pojo/entity/tables/daos/BaseDicDao.java rename to src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDicDao.java index f125e64..22a05ad 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/daos/BaseDicDao.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDicDao.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.daos; +package com.cecilia.pojo.entity.tables.daos; -import com.darkness.pojo.entity.tables.BaseDic; -import com.darkness.pojo.entity.tables.records.BaseDicRecord; +import com.cecilia.pojo.entity.tables.BaseDic; +import com.cecilia.pojo.entity.tables.records.BaseDicRecord; import java.time.LocalDateTime; import java.util.List; @@ -21,13 +21,13 @@ import org.springframework.stereotype.Repository; */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) @Repository -public class BaseDicDao extends DAOImpl { +public class BaseDicDao extends DAOImpl { /** * Create a new BaseDicDao without any configuration */ public BaseDicDao() { - super(BaseDic.BASE_DIC, com.darkness.pojo.entity.tables.pojos.BaseDic.class); + super(BaseDic.BASE_DIC, com.cecilia.pojo.entity.tables.pojos.BaseDic.class); } /** @@ -35,270 +35,270 @@ public class BaseDicDao extends DAOImplid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfId(Long lowerInclusive, Long upperInclusive) { + public List fetchRangeOfId(Long lowerInclusive, Long upperInclusive) { return fetchRange(BaseDic.BASE_DIC.ID, lowerInclusive, upperInclusive); } /** * Fetch records that have id IN (values) */ - public List fetchById(Long... values) { + public List fetchById(Long... values) { return fetch(BaseDic.BASE_DIC.ID, values); } /** * Fetch a unique record that has id = value */ - public com.darkness.pojo.entity.tables.pojos.BaseDic fetchOneById(Long value) { + public com.cecilia.pojo.entity.tables.pojos.BaseDic fetchOneById(Long value) { return fetchOne(BaseDic.BASE_DIC.ID, value); } /** * Fetch records that have type_code BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfTypeCode(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfTypeCode(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDic.BASE_DIC.TYPE_CODE, lowerInclusive, upperInclusive); } /** * Fetch records that have type_code IN (values) */ - public List fetchByTypeCode(String... values) { + public List fetchByTypeCode(String... values) { return fetch(BaseDic.BASE_DIC.TYPE_CODE, values); } /** * Fetch records that have code BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfCode(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfCode(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDic.BASE_DIC.CODE, lowerInclusive, upperInclusive); } /** * Fetch records that have code IN (values) */ - public List fetchByCode(Integer... values) { + public List fetchByCode(Integer... values) { return fetch(BaseDic.BASE_DIC.CODE, values); } /** * Fetch records that have name BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfName(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfName(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDic.BASE_DIC.NAME, lowerInclusive, upperInclusive); } /** * Fetch records that have name IN (values) */ - public List fetchByName(String... values) { + public List fetchByName(String... values) { return fetch(BaseDic.BASE_DIC.NAME, values); } /** * Fetch records that have parenet_code BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfParenetCode(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfParenetCode(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDic.BASE_DIC.PARENET_CODE, lowerInclusive, upperInclusive); } /** * Fetch records that have parenet_code IN (values) */ - public List fetchByParenetCode(Integer... values) { + public List fetchByParenetCode(Integer... values) { return fetch(BaseDic.BASE_DIC.PARENET_CODE, values); } /** * Fetch records that have tree_code BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfTreeCode(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfTreeCode(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDic.BASE_DIC.TREE_CODE, lowerInclusive, upperInclusive); } /** * Fetch records that have tree_code IN (values) */ - public List fetchByTreeCode(String... values) { + public List fetchByTreeCode(String... values) { return fetch(BaseDic.BASE_DIC.TREE_CODE, values); } /** * Fetch records that have order BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfOrder(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfOrder(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDic.BASE_DIC.ORDER, lowerInclusive, upperInclusive); } /** * Fetch records that have order IN (values) */ - public List fetchByOrder(Integer... values) { + public List fetchByOrder(Integer... values) { return fetch(BaseDic.BASE_DIC.ORDER, values); } /** * Fetch records that have level BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfLevel(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfLevel(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDic.BASE_DIC.LEVEL, lowerInclusive, upperInclusive); } /** * Fetch records that have level IN (values) */ - public List fetchByLevel(Integer... values) { + public List fetchByLevel(Integer... values) { return fetch(BaseDic.BASE_DIC.LEVEL, values); } /** * Fetch records that have business_value BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfBusinessValue(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfBusinessValue(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDic.BASE_DIC.BUSINESS_VALUE, lowerInclusive, upperInclusive); } /** * Fetch records that have business_value IN (values) */ - public List fetchByBusinessValue(String... values) { + public List fetchByBusinessValue(String... values) { return fetch(BaseDic.BASE_DIC.BUSINESS_VALUE, values); } /** * Fetch records that have filter_item BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfFilterItem(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfFilterItem(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDic.BASE_DIC.FILTER_ITEM, lowerInclusive, upperInclusive); } /** * Fetch records that have filter_item IN (values) */ - public List fetchByFilterItem(String... values) { + public List fetchByFilterItem(String... values) { return fetch(BaseDic.BASE_DIC.FILTER_ITEM, values); } /** * Fetch records that have creator_uid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfCreatorUid(Long lowerInclusive, Long upperInclusive) { + public List fetchRangeOfCreatorUid(Long lowerInclusive, Long upperInclusive) { return fetchRange(BaseDic.BASE_DIC.CREATOR_UID, lowerInclusive, upperInclusive); } /** * Fetch records that have creator_uid IN (values) */ - public List fetchByCreatorUid(Long... values) { + public List fetchByCreatorUid(Long... values) { return fetch(BaseDic.BASE_DIC.CREATOR_UID, values); } /** * Fetch records that have create_time BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfCreateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { + public List fetchRangeOfCreateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { return fetchRange(BaseDic.BASE_DIC.CREATE_TIME, lowerInclusive, upperInclusive); } /** * Fetch records that have create_time IN (values) */ - public List fetchByCreateTime(LocalDateTime... values) { + public List fetchByCreateTime(LocalDateTime... values) { return fetch(BaseDic.BASE_DIC.CREATE_TIME, values); } /** * Fetch records that have operator_uid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfOperatorUid(Long lowerInclusive, Long upperInclusive) { + public List fetchRangeOfOperatorUid(Long lowerInclusive, Long upperInclusive) { return fetchRange(BaseDic.BASE_DIC.OPERATOR_UID, lowerInclusive, upperInclusive); } /** * Fetch records that have operator_uid IN (values) */ - public List fetchByOperatorUid(Long... values) { + public List fetchByOperatorUid(Long... values) { return fetch(BaseDic.BASE_DIC.OPERATOR_UID, values); } /** * Fetch records that have update_time BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfUpdateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { + public List fetchRangeOfUpdateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { return fetchRange(BaseDic.BASE_DIC.UPDATE_TIME, lowerInclusive, upperInclusive); } /** * Fetch records that have update_time IN (values) */ - public List fetchByUpdateTime(LocalDateTime... values) { + public List fetchByUpdateTime(LocalDateTime... values) { return fetch(BaseDic.BASE_DIC.UPDATE_TIME, values); } /** * Fetch records that have delete_flag BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfDeleteFlag(Byte lowerInclusive, Byte upperInclusive) { + public List fetchRangeOfDeleteFlag(Byte lowerInclusive, Byte upperInclusive) { return fetchRange(BaseDic.BASE_DIC.DELETE_FLAG, lowerInclusive, upperInclusive); } /** * Fetch records that have delete_flag IN (values) */ - public List fetchByDeleteFlag(Byte... values) { + public List fetchByDeleteFlag(Byte... values) { return fetch(BaseDic.BASE_DIC.DELETE_FLAG, values); } /** * Fetch records that have is_enable BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfIsEnable(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfIsEnable(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDic.BASE_DIC.IS_ENABLE, lowerInclusive, upperInclusive); } /** * Fetch records that have is_enable IN (values) */ - public List fetchByIsEnable(Integer... values) { + public List fetchByIsEnable(Integer... values) { return fetch(BaseDic.BASE_DIC.IS_ENABLE, values); } /** * Fetch records that have app_id BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfAppId(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfAppId(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDic.BASE_DIC.APP_ID, lowerInclusive, upperInclusive); } /** * Fetch records that have app_id IN (values) */ - public List fetchByAppId(String... values) { + public List fetchByAppId(String... values) { return fetch(BaseDic.BASE_DIC.APP_ID, values); } /** * Fetch records that have namespace_id BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNamespaceId(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfNamespaceId(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDic.BASE_DIC.NAMESPACE_ID, lowerInclusive, upperInclusive); } /** * Fetch records that have namespace_id IN (values) */ - public List fetchByNamespaceId(Integer... values) { + public List fetchByNamespaceId(Integer... values) { return fetch(BaseDic.BASE_DIC.NAMESPACE_ID, values); } } diff --git a/src/main/java/com/darkness/pojo/entity/tables/daos/BaseDicTypeDao.java b/src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDicTypeDao.java similarity index 60% rename from src/main/java/com/darkness/pojo/entity/tables/daos/BaseDicTypeDao.java rename to src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDicTypeDao.java index c78aca5..72e4087 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/daos/BaseDicTypeDao.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/daos/BaseDicTypeDao.java @@ -1,11 +1,11 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.daos; +package com.cecilia.pojo.entity.tables.daos; -import com.darkness.pojo.entity.tables.BaseDicType; -import com.darkness.pojo.entity.tables.records.BaseDicTypeRecord; +import com.cecilia.pojo.entity.tables.BaseDicType; +import com.cecilia.pojo.entity.tables.records.BaseDicTypeRecord; import java.time.LocalDateTime; import java.util.List; @@ -21,13 +21,13 @@ import org.springframework.stereotype.Repository; */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) @Repository -public class BaseDicTypeDao extends DAOImpl { +public class BaseDicTypeDao extends DAOImpl { /** * Create a new BaseDicTypeDao without any configuration */ public BaseDicTypeDao() { - super(BaseDicType.BASE_DIC_TYPE, com.darkness.pojo.entity.tables.pojos.BaseDicType.class); + super(BaseDicType.BASE_DIC_TYPE, com.cecilia.pojo.entity.tables.pojos.BaseDicType.class); } /** @@ -35,172 +35,172 @@ public class BaseDicTypeDao extends DAOImplid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfId(Long lowerInclusive, Long upperInclusive) { + public List fetchRangeOfId(Long lowerInclusive, Long upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.ID, lowerInclusive, upperInclusive); } /** * Fetch records that have id IN (values) */ - public List fetchById(Long... values) { + public List fetchById(Long... values) { return fetch(BaseDicType.BASE_DIC_TYPE.ID, values); } /** * Fetch a unique record that has id = value */ - public com.darkness.pojo.entity.tables.pojos.BaseDicType fetchOneById(Long value) { + public com.cecilia.pojo.entity.tables.pojos.BaseDicType fetchOneById(Long value) { return fetchOne(BaseDicType.BASE_DIC_TYPE.ID, value); } /** * Fetch records that have type_code BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfTypeCode(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfTypeCode(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.TYPE_CODE, lowerInclusive, upperInclusive); } /** * Fetch records that have type_code IN (values) */ - public List fetchByTypeCode(String... values) { + public List fetchByTypeCode(String... values) { return fetch(BaseDicType.BASE_DIC_TYPE.TYPE_CODE, values); } /** * Fetch records that have type_name BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfTypeName(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfTypeName(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.TYPE_NAME, lowerInclusive, upperInclusive); } /** * Fetch records that have type_name IN (values) */ - public List fetchByTypeName(String... values) { + public List fetchByTypeName(String... values) { return fetch(BaseDicType.BASE_DIC_TYPE.TYPE_NAME, values); } /** * Fetch records that have order BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfOrder(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfOrder(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.ORDER, lowerInclusive, upperInclusive); } /** * Fetch records that have order IN (values) */ - public List fetchByOrder(Integer... values) { + public List fetchByOrder(Integer... values) { return fetch(BaseDicType.BASE_DIC_TYPE.ORDER, values); } /** * Fetch records that have creator_uid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfCreatorUid(Long lowerInclusive, Long upperInclusive) { + public List fetchRangeOfCreatorUid(Long lowerInclusive, Long upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.CREATOR_UID, lowerInclusive, upperInclusive); } /** * Fetch records that have creator_uid IN (values) */ - public List fetchByCreatorUid(Long... values) { + public List fetchByCreatorUid(Long... values) { return fetch(BaseDicType.BASE_DIC_TYPE.CREATOR_UID, values); } /** * Fetch records that have create_time BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfCreateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { + public List fetchRangeOfCreateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.CREATE_TIME, lowerInclusive, upperInclusive); } /** * Fetch records that have create_time IN (values) */ - public List fetchByCreateTime(LocalDateTime... values) { + public List fetchByCreateTime(LocalDateTime... values) { return fetch(BaseDicType.BASE_DIC_TYPE.CREATE_TIME, values); } /** * Fetch records that have operator_uid BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfOperatorUid(Long lowerInclusive, Long upperInclusive) { + public List fetchRangeOfOperatorUid(Long lowerInclusive, Long upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.OPERATOR_UID, lowerInclusive, upperInclusive); } /** * Fetch records that have operator_uid IN (values) */ - public List fetchByOperatorUid(Long... values) { + public List fetchByOperatorUid(Long... values) { return fetch(BaseDicType.BASE_DIC_TYPE.OPERATOR_UID, values); } /** * Fetch records that have update_time BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfUpdateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { + public List fetchRangeOfUpdateTime(LocalDateTime lowerInclusive, LocalDateTime upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.UPDATE_TIME, lowerInclusive, upperInclusive); } /** * Fetch records that have update_time IN (values) */ - public List fetchByUpdateTime(LocalDateTime... values) { + public List fetchByUpdateTime(LocalDateTime... values) { return fetch(BaseDicType.BASE_DIC_TYPE.UPDATE_TIME, values); } /** * Fetch records that have delete_flag BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfDeleteFlag(Byte lowerInclusive, Byte upperInclusive) { + public List fetchRangeOfDeleteFlag(Byte lowerInclusive, Byte upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.DELETE_FLAG, lowerInclusive, upperInclusive); } /** * Fetch records that have delete_flag IN (values) */ - public List fetchByDeleteFlag(Byte... values) { + public List fetchByDeleteFlag(Byte... values) { return fetch(BaseDicType.BASE_DIC_TYPE.DELETE_FLAG, values); } /** * Fetch records that have app_id BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfAppId(String lowerInclusive, String upperInclusive) { + public List fetchRangeOfAppId(String lowerInclusive, String upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.APP_ID, lowerInclusive, upperInclusive); } /** * Fetch records that have app_id IN (values) */ - public List fetchByAppId(String... values) { + public List fetchByAppId(String... values) { return fetch(BaseDicType.BASE_DIC_TYPE.APP_ID, values); } /** * Fetch records that have namespace_id BETWEEN lowerInclusive AND upperInclusive */ - public List fetchRangeOfNamespaceId(Integer lowerInclusive, Integer upperInclusive) { + public List fetchRangeOfNamespaceId(Integer lowerInclusive, Integer upperInclusive) { return fetchRange(BaseDicType.BASE_DIC_TYPE.NAMESPACE_ID, lowerInclusive, upperInclusive); } /** * Fetch records that have namespace_id IN (values) */ - public List fetchByNamespaceId(Integer... values) { + public List fetchByNamespaceId(Integer... values) { return fetch(BaseDicType.BASE_DIC_TYPE.NAMESPACE_ID, values); } } diff --git a/src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDataHoliday.java b/src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDataHoliday.java similarity index 99% rename from src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDataHoliday.java rename to src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDataHoliday.java index e2ac6b9..f5e23e1 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDataHoliday.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDataHoliday.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.pojos; +package com.cecilia.pojo.entity.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDic.java b/src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDic.java similarity index 99% rename from src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDic.java rename to src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDic.java index 3bfd254..561fd2f 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDic.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDic.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.pojos; +package com.cecilia.pojo.entity.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDicType.java b/src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDicType.java similarity index 99% rename from src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDicType.java rename to src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDicType.java index 027b5b2..bfe7e8d 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/pojos/BaseDicType.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/pojos/BaseDicType.java @@ -1,7 +1,7 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.pojos; +package com.cecilia.pojo.entity.tables.pojos; import java.io.Serializable; diff --git a/src/main/java/com/darkness/pojo/entity/tables/records/BaseDataHolidayRecord.java b/src/main/java/com/cecilia/pojo/entity/tables/records/BaseDataHolidayRecord.java similarity index 99% rename from src/main/java/com/darkness/pojo/entity/tables/records/BaseDataHolidayRecord.java rename to src/main/java/com/cecilia/pojo/entity/tables/records/BaseDataHolidayRecord.java index f2c7674..d5543be 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/records/BaseDataHolidayRecord.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/records/BaseDataHolidayRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.records; +package com.cecilia.pojo.entity.tables.records; -import com.darkness.pojo.entity.tables.BaseDataHoliday; +import com.cecilia.pojo.entity.tables.BaseDataHoliday; import java.time.LocalDate; diff --git a/src/main/java/com/darkness/pojo/entity/tables/records/BaseDicRecord.java b/src/main/java/com/cecilia/pojo/entity/tables/records/BaseDicRecord.java similarity index 99% rename from src/main/java/com/darkness/pojo/entity/tables/records/BaseDicRecord.java rename to src/main/java/com/cecilia/pojo/entity/tables/records/BaseDicRecord.java index 516836d..d6e3fdb 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/records/BaseDicRecord.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/records/BaseDicRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.records; +package com.cecilia.pojo.entity.tables.records; -import com.darkness.pojo.entity.tables.BaseDic; +import com.cecilia.pojo.entity.tables.BaseDic; import java.time.LocalDateTime; diff --git a/src/main/java/com/darkness/pojo/entity/tables/records/BaseDicTypeRecord.java b/src/main/java/com/cecilia/pojo/entity/tables/records/BaseDicTypeRecord.java similarity index 99% rename from src/main/java/com/darkness/pojo/entity/tables/records/BaseDicTypeRecord.java rename to src/main/java/com/cecilia/pojo/entity/tables/records/BaseDicTypeRecord.java index bcfa6cb..aea763e 100644 --- a/src/main/java/com/darkness/pojo/entity/tables/records/BaseDicTypeRecord.java +++ b/src/main/java/com/cecilia/pojo/entity/tables/records/BaseDicTypeRecord.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package com.darkness.pojo.entity.tables.records; +package com.cecilia.pojo.entity.tables.records; -import com.darkness.pojo.entity.tables.BaseDicType; +import com.cecilia.pojo.entity.tables.BaseDicType; import java.time.LocalDateTime; diff --git a/src/main/java/com/cecilia/pojo/response/demo/DemoRsp.java b/src/main/java/com/cecilia/pojo/response/demo/DemoRsp.java new file mode 100644 index 0000000..b7a9869 --- /dev/null +++ b/src/main/java/com/cecilia/pojo/response/demo/DemoRsp.java @@ -0,0 +1,4 @@ +package com.cecilia.pojo.response.demo; + +public class DemoRsp { +} diff --git a/src/main/java/com/cecilia/pojo/response/test/TestRsp.java b/src/main/java/com/cecilia/pojo/response/test/TestRsp.java new file mode 100644 index 0000000..7c06fd8 --- /dev/null +++ b/src/main/java/com/cecilia/pojo/response/test/TestRsp.java @@ -0,0 +1,4 @@ +package com.cecilia.pojo.response.test; + +public class TestRsp { +} diff --git a/src/main/java/com/darkness/api/service/demo/DemoService.java b/src/main/java/com/darkness/api/service/demo/DemoService.java deleted file mode 100644 index 9bca93a..0000000 --- a/src/main/java/com/darkness/api/service/demo/DemoService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.api.service.demo; - -public interface DemoService { -} diff --git a/src/main/java/com/darkness/api/service/test/TestService.java b/src/main/java/com/darkness/api/service/test/TestService.java deleted file mode 100644 index db5bdf3..0000000 --- a/src/main/java/com/darkness/api/service/test/TestService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.api.service.test; - -public interface TestService { -} diff --git a/src/main/java/com/darkness/engine/demo/DemoController.java b/src/main/java/com/darkness/engine/demo/DemoController.java deleted file mode 100644 index 73373d8..0000000 --- a/src/main/java/com/darkness/engine/demo/DemoController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.engine.demo; - -public class DemoController { -} diff --git a/src/main/java/com/darkness/engine/test/TestController.java b/src/main/java/com/darkness/engine/test/TestController.java deleted file mode 100644 index 173b28e..0000000 --- a/src/main/java/com/darkness/engine/test/TestController.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.engine.test; - -public class TestController { -} diff --git a/src/main/java/com/darkness/engine/test/TestServiceImpl.java b/src/main/java/com/darkness/engine/test/TestServiceImpl.java deleted file mode 100644 index 636a0b4..0000000 --- a/src/main/java/com/darkness/engine/test/TestServiceImpl.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.engine.test; - -public class TestServiceImpl { -} diff --git a/src/main/java/com/darkness/pojo/cmd/demo/DemoCommand.java b/src/main/java/com/darkness/pojo/cmd/demo/DemoCommand.java deleted file mode 100644 index a2cad00..0000000 --- a/src/main/java/com/darkness/pojo/cmd/demo/DemoCommand.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.pojo.cmd.demo; - -public class DemoCommand { -} diff --git a/src/main/java/com/darkness/pojo/cmd/test/TestCommand.java b/src/main/java/com/darkness/pojo/cmd/test/TestCommand.java deleted file mode 100644 index d4c6ca7..0000000 --- a/src/main/java/com/darkness/pojo/cmd/test/TestCommand.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.pojo.cmd.test; - -public class TestCommand { -} diff --git a/src/main/java/com/darkness/pojo/dto/demo/DemoDto.java b/src/main/java/com/darkness/pojo/dto/demo/DemoDto.java deleted file mode 100644 index 9affa99..0000000 --- a/src/main/java/com/darkness/pojo/dto/demo/DemoDto.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.pojo.dto.demo; - -public class DemoDto { -} diff --git a/src/main/java/com/darkness/pojo/dto/test/TestDto.java b/src/main/java/com/darkness/pojo/dto/test/TestDto.java deleted file mode 100644 index ef8aec2..0000000 --- a/src/main/java/com/darkness/pojo/dto/test/TestDto.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.pojo.dto.test; - -public class TestDto { -} diff --git a/src/main/java/com/darkness/pojo/response/demo/DemoRsp.java b/src/main/java/com/darkness/pojo/response/demo/DemoRsp.java deleted file mode 100644 index 5d5242d..0000000 --- a/src/main/java/com/darkness/pojo/response/demo/DemoRsp.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.pojo.response.demo; - -public class DemoRsp { -} diff --git a/src/main/java/com/darkness/pojo/response/test/TestRsp.java b/src/main/java/com/darkness/pojo/response/test/TestRsp.java deleted file mode 100644 index 7be9b3c..0000000 --- a/src/main/java/com/darkness/pojo/response/test/TestRsp.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.darkness.pojo.response.test; - -public class TestRsp { -} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b23713f..f979a25 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,11 +3,11 @@ server: spring: application: - name: darkness + name: cecilia datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://192.168.217.100:3306/darkness?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai + url: jdbc:mysql://192.168.217.100:3306/cecilia?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai username: root password: 12345678 type: com.zaxxer.hikari.HikariDataSource @@ -33,7 +33,7 @@ spring: bootstrap-servers: 192.168.217.100:9092 consumer: auto-offset-reset: earliest - group-id: darkness-group + group-id: cecilia-group key-deserializer: org.apache.kafka.common.serialization.StringDeserializer value-deserializer: org.apache.kafka.common.serialization.ByteArrayDeserializer producer: diff --git a/src/main/resources/deploy/darkness-base.sql b/src/main/resources/deploy/cecilia-base.sql similarity index 100% rename from src/main/resources/deploy/darkness-base.sql rename to src/main/resources/deploy/cecilia-base.sql diff --git a/src/main/resources/deploy/logback.xml b/src/main/resources/deploy/logback.xml index dbf7e3f..62affee 100644 --- a/src/main/resources/deploy/logback.xml +++ b/src/main/resources/deploy/logback.xml @@ -26,13 +26,30 @@ - + + logs/cecilia.log + + + logs/cecilia.%d{yyyy-MM-dd}.%i.log + + 10MB + + + + totalNum + + + + + + - + + diff --git a/src/main/resources/deploy/server b/src/main/resources/deploy/server index 95e28b6..3df09bd 100644 --- a/src/main/resources/deploy/server +++ b/src/main/resources/deploy/server @@ -1,27 +1,27 @@ #!/bin/bash source /etc/profile -EVH_HOME=/data/server/darkness -EVH_IOS_HOME=/data/server/darkness +EVH_HOME=/data/server/cecilia +EVH_IOS_HOME=/data/server/cecilia LANG=en_US.UTF-8 export EVH_HOME EVH_IOS_HOME LANG -WAR=darkness-0.0.1-SNAPSHOT.jar -pid=`pgrep -f server/darkness/darkness-` +WAR=cecilia-0.0.1-SNAPSHOT.jar +pid=`pgrep -f server/cecilia/cecilia-` JVM_OPTIONS=`[ -f ${EVH_HOME}/jvm.options ] && cat ${EVH_HOME}/jvm.options |grep -v "^#"` JAVA_HOME=/usr/local/jdk1.8.0_171/bin if [ ! -e $EVH_HOME/$WAR ]; then - echo "darkness server is not properly installed" + echo "cecilia server is not properly installed" else if [ "$pid" = "" ]; then case $1 in start|restart) - echo "Start darkness server ..." + echo "Start cecilia server ..." rm -rf $EVH_HOME/atomikos nohup $JAVA_HOME/java ${JVM_OPTIONS} -jar $EVH_HOME/$WAR --spring.config.name=application --logging.config=logback.xml > /dev/null 2>start_err.log & ;; stop) - echo darkness server is not running + echo cecilia server is not running ;; *) echo "Usage: $0 {start|stop|status|restart}" @@ -29,10 +29,10 @@ else else case $1 in start) - echo darkness server is already running + echo cecilia server is already running ;; stop) - echo "darkness server is stopping ..." + echo "cecilia server is stopping ..." kill $pid ;; restart) @@ -41,20 +41,20 @@ else do sleep 1 if [ `ps $pid |wc -l` -gt 1 ];then - echo "darkness server is stopping ..." + echo "cecilia server is stopping ..." else break fi done if [ `ps $pid |wc -l` -gt 1 ];then - echo "Stop darkness server failed,we will stop force" + echo "Stop cecilia server failed,we will stop force" kill -9 $pid sleep 5 - echo "Start darkness server ..." + echo "Start cecilia server ..." else - echo "Stop darkness server succcess" + echo "Stop cecilia server succcess" sleep 1 - echo "Start darkness server ..." + echo "Start cecilia server ..." fi rm -rf $EVH_HOME/atomikos nohup java ${JVM_OPTIONS} -jar $EVH_HOME/$WAR --spring.config.name=application --logging.config=logback.xml > /dev/null 2>start_err.log & diff --git a/src/main/resources/jooq-config.xml b/src/main/resources/jooq-config.xml index 016ca9f..bd01f24 100644 --- a/src/main/resources/jooq-config.xml +++ b/src/main/resources/jooq-config.xml @@ -2,7 +2,7 @@ com.mysql.cj.jdbc.Driver - jdbc:mysql://localhost:3306/darkness + jdbc:mysql://localhost:3306/cecilia root root @@ -10,10 +10,10 @@ .* - darkness + cecilia - com.darkness.pojo.entity + com.cecilia.pojo.entity src/main/java