From bd9808a81b1eafdc75a42c1c9904408dc888061d Mon Sep 17 00:00:00 2001
From: elkers <elkers@163.com>
Date: 星期一, 07 四月 2025 09:55:09 +0800
Subject: [PATCH] 初始化项目
---
src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateDeSerializer.java | 8
src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskError.java | 4
src/main/java/com/nanjing/water/entity/enums/EUserType.java | 2
src/main/java/com/nanjing/water/host/api/MvcTokenInterceptors.java | 2
src/main/java/com/nanjing/water/common/util/MailUtils.java | 2
src/main/java/com/nanjing/water/common/ConstantFactory.java | 2
src/main/java/com/nanjing/water/common/util/CopierUtil.java | 2
src/main/java/com/nanjing/water/entity/response/ResNameValue.java | 2
src/main/java/com/nanjing/water/service/TestInfoService.java | 33
src/main/resources/application-prod.yml | 22 +
src/main/java/com/nanjing/water/common/model/Tuple.java | 2
src/test/java/com/nanjing/water/GenCodeGauss.java | 65 +-
src/main/java/com/nanjing/water/common/model/ExcelDiscernCell.java | 2
src/test/java/com/nanjing/water/SpringConfig.java | 2
src/test/java/com/nanjing/water/repository/test123.java | 4
src/main/java/com/nanjing/water/common/config/SysConfig.java | 4
src/test/java/com/nanjing/water/repository/mapper/UserMapper.java | 9
src/main/java/com/nanjing/water/common/config/FileConfig.java | 2
src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskRecord.java | 4
src/main/java/com/nanjing/water/common/jwt/JWTUtil.java | 16
src/main/java/com/nanjing/water/entity/dto/NameSortDTO.java | 2
src/main/java/com/nanjing/water/repository/po/QuartzTaskErrorPO.java | 2
src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqRunTaskRightNow.java | 2
src/main/java/com/nanjing/water/host/api/ApiRequestLogDTO.java | 2
src/main/java/com/nanjing/water/host/api/CorsFilterConfig.java | 2
src/main/java/com/nanjing/water/service/quartz/QuartzService.java | 47 +-
src/main/java/com/nanjing/water/host/BasicController.java | 10
src/main/resources/application-dev.yml | 22 +
src/main/java/com/nanjing/water/entity/request/ReqOperate.java | 2
src/main/java/com/nanjing/water/repository/mapper/TestInfoMapper.java | 8
src/main/java/com/nanjing/water/host/controller/TestInfoServiceController.java | 36
src/main/java/com/nanjing/water/common/ToBigDecimalFunction.java | 2
src/main/java/com/nanjing/water/common/util/MoneyUtil.java | 2
src/main/java/com/nanjing/water/common/util/IPUtils.java | 2
src/main/java/com/nanjing/water/entity/request/ReqListSetSort.java | 2
src/main/java/com/nanjing/water/common/util/NumericUtil.java | 2
src/main/java/com/nanjing/water/common/enums/EnumBasic.java | 2
src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java | 10
src/main/resources/application-test.yml | 4
src/main/java/com/nanjing/water/common/validator/ParameterRunnable.java | 2
src/main/java/com/nanjing/water/common/cache/RedisKeySerializer.java | 4
src/main/java/com/nanjing/water/entity/dto/NameSortIdDTO.java | 2
src/main/java/com/nanjing/water/common/exceptions/BusinessException.java | 4
src/main/java/com/nanjing/water/common/validator/ParameterValidateResult.java | 2
src/main/java/com/nanjing/water/repository/impl/QuartzTaskErrorMapperImpl.java | 24
src/main/java/com/nanjing/water/common/enums/ERequestTokenFrom.java | 2
src/main/java/com/nanjing/water/service/convert/QuartzTaskErrorConvert.java | 10
src/test/java/com/nanjing/water/DateTimeTest.java | 4
src/test/java/com/nanjing/water/GaussExportTest.java | 4
src/main/java/com/nanjing/water/repository/mapper/QuartzTaskErrorMapper.java | 12
src/main/java/com/nanjing/water/entity/request/test/ReqModifyTestInfo.java | 2
src/main/java/com/nanjing/water/entity/request/ReqNeedId.java | 2
src/main/java/com/nanjing/water/host/api/TokenFilter.java | 22
src/main/java/com/nanjing/water/common/util/OrderUtil.java | 2
src/main/java/com/nanjing/water/entity/enums/EParameterType.java | 2
src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java | 2
src/main/java/com/nanjing/water/entity/request/test/ReqCreateTestInfo.java | 2
src/test/java/com/nanjing/water/BasicServiceApplicationTests.java | 6
src/main/java/com/nanjing/water/common/enums/EYesOrNo.java | 2
src/main/java/com/nanjing/water/entity/request/ReqListStatus.java | 2
src/main/java/com/nanjing/water/common/util/ThreadPoolUtil.java | 2
src/main/java/com/nanjing/water/common/serializer/deserializer/CQCalendarDeSerializer.java | 10
src/main/java/com/nanjing/water/entity/request/ReqSetSort.java | 2
src/main/java/com/nanjing/water/entity/enums/EOrderBy.java | 2
src/main/java/com/nanjing/water/service/quartz/QuartzMainJobFactory.java | 16
pom.xml | 2
src/main/java/com/nanjing/water/repository/vo/QuartzTaskInfoVO.java | 8
src/main/java/com/nanjing/water/common/ExecutedResult.java | 6
src/main/java/com/nanjing/water/common/util/LoggerUtil.java | 4
src/main/java/com/nanjing/water/common/serializer/CQLocalDateSerializer.java | 4
src/main/java/com/nanjing/water/common/extend/CollectorsPlus.java | 4
src/main/java/com/nanjing/water/common/enums/IErrorCode.java | 2
src/main/java/com/nanjing/water/repository/mapper/QuartzTaskRecordMapper.java | 12
src/main/java/com/nanjing/water/entity/enums/EState.java | 2
src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java | 2
src/main/java/com/nanjing/water/repository/mapper/QuartzTaskInfoMapper.java | 12
src/main/java/com/nanjing/water/common/util/CalendarUtil.java | 4
src/main/java/com/nanjing/water/common/util/SM4Util.java | 2
src/main/java/com/nanjing/water/common/config/RedisConfig.java | 2
src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskInfo.java | 4
src/main/java/com/nanjing/water/entity/enums/ESortOrderBy.java | 2
src/main/java/com/nanjing/water/repository/vo/QuartzTaskRecordVO.java | 8
src/main/java/com/nanjing/water/entity/request/ReqUserLogin.java | 2
src/main/java/com/nanjing/water/common/config/TokenConfig.java | 2
src/main/java/com/nanjing/water/host/api/MustAdmin.java | 2
src/main/java/com/nanjing/water/common/util/FileUtil.java | 2
src/main/java/com/nanjing/water/common/validator/EParameterValidateType.java | 2
src/main/java/com/nanjing/water/entity/dto/OrderByDTO.java | 2
src/test/java/com/nanjing/water/MySqlExportTest.java | 4
src/main/java/com/nanjing/water/common/jackson/JacksonConfig.java | 2
src/main/java/com/nanjing/water/common/security/MD5Util.java | 2
src/main/java/com/nanjing/water/repository/vo/QuartzTaskErrorVO.java | 8
src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java | 2
src/main/java/com/nanjing/water/common/security/Base64Util.java | 4
src/main/java/com/nanjing/water/entity/dto/PagerBasicDTO.java | 2
src/main/java/com/nanjing/water/host/ApplicationStarter.java | 6
src/main/java/com/nanjing/water/common/util/EncryptionUtil.java | 2
src/main/java/com/nanjing/water/common/util/ParameterUtil.java | 6
src/main/java/com/nanjing/water/common/validator/ParameterValidateItem.java | 2
src/main/java/com/nanjing/water/common/config/JWTConfig.java | 2
src/main/java/com/nanjing/water/host/controller/base/BaseController.java | 10
src/main/java/com/nanjing/water/repository/vo/BasicVO.java | 2
src/main/java/com/nanjing/water/host/api/GlobalExceptionHandler.java | 15
src/main/java/com/nanjing/water/host/api/HttpRequestLogPool.java | 2
src/main/java/com/nanjing/water/common/cache/CacheManagerConfig.java | 4
src/main/java/com/nanjing/water/common/util/SnowFlakeUtil.java | 2
src/test/java/com/nanjing/water/StringUtilTest.java | 4
src/main/java/com/nanjing/water/entity/request/ReqNeedCode.java | 2
src/main/java/com/nanjing/water/repository/impl/QuartzTaskRecordMapperImpl.java | 26
src/main/java/com/nanjing/water/common/util/SerializeUtil.java | 8
src/main/java/com/nanjing/water/entity/dto/UserInfoDto.java | 2
src/test/resources/application-dev.yml | 2
src/main/java/com/nanjing/water/common/util/SM2Util.java | 2
src/main/java/com/nanjing/water/repository/impl/QuartzTaskInfoMapperImpl.java | 26
src/main/java/com/nanjing/water/common/util/SnowFlake.java | 2
src/main/java/com/nanjing/water/service/convert/QuartzTaskInfoConvert.java | 10
src/main/java/com/nanjing/water/common/model/ResFileUpload.java | 2
src/main/java/com/nanjing/water/service/BaseService.java | 8
src/test/java/com/nanjing/water/Gauss2Gauss.java | 6
src/main/java/com/nanjing/water/common/util/ExceptionUtil.java | 2
src/main/java/com/nanjing/water/entity/enums/ELockValue.java | 2
src/main/java/com/nanjing/water/entity/request/AdminSendMail.java | 2
src/main/java/com/nanjing/water/repository/po/QuartzTaskRecordPO.java | 2
src/main/java/com/nanjing/water/common/util/RandVerifyCode.java | 2
src/main/java/com/nanjing/water/common/serializer/CQLocalDateTimeSerializer.java | 4
src/test/java/com/nanjing/water/DemoTest.java | 2
src/main/java/com/nanjing/water/common/enums/EContentType.java | 2
src/main/java/com/nanjing/water/common/validator/ParameterValidator.java | 18
src/main/java/com/nanjing/water/common/enums/EHorizontalLocation.java | 2
src/main/java/com/nanjing/water/common/util/ListUtil.java | 2
src/main/java/com/nanjing/water/repository/BasicMapper.java | 6
src/main/java/com/nanjing/water/host/api/NonLogin.java | 2
src/main/java/com/nanjing/water/entity/dto/NameValueDTO.java | 2
src/main/java/com/nanjing/water/common/util/SpringUtil.java | 2
src/main/java/com/nanjing/water/entity/request/ReqChangePassword.java | 2
src/main/java/com/nanjing/water/entity/enums/EDataChangeType.java | 2
src/main/java/com/nanjing/water/common/model/ExcelDiscernRow.java | 2
src/main/java/com/nanjing/water/host/api/WebLogAspect.java | 10
src/main/java/com/nanjing/water/host/controller/base/QuartzController.java | 26
src/main/java/com/nanjing/water/repository/po/QuartzTaskInfoPO.java | 2
src/main/java/com/nanjing/water/common/enums/EVerticalLocation.java | 2
src/main/java/com/nanjing/water/common/serializer/CQCalendarSerializer.java | 4
src/test/java/com/nanjing/water/Mysql2Gauss.java | 4
src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java | 2
src/main/java/com/nanjing/water/entity/search/SearchTestInfo.java | 4
src/main/java/com/nanjing/water/common/config/JdbcSetConfig.java | 2
src/main/java/com/nanjing/water/entity/dto/KeyValueDTO.java | 2
src/main/java/com/nanjing/water/common/serializer/CQDateSerializer.java | 4
src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java | 2
src/main/java/com/nanjing/water/common/jackson/BigNumberSerializer.java | 2
src/main/java/com/nanjing/water/common/util/StringUtil.java | 6
src/main/java/com/nanjing/water/host/api/MyBatisPlusConfig.java | 2
src/test/java/com/nanjing/water/JenkinsTest.java | 2
src/main/java/com/nanjing/water/repository/BasicMapperImpl.java | 16
src/main/java/com/nanjing/water/common/serializer/CQTimestampSerializer.java | 4
src/test/java/com/nanjing/water/po/UserPO.java | 2
src/main/java/com/nanjing/water/common/serializer/deserializer/CQTimestampDeSerializer.java | 10
src/main/java/com/nanjing/water/entity/enums/ESex.java | 2
src/main/java/com/nanjing/water/common/PagerResultMore.java | 2
src/main/java/com/nanjing/water/common/util/HttpUtil.java | 4
src/main/java/com/nanjing/water/common/jwt/LoginUserDTO.java | 2
src/main/java/com/nanjing/water/repository/po/TestInfoPO.java | 2
src/main/resources/smart-doc.json | 16
src/main/java/com/nanjing/water/common/util/LocalDateTimeUtil.java | 7
src/main/java/com/nanjing/water/common/enums/ELogger.java | 2
src/main/java/com/nanjing/water/service/convert/QuartzTaskRecordConvert.java | 10
src/main/java/com/nanjing/water/entity/enums/EHandleStatus.java | 2
src/main/java/com/nanjing/water/entity/dto/SearchBasicDTO.java | 2
src/main/java/com/nanjing/water/entity/request/ReqListId.java | 2
src/main/java/com/nanjing/water/common/security/Des3Util.java | 6
src/main/java/com/nanjing/water/common/PagerResult.java | 2
src/main/java/com/nanjing/water/common/enums/EHttpContentType.java | 2
src/main/java/com/nanjing/water/repository/vo/TestInfoVO.java | 8
src/main/java/com/nanjing/water/service/quartz/QuartzExecutor.java | 16
/dev/null | 4
src/main/java/com/nanjing/water/common/serializer/deserializer/CQDateDeSerializer.java | 8
src/test/java/com/nanjing/water/GenCodeMysql.java | 7
src/main/java/com/nanjing/water/service/convert/TestInfoConvert.java | 10
src/main/java/com/nanjing/water/entity/dto/RequestDTO.java | 2
src/main/java/com/nanjing/water/common/enums/EResultCode.java | 2
src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java | 2
src/main/java/com/nanjing/water/common/util/PinYinUtil.java | 2
src/main/java/com/nanjing/water/entity/enums/EExecuteType.java | 2
src/main/java/com/nanjing/water/repository/impl/TestInfoMapperImpl.java | 26
184 files changed, 586 insertions(+), 497 deletions(-)
diff --git a/pom.xml b/pom.xml
index 287fa5e..e5256b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<relativePath/>
</parent>
- <groupId>com.lunhan.xxx</groupId>
+ <groupId>com.nanjing.water</groupId>
<artifactId>xxx-yyy</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>xxx-yyy-service</name>
diff --git a/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskErrorMapper.java b/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskErrorMapper.java
deleted file mode 100644
index 8658cf2..0000000
--- a/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskErrorMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lunhan.xxx.repository.mapper;
-
-import com.lunhan.xxx.repository.BasicMapper;
-import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
-
-/**
- * 定时任务错误信息 mapper
- * @author lin.liu
- * @description 定时任务错误信息 mapper
- */
-public interface QuartzTaskErrorMapper extends BasicMapper<QuartzTaskErrorPO> {
-}
diff --git a/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskInfoMapper.java b/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskInfoMapper.java
deleted file mode 100644
index 3bbc195..0000000
--- a/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskInfoMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lunhan.xxx.repository.mapper;
-
-import com.lunhan.xxx.repository.BasicMapper;
-import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
-
-/**
- * 定时任务信息 mapper
- * @author lin.liu
- * @description 定时任务信息 mapper
- */
-public interface QuartzTaskInfoMapper extends BasicMapper<QuartzTaskInfoPO> {
-}
diff --git a/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskRecordMapper.java b/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskRecordMapper.java
deleted file mode 100644
index 8974935..0000000
--- a/src/main/java/com/lunhan/xxx/repository/mapper/QuartzTaskRecordMapper.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.lunhan.xxx.repository.mapper;
-
-import com.lunhan.xxx.repository.BasicMapper;
-import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
-
-/**
- * 定时任务执行记录 mapper
- * @author lin.liu
- * @description 定时任务执行记录 mapper
- */
-public interface QuartzTaskRecordMapper extends BasicMapper<QuartzTaskRecordPO> {
-}
diff --git a/src/main/java/com/lunhan/xxx/common/ConstantFactory.java b/src/main/java/com/nanjing/water/common/ConstantFactory.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/ConstantFactory.java
rename to src/main/java/com/nanjing/water/common/ConstantFactory.java
index 7a7a7c1..bc72751 100644
--- a/src/main/java/com/lunhan/xxx/common/ConstantFactory.java
+++ b/src/main/java/com/nanjing/water/common/ConstantFactory.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common;
+package com.nanjing.water.common;
import java.math.BigDecimal;
diff --git a/src/main/java/com/lunhan/xxx/common/ExecutedResult.java b/src/main/java/com/nanjing/water/common/ExecutedResult.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/ExecutedResult.java
rename to src/main/java/com/nanjing/water/common/ExecutedResult.java
index 98ae39e..6e214b6 100644
--- a/src/main/java/com/lunhan/xxx/common/ExecutedResult.java
+++ b/src/main/java/com/nanjing/water/common/ExecutedResult.java
@@ -1,8 +1,8 @@
-package com.lunhan.xxx.common;
+package com.nanjing.water.common;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.lunhan.xxx.common.enums.EResultCode;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.enums.EResultCode;
+import com.nanjing.water.common.util.StringUtil;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/common/PagerResult.java b/src/main/java/com/nanjing/water/common/PagerResult.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/PagerResult.java
rename to src/main/java/com/nanjing/water/common/PagerResult.java
index a85c492..89a1552 100644
--- a/src/main/java/com/lunhan/xxx/common/PagerResult.java
+++ b/src/main/java/com/nanjing/water/common/PagerResult.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common;
+package com.nanjing.water.common;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/common/PagerResultMore.java b/src/main/java/com/nanjing/water/common/PagerResultMore.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/common/PagerResultMore.java
rename to src/main/java/com/nanjing/water/common/PagerResultMore.java
index 1b46f76..c304aab 100644
--- a/src/main/java/com/lunhan/xxx/common/PagerResultMore.java
+++ b/src/main/java/com/nanjing/water/common/PagerResultMore.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common;
+package com.nanjing.water.common;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/common/ToBigDecimalFunction.java b/src/main/java/com/nanjing/water/common/ToBigDecimalFunction.java
similarity index 80%
rename from src/main/java/com/lunhan/xxx/common/ToBigDecimalFunction.java
rename to src/main/java/com/nanjing/water/common/ToBigDecimalFunction.java
index 15a0c55..1ba69ba 100644
--- a/src/main/java/com/lunhan/xxx/common/ToBigDecimalFunction.java
+++ b/src/main/java/com/nanjing/water/common/ToBigDecimalFunction.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common;
+package com.nanjing.water.common;
import java.math.BigDecimal;
diff --git a/src/main/java/com/lunhan/xxx/common/cache/CacheManagerConfig.java b/src/main/java/com/nanjing/water/common/cache/CacheManagerConfig.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/cache/CacheManagerConfig.java
rename to src/main/java/com/nanjing/water/common/cache/CacheManagerConfig.java
index 815af08..feef7b0 100644
--- a/src/main/java/com/lunhan/xxx/common/cache/CacheManagerConfig.java
+++ b/src/main/java/com/nanjing/water/common/cache/CacheManagerConfig.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.cache;
+package com.nanjing.water.common.cache;
-import com.lunhan.xxx.common.ConstantFactory;
+import com.nanjing.water.common.ConstantFactory;
import org.springframework.cache.CacheManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/lunhan/xxx/common/cache/RedisKeySerializer.java b/src/main/java/com/nanjing/water/common/cache/RedisKeySerializer.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/common/cache/RedisKeySerializer.java
rename to src/main/java/com/nanjing/water/common/cache/RedisKeySerializer.java
index a1d4655..be86be4 100644
--- a/src/main/java/com/lunhan/xxx/common/cache/RedisKeySerializer.java
+++ b/src/main/java/com/nanjing/water/common/cache/RedisKeySerializer.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.cache;
+package com.nanjing.water.common.cache;
-import com.lunhan.xxx.common.config.SysConfig;
+import com.nanjing.water.common.config.SysConfig;
import org.springframework.data.redis.serializer.RedisSerializer;
import org.springframework.lang.Nullable;
diff --git a/src/main/java/com/lunhan/xxx/common/config/FileConfig.java b/src/main/java/com/nanjing/water/common/config/FileConfig.java
similarity index 95%
rename from src/main/java/com/lunhan/xxx/common/config/FileConfig.java
rename to src/main/java/com/nanjing/water/common/config/FileConfig.java
index 5a0b4f1..a4fdac9 100644
--- a/src/main/java/com/lunhan/xxx/common/config/FileConfig.java
+++ b/src/main/java/com/nanjing/water/common/config/FileConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.config;
+package com.nanjing.water.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/common/config/JWTConfig.java b/src/main/java/com/nanjing/water/common/config/JWTConfig.java
similarity index 95%
rename from src/main/java/com/lunhan/xxx/common/config/JWTConfig.java
rename to src/main/java/com/nanjing/water/common/config/JWTConfig.java
index 67162ec..b9ca722 100644
--- a/src/main/java/com/lunhan/xxx/common/config/JWTConfig.java
+++ b/src/main/java/com/nanjing/water/common/config/JWTConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.config;
+package com.nanjing.water.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/common/config/JdbcSetConfig.java b/src/main/java/com/nanjing/water/common/config/JdbcSetConfig.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/common/config/JdbcSetConfig.java
rename to src/main/java/com/nanjing/water/common/config/JdbcSetConfig.java
index 1120a95..9a48383 100644
--- a/src/main/java/com/lunhan/xxx/common/config/JdbcSetConfig.java
+++ b/src/main/java/com/nanjing/water/common/config/JdbcSetConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.config;
+package com.nanjing.water.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/common/config/RedisConfig.java b/src/main/java/com/nanjing/water/common/config/RedisConfig.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/common/config/RedisConfig.java
rename to src/main/java/com/nanjing/water/common/config/RedisConfig.java
index 0530571..dd46dc1 100644
--- a/src/main/java/com/lunhan/xxx/common/config/RedisConfig.java
+++ b/src/main/java/com/nanjing/water/common/config/RedisConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.config;
+package com.nanjing.water.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/common/config/SysConfig.java b/src/main/java/com/nanjing/water/common/config/SysConfig.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/common/config/SysConfig.java
rename to src/main/java/com/nanjing/water/common/config/SysConfig.java
index 6a8d4ad..f671726 100644
--- a/src/main/java/com/lunhan/xxx/common/config/SysConfig.java
+++ b/src/main/java/com/nanjing/water/common/config/SysConfig.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.config;
+package com.nanjing.water.common.config;
-import com.lunhan.xxx.common.util.SpringUtil;
+import com.nanjing.water.common.util.SpringUtil;
/**
* 获取系统配置 读取“config.properties”
diff --git a/src/main/java/com/lunhan/xxx/common/config/TokenConfig.java b/src/main/java/com/nanjing/water/common/config/TokenConfig.java
similarity index 95%
rename from src/main/java/com/lunhan/xxx/common/config/TokenConfig.java
rename to src/main/java/com/nanjing/water/common/config/TokenConfig.java
index 2f2f7d7..65736f8 100644
--- a/src/main/java/com/lunhan/xxx/common/config/TokenConfig.java
+++ b/src/main/java/com/nanjing/water/common/config/TokenConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.config;
+package com.nanjing.water.common.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EContentType.java b/src/main/java/com/nanjing/water/common/enums/EContentType.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/enums/EContentType.java
rename to src/main/java/com/nanjing/water/common/enums/EContentType.java
index 47ad591..2d51eda 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EContentType.java
+++ b/src/main/java/com/nanjing/water/common/enums/EContentType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EHorizontalLocation.java b/src/main/java/com/nanjing/water/common/enums/EHorizontalLocation.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/enums/EHorizontalLocation.java
rename to src/main/java/com/nanjing/water/common/enums/EHorizontalLocation.java
index 05690d5..e82647f 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EHorizontalLocation.java
+++ b/src/main/java/com/nanjing/water/common/enums/EHorizontalLocation.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EHttpContentType.java b/src/main/java/com/nanjing/water/common/enums/EHttpContentType.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/enums/EHttpContentType.java
rename to src/main/java/com/nanjing/water/common/enums/EHttpContentType.java
index 6cd648c..65d6631 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EHttpContentType.java
+++ b/src/main/java/com/nanjing/water/common/enums/EHttpContentType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/ELogger.java b/src/main/java/com/nanjing/water/common/enums/ELogger.java
similarity index 94%
rename from src/main/java/com/lunhan/xxx/common/enums/ELogger.java
rename to src/main/java/com/nanjing/water/common/enums/ELogger.java
index f312110..1554ab5 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/ELogger.java
+++ b/src/main/java/com/nanjing/water/common/enums/ELogger.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/ERequestTokenFrom.java b/src/main/java/com/nanjing/water/common/enums/ERequestTokenFrom.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/enums/ERequestTokenFrom.java
rename to src/main/java/com/nanjing/water/common/enums/ERequestTokenFrom.java
index 9609230..4d0dd84 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/ERequestTokenFrom.java
+++ b/src/main/java/com/nanjing/water/common/enums/ERequestTokenFrom.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EResultCode.java b/src/main/java/com/nanjing/water/common/enums/EResultCode.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/enums/EResultCode.java
rename to src/main/java/com/nanjing/water/common/enums/EResultCode.java
index 68fc714..e8ad0a6 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EResultCode.java
+++ b/src/main/java/com/nanjing/water/common/enums/EResultCode.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
/**
* 执行结果 枚举
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EVerticalLocation.java b/src/main/java/com/nanjing/water/common/enums/EVerticalLocation.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/enums/EVerticalLocation.java
rename to src/main/java/com/nanjing/water/common/enums/EVerticalLocation.java
index dfdcc61..7143654 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EVerticalLocation.java
+++ b/src/main/java/com/nanjing/water/common/enums/EVerticalLocation.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EYesOrNo.java b/src/main/java/com/nanjing/water/common/enums/EYesOrNo.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/enums/EYesOrNo.java
rename to src/main/java/com/nanjing/water/common/enums/EYesOrNo.java
index ee02c2e..e30e39a 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EYesOrNo.java
+++ b/src/main/java/com/nanjing/water/common/enums/EYesOrNo.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/common/enums/EnumBasic.java b/src/main/java/com/nanjing/water/common/enums/EnumBasic.java
similarity index 80%
rename from src/main/java/com/lunhan/xxx/common/enums/EnumBasic.java
rename to src/main/java/com/nanjing/water/common/enums/EnumBasic.java
index 4516e54..e2cd284 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/EnumBasic.java
+++ b/src/main/java/com/nanjing/water/common/enums/EnumBasic.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
/**
* 枚举基类
diff --git a/src/main/java/com/lunhan/xxx/common/enums/IErrorCode.java b/src/main/java/com/nanjing/water/common/enums/IErrorCode.java
similarity index 85%
rename from src/main/java/com/lunhan/xxx/common/enums/IErrorCode.java
rename to src/main/java/com/nanjing/water/common/enums/IErrorCode.java
index fef538c..3a2fda0 100644
--- a/src/main/java/com/lunhan/xxx/common/enums/IErrorCode.java
+++ b/src/main/java/com/nanjing/water/common/enums/IErrorCode.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.enums;
+package com.nanjing.water.common.enums;
/**
* @Author lin.liu
diff --git a/src/main/java/com/lunhan/xxx/common/exceptions/BusinessException.java b/src/main/java/com/nanjing/water/common/exceptions/BusinessException.java
similarity index 88%
rename from src/main/java/com/lunhan/xxx/common/exceptions/BusinessException.java
rename to src/main/java/com/nanjing/water/common/exceptions/BusinessException.java
index cbf2aaa..95b5281 100644
--- a/src/main/java/com/lunhan/xxx/common/exceptions/BusinessException.java
+++ b/src/main/java/com/nanjing/water/common/exceptions/BusinessException.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.exceptions;
+package com.nanjing.water.common.exceptions;
-import com.lunhan.xxx.common.enums.EResultCode;
+import com.nanjing.water.common.enums.EResultCode;
/**
* 自定义业务异常
diff --git a/src/main/java/com/lunhan/xxx/common/extend/CollectorsPlus.java b/src/main/java/com/nanjing/water/common/extend/CollectorsPlus.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/extend/CollectorsPlus.java
rename to src/main/java/com/nanjing/water/common/extend/CollectorsPlus.java
index cc8e14a..a5054fb 100644
--- a/src/main/java/com/lunhan/xxx/common/extend/CollectorsPlus.java
+++ b/src/main/java/com/nanjing/water/common/extend/CollectorsPlus.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.extend;
+package com.nanjing.water.common.extend;
-import com.lunhan.xxx.common.ToBigDecimalFunction;
+import com.nanjing.water.common.ToBigDecimalFunction;
import java.math.BigDecimal;
import java.util.*;
diff --git a/src/main/java/com/lunhan/xxx/common/jackson/BigNumberSerializer.java b/src/main/java/com/nanjing/water/common/jackson/BigNumberSerializer.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/jackson/BigNumberSerializer.java
rename to src/main/java/com/nanjing/water/common/jackson/BigNumberSerializer.java
index 619d0c1..af6b40c 100644
--- a/src/main/java/com/lunhan/xxx/common/jackson/BigNumberSerializer.java
+++ b/src/main/java/com/nanjing/water/common/jackson/BigNumberSerializer.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.jackson;
+package com.nanjing.water.common.jackson;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
diff --git a/src/main/java/com/lunhan/xxx/common/jackson/JacksonConfig.java b/src/main/java/com/nanjing/water/common/jackson/JacksonConfig.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/jackson/JacksonConfig.java
rename to src/main/java/com/nanjing/water/common/jackson/JacksonConfig.java
index 9c9b565..2144adf 100644
--- a/src/main/java/com/lunhan/xxx/common/jackson/JacksonConfig.java
+++ b/src/main/java/com/nanjing/water/common/jackson/JacksonConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.jackson;
+package com.nanjing.water.common.jackson;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
diff --git a/src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java b/src/main/java/com/nanjing/water/common/jwt/JWTUtil.java
similarity index 88%
rename from src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java
rename to src/main/java/com/nanjing/water/common/jwt/JWTUtil.java
index dbe9370..07a490f 100644
--- a/src/main/java/com/lunhan/xxx/common/jwt/JWTUtil.java
+++ b/src/main/java/com/nanjing/water/common/jwt/JWTUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.jwt;
+package com.nanjing.water.common.jwt;
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTCreator;
@@ -6,13 +6,13 @@
import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.exceptions.TokenExpiredException;
import com.auth0.jwt.interfaces.DecodedJWT;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.config.SysConfig;
-import com.lunhan.xxx.common.enums.EResultCode;
-import com.lunhan.xxx.common.exceptions.BusinessException;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.config.SysConfig;
+import com.nanjing.water.common.enums.EResultCode;
+import com.nanjing.water.common.exceptions.BusinessException;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.time.LocalDateTime;
import java.util.Date;
diff --git a/src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java b/src/main/java/com/nanjing/water/common/jwt/LoginUserDTO.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java
rename to src/main/java/com/nanjing/water/common/jwt/LoginUserDTO.java
index b8ca96c..92aa2d1 100644
--- a/src/main/java/com/lunhan/xxx/common/jwt/LoginUserDTO.java
+++ b/src/main/java/com/nanjing/water/common/jwt/LoginUserDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.jwt;
+package com.nanjing.water.common.jwt;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/common/model/ExcelDiscernCell.java b/src/main/java/com/nanjing/water/common/model/ExcelDiscernCell.java
similarity index 92%
rename from src/main/java/com/lunhan/xxx/common/model/ExcelDiscernCell.java
rename to src/main/java/com/nanjing/water/common/model/ExcelDiscernCell.java
index a9ce8bf..1ea0db2 100644
--- a/src/main/java/com/lunhan/xxx/common/model/ExcelDiscernCell.java
+++ b/src/main/java/com/nanjing/water/common/model/ExcelDiscernCell.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.model;
+package com.nanjing.water.common.model;
public class ExcelDiscernCell {
private int cellIndex;
diff --git a/src/main/java/com/lunhan/xxx/common/model/ExcelDiscernRow.java b/src/main/java/com/nanjing/water/common/model/ExcelDiscernRow.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/common/model/ExcelDiscernRow.java
rename to src/main/java/com/nanjing/water/common/model/ExcelDiscernRow.java
index ed12949..204b9de 100644
--- a/src/main/java/com/lunhan/xxx/common/model/ExcelDiscernRow.java
+++ b/src/main/java/com/nanjing/water/common/model/ExcelDiscernRow.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.model;
+package com.nanjing.water.common.model;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/common/model/ResFileUpload.java b/src/main/java/com/nanjing/water/common/model/ResFileUpload.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/model/ResFileUpload.java
rename to src/main/java/com/nanjing/water/common/model/ResFileUpload.java
index 05c9dc1..9692d55 100644
--- a/src/main/java/com/lunhan/xxx/common/model/ResFileUpload.java
+++ b/src/main/java/com/nanjing/water/common/model/ResFileUpload.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.model;
+package com.nanjing.water.common.model;
/**
* 文件上传 响应dto
diff --git a/src/main/java/com/lunhan/xxx/common/model/Tuple.java b/src/main/java/com/nanjing/water/common/model/Tuple.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/common/model/Tuple.java
rename to src/main/java/com/nanjing/water/common/model/Tuple.java
index c9a5a97..5af4cfd 100644
--- a/src/main/java/com/lunhan/xxx/common/model/Tuple.java
+++ b/src/main/java/com/nanjing/water/common/model/Tuple.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.model;
+package com.nanjing.water.common.model;
/**
* 2个泛型参数返回结果
diff --git a/src/main/java/com/lunhan/xxx/common/security/Base64Util.java b/src/main/java/com/nanjing/water/common/security/Base64Util.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/security/Base64Util.java
rename to src/main/java/com/nanjing/water/common/security/Base64Util.java
index 792b3f4..0c750e3 100644
--- a/src/main/java/com/lunhan/xxx/common/security/Base64Util.java
+++ b/src/main/java/com/nanjing/water/common/security/Base64Util.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.security;
+package com.nanjing.water.common.security;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.nio.charset.Charset;
import java.util.Base64;
diff --git a/src/main/java/com/lunhan/xxx/common/security/Des3Util.java b/src/main/java/com/nanjing/water/common/security/Des3Util.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/security/Des3Util.java
rename to src/main/java/com/nanjing/water/common/security/Des3Util.java
index e8c95e5..0bb5704 100644
--- a/src/main/java/com/lunhan/xxx/common/security/Des3Util.java
+++ b/src/main/java/com/nanjing/water/common/security/Des3Util.java
@@ -1,7 +1,7 @@
-package com.lunhan.xxx.common.security;
+package com.nanjing.water.common.security;
-import com.lunhan.xxx.common.enums.ELogger;
-import com.lunhan.xxx.common.util.LoggerUtil;
+import com.nanjing.water.common.enums.ELogger;
+import com.nanjing.water.common.util.LoggerUtil;
import org.slf4j.Logger;
import javax.crypto.Cipher;
diff --git a/src/main/java/com/lunhan/xxx/common/security/MD5Util.java b/src/main/java/com/nanjing/water/common/security/MD5Util.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/security/MD5Util.java
rename to src/main/java/com/nanjing/water/common/security/MD5Util.java
index 2ce463a..80c02e9 100644
--- a/src/main/java/com/lunhan/xxx/common/security/MD5Util.java
+++ b/src/main/java/com/nanjing/water/common/security/MD5Util.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.security;
+package com.nanjing.water.common.security;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/CQCalendarSerializer.java b/src/main/java/com/nanjing/water/common/serializer/CQCalendarSerializer.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/common/serializer/CQCalendarSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/CQCalendarSerializer.java
index 47cb9b1..a901172 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/CQCalendarSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/CQCalendarSerializer.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.common.serializer;
+package com.nanjing.water.common.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import com.lunhan.xxx.common.util.CalendarUtil;
+import com.nanjing.water.common.util.CalendarUtil;
import java.io.IOException;
import java.util.Calendar;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/CQDateSerializer.java b/src/main/java/com/nanjing/water/common/serializer/CQDateSerializer.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/common/serializer/CQDateSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/CQDateSerializer.java
index b9cd09e..58b59a8 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/CQDateSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/CQDateSerializer.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.common.serializer;
+package com.nanjing.water.common.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import com.lunhan.xxx.common.ConstantFactory;
+import com.nanjing.water.common.ConstantFactory;
import java.io.IOException;
import java.text.SimpleDateFormat;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateSerializer.java b/src/main/java/com/nanjing/water/common/serializer/CQLocalDateSerializer.java
similarity index 84%
rename from src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/CQLocalDateSerializer.java
index 0ef0341..0e19c26 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/CQLocalDateSerializer.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.common.serializer;
+package com.nanjing.water.common.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
import java.io.IOException;
import java.time.LocalDate;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateTimeSerializer.java b/src/main/java/com/nanjing/water/common/serializer/CQLocalDateTimeSerializer.java
similarity index 85%
rename from src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateTimeSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/CQLocalDateTimeSerializer.java
index bf49940..f0a89d4 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/CQLocalDateTimeSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/CQLocalDateTimeSerializer.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.common.serializer;
+package com.nanjing.water.common.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
import java.io.IOException;
import java.time.LocalDateTime;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/CQTimestampSerializer.java b/src/main/java/com/nanjing/water/common/serializer/CQTimestampSerializer.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/common/serializer/CQTimestampSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/CQTimestampSerializer.java
index c58e91e..3a7093a 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/CQTimestampSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/CQTimestampSerializer.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.common.serializer;
+package com.nanjing.water.common.serializer;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
import java.io.IOException;
import java.sql.Timestamp;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQCalendarDeSerializer.java b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQCalendarDeSerializer.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQCalendarDeSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/deserializer/CQCalendarDeSerializer.java
index a1d3c63..7623b93 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQCalendarDeSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQCalendarDeSerializer.java
@@ -1,12 +1,12 @@
-package com.lunhan.xxx.common.serializer.deserializer;
+package com.nanjing.water.common.serializer.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.CalendarUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.CalendarUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.io.IOException;
import java.util.Calendar;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQDateDeSerializer.java b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQDateDeSerializer.java
similarity index 82%
rename from src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQDateDeSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/deserializer/CQDateDeSerializer.java
index 0130f52..cb7a95b 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQDateDeSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQDateDeSerializer.java
@@ -1,11 +1,11 @@
-package com.lunhan.xxx.common.serializer.deserializer;
+package com.nanjing.water.common.serializer.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.io.IOException;
import java.time.Instant;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateDeSerializer.java b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateDeSerializer.java
similarity index 78%
rename from src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateDeSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateDeSerializer.java
index 089b27b..f5323b3 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateDeSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateDeSerializer.java
@@ -1,11 +1,11 @@
-package com.lunhan.xxx.common.serializer.deserializer;
+package com.nanjing.water.common.serializer.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.io.IOException;
import java.time.LocalDate;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java
similarity index 83%
rename from src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java
index 780633c..49d1711 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQLocalDateTimeDeSerializer.java
@@ -1,12 +1,12 @@
-package com.lunhan.xxx.common.serializer.deserializer;
+package com.nanjing.water.common.serializer.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.io.IOException;
import java.time.LocalDateTime;
diff --git a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQTimestampDeSerializer.java b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQTimestampDeSerializer.java
similarity index 82%
rename from src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQTimestampDeSerializer.java
rename to src/main/java/com/nanjing/water/common/serializer/deserializer/CQTimestampDeSerializer.java
index abc6cad..67f36d6 100644
--- a/src/main/java/com/lunhan/xxx/common/serializer/deserializer/CQTimestampDeSerializer.java
+++ b/src/main/java/com/nanjing/water/common/serializer/deserializer/CQTimestampDeSerializer.java
@@ -1,12 +1,12 @@
-package com.lunhan.xxx.common.serializer.deserializer;
+package com.nanjing.water.common.serializer.deserializer;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.DeserializationContext;
import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.io.IOException;
import java.sql.Timestamp;
diff --git a/src/main/java/com/lunhan/xxx/common/util/CalendarUtil.java b/src/main/java/com/nanjing/water/common/util/CalendarUtil.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/CalendarUtil.java
rename to src/main/java/com/nanjing/water/common/util/CalendarUtil.java
index 0b0d24f..28dc748 100644
--- a/src/main/java/com/lunhan/xxx/common/util/CalendarUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/CalendarUtil.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
-import com.lunhan.xxx.common.ConstantFactory;
+import com.nanjing.water.common.ConstantFactory;
import java.sql.Timestamp;
import java.text.ParseException;
diff --git a/src/main/java/com/lunhan/xxx/common/util/CopierUtil.java b/src/main/java/com/nanjing/water/common/util/CopierUtil.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/util/CopierUtil.java
rename to src/main/java/com/nanjing/water/common/util/CopierUtil.java
index 1365a88..2817d57 100644
--- a/src/main/java/com/lunhan/xxx/common/util/CopierUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/CopierUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import org.springframework.cglib.beans.BeanCopier;
diff --git a/src/main/java/com/lunhan/xxx/common/util/EncryptionUtil.java b/src/main/java/com/nanjing/water/common/util/EncryptionUtil.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/util/EncryptionUtil.java
rename to src/main/java/com/nanjing/water/common/util/EncryptionUtil.java
index 7c5cf4f..377abf1 100644
--- a/src/main/java/com/lunhan/xxx/common/util/EncryptionUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/EncryptionUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
diff --git a/src/main/java/com/lunhan/xxx/common/util/ExceptionUtil.java b/src/main/java/com/nanjing/water/common/util/ExceptionUtil.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/util/ExceptionUtil.java
rename to src/main/java/com/nanjing/water/common/util/ExceptionUtil.java
index d763a37..8a1ffcc 100644
--- a/src/main/java/com/lunhan/xxx/common/util/ExceptionUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/ExceptionUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
diff --git a/src/main/java/com/lunhan/xxx/common/util/FileUtil.java b/src/main/java/com/nanjing/water/common/util/FileUtil.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/util/FileUtil.java
rename to src/main/java/com/nanjing/water/common/util/FileUtil.java
index 82574e4..74953a4 100644
--- a/src/main/java/com/lunhan/xxx/common/util/FileUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/FileUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.io.*;
import java.nio.charset.Charset;
diff --git a/src/main/java/com/lunhan/xxx/common/util/HttpUtil.java b/src/main/java/com/nanjing/water/common/util/HttpUtil.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/util/HttpUtil.java
rename to src/main/java/com/nanjing/water/common/util/HttpUtil.java
index cfd9058..4539a7c 100644
--- a/src/main/java/com/lunhan/xxx/common/util/HttpUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/HttpUtil.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
-import com.lunhan.xxx.common.enums.EHttpContentType;
+import com.nanjing.water.common.enums.EHttpContentType;
import org.apache.http.HttpEntity;
import org.apache.http.HttpHost;
import org.apache.http.HttpStatus;
diff --git a/src/main/java/com/lunhan/xxx/common/util/IPUtils.java b/src/main/java/com/nanjing/water/common/util/IPUtils.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/IPUtils.java
rename to src/main/java/com/nanjing/water/common/util/IPUtils.java
index 29e9eb3..40a1d4f 100644
--- a/src/main/java/com/lunhan/xxx/common/util/IPUtils.java
+++ b/src/main/java/com/nanjing/water/common/util/IPUtils.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/lunhan/xxx/common/util/ListUtil.java b/src/main/java/com/nanjing/water/common/util/ListUtil.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/ListUtil.java
rename to src/main/java/com/nanjing/water/common/util/ListUtil.java
index 91ab5cb..1da469a 100644
--- a/src/main/java/com/lunhan/xxx/common/util/ListUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/ListUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.math.BigDecimal;
import java.util.*;
diff --git a/src/main/java/com/lunhan/xxx/common/util/LocalDateTimeUtil.java b/src/main/java/com/nanjing/water/common/util/LocalDateTimeUtil.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/LocalDateTimeUtil.java
rename to src/main/java/com/nanjing/water/common/util/LocalDateTimeUtil.java
index 05d1405..e8b8118 100644
--- a/src/main/java/com/lunhan/xxx/common/util/LocalDateTimeUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/LocalDateTimeUtil.java
@@ -1,8 +1,8 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import cn.hutool.core.date.DateTime;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.exceptions.BusinessException;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.exceptions.BusinessException;
import java.sql.Timestamp;
import java.text.SimpleDateFormat;
@@ -11,7 +11,6 @@
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
-import java.time.format.DateTimeParseException;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalAdjusters;
import java.util.Date;
diff --git a/src/main/java/com/lunhan/xxx/common/util/LoggerUtil.java b/src/main/java/com/nanjing/water/common/util/LoggerUtil.java
similarity index 78%
rename from src/main/java/com/lunhan/xxx/common/util/LoggerUtil.java
rename to src/main/java/com/nanjing/water/common/util/LoggerUtil.java
index 72e7a70..d57b7b9 100644
--- a/src/main/java/com/lunhan/xxx/common/util/LoggerUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/LoggerUtil.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
-import com.lunhan.xxx.common.enums.ELogger;
+import com.nanjing.water.common.enums.ELogger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/com/lunhan/xxx/common/util/MailUtils.java b/src/main/java/com/nanjing/water/common/util/MailUtils.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/MailUtils.java
rename to src/main/java/com/nanjing/water/common/util/MailUtils.java
index c2e65dc..cc6af0a 100644
--- a/src/main/java/com/lunhan/xxx/common/util/MailUtils.java
+++ b/src/main/java/com/nanjing/water/common/util/MailUtils.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/common/util/MoneyUtil.java b/src/main/java/com/nanjing/water/common/util/MoneyUtil.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/MoneyUtil.java
rename to src/main/java/com/nanjing/water/common/util/MoneyUtil.java
index 56b37fa..4e0cb4b 100644
--- a/src/main/java/com/lunhan/xxx/common/util/MoneyUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/MoneyUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.math.BigDecimal;
diff --git a/src/main/java/com/lunhan/xxx/common/util/NumericUtil.java b/src/main/java/com/nanjing/water/common/util/NumericUtil.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/util/NumericUtil.java
rename to src/main/java/com/nanjing/water/common/util/NumericUtil.java
index c745cf5..f885ad7 100644
--- a/src/main/java/com/lunhan/xxx/common/util/NumericUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/NumericUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.lang.reflect.Method;
import java.math.BigDecimal;
diff --git a/src/main/java/com/lunhan/xxx/common/util/OrderUtil.java b/src/main/java/com/nanjing/water/common/util/OrderUtil.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/common/util/OrderUtil.java
rename to src/main/java/com/nanjing/water/common/util/OrderUtil.java
index 080d163..8b3c23a 100644
--- a/src/main/java/com/lunhan/xxx/common/util/OrderUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/OrderUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
public class OrderUtil {
diff --git a/src/main/java/com/lunhan/xxx/common/util/ParameterUtil.java b/src/main/java/com/nanjing/water/common/util/ParameterUtil.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/common/util/ParameterUtil.java
rename to src/main/java/com/nanjing/water/common/util/ParameterUtil.java
index 6305256..edf7c36 100644
--- a/src/main/java/com/lunhan/xxx/common/util/ParameterUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/ParameterUtil.java
@@ -1,7 +1,7 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.model.Tuple;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.model.Tuple;
import java.util.ArrayList;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/common/util/PinYinUtil.java b/src/main/java/com/nanjing/water/common/util/PinYinUtil.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/PinYinUtil.java
rename to src/main/java/com/nanjing/water/common/util/PinYinUtil.java
index a5a6f4b..059e373 100644
--- a/src/main/java/com/lunhan/xxx/common/util/PinYinUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/PinYinUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import net.sourceforge.pinyin4j.PinyinHelper;
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
diff --git a/src/main/java/com/lunhan/xxx/common/util/RandVerifyCode.java b/src/main/java/com/nanjing/water/common/util/RandVerifyCode.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/RandVerifyCode.java
rename to src/main/java/com/nanjing/water/common/util/RandVerifyCode.java
index 431c933..c908868 100644
--- a/src/main/java/com/lunhan/xxx/common/util/RandVerifyCode.java
+++ b/src/main/java/com/nanjing/water/common/util/RandVerifyCode.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.util.Random;
diff --git a/src/main/java/com/lunhan/xxx/common/util/SM2Util.java b/src/main/java/com/nanjing/water/common/util/SM2Util.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/SM2Util.java
rename to src/main/java/com/nanjing/water/common/util/SM2Util.java
index 59d3472..7008634 100644
--- a/src/main/java/com/lunhan/xxx/common/util/SM2Util.java
+++ b/src/main/java/com/nanjing/water/common/util/SM2Util.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import org.bouncycastle.crypto.CipherParameters;
import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
diff --git a/src/main/java/com/lunhan/xxx/common/util/SM4Util.java b/src/main/java/com/nanjing/water/common/util/SM4Util.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/SM4Util.java
rename to src/main/java/com/nanjing/water/common/util/SM4Util.java
index f30265d..655c0b5 100644
--- a/src/main/java/com/lunhan/xxx/common/util/SM4Util.java
+++ b/src/main/java/com/nanjing/water/common/util/SM4Util.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import org.springframework.util.Base64Utils;
diff --git a/src/main/java/com/lunhan/xxx/common/util/SerializeUtil.java b/src/main/java/com/nanjing/water/common/util/SerializeUtil.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/common/util/SerializeUtil.java
rename to src/main/java/com/nanjing/water/common/util/SerializeUtil.java
index 3a40038..ae42602 100644
--- a/src/main/java/com/lunhan/xxx/common/util/SerializeUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/SerializeUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.*;
@@ -9,8 +9,10 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-import com.lunhan.xxx.common.serializer.*;
-import com.lunhan.xxx.common.serializer.deserializer.*;
+import com.nanjing.water.common.serializer.*;
+import com.nanjing.water.common.serializer.deserializer.*;
+import com.nanjing.water.common.serializer.*;
+import com.nanjing.water.common.serializer.deserializer.*;
import java.io.IOException;
import java.sql.Timestamp;
diff --git a/src/main/java/com/lunhan/xxx/common/util/SnowFlake.java b/src/main/java/com/nanjing/water/common/util/SnowFlake.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/util/SnowFlake.java
rename to src/main/java/com/nanjing/water/common/util/SnowFlake.java
index 4649623..8788553 100644
--- a/src/main/java/com/lunhan/xxx/common/util/SnowFlake.java
+++ b/src/main/java/com/nanjing/water/common/util/SnowFlake.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
/**
diff --git a/src/main/java/com/lunhan/xxx/common/util/SnowFlakeUtil.java b/src/main/java/com/nanjing/water/common/util/SnowFlakeUtil.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/util/SnowFlakeUtil.java
rename to src/main/java/com/nanjing/water/common/util/SnowFlakeUtil.java
index a384201..db3f48c 100644
--- a/src/main/java/com/lunhan/xxx/common/util/SnowFlakeUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/SnowFlakeUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
public class SnowFlakeUtil {
diff --git a/src/main/java/com/lunhan/xxx/common/util/SpringUtil.java b/src/main/java/com/nanjing/water/common/util/SpringUtil.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/util/SpringUtil.java
rename to src/main/java/com/nanjing/water/common/util/SpringUtil.java
index c810efa..b9bf3a7 100644
--- a/src/main/java/com/lunhan/xxx/common/util/SpringUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/SpringUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
diff --git a/src/main/java/com/lunhan/xxx/common/util/StringUtil.java b/src/main/java/com/nanjing/water/common/util/StringUtil.java
similarity index 99%
rename from src/main/java/com/lunhan/xxx/common/util/StringUtil.java
rename to src/main/java/com/nanjing/water/common/util/StringUtil.java
index 40bd4bf..7f5551c 100644
--- a/src/main/java/com/lunhan/xxx/common/util/StringUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/StringUtil.java
@@ -1,7 +1,7 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.security.MD5Util;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.security.MD5Util;
import org.apache.commons.lang3.EnumUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/lunhan/xxx/common/util/ThreadPoolUtil.java b/src/main/java/com/nanjing/water/common/util/ThreadPoolUtil.java
similarity index 94%
rename from src/main/java/com/lunhan/xxx/common/util/ThreadPoolUtil.java
rename to src/main/java/com/nanjing/water/common/util/ThreadPoolUtil.java
index f7fe230..6ede136 100644
--- a/src/main/java/com/lunhan/xxx/common/util/ThreadPoolUtil.java
+++ b/src/main/java/com/nanjing/water/common/util/ThreadPoolUtil.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.util;
+package com.nanjing.water.common.util;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
diff --git a/src/main/java/com/lunhan/xxx/common/validator/EParameterValidateType.java b/src/main/java/com/nanjing/water/common/validator/EParameterValidateType.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/validator/EParameterValidateType.java
rename to src/main/java/com/nanjing/water/common/validator/EParameterValidateType.java
index a84b4f2..eb3275f 100644
--- a/src/main/java/com/lunhan/xxx/common/validator/EParameterValidateType.java
+++ b/src/main/java/com/nanjing/water/common/validator/EParameterValidateType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.validator;
+package com.nanjing.water.common.validator;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/common/validator/ParameterRunnable.java b/src/main/java/com/nanjing/water/common/validator/ParameterRunnable.java
similarity index 83%
rename from src/main/java/com/lunhan/xxx/common/validator/ParameterRunnable.java
rename to src/main/java/com/nanjing/water/common/validator/ParameterRunnable.java
index c527603..50b7ac2 100644
--- a/src/main/java/com/lunhan/xxx/common/validator/ParameterRunnable.java
+++ b/src/main/java/com/nanjing/water/common/validator/ParameterRunnable.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.validator;
+package com.nanjing.water.common.validator;
public class ParameterRunnable<T> implements Runnable {
T param;
diff --git a/src/main/java/com/lunhan/xxx/common/validator/ParameterValidateItem.java b/src/main/java/com/nanjing/water/common/validator/ParameterValidateItem.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/common/validator/ParameterValidateItem.java
rename to src/main/java/com/nanjing/water/common/validator/ParameterValidateItem.java
index a23b761..118bbc6 100644
--- a/src/main/java/com/lunhan/xxx/common/validator/ParameterValidateItem.java
+++ b/src/main/java/com/nanjing/water/common/validator/ParameterValidateItem.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.validator;
+package com.nanjing.water.common.validator;
import java.util.function.Function;
diff --git a/src/main/java/com/lunhan/xxx/common/validator/ParameterValidateResult.java b/src/main/java/com/nanjing/water/common/validator/ParameterValidateResult.java
similarity index 94%
rename from src/main/java/com/lunhan/xxx/common/validator/ParameterValidateResult.java
rename to src/main/java/com/nanjing/water/common/validator/ParameterValidateResult.java
index 4b46d15..6568d75 100644
--- a/src/main/java/com/lunhan/xxx/common/validator/ParameterValidateResult.java
+++ b/src/main/java/com/nanjing/water/common/validator/ParameterValidateResult.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.common.validator;
+package com.nanjing.water.common.validator;
public class ParameterValidateResult {
private Boolean isSuccess;
diff --git a/src/main/java/com/lunhan/xxx/common/validator/ParameterValidator.java b/src/main/java/com/nanjing/water/common/validator/ParameterValidator.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/common/validator/ParameterValidator.java
rename to src/main/java/com/nanjing/water/common/validator/ParameterValidator.java
index 654acd3..0633705 100644
--- a/src/main/java/com/lunhan/xxx/common/validator/ParameterValidator.java
+++ b/src/main/java/com/nanjing/water/common/validator/ParameterValidator.java
@@ -1,10 +1,10 @@
-package com.lunhan.xxx.common.validator;
+package com.nanjing.water.common.validator;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.ListUtil;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -277,12 +277,12 @@
private ParameterValidateResult checkDateTime(ParameterValidateItem item) {
switch (item.getType()) {
case MUST_DATE:
- if(!ParameterValidator.checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDate(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATE)) {
+ if(!checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDate(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATE)) {
return new ParameterValidateResult(false, item.getFieldName()+item.getType().getDesc());
}
break;
case MUST_DATE_TIME:
- if(!ParameterValidator.checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDateTime(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATETIME)) {
+ if(!checkIsMatch(item.getValue(), item.getType()) || !LocalDateTimeUtil.getDateTime(item.getValue().toString()).isAfter(LocalDateTimeUtil.DEFAULT_DATETIME)) {
return new ParameterValidateResult(false, item.getFieldName()+item.getType().getDesc());
}
break;
@@ -318,7 +318,7 @@
case MUST_MOBILE_NUMBER:
case MUST_TELEPHONE_NUMBER:
case MUST_PHONE_NUMBER:
- if(!ParameterValidator.checkIsMatch(item.getValue(), item.getType())) {
+ if(!checkIsMatch(item.getValue(), item.getType())) {
return new ParameterValidateResult(false, item.getFieldName()+item.getType().getDesc());
}
break;
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/KeyValueDTO.java b/src/main/java/com/nanjing/water/entity/dto/KeyValueDTO.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/entity/dto/KeyValueDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/KeyValueDTO.java
index 586081f..9ff1386 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/KeyValueDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/KeyValueDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
/**
* 键值对 dto
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/NameSortDTO.java b/src/main/java/com/nanjing/water/entity/dto/NameSortDTO.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/entity/dto/NameSortDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/NameSortDTO.java
index 5bb29e9..7076435 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/NameSortDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/NameSortDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
public class NameSortDTO {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/NameSortIdDTO.java b/src/main/java/com/nanjing/water/entity/dto/NameSortIdDTO.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/entity/dto/NameSortIdDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/NameSortIdDTO.java
index 6747392..2ffbbe6 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/NameSortIdDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/NameSortIdDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
public class NameSortIdDTO {
private Long id;
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/NameValueDTO.java b/src/main/java/com/nanjing/water/entity/dto/NameValueDTO.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/entity/dto/NameValueDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/NameValueDTO.java
index 6272591..1b7bc34 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/NameValueDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/NameValueDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
/**
* 名称-值 数据对象
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/OrderByDTO.java b/src/main/java/com/nanjing/water/entity/dto/OrderByDTO.java
similarity index 94%
rename from src/main/java/com/lunhan/xxx/entity/dto/OrderByDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/OrderByDTO.java
index 9539ee7..0078582 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/OrderByDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/OrderByDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
public class OrderByDTO {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/PagerBasicDTO.java b/src/main/java/com/nanjing/water/entity/dto/PagerBasicDTO.java
similarity index 95%
rename from src/main/java/com/lunhan/xxx/entity/dto/PagerBasicDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/PagerBasicDTO.java
index 6165936..1a79959 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/PagerBasicDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/PagerBasicDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
/**
* 分页基本属性 dto
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/RequestDTO.java b/src/main/java/com/nanjing/water/entity/dto/RequestDTO.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/entity/dto/RequestDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/RequestDTO.java
index 7d4a200..e64fe00 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/RequestDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/RequestDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
import java.util.Map;
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/SearchBasicDTO.java b/src/main/java/com/nanjing/water/entity/dto/SearchBasicDTO.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/entity/dto/SearchBasicDTO.java
rename to src/main/java/com/nanjing/water/entity/dto/SearchBasicDTO.java
index 66f23de..cbf855c 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/SearchBasicDTO.java
+++ b/src/main/java/com/nanjing/water/entity/dto/SearchBasicDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/entity/dto/UserInfoDto.java b/src/main/java/com/nanjing/water/entity/dto/UserInfoDto.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/entity/dto/UserInfoDto.java
rename to src/main/java/com/nanjing/water/entity/dto/UserInfoDto.java
index ebd6e8b..d043f0c 100644
--- a/src/main/java/com/lunhan/xxx/entity/dto/UserInfoDto.java
+++ b/src/main/java/com/nanjing/water/entity/dto/UserInfoDto.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.dto;
+package com.nanjing.water.entity.dto;
public class UserInfoDto {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EDataChangeType.java b/src/main/java/com/nanjing/water/entity/enums/EDataChangeType.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EDataChangeType.java
rename to src/main/java/com/nanjing/water/entity/enums/EDataChangeType.java
index d8dc718..090e446 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EDataChangeType.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EDataChangeType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EExecuteType.java b/src/main/java/com/nanjing/water/entity/enums/EExecuteType.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EExecuteType.java
rename to src/main/java/com/nanjing/water/entity/enums/EExecuteType.java
index bc8cbc3..2cb9a99 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EExecuteType.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EExecuteType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EHandleStatus.java b/src/main/java/com/nanjing/water/entity/enums/EHandleStatus.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EHandleStatus.java
rename to src/main/java/com/nanjing/water/entity/enums/EHandleStatus.java
index a377782..c5b1a6a 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EHandleStatus.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EHandleStatus.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/ELockValue.java b/src/main/java/com/nanjing/water/entity/enums/ELockValue.java
similarity index 67%
rename from src/main/java/com/lunhan/xxx/entity/enums/ELockValue.java
rename to src/main/java/com/nanjing/water/entity/enums/ELockValue.java
index 469ed4f..687cce4 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/ELockValue.java
+++ b/src/main/java/com/nanjing/water/entity/enums/ELockValue.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
public enum ELockValue {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EOrderBy.java b/src/main/java/com/nanjing/water/entity/enums/EOrderBy.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EOrderBy.java
rename to src/main/java/com/nanjing/water/entity/enums/EOrderBy.java
index d163c22..6e5c38c 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EOrderBy.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EOrderBy.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EParameterType.java b/src/main/java/com/nanjing/water/entity/enums/EParameterType.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EParameterType.java
rename to src/main/java/com/nanjing/water/entity/enums/EParameterType.java
index e7576f0..b1ffa10 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EParameterType.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EParameterType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/ESex.java b/src/main/java/com/nanjing/water/entity/enums/ESex.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/ESex.java
rename to src/main/java/com/nanjing/water/entity/enums/ESex.java
index beec2ef..030d4f6 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/ESex.java
+++ b/src/main/java/com/nanjing/water/entity/enums/ESex.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/ESortOrderBy.java b/src/main/java/com/nanjing/water/entity/enums/ESortOrderBy.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/ESortOrderBy.java
rename to src/main/java/com/nanjing/water/entity/enums/ESortOrderBy.java
index 3da2aca..648ab98 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/ESortOrderBy.java
+++ b/src/main/java/com/nanjing/water/entity/enums/ESortOrderBy.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EState.java b/src/main/java/com/nanjing/water/entity/enums/EState.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EState.java
rename to src/main/java/com/nanjing/water/entity/enums/EState.java
index 8126274..cbef3b0 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EState.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EState.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/enums/EUserType.java b/src/main/java/com/nanjing/water/entity/enums/EUserType.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/enums/EUserType.java
rename to src/main/java/com/nanjing/water/entity/enums/EUserType.java
index 0e8a087..fd4ab88 100644
--- a/src/main/java/com/lunhan/xxx/entity/enums/EUserType.java
+++ b/src/main/java/com/nanjing/water/entity/enums/EUserType.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.enums;
+package com.nanjing.water.entity.enums;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/AdminSendMail.java b/src/main/java/com/nanjing/water/entity/request/AdminSendMail.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/entity/request/AdminSendMail.java
rename to src/main/java/com/nanjing/water/entity/request/AdminSendMail.java
index b2b12d8..9e60562 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/AdminSendMail.java
+++ b/src/main/java/com/nanjing/water/entity/request/AdminSendMail.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
public class AdminSendMail {
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqChangePassword.java b/src/main/java/com/nanjing/water/entity/request/ReqChangePassword.java
similarity index 92%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqChangePassword.java
rename to src/main/java/com/nanjing/water/entity/request/ReqChangePassword.java
index 7ee7ffe..0a49108 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqChangePassword.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqChangePassword.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
public class ReqChangePassword {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqListId.java b/src/main/java/com/nanjing/water/entity/request/ReqListId.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqListId.java
rename to src/main/java/com/nanjing/water/entity/request/ReqListId.java
index 7d801a0..aa4b350 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqListId.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqListId.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqListSetSort.java b/src/main/java/com/nanjing/water/entity/request/ReqListSetSort.java
similarity index 88%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqListSetSort.java
rename to src/main/java/com/nanjing/water/entity/request/ReqListSetSort.java
index 13b1360..9e211d9 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqListSetSort.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqListSetSort.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqListStatus.java b/src/main/java/com/nanjing/water/entity/request/ReqListStatus.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqListStatus.java
rename to src/main/java/com/nanjing/water/entity/request/ReqListStatus.java
index 4757014..781b3da 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqListStatus.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqListStatus.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqNeedCode.java b/src/main/java/com/nanjing/water/entity/request/ReqNeedCode.java
similarity index 84%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqNeedCode.java
rename to src/main/java/com/nanjing/water/entity/request/ReqNeedCode.java
index 2b74cc9..35d3571 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqNeedCode.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqNeedCode.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqNeedId.java b/src/main/java/com/nanjing/water/entity/request/ReqNeedId.java
similarity index 83%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqNeedId.java
rename to src/main/java/com/nanjing/water/entity/request/ReqNeedId.java
index de70a98..32763fd 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqNeedId.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqNeedId.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
public class ReqNeedId {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqOperate.java b/src/main/java/com/nanjing/water/entity/request/ReqOperate.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqOperate.java
rename to src/main/java/com/nanjing/water/entity/request/ReqOperate.java
index 24780fc..33c708f 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqOperate.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqOperate.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
public class ReqOperate {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqSetSort.java b/src/main/java/com/nanjing/water/entity/request/ReqSetSort.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqSetSort.java
rename to src/main/java/com/nanjing/water/entity/request/ReqSetSort.java
index f6a7256..f0375a3 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqSetSort.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqSetSort.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
public class ReqSetSort {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/request/ReqUserLogin.java b/src/main/java/com/nanjing/water/entity/request/ReqUserLogin.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/entity/request/ReqUserLogin.java
rename to src/main/java/com/nanjing/water/entity/request/ReqUserLogin.java
index 4544241..5e23448 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/ReqUserLogin.java
+++ b/src/main/java/com/nanjing/water/entity/request/ReqUserLogin.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request;
+package com.nanjing.water.entity.request;
public class ReqUserLogin {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java b/src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java
index 80968e4..30d251c 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqCreateQuartzTaskError.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.entity.request.quartztaskerror;
+package com.nanjing.water.entity.request.quartztaskerror;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java b/src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java
index 12c0177..16fb15c 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskerror/ReqModifyQuartzTaskError.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.entity.request.quartztaskerror;
+package com.nanjing.water.entity.request.quartztaskerror;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java b/src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java
index 5b38e58..75ebe01 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqCreateQuartzTaskInfo.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.entity.request.quartztaskinfo;
+package com.nanjing.water.entity.request.quartztaskinfo;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java b/src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java
index 6d233f0..73a2e8b 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqModifyQuartzTaskInfo.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.entity.request.quartztaskinfo;
+package com.nanjing.water.entity.request.quartztaskinfo;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqRunTaskRightNow.java b/src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqRunTaskRightNow.java
similarity index 76%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqRunTaskRightNow.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqRunTaskRightNow.java
index 1235063..3be2329 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskinfo/ReqRunTaskRightNow.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskinfo/ReqRunTaskRightNow.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request.quartztaskinfo;
+package com.nanjing.water.entity.request.quartztaskinfo;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java b/src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java
index 8003f5a..a09154c 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqCreateQuartzTaskRecord.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.entity.request.quartztaskrecord;
+package com.nanjing.water.entity.request.quartztaskrecord;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java b/src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java
rename to src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java
index 0b7fb38..0a6e013 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java
+++ b/src/main/java/com/nanjing/water/entity/request/quartztaskrecord/ReqModifyQuartzTaskRecord.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.entity.request.quartztaskrecord;
+package com.nanjing.water.entity.request.quartztaskrecord;
import lombok.Data;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/test/ReqCreateTestInfo.java b/src/main/java/com/nanjing/water/entity/request/test/ReqCreateTestInfo.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/entity/request/test/ReqCreateTestInfo.java
rename to src/main/java/com/nanjing/water/entity/request/test/ReqCreateTestInfo.java
index 83b3fef..927d177 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/test/ReqCreateTestInfo.java
+++ b/src/main/java/com/nanjing/water/entity/request/test/ReqCreateTestInfo.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request.test;
+package com.nanjing.water.entity.request.test;
import java.math.BigDecimal;
diff --git a/src/main/java/com/lunhan/xxx/entity/request/test/ReqModifyTestInfo.java b/src/main/java/com/nanjing/water/entity/request/test/ReqModifyTestInfo.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/entity/request/test/ReqModifyTestInfo.java
rename to src/main/java/com/nanjing/water/entity/request/test/ReqModifyTestInfo.java
index 74ced95..e6faf6b 100644
--- a/src/main/java/com/lunhan/xxx/entity/request/test/ReqModifyTestInfo.java
+++ b/src/main/java/com/nanjing/water/entity/request/test/ReqModifyTestInfo.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.request.test;
+package com.nanjing.water.entity.request.test;
import java.math.BigDecimal;
diff --git a/src/main/java/com/lunhan/xxx/entity/response/ResNameValue.java b/src/main/java/com/nanjing/water/entity/response/ResNameValue.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/entity/response/ResNameValue.java
rename to src/main/java/com/nanjing/water/entity/response/ResNameValue.java
index 2561d75..4b9b0fd 100644
--- a/src/main/java/com/lunhan/xxx/entity/response/ResNameValue.java
+++ b/src/main/java/com/nanjing/water/entity/response/ResNameValue.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.entity.response;
+package com.nanjing.water.entity.response;
public class ResNameValue {
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskError.java b/src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskError.java
similarity index 85%
rename from src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskError.java
rename to src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskError.java
index 1bfd593..48afaf0 100644
--- a/src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskError.java
+++ b/src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskError.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.entity.search;
+package com.nanjing.water.entity.search;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
/**
* 定时任务错误信息表
diff --git a/src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskInfo.java b/src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskInfo.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskInfo.java
rename to src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskInfo.java
index 36a7e18..5f03705 100644
--- a/src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskInfo.java
+++ b/src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskInfo.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.entity.search;
+package com.nanjing.water.entity.search;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
import lombok.Data;
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskRecord.java b/src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskRecord.java
similarity index 92%
rename from src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskRecord.java
rename to src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskRecord.java
index 837df4e..aa532a9 100644
--- a/src/main/java/com/lunhan/xxx/entity/search/SearchQuartzTaskRecord.java
+++ b/src/main/java/com/nanjing/water/entity/search/SearchQuartzTaskRecord.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.entity.search;
+package com.nanjing.water.entity.search;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
import lombok.Data;
/**
diff --git a/src/main/java/com/lunhan/xxx/entity/search/SearchTestInfo.java b/src/main/java/com/nanjing/water/entity/search/SearchTestInfo.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/entity/search/SearchTestInfo.java
rename to src/main/java/com/nanjing/water/entity/search/SearchTestInfo.java
index 0945ed3..7bda6be 100644
--- a/src/main/java/com/lunhan/xxx/entity/search/SearchTestInfo.java
+++ b/src/main/java/com/nanjing/water/entity/search/SearchTestInfo.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx.entity.search;
+package com.nanjing.water.entity.search;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
/**
* 测试信息 查询条件dto
diff --git a/src/main/java/com/lunhan/xxx/host/ApplicationStarter.java b/src/main/java/com/nanjing/water/host/ApplicationStarter.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/host/ApplicationStarter.java
rename to src/main/java/com/nanjing/water/host/ApplicationStarter.java
index 22b2de4..8f7079d 100644
--- a/src/main/java/com/lunhan/xxx/host/ApplicationStarter.java
+++ b/src/main/java/com/nanjing/water/host/ApplicationStarter.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host;
+package com.nanjing.water.host;
import com.yomahub.tlog.core.enhance.AspectLogEnhance;
import org.mybatis.spring.annotation.MapperScan;
@@ -9,9 +9,9 @@
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.cache.annotation.EnableCaching;
-@SpringBootApplication(scanBasePackages = { "com.lunhan" })
+@SpringBootApplication(scanBasePackages = { "com.nanjing" })
@ServletComponentScan
-@MapperScan("com.lunhan.xxx.repository.mapper")
+@MapperScan("com.nanjing.water.repository.mapper")
// 开启缓存
@EnableCaching
public class ApplicationStarter extends SpringBootServletInitializer {
diff --git a/src/main/java/com/lunhan/xxx/host/BasicController.java b/src/main/java/com/nanjing/water/host/BasicController.java
similarity index 88%
rename from src/main/java/com/lunhan/xxx/host/BasicController.java
rename to src/main/java/com/nanjing/water/host/BasicController.java
index cb3bb9a..268b7f4 100644
--- a/src/main/java/com/lunhan/xxx/host/BasicController.java
+++ b/src/main/java/com/nanjing/water/host/BasicController.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.host;
+package com.nanjing.water.host;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.config.SysConfig;
-import com.lunhan.xxx.common.jwt.JWTUtil;
-import com.lunhan.xxx.common.jwt.LoginUserDTO;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.config.SysConfig;
+import com.nanjing.water.common.jwt.JWTUtil;
+import com.nanjing.water.common.jwt.LoginUserDTO;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
diff --git a/src/main/java/com/lunhan/xxx/host/api/ApiRequestLogDTO.java b/src/main/java/com/nanjing/water/host/api/ApiRequestLogDTO.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/host/api/ApiRequestLogDTO.java
rename to src/main/java/com/nanjing/water/host/api/ApiRequestLogDTO.java
index 4818c10..7054b9e 100644
--- a/src/main/java/com/lunhan/xxx/host/api/ApiRequestLogDTO.java
+++ b/src/main/java/com/nanjing/water/host/api/ApiRequestLogDTO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
public class ApiRequestLogDTO {
private String requestId;
diff --git a/src/main/java/com/lunhan/xxx/host/api/CorsFilterConfig.java b/src/main/java/com/nanjing/water/host/api/CorsFilterConfig.java
similarity index 96%
rename from src/main/java/com/lunhan/xxx/host/api/CorsFilterConfig.java
rename to src/main/java/com/nanjing/water/host/api/CorsFilterConfig.java
index e1393be..e81d544 100644
--- a/src/main/java/com/lunhan/xxx/host/api/CorsFilterConfig.java
+++ b/src/main/java/com/nanjing/water/host/api/CorsFilterConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/lunhan/xxx/host/api/GlobalExceptionHandler.java b/src/main/java/com/nanjing/water/host/api/GlobalExceptionHandler.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/host/api/GlobalExceptionHandler.java
rename to src/main/java/com/nanjing/water/host/api/GlobalExceptionHandler.java
index fdd47b3..a88939e 100644
--- a/src/main/java/com/lunhan/xxx/host/api/GlobalExceptionHandler.java
+++ b/src/main/java/com/nanjing/water/host/api/GlobalExceptionHandler.java
@@ -1,11 +1,14 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import com.google.common.base.Charsets;
-import com.lunhan.xxx.common.enums.ELogger;
-import com.lunhan.xxx.common.enums.EResultCode;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.exceptions.BusinessException;
-import com.lunhan.xxx.common.util.*;
+import com.nanjing.water.common.enums.ELogger;
+import com.nanjing.water.common.enums.EResultCode;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.exceptions.BusinessException;
+import com.nanjing.water.common.util.HttpUtil;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.LoggerUtil;
+import com.nanjing.water.common.util.SerializeUtil;
import org.slf4j.Logger;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
diff --git a/src/main/java/com/lunhan/xxx/host/api/HttpRequestLogPool.java b/src/main/java/com/nanjing/water/host/api/HttpRequestLogPool.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/host/api/HttpRequestLogPool.java
rename to src/main/java/com/nanjing/water/host/api/HttpRequestLogPool.java
index 77536ae..97fa471 100644
--- a/src/main/java/com/lunhan/xxx/host/api/HttpRequestLogPool.java
+++ b/src/main/java/com/nanjing/water/host/api/HttpRequestLogPool.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
class HttpRequestLogPool {
private static ThreadLocal<ApiRequestLogDTO> requestThreadLocal = new ThreadLocal<>();
diff --git a/src/main/java/com/lunhan/xxx/host/api/MustAdmin.java b/src/main/java/com/nanjing/water/host/api/MustAdmin.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/host/api/MustAdmin.java
rename to src/main/java/com/nanjing/water/host/api/MustAdmin.java
index 3bb4b9b..10c1417 100644
--- a/src/main/java/com/lunhan/xxx/host/api/MustAdmin.java
+++ b/src/main/java/com/nanjing/water/host/api/MustAdmin.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/src/main/java/com/lunhan/xxx/host/api/MvcTokenInterceptors.java b/src/main/java/com/nanjing/water/host/api/MvcTokenInterceptors.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/host/api/MvcTokenInterceptors.java
rename to src/main/java/com/nanjing/water/host/api/MvcTokenInterceptors.java
index 7301feb..518ec7f 100644
--- a/src/main/java/com/lunhan/xxx/host/api/MvcTokenInterceptors.java
+++ b/src/main/java/com/nanjing/water/host/api/MvcTokenInterceptors.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/com/lunhan/xxx/host/api/MyBatisPlusConfig.java b/src/main/java/com/nanjing/water/host/api/MyBatisPlusConfig.java
similarity index 93%
rename from src/main/java/com/lunhan/xxx/host/api/MyBatisPlusConfig.java
rename to src/main/java/com/nanjing/water/host/api/MyBatisPlusConfig.java
index b1e0b3c..e4841fc 100644
--- a/src/main/java/com/lunhan/xxx/host/api/MyBatisPlusConfig.java
+++ b/src/main/java/com/nanjing/water/host/api/MyBatisPlusConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
diff --git a/src/main/java/com/lunhan/xxx/host/api/NonLogin.java b/src/main/java/com/nanjing/water/host/api/NonLogin.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/host/api/NonLogin.java
rename to src/main/java/com/nanjing/water/host/api/NonLogin.java
index dd31f40..abc768b 100644
--- a/src/main/java/com/lunhan/xxx/host/api/NonLogin.java
+++ b/src/main/java/com/nanjing/water/host/api/NonLogin.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/src/main/java/com/lunhan/xxx/host/api/TokenFilter.java b/src/main/java/com/nanjing/water/host/api/TokenFilter.java
similarity index 88%
rename from src/main/java/com/lunhan/xxx/host/api/TokenFilter.java
rename to src/main/java/com/nanjing/water/host/api/TokenFilter.java
index 6971c21..a4a7a68 100644
--- a/src/main/java/com/lunhan/xxx/host/api/TokenFilter.java
+++ b/src/main/java/com/nanjing/water/host/api/TokenFilter.java
@@ -1,15 +1,15 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
-import com.lunhan.xxx.common.config.SysConfig;
-import com.lunhan.xxx.common.enums.EResultCode;
-import com.lunhan.xxx.common.exceptions.BusinessException;
-import com.lunhan.xxx.common.jwt.JWTUtil;
-import com.lunhan.xxx.common.jwt.LoginUserDTO;
-import com.lunhan.xxx.common.util.IPUtils;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.RandVerifyCode;
-import com.lunhan.xxx.common.util.StringUtil;
-import com.lunhan.xxx.entity.enums.EUserType;
+import com.nanjing.water.common.config.SysConfig;
+import com.nanjing.water.common.enums.EResultCode;
+import com.nanjing.water.common.exceptions.BusinessException;
+import com.nanjing.water.common.jwt.JWTUtil;
+import com.nanjing.water.common.jwt.LoginUserDTO;
+import com.nanjing.water.common.util.IPUtils;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.RandVerifyCode;
+import com.nanjing.water.common.util.StringUtil;
+import com.nanjing.water.entity.enums.EUserType;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/lunhan/xxx/host/api/WebLogAspect.java b/src/main/java/com/nanjing/water/host/api/WebLogAspect.java
similarity index 95%
rename from src/main/java/com/lunhan/xxx/host/api/WebLogAspect.java
rename to src/main/java/com/nanjing/water/host/api/WebLogAspect.java
index 28a8a59..ee2f789 100644
--- a/src/main/java/com/lunhan/xxx/host/api/WebLogAspect.java
+++ b/src/main/java/com/nanjing/water/host/api/WebLogAspect.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.host.api;
+package com.nanjing.water.host.api;
import java.lang.reflect.Method;
import java.lang.reflect.Parameter;
@@ -8,8 +8,12 @@
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import com.lunhan.xxx.common.enums.ELogger;
-import com.lunhan.xxx.common.util.*;
+import com.nanjing.water.common.enums.ELogger;
+import com.nanjing.water.common.util.*;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.LoggerUtil;
+import com.nanjing.water.common.util.SerializeUtil;
+import com.nanjing.water.common.util.StringUtil;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
diff --git a/src/main/java/com/lunhan/xxx/host/controller/TestInfoServiceController.java b/src/main/java/com/nanjing/water/host/controller/TestInfoServiceController.java
similarity index 89%
rename from src/main/java/com/lunhan/xxx/host/controller/TestInfoServiceController.java
rename to src/main/java/com/nanjing/water/host/controller/TestInfoServiceController.java
index 0780a1c..3d96d94 100644
--- a/src/main/java/com/lunhan/xxx/host/controller/TestInfoServiceController.java
+++ b/src/main/java/com/nanjing/water/host/controller/TestInfoServiceController.java
@@ -1,22 +1,22 @@
-package com.lunhan.xxx.host.controller;
+package com.nanjing.water.host.controller;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.util.ParameterUtil;
-import com.lunhan.xxx.common.validator.ParameterValidateResult;
-import com.lunhan.xxx.common.validator.ParameterValidator;
-import com.lunhan.xxx.entity.search.SearchTestInfo;
-import com.lunhan.xxx.entity.enums.ESex;
-import com.lunhan.xxx.entity.request.ReqListId;
-import com.lunhan.xxx.entity.request.ReqListSetSort;
-import com.lunhan.xxx.entity.request.ReqSetSort;
-import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
-import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
-import com.lunhan.xxx.host.BasicController;
-import com.lunhan.xxx.host.api.NonLogin;
-import com.lunhan.xxx.repository.vo.TestInfoVO;
-import com.lunhan.xxx.service.TestInfoService;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.util.ParameterUtil;
+import com.nanjing.water.common.validator.ParameterValidateResult;
+import com.nanjing.water.common.validator.ParameterValidator;
+import com.nanjing.water.entity.search.SearchTestInfo;
+import com.nanjing.water.entity.enums.ESex;
+import com.nanjing.water.entity.request.ReqListId;
+import com.nanjing.water.entity.request.ReqListSetSort;
+import com.nanjing.water.entity.request.ReqSetSort;
+import com.nanjing.water.entity.request.test.ReqCreateTestInfo;
+import com.nanjing.water.entity.request.test.ReqModifyTestInfo;
+import com.nanjing.water.host.BasicController;
+import com.nanjing.water.host.api.NonLogin;
+import com.nanjing.water.repository.vo.TestInfoVO;
+import com.nanjing.water.service.TestInfoService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/com/lunhan/xxx/host/controller/base/BaseController.java b/src/main/java/com/nanjing/water/host/controller/base/BaseController.java
similarity index 84%
rename from src/main/java/com/lunhan/xxx/host/controller/base/BaseController.java
rename to src/main/java/com/nanjing/water/host/controller/base/BaseController.java
index cb9c0c6..3d5b294 100644
--- a/src/main/java/com/lunhan/xxx/host/controller/base/BaseController.java
+++ b/src/main/java/com/nanjing/water/host/controller/base/BaseController.java
@@ -1,8 +1,8 @@
-package com.lunhan.xxx.host.controller.base;
+package com.nanjing.water.host.controller.base;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.entity.dto.NameValueDTO;
-import com.lunhan.xxx.host.api.NonLogin;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.entity.dto.NameValueDTO;
+import com.nanjing.water.host.api.NonLogin;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +27,7 @@
@GetMapping("listEnumValue/{enumName}")
public ExecutedResult<List<NameValueDTO>> listEnumValue(@PathVariable String enumName) {
try {
- Class<?> enumClass = Class.forName("com.lunhan.xxx.entity.enums." + enumName);
+ Class<?> enumClass = Class.forName("com.nanjing.water.entity.enums." + enumName);
Method valuesMethod = enumClass.getMethod("values");
Method getValueMethod = enumClass.getMethod("getValue");
Method getDescMethod = enumClass.getMethod("getDesc");
diff --git a/src/main/java/com/lunhan/xxx/host/controller/base/QuartzController.java b/src/main/java/com/nanjing/water/host/controller/base/QuartzController.java
similarity index 82%
rename from src/main/java/com/lunhan/xxx/host/controller/base/QuartzController.java
rename to src/main/java/com/nanjing/water/host/controller/base/QuartzController.java
index 1e1cb4f..48c36cc 100644
--- a/src/main/java/com/lunhan/xxx/host/controller/base/QuartzController.java
+++ b/src/main/java/com/nanjing/water/host/controller/base/QuartzController.java
@@ -1,17 +1,17 @@
-package com.lunhan.xxx.host.controller.base;
+package com.nanjing.water.host.controller.base;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqRunTaskRightNow;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskInfo;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskRecord;
-import com.lunhan.xxx.host.api.NonLogin;
-import com.lunhan.xxx.repository.vo.QuartzTaskErrorVO;
-import com.lunhan.xxx.repository.vo.QuartzTaskInfoVO;
-import com.lunhan.xxx.repository.vo.QuartzTaskRecordVO;
-import com.lunhan.xxx.service.quartz.QuartzService;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqRunTaskRightNow;
+import com.nanjing.water.entity.search.SearchQuartzTaskInfo;
+import com.nanjing.water.entity.search.SearchQuartzTaskRecord;
+import com.nanjing.water.host.api.NonLogin;
+import com.nanjing.water.repository.vo.QuartzTaskErrorVO;
+import com.nanjing.water.repository.vo.QuartzTaskInfoVO;
+import com.nanjing.water.repository.vo.QuartzTaskRecordVO;
+import com.nanjing.water.service.quartz.QuartzService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/lunhan/xxx/repository/BasicMapper.java b/src/main/java/com/nanjing/water/repository/BasicMapper.java
similarity index 94%
rename from src/main/java/com/lunhan/xxx/repository/BasicMapper.java
rename to src/main/java/com/nanjing/water/repository/BasicMapper.java
index 3908aa4..484bbdf 100644
--- a/src/main/java/com/lunhan/xxx/repository/BasicMapper.java
+++ b/src/main/java/com/nanjing/water/repository/BasicMapper.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.repository;
+package com.nanjing.water.repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
import org.apache.ibatis.session.ResultHandler;
import java.io.Serializable;
diff --git a/src/main/java/com/lunhan/xxx/repository/BasicMapperImpl.java b/src/main/java/com/nanjing/water/repository/BasicMapperImpl.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/repository/BasicMapperImpl.java
rename to src/main/java/com/nanjing/water/repository/BasicMapperImpl.java
index 4a33f2f..28e955d 100644
--- a/src/main/java/com/lunhan/xxx/repository/BasicMapperImpl.java
+++ b/src/main/java/com/nanjing/water/repository/BasicMapperImpl.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.repository;
+package com.nanjing.water.repository;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.core.batch.BatchSqlSession;
@@ -10,13 +10,13 @@
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.ELogger;
-import com.lunhan.xxx.common.enums.EResultCode;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.exceptions.BusinessException;
-import com.lunhan.xxx.common.util.LoggerUtil;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.ELogger;
+import com.nanjing.water.common.enums.EResultCode;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.exceptions.BusinessException;
+import com.nanjing.water.common.util.LoggerUtil;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.executor.BatchResult;
import org.apache.ibatis.session.ResultHandler;
diff --git a/src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskErrorMapperImpl.java b/src/main/java/com/nanjing/water/repository/impl/QuartzTaskErrorMapperImpl.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskErrorMapperImpl.java
rename to src/main/java/com/nanjing/water/repository/impl/QuartzTaskErrorMapperImpl.java
index bbfd6bf..7a4185e 100644
--- a/src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskErrorMapperImpl.java
+++ b/src/main/java/com/nanjing/water/repository/impl/QuartzTaskErrorMapperImpl.java
@@ -1,18 +1,18 @@
-package com.lunhan.xxx.repository.impl;
+package com.nanjing.water.repository.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.entity.dto.OrderByDTO;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
-import com.lunhan.xxx.entity.enums.EOrderBy;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskError;
-import com.lunhan.xxx.repository.BasicMapperImpl;
-import com.lunhan.xxx.repository.mapper.QuartzTaskErrorMapper;
-import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.util.ListUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.entity.dto.OrderByDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.enums.EOrderBy;
+import com.nanjing.water.entity.search.SearchQuartzTaskError;
+import com.nanjing.water.repository.BasicMapperImpl;
+import com.nanjing.water.repository.mapper.QuartzTaskErrorMapper;
+import com.nanjing.water.repository.po.QuartzTaskErrorPO;
import org.springframework.stereotype.Repository;
/**
diff --git a/src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskInfoMapperImpl.java b/src/main/java/com/nanjing/water/repository/impl/QuartzTaskInfoMapperImpl.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskInfoMapperImpl.java
rename to src/main/java/com/nanjing/water/repository/impl/QuartzTaskInfoMapperImpl.java
index 490fc59..ab40c96 100644
--- a/src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskInfoMapperImpl.java
+++ b/src/main/java/com/nanjing/water/repository/impl/QuartzTaskInfoMapperImpl.java
@@ -1,19 +1,19 @@
-package com.lunhan.xxx.repository.impl;
+package com.nanjing.water.repository.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
-import com.lunhan.xxx.entity.dto.OrderByDTO;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
-import com.lunhan.xxx.entity.enums.EOrderBy;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskInfo;
-import com.lunhan.xxx.repository.BasicMapperImpl;
-import com.lunhan.xxx.repository.mapper.QuartzTaskInfoMapper;
-import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.util.ListUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
+import com.nanjing.water.entity.dto.OrderByDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.enums.EOrderBy;
+import com.nanjing.water.entity.search.SearchQuartzTaskInfo;
+import com.nanjing.water.repository.BasicMapperImpl;
+import com.nanjing.water.repository.mapper.QuartzTaskInfoMapper;
+import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import org.springframework.stereotype.Repository;
import java.util.List;
diff --git a/src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskRecordMapperImpl.java b/src/main/java/com/nanjing/water/repository/impl/QuartzTaskRecordMapperImpl.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskRecordMapperImpl.java
rename to src/main/java/com/nanjing/water/repository/impl/QuartzTaskRecordMapperImpl.java
index 314ffa3..ed87717 100644
--- a/src/main/java/com/lunhan/xxx/repository/impl/QuartzTaskRecordMapperImpl.java
+++ b/src/main/java/com/nanjing/water/repository/impl/QuartzTaskRecordMapperImpl.java
@@ -1,19 +1,19 @@
-package com.lunhan.xxx.repository.impl;
+package com.nanjing.water.repository.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
-import com.lunhan.xxx.entity.dto.OrderByDTO;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
-import com.lunhan.xxx.entity.enums.EOrderBy;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskRecord;
-import com.lunhan.xxx.repository.BasicMapperImpl;
-import com.lunhan.xxx.repository.mapper.QuartzTaskRecordMapper;
-import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.util.ListUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
+import com.nanjing.water.entity.dto.OrderByDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.enums.EOrderBy;
+import com.nanjing.water.entity.search.SearchQuartzTaskRecord;
+import com.nanjing.water.repository.BasicMapperImpl;
+import com.nanjing.water.repository.mapper.QuartzTaskRecordMapper;
+import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import org.springframework.stereotype.Repository;
/**
diff --git a/src/main/java/com/lunhan/xxx/repository/impl/TestInfoMapperImpl.java b/src/main/java/com/nanjing/water/repository/impl/TestInfoMapperImpl.java
similarity index 87%
rename from src/main/java/com/lunhan/xxx/repository/impl/TestInfoMapperImpl.java
rename to src/main/java/com/nanjing/water/repository/impl/TestInfoMapperImpl.java
index 22779e5..2582a98 100644
--- a/src/main/java/com/lunhan/xxx/repository/impl/TestInfoMapperImpl.java
+++ b/src/main/java/com/nanjing/water/repository/impl/TestInfoMapperImpl.java
@@ -20,22 +20,22 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.impl;
+package com.nanjing.water.repository.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
-import com.lunhan.xxx.entity.dto.OrderByDTO;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
-import com.lunhan.xxx.entity.search.SearchTestInfo;
-import com.lunhan.xxx.entity.enums.EOrderBy;
-import com.lunhan.xxx.repository.BasicMapperImpl;
-import com.lunhan.xxx.repository.mapper.TestInfoMapper;
-import com.lunhan.xxx.repository.po.TestInfoPO;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.util.ListUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
+import com.nanjing.water.entity.dto.OrderByDTO;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
+import com.nanjing.water.entity.search.SearchTestInfo;
+import com.nanjing.water.entity.enums.EOrderBy;
+import com.nanjing.water.repository.BasicMapperImpl;
+import com.nanjing.water.repository.mapper.TestInfoMapper;
+import com.nanjing.water.repository.po.TestInfoPO;
import org.springframework.stereotype.Repository;
import java.util.List;
diff --git a/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskErrorMapper.java b/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskErrorMapper.java
new file mode 100644
index 0000000..b053dc5
--- /dev/null
+++ b/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskErrorMapper.java
@@ -0,0 +1,12 @@
+package com.nanjing.water.repository.mapper;
+
+import com.nanjing.water.repository.BasicMapper;
+import com.nanjing.water.repository.po.QuartzTaskErrorPO;
+
+/**
+ * 定时任务错误信息 mapper
+ * @author lin.liu
+ * @description 定时任务错误信息 mapper
+ */
+public interface QuartzTaskErrorMapper extends BasicMapper<QuartzTaskErrorPO> {
+}
diff --git a/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskInfoMapper.java b/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskInfoMapper.java
new file mode 100644
index 0000000..d7a443d
--- /dev/null
+++ b/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskInfoMapper.java
@@ -0,0 +1,12 @@
+package com.nanjing.water.repository.mapper;
+
+import com.nanjing.water.repository.BasicMapper;
+import com.nanjing.water.repository.po.QuartzTaskInfoPO;
+
+/**
+ * 定时任务信息 mapper
+ * @author lin.liu
+ * @description 定时任务信息 mapper
+ */
+public interface QuartzTaskInfoMapper extends BasicMapper<QuartzTaskInfoPO> {
+}
diff --git a/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskRecordMapper.java b/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskRecordMapper.java
new file mode 100644
index 0000000..ed43ce8
--- /dev/null
+++ b/src/main/java/com/nanjing/water/repository/mapper/QuartzTaskRecordMapper.java
@@ -0,0 +1,12 @@
+package com.nanjing.water.repository.mapper;
+
+import com.nanjing.water.repository.BasicMapper;
+import com.nanjing.water.repository.po.QuartzTaskRecordPO;
+
+/**
+ * 定时任务执行记录 mapper
+ * @author lin.liu
+ * @description 定时任务执行记录 mapper
+ */
+public interface QuartzTaskRecordMapper extends BasicMapper<QuartzTaskRecordPO> {
+}
diff --git a/src/main/java/com/lunhan/xxx/repository/mapper/TestInfoMapper.java b/src/main/java/com/nanjing/water/repository/mapper/TestInfoMapper.java
similarity index 88%
rename from src/main/java/com/lunhan/xxx/repository/mapper/TestInfoMapper.java
rename to src/main/java/com/nanjing/water/repository/mapper/TestInfoMapper.java
index be6b533..eb3b59e 100644
--- a/src/main/java/com/lunhan/xxx/repository/mapper/TestInfoMapper.java
+++ b/src/main/java/com/nanjing/water/repository/mapper/TestInfoMapper.java
@@ -1,9 +1,9 @@
-package com.lunhan.xxx.repository.mapper;
+package com.nanjing.water.repository.mapper;
import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.lunhan.xxx.entity.search.SearchTestInfo;
-import com.lunhan.xxx.repository.BasicMapper;
-import com.lunhan.xxx.repository.po.TestInfoPO;
+import com.nanjing.water.entity.search.SearchTestInfo;
+import com.nanjing.water.repository.BasicMapper;
+import com.nanjing.water.repository.po.TestInfoPO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
diff --git a/src/main/java/com/lunhan/xxx/repository/po/QuartzTaskErrorPO.java b/src/main/java/com/nanjing/water/repository/po/QuartzTaskErrorPO.java
similarity index 97%
rename from src/main/java/com/lunhan/xxx/repository/po/QuartzTaskErrorPO.java
rename to src/main/java/com/nanjing/water/repository/po/QuartzTaskErrorPO.java
index 5f50901..6499401 100644
--- a/src/main/java/com/lunhan/xxx/repository/po/QuartzTaskErrorPO.java
+++ b/src/main/java/com/nanjing/water/repository/po/QuartzTaskErrorPO.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.po;
+package com.nanjing.water.repository.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
diff --git a/src/main/java/com/lunhan/xxx/repository/po/QuartzTaskInfoPO.java b/src/main/java/com/nanjing/water/repository/po/QuartzTaskInfoPO.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/repository/po/QuartzTaskInfoPO.java
rename to src/main/java/com/nanjing/water/repository/po/QuartzTaskInfoPO.java
index c67681e..b336285 100644
--- a/src/main/java/com/lunhan/xxx/repository/po/QuartzTaskInfoPO.java
+++ b/src/main/java/com/nanjing/water/repository/po/QuartzTaskInfoPO.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.po;
+package com.nanjing.water.repository.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
diff --git a/src/main/java/com/lunhan/xxx/repository/po/QuartzTaskRecordPO.java b/src/main/java/com/nanjing/water/repository/po/QuartzTaskRecordPO.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/repository/po/QuartzTaskRecordPO.java
rename to src/main/java/com/nanjing/water/repository/po/QuartzTaskRecordPO.java
index c58f314..c5ccd28 100644
--- a/src/main/java/com/lunhan/xxx/repository/po/QuartzTaskRecordPO.java
+++ b/src/main/java/com/nanjing/water/repository/po/QuartzTaskRecordPO.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.po;
+package com.nanjing.water.repository.po;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
diff --git a/src/main/java/com/lunhan/xxx/repository/po/TestInfoPO.java b/src/main/java/com/nanjing/water/repository/po/TestInfoPO.java
similarity index 98%
rename from src/main/java/com/lunhan/xxx/repository/po/TestInfoPO.java
rename to src/main/java/com/nanjing/water/repository/po/TestInfoPO.java
index 64394c1..c4e19bc 100644
--- a/src/main/java/com/lunhan/xxx/repository/po/TestInfoPO.java
+++ b/src/main/java/com/nanjing/water/repository/po/TestInfoPO.java
@@ -20,7 +20,7 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.po;
+package com.nanjing.water.repository.po;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/src/main/java/com/lunhan/xxx/repository/vo/BasicVO.java b/src/main/java/com/nanjing/water/repository/vo/BasicVO.java
similarity index 82%
rename from src/main/java/com/lunhan/xxx/repository/vo/BasicVO.java
rename to src/main/java/com/nanjing/water/repository/vo/BasicVO.java
index 5a31afa..ff91458 100644
--- a/src/main/java/com/lunhan/xxx/repository/vo/BasicVO.java
+++ b/src/main/java/com/nanjing/water/repository/vo/BasicVO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.repository.vo;
+package com.nanjing.water.repository.vo;
public interface BasicVO {
diff --git a/src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskErrorVO.java b/src/main/java/com/nanjing/water/repository/vo/QuartzTaskErrorVO.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskErrorVO.java
rename to src/main/java/com/nanjing/water/repository/vo/QuartzTaskErrorVO.java
index 6966179..3c62d5c 100644
--- a/src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskErrorVO.java
+++ b/src/main/java/com/nanjing/water/repository/vo/QuartzTaskErrorVO.java
@@ -20,11 +20,11 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.vo;
+package com.nanjing.water.repository.vo;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.repository.po.QuartzTaskErrorPO;
import lombok.Data;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskInfoVO.java b/src/main/java/com/nanjing/water/repository/vo/QuartzTaskInfoVO.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskInfoVO.java
rename to src/main/java/com/nanjing/water/repository/vo/QuartzTaskInfoVO.java
index ed24203..df04f80 100644
--- a/src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskInfoVO.java
+++ b/src/main/java/com/nanjing/water/repository/vo/QuartzTaskInfoVO.java
@@ -20,11 +20,11 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.vo;
+package com.nanjing.water.repository.vo;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.repository.po.QuartzTaskInfoPO;
import lombok.Data;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskRecordVO.java b/src/main/java/com/nanjing/water/repository/vo/QuartzTaskRecordVO.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskRecordVO.java
rename to src/main/java/com/nanjing/water/repository/vo/QuartzTaskRecordVO.java
index 84309ed..8bf10d0 100644
--- a/src/main/java/com/lunhan/xxx/repository/vo/QuartzTaskRecordVO.java
+++ b/src/main/java/com/nanjing/water/repository/vo/QuartzTaskRecordVO.java
@@ -20,11 +20,11 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.repository.vo;
+package com.nanjing.water.repository.vo;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import lombok.Data;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/repository/vo/TestInfoVO.java b/src/main/java/com/nanjing/water/repository/vo/TestInfoVO.java
similarity index 73%
rename from src/main/java/com/lunhan/xxx/repository/vo/TestInfoVO.java
rename to src/main/java/com/nanjing/water/repository/vo/TestInfoVO.java
index fcde1c8..d495a24 100644
--- a/src/main/java/com/lunhan/xxx/repository/vo/TestInfoVO.java
+++ b/src/main/java/com/nanjing/water/repository/vo/TestInfoVO.java
@@ -1,8 +1,8 @@
-package com.lunhan.xxx.repository.vo;
+package com.nanjing.water.repository.vo;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.repository.po.TestInfoPO;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.repository.po.TestInfoPO;
import java.util.Objects;
diff --git a/src/main/java/com/lunhan/xxx/service/BaseService.java b/src/main/java/com/nanjing/water/service/BaseService.java
similarity index 65%
rename from src/main/java/com/lunhan/xxx/service/BaseService.java
rename to src/main/java/com/nanjing/water/service/BaseService.java
index ddb35cd..440b1e2 100644
--- a/src/main/java/com/lunhan/xxx/service/BaseService.java
+++ b/src/main/java/com/nanjing/water/service/BaseService.java
@@ -1,8 +1,8 @@
-package com.lunhan.xxx.service;
+package com.nanjing.water.service;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.entity.dto.SearchBasicDTO;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.entity.dto.SearchBasicDTO;
public class BaseService {
public void dealPager(SearchBasicDTO search) {
diff --git a/src/main/java/com/lunhan/xxx/service/TestInfoService.java b/src/main/java/com/nanjing/water/service/TestInfoService.java
similarity index 90%
rename from src/main/java/com/lunhan/xxx/service/TestInfoService.java
rename to src/main/java/com/nanjing/water/service/TestInfoService.java
index e4ca14f..95f4275 100644
--- a/src/main/java/com/lunhan/xxx/service/TestInfoService.java
+++ b/src/main/java/com/nanjing/water/service/TestInfoService.java
@@ -1,20 +1,21 @@
-package com.lunhan.xxx.service;
+package com.nanjing.water.service;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.model.Tuple;
-import com.lunhan.xxx.common.util.*;
-import com.lunhan.xxx.entity.search.SearchTestInfo;
-import com.lunhan.xxx.entity.enums.EState;
-import com.lunhan.xxx.entity.request.ReqListSetSort;
-import com.lunhan.xxx.entity.request.ReqSetSort;
-import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
-import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
-import com.lunhan.xxx.repository.impl.TestInfoMapperImpl;
-import com.lunhan.xxx.repository.po.TestInfoPO;
-import com.lunhan.xxx.repository.vo.TestInfoVO;
-import com.lunhan.xxx.service.convert.TestInfoConvert;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.model.Tuple;
+import com.nanjing.water.common.util.*;
+import com.nanjing.water.entity.search.SearchTestInfo;
+import com.nanjing.water.entity.enums.EState;
+import com.nanjing.water.entity.request.ReqListSetSort;
+import com.nanjing.water.entity.request.ReqSetSort;
+import com.nanjing.water.entity.request.test.ReqCreateTestInfo;
+import com.nanjing.water.entity.request.test.ReqModifyTestInfo;
+import com.nanjing.water.repository.impl.TestInfoMapperImpl;
+import com.nanjing.water.repository.po.TestInfoPO;
+import com.nanjing.water.repository.vo.TestInfoVO;
+import com.nanjing.water.service.convert.TestInfoConvert;
+import com.nanjing.water.common.util.*;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/com/lunhan/xxx/service/convert/QuartzTaskErrorConvert.java b/src/main/java/com/nanjing/water/service/convert/QuartzTaskErrorConvert.java
similarity index 84%
rename from src/main/java/com/lunhan/xxx/service/convert/QuartzTaskErrorConvert.java
rename to src/main/java/com/nanjing/water/service/convert/QuartzTaskErrorConvert.java
index 83792ca..17ede8d 100644
--- a/src/main/java/com/lunhan/xxx/service/convert/QuartzTaskErrorConvert.java
+++ b/src/main/java/com/nanjing/water/service/convert/QuartzTaskErrorConvert.java
@@ -20,12 +20,12 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.service.convert;
+package com.nanjing.water.service.convert;
-import com.lunhan.xxx.entity.request.quartztaskerror.ReqCreateQuartzTaskError;
-import com.lunhan.xxx.entity.request.quartztaskerror.ReqModifyQuartzTaskError;
-import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
-import com.lunhan.xxx.repository.vo.QuartzTaskErrorVO;
+import com.nanjing.water.entity.request.quartztaskerror.ReqCreateQuartzTaskError;
+import com.nanjing.water.entity.request.quartztaskerror.ReqModifyQuartzTaskError;
+import com.nanjing.water.repository.po.QuartzTaskErrorPO;
+import com.nanjing.water.repository.vo.QuartzTaskErrorVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/src/main/java/com/lunhan/xxx/service/convert/QuartzTaskInfoConvert.java b/src/main/java/com/nanjing/water/service/convert/QuartzTaskInfoConvert.java
similarity index 84%
rename from src/main/java/com/lunhan/xxx/service/convert/QuartzTaskInfoConvert.java
rename to src/main/java/com/nanjing/water/service/convert/QuartzTaskInfoConvert.java
index 4e58b0b..a98cb55 100644
--- a/src/main/java/com/lunhan/xxx/service/convert/QuartzTaskInfoConvert.java
+++ b/src/main/java/com/nanjing/water/service/convert/QuartzTaskInfoConvert.java
@@ -20,12 +20,12 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.service.convert;
+package com.nanjing.water.service.convert;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
-import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
-import com.lunhan.xxx.repository.vo.QuartzTaskInfoVO;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
+import com.nanjing.water.repository.po.QuartzTaskInfoPO;
+import com.nanjing.water.repository.vo.QuartzTaskInfoVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/src/main/java/com/lunhan/xxx/service/convert/QuartzTaskRecordConvert.java b/src/main/java/com/nanjing/water/service/convert/QuartzTaskRecordConvert.java
similarity index 84%
rename from src/main/java/com/lunhan/xxx/service/convert/QuartzTaskRecordConvert.java
rename to src/main/java/com/nanjing/water/service/convert/QuartzTaskRecordConvert.java
index 7579fad..e268d62 100644
--- a/src/main/java/com/lunhan/xxx/service/convert/QuartzTaskRecordConvert.java
+++ b/src/main/java/com/nanjing/water/service/convert/QuartzTaskRecordConvert.java
@@ -20,12 +20,12 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.service.convert;
+package com.nanjing.water.service.convert;
-import com.lunhan.xxx.entity.request.quartztaskrecord.ReqCreateQuartzTaskRecord;
-import com.lunhan.xxx.entity.request.quartztaskrecord.ReqModifyQuartzTaskRecord;
-import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
-import com.lunhan.xxx.repository.vo.QuartzTaskRecordVO;
+import com.nanjing.water.entity.request.quartztaskrecord.ReqCreateQuartzTaskRecord;
+import com.nanjing.water.entity.request.quartztaskrecord.ReqModifyQuartzTaskRecord;
+import com.nanjing.water.repository.po.QuartzTaskRecordPO;
+import com.nanjing.water.repository.vo.QuartzTaskRecordVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/src/main/java/com/lunhan/xxx/service/convert/TestInfoConvert.java b/src/main/java/com/nanjing/water/service/convert/TestInfoConvert.java
similarity index 86%
rename from src/main/java/com/lunhan/xxx/service/convert/TestInfoConvert.java
rename to src/main/java/com/nanjing/water/service/convert/TestInfoConvert.java
index c0fc66e..19b0c4e 100644
--- a/src/main/java/com/lunhan/xxx/service/convert/TestInfoConvert.java
+++ b/src/main/java/com/nanjing/water/service/convert/TestInfoConvert.java
@@ -20,12 +20,12 @@
# 神兽保佑
# 永无BUG！
*/
-package com.lunhan.xxx.service.convert;
+package com.nanjing.water.service.convert;
-import com.lunhan.xxx.entity.request.test.ReqCreateTestInfo;
-import com.lunhan.xxx.entity.request.test.ReqModifyTestInfo;
-import com.lunhan.xxx.repository.po.TestInfoPO;
-import com.lunhan.xxx.repository.vo.TestInfoVO;
+import com.nanjing.water.entity.request.test.ReqCreateTestInfo;
+import com.nanjing.water.entity.request.test.ReqModifyTestInfo;
+import com.nanjing.water.repository.po.TestInfoPO;
+import com.nanjing.water.repository.vo.TestInfoVO;
import org.mapstruct.Mapper;
import org.mapstruct.factory.Mappers;
diff --git a/src/main/java/com/lunhan/xxx/service/quartz/QuartzExecutor.java b/src/main/java/com/nanjing/water/service/quartz/QuartzExecutor.java
similarity index 85%
rename from src/main/java/com/lunhan/xxx/service/quartz/QuartzExecutor.java
rename to src/main/java/com/nanjing/water/service/quartz/QuartzExecutor.java
index 5efefa2..3927379 100644
--- a/src/main/java/com/lunhan/xxx/service/quartz/QuartzExecutor.java
+++ b/src/main/java/com/nanjing/water/service/quartz/QuartzExecutor.java
@@ -1,15 +1,15 @@
-package com.lunhan.xxx.service.quartz;
+package com.nanjing.water.service.quartz;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
-import com.lunhan.xxx.common.util.NumericUtil;
-import com.lunhan.xxx.common.util.StringUtil;
-import com.lunhan.xxx.repository.impl.QuartzTaskErrorMapperImpl;
-import com.lunhan.xxx.repository.impl.QuartzTaskRecordMapperImpl;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.NumericUtil;
+import com.nanjing.water.common.util.StringUtil;
+import com.nanjing.water.repository.impl.QuartzTaskErrorMapperImpl;
+import com.nanjing.water.repository.impl.QuartzTaskRecordMapperImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/com/lunhan/xxx/service/quartz/QuartzMainJobFactory.java b/src/main/java/com/nanjing/water/service/quartz/QuartzMainJobFactory.java
similarity index 91%
rename from src/main/java/com/lunhan/xxx/service/quartz/QuartzMainJobFactory.java
rename to src/main/java/com/nanjing/water/service/quartz/QuartzMainJobFactory.java
index 078de50..279efed 100644
--- a/src/main/java/com/lunhan/xxx/service/quartz/QuartzMainJobFactory.java
+++ b/src/main/java/com/nanjing/water/service/quartz/QuartzMainJobFactory.java
@@ -1,12 +1,12 @@
-package com.lunhan.xxx.service.quartz;
+package com.nanjing.water.service.quartz;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.util.ExceptionUtil;
-import com.lunhan.xxx.common.util.SerializeUtil;
-import com.lunhan.xxx.entity.enums.EHandleStatus;
-import com.lunhan.xxx.entity.enums.EState;
-import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
-import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.util.ExceptionUtil;
+import com.nanjing.water.common.util.SerializeUtil;
+import com.nanjing.water.entity.enums.EHandleStatus;
+import com.nanjing.water.entity.enums.EState;
+import com.nanjing.water.repository.po.QuartzTaskInfoPO;
+import com.nanjing.water.repository.po.QuartzTaskRecordPO;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobDataMap;
diff --git a/src/main/java/com/lunhan/xxx/service/quartz/QuartzService.java b/src/main/java/com/nanjing/water/service/quartz/QuartzService.java
similarity index 92%
rename from src/main/java/com/lunhan/xxx/service/quartz/QuartzService.java
rename to src/main/java/com/nanjing/water/service/quartz/QuartzService.java
index b54a434..e7613e3 100644
--- a/src/main/java/com/lunhan/xxx/service/quartz/QuartzService.java
+++ b/src/main/java/com/nanjing/water/service/quartz/QuartzService.java
@@ -1,27 +1,28 @@
-package com.lunhan.xxx.service.quartz;
+package com.nanjing.water.service.quartz;
-import com.lunhan.xxx.common.ExecutedResult;
-import com.lunhan.xxx.common.PagerResult;
-import com.lunhan.xxx.common.enums.EYesOrNo;
-import com.lunhan.xxx.common.model.Tuple;
-import com.lunhan.xxx.common.util.*;
-import com.lunhan.xxx.entity.enums.EHandleStatus;
-import com.lunhan.xxx.entity.enums.EState;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
-import com.lunhan.xxx.entity.request.quartztaskinfo.ReqRunTaskRightNow;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskInfo;
-import com.lunhan.xxx.entity.search.SearchQuartzTaskRecord;
-import com.lunhan.xxx.repository.impl.QuartzTaskErrorMapperImpl;
-import com.lunhan.xxx.repository.impl.QuartzTaskInfoMapperImpl;
-import com.lunhan.xxx.repository.impl.QuartzTaskRecordMapperImpl;
-import com.lunhan.xxx.repository.po.QuartzTaskErrorPO;
-import com.lunhan.xxx.repository.po.QuartzTaskInfoPO;
-import com.lunhan.xxx.repository.po.QuartzTaskRecordPO;
-import com.lunhan.xxx.repository.vo.QuartzTaskErrorVO;
-import com.lunhan.xxx.repository.vo.QuartzTaskInfoVO;
-import com.lunhan.xxx.repository.vo.QuartzTaskRecordVO;
-import com.lunhan.xxx.service.convert.QuartzTaskInfoConvert;
+import com.nanjing.water.common.ExecutedResult;
+import com.nanjing.water.common.PagerResult;
+import com.nanjing.water.common.enums.EYesOrNo;
+import com.nanjing.water.common.model.Tuple;
+import com.nanjing.water.common.util.*;
+import com.nanjing.water.entity.enums.EHandleStatus;
+import com.nanjing.water.entity.enums.EState;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqCreateQuartzTaskInfo;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqModifyQuartzTaskInfo;
+import com.nanjing.water.entity.request.quartztaskinfo.ReqRunTaskRightNow;
+import com.nanjing.water.entity.search.SearchQuartzTaskInfo;
+import com.nanjing.water.entity.search.SearchQuartzTaskRecord;
+import com.nanjing.water.repository.impl.QuartzTaskErrorMapperImpl;
+import com.nanjing.water.repository.impl.QuartzTaskInfoMapperImpl;
+import com.nanjing.water.repository.impl.QuartzTaskRecordMapperImpl;
+import com.nanjing.water.repository.po.QuartzTaskErrorPO;
+import com.nanjing.water.repository.po.QuartzTaskInfoPO;
+import com.nanjing.water.repository.po.QuartzTaskRecordPO;
+import com.nanjing.water.repository.vo.QuartzTaskErrorVO;
+import com.nanjing.water.repository.vo.QuartzTaskInfoVO;
+import com.nanjing.water.repository.vo.QuartzTaskRecordVO;
+import com.nanjing.water.service.convert.QuartzTaskInfoConvert;
+import com.nanjing.water.common.util.*;
import org.quartz.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index f88eecd..21bf1f3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8027
+ port: 8038
spring:
jackson:
@@ -34,14 +34,30 @@
path: ./logs
level:
root: info
- com.lunhan.xxx: info
+ com.nanjing.water: info
# mybatis-plus 配置：
mybatis-plus:
configuration:
### 开启打印sql配置
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
+mqtt:
+ # 是否启用
+ enable: false
+ host: 113.250.189.120
+ port: 1885
+ user: admin
+ password: public
+ # 订阅主题
+ topic: nanjing/#
+ # 订阅消息的客户端id
+ clientId: nanjing-station-dev
+ # 连接超时时间
+ connectionTimeout: 10
+ # 心跳
+ keepAliveInterval: 20
+ # 发送消息的客户端id
+ serverClientId: nanjing-station-publish-dev
# quartz定时任务配置
quartz:
# 是否启用
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 3b025b8..8876e01 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,5 +1,5 @@
server:
- port: 9009
+ port: 9038
spring:
jackson:
@@ -34,8 +34,24 @@
path: ./logs
level:
root: info
- com.lunhan.xxx.host: debug
-
+ com.nanjing.water.host: debug
+mqtt:
+ # 是否启用
+ enable: true
+ host: 113.250.189.120
+ port: 1883
+ user: admin
+ password: public
+ # 订阅主题
+ topic: nanjing/#
+ # 订阅消息的客户端id
+ clientId: nanjing-station-prod
+ # 连接超时时间
+ connectionTimeout: 10
+ # 心跳
+ keepAliveInterval: 20
+ # 发送消息的客户端id
+ serverClientId: nanjing-station-publish-prod
# quartz定时任务配置
quartz:
# 是否启用
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 7a949d8..d02c2fb 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -34,8 +34,8 @@
path: ./logs
level:
root: info
- com.lunhan.xxx.host: DEBUG
- com.lunhan.xxx.service: DEBUG
+ com.nanjing.water.host: DEBUG
+ com.nanjing.water.service: DEBUG
# quartz定时任务配置
quartz:
diff --git a/src/main/resources/smart-doc.json b/src/main/resources/smart-doc.json
index 6101148..ae982b2 100644
--- a/src/main/resources/smart-doc.json
+++ b/src/main/resources/smart-doc.json
@@ -5,7 +5,7 @@
"allInOneDocFileName":"index.html",//自定义设置输出文档名称, @since 1.9.0
"style": "vs2015",
"createDebugPage": true, //@since 2.0.0 smart-doc支持创建可以测试的html页面，仅在AllInOne模式中起作用。
- "packageFilters": "com.lunhan.xxx.host.controller.*,com.lunhan.xxx.host.admin.*,com.lunhan.xxx.host.controller.pay.*",//controller包过滤，多个包用英文逗号隔开，2.2.2开始需要采用正则：com.test.controller.*
+ "packageFilters": "com.nanjing.water.host.controller.*,com.nanjing.water.host.admin.*,com.nanjing.water.host.controller.pay.*",//controller包过滤，多个包用英文逗号隔开，2.2.2开始需要采用正则：com.test.controller.*
"requestExample":"true",//是否将请求示例展示在文档中，默认true，@since 1.9.0
"responseExample":"true",//是否将响应示例展示在文档中，默认为true，@since 1.9.0
// "requestHeaders": [{ //设置请求头，没有需求可以不设置
@@ -20,27 +20,27 @@
// }],
"dataDictionaries": [{
"title": "EResultCode - 请求响应状态码",
- "enumClassName": "com.lunhan.xxx.common.enums.EResultCode",
+ "enumClassName": "com.nanjing.water.common.enums.EResultCode",
"codeField": "code",
"descField": "message"
},{
"title": "ESex - 性别",
- "enumClassName": "com.lunhan.xxx.entity.enums.ESex",
+ "enumClassName": "com.nanjing.water.entity.enums.ESex",
"codeField": "value",
"descField": "desc"
}, {
"title": "EState - 状态",
- "enumClassName": "com.lunhan.xxx.entity.enums.EState",
+ "enumClassName": "com.nanjing.water.entity.enums.EState",
"codeField": "value",
"descField": "desc"
}, {
"title": "EParameterType - 参数类型",
- "enumClassName": "com.lunhan.xxx.entity.enums.EParameterType",
+ "enumClassName": "com.nanjing.water.entity.enums.EParameterType",
"codeField": "value",
"descField": "desc"
}, {
"title": "EUserType - 用户类型",
- "enumClassName": "com.lunhan.xxx.entity.enums.EUserType",
+ "enumClassName": "com.nanjing.water.entity.enums.EUserType",
"codeField": "value",
"descField": "desc"
},
@@ -50,12 +50,12 @@
// 排序的枚举，为了便于阅读请放在字典列表的最后。业务枚举放在前面
{
"title": "EOrderBy - 通用查询-排序支持的字段枚举",
- "enumClassName": "com.lunhan.xxx.entity.enums.EOrderBy",
+ "enumClassName": "com.nanjing.water.entity.enums.EOrderBy",
"codeField": "value",
"descField": "desc"
}, {
"title": "ESortOrderBy - 排序类型带排序值字段",
- "enumClassName": "com.lunhan.xxx.entity.enums.ESortOrderBy",
+ "enumClassName": "com.nanjing.water.entity.enums.ESortOrderBy",
"codeField": "value",
"descField": "desc"
}
diff --git a/src/test/java/com/lunhan/xxx/repository/mapper/UserMapper.java b/src/test/java/com/lunhan/xxx/repository/mapper/UserMapper.java
deleted file mode 100644
index 1fc59f0..0000000
--- a/src/test/java/com/lunhan/xxx/repository/mapper/UserMapper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.lunhan.xxx.repository.mapper;
-
-import com.lunhan.xxx.po.UserPO;
-import com.lunhan.xxx.repository.BasicMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-@Mapper
-public interface UserMapper extends BasicMapper<UserPO> {
-}
diff --git a/src/test/java/com/lunhan/xxx/repository/test123.java b/src/test/java/com/lunhan/xxx/repository/test123.java
deleted file mode 100644
index 92f53cd..0000000
--- a/src/test/java/com/lunhan/xxx/repository/test123.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.lunhan.xxx.repository;
-
-public class test123 {
-}
diff --git a/src/test/java/com/lunhan/xxx/BasicServiceApplicationTests.java b/src/test/java/com/nanjing/water/BasicServiceApplicationTests.java
similarity index 94%
rename from src/test/java/com/lunhan/xxx/BasicServiceApplicationTests.java
rename to src/test/java/com/nanjing/water/BasicServiceApplicationTests.java
index 2227823..255b2b3 100644
--- a/src/test/java/com/lunhan/xxx/BasicServiceApplicationTests.java
+++ b/src/test/java/com/nanjing/water/BasicServiceApplicationTests.java
@@ -1,8 +1,8 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
-import com.lunhan.xxx.po.UserPO;
-import com.lunhan.xxx.repository.mapper.UserMapper;
+import com.nanjing.water.po.UserPO;
+import com.nanjing.water.repository.mapper.UserMapper;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
diff --git a/src/test/java/com/lunhan/xxx/DateTimeTest.java b/src/test/java/com/nanjing/water/DateTimeTest.java
similarity index 80%
rename from src/test/java/com/lunhan/xxx/DateTimeTest.java
rename to src/test/java/com/nanjing/water/DateTimeTest.java
index aa33759..da891cd 100644
--- a/src/test/java/com/lunhan/xxx/DateTimeTest.java
+++ b/src/test/java/com/nanjing/water/DateTimeTest.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.util.LocalDateTimeUtil;
+import com.nanjing.water.common.util.LocalDateTimeUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/lunhan/xxx/DemoTest.java b/src/test/java/com/nanjing/water/DemoTest.java
similarity index 99%
rename from src/test/java/com/lunhan/xxx/DemoTest.java
rename to src/test/java/com/nanjing/water/DemoTest.java
index 7e5aa87..06b88d7 100644
--- a/src/test/java/com/lunhan/xxx/DemoTest.java
+++ b/src/test/java/com/nanjing/water/DemoTest.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
import org.junit.runner.RunWith;
import org.springframework.test.context.ContextConfiguration;
diff --git a/src/test/java/com/lunhan/xxx/Gauss2Gauss.java b/src/test/java/com/nanjing/water/Gauss2Gauss.java
similarity index 97%
rename from src/test/java/com/lunhan/xxx/Gauss2Gauss.java
rename to src/test/java/com/nanjing/water/Gauss2Gauss.java
index 74747ea..ff10868 100644
--- a/src/test/java/com/lunhan/xxx/Gauss2Gauss.java
+++ b/src/test/java/com/nanjing/water/Gauss2Gauss.java
@@ -1,7 +1,7 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.util.ListUtil;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.util.ListUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git a/src/test/java/com/lunhan/xxx/GaussExportTest.java b/src/test/java/com/nanjing/water/GaussExportTest.java
similarity index 89%
rename from src/test/java/com/lunhan/xxx/GaussExportTest.java
rename to src/test/java/com/nanjing/water/GaussExportTest.java
index 6140221..a0ca196 100644
--- a/src/test/java/com/lunhan/xxx/GaussExportTest.java
+++ b/src/test/java/com/nanjing/water/GaussExportTest.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git a/src/test/java/com/lunhan/xxx/GenCodeGauss.java b/src/test/java/com/nanjing/water/GenCodeGauss.java
similarity index 97%
rename from src/test/java/com/lunhan/xxx/GenCodeGauss.java
rename to src/test/java/com/nanjing/water/GenCodeGauss.java
index 052d748..31feb18 100644
--- a/src/test/java/com/lunhan/xxx/GenCodeGauss.java
+++ b/src/test/java/com/nanjing/water/GenCodeGauss.java
@@ -1,7 +1,8 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.*;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.*;
+import com.nanjing.water.common.util.*;
import org.apache.commons.lang3.BooleanUtils;
import java.io.File;
@@ -44,16 +45,16 @@
//region 架包路径设置
class PackageSet {
- public static final String PO = "com.lunhan.xxx.repository.po";
- public static final String VO = "com.lunhan.xxx.repository.vo";
- public static final String CONVERT_MAPPER = "com.lunhan.xxx.service.convert";
- public static final String MAPPER_IMPL = "com.lunhan.xxx.repository.impl";
- public static final String MAPPER = "com.lunhan.xxx.repository.mapper";
- public static final String SERVICE = "com.lunhan.xxx.service";
- public static final String Controller = "com.lunhan.xxx.host.controller";
- public static final String SEARCH = "com.lunhan.xxx.entity.search";
- public static final String Request = "com.lunhan.xxx.entity.request";
- public static final String Response = "com.lunhan.xxx.entity.response";
+ public static final String PO = "com.nanjing.water.repository.po";
+ public static final String VO = "com.nanjing.water.repository.vo";
+ public static final String CONVERT_MAPPER = "com.nanjing.water.service.convert";
+ public static final String MAPPER_IMPL = "com.nanjing.water.repository.impl";
+ public static final String MAPPER = "com.nanjing.water.repository.mapper";
+ public static final String SERVICE = "com.nanjing.water.service";
+ public static final String Controller = "com.nanjing.water.host.controller";
+ public static final String SEARCH = "com.nanjing.water.entity.search";
+ public static final String Request = "com.nanjing.water.entity.request";
+ public static final String Response = "com.nanjing.water.entity.response";
}
//endregion
@@ -119,8 +120,8 @@
//region vo类 import 内容设置
private static final String[] SET_VO_IMPORT = new String[]{
- "import com.lunhan.xxx.common.util.LocalDateTimeUtil;",
- "import com.lunhan.xxx.common.util.NumericUtil;",
+ "import com.nanjing.water.common.util.LocalDateTimeUtil;",
+ "import com.nanjing.water.common.util.NumericUtil;",
"import java.util.Objects;"
};
//endregion
@@ -138,12 +139,12 @@
private static final String[] SET_MAPPER_IMPL_IMPORT = new String[]{
"import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;",
"import com.baomidou.mybatisplus.extension.plugins.pagination.Page;",
- "import com.lunhan.xxx.common.PagerResult;",
- "import com.lunhan.xxx.common.enums.EYesOrNo;",
- "import com.lunhan.xxx.common.util.*;",
- "import com.lunhan.xxx.entity.dto.*;",
- "import com.lunhan.xxx.entity.enums.*;",
- "import com.lunhan.xxx.repository.BasicMapperImpl;",
+ "import com.nanjing.water.common.PagerResult;",
+ "import com.nanjing.water.common.enums.EYesOrNo;",
+ "import com.nanjing.water.common.util.*;",
+ "import com.nanjing.water.entity.dto.*;",
+ "import com.nanjing.water.entity.enums.*;",
+ "import com.nanjing.water.repository.BasicMapperImpl;",
"import org.springframework.stereotype.Repository;",
"",
"import java.util.List;"
@@ -152,10 +153,10 @@
//region service类 import 内容设置
private static final String[] SET_Service_IMPORT = new String[]{
- "import com.lunhan.xxx.common.*;",
- "import com.lunhan.xxx.common.enums.*;",
- "import com.lunhan.xxx.common.model.Tuple;",
- "import com.lunhan.xxx.common.util.*;",
+ "import com.nanjing.water.common.*;",
+ "import com.nanjing.water.common.enums.*;",
+ "import com.nanjing.water.common.model.Tuple;",
+ "import com.nanjing.water.common.util.*;",
"import org.apache.commons.lang3.BooleanUtils;",
"import org.springframework.beans.factory.annotation.Autowired;",
"import org.springframework.stereotype.Service;",
@@ -166,13 +167,13 @@
//region Controller类 import 内容设置
private static final String[] SET_Controller_IMPORT = new String[]{
- "import com.lunhan.xxx.common.ExecutedResult;",
- "import com.lunhan.xxx.common.PagerResult;",
- "import com.lunhan.xxx.common.util.ParameterUtil;",
- "import com.lunhan.xxx.common.validator.ParameterValidateResult;",
- "import com.lunhan.xxx.common.validator.ParameterValidator;",
- "import com.lunhan.xxx.entity.request.ReqListId;",
- "import com.lunhan.xxx.host.BasicController;",
+ "import com.nanjing.water.common.ExecutedResult;",
+ "import com.nanjing.water.common.PagerResult;",
+ "import com.nanjing.water.common.util.ParameterUtil;",
+ "import com.nanjing.water.common.validator.ParameterValidateResult;",
+ "import com.nanjing.water.common.validator.ParameterValidator;",
+ "import com.nanjing.water.entity.request.ReqListId;",
+ "import com.nanjing.water.host.BasicController;",
"import org.springframework.beans.factory.annotation.Autowired;",
"import org.springframework.web.bind.annotation.*;",
"import java.util.List;"
diff --git a/src/test/java/com/lunhan/xxx/GenCodeMysql.java b/src/test/java/com/nanjing/water/GenCodeMysql.java
similarity index 99%
rename from src/test/java/com/lunhan/xxx/GenCodeMysql.java
rename to src/test/java/com/nanjing/water/GenCodeMysql.java
index 3dde862..d57a60e 100644
--- a/src/test/java/com/lunhan/xxx/GenCodeMysql.java
+++ b/src/test/java/com/nanjing/water/GenCodeMysql.java
@@ -1,7 +1,8 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.ConstantFactory;
-import com.lunhan.xxx.common.util.*;
+import com.nanjing.water.common.ConstantFactory;
+import com.nanjing.water.common.util.*;
+import com.nanjing.water.common.util.*;
import org.apache.commons.lang3.BooleanUtils;
import java.io.File;
diff --git a/src/test/java/com/lunhan/xxx/JenkinsTest.java b/src/test/java/com/nanjing/water/JenkinsTest.java
similarity index 97%
rename from src/test/java/com/lunhan/xxx/JenkinsTest.java
rename to src/test/java/com/nanjing/water/JenkinsTest.java
index 0461f64..4a817be 100644
--- a/src/test/java/com/lunhan/xxx/JenkinsTest.java
+++ b/src/test/java/com/nanjing/water/JenkinsTest.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
import com.cdancy.jenkins.rest.JenkinsClient;
import com.cdancy.jenkins.rest.domain.job.Job;
diff --git a/src/test/java/com/lunhan/xxx/MySqlExportTest.java b/src/test/java/com/nanjing/water/MySqlExportTest.java
similarity index 92%
rename from src/test/java/com/lunhan/xxx/MySqlExportTest.java
rename to src/test/java/com/nanjing/water/MySqlExportTest.java
index 315487f..cac7dd8 100644
--- a/src/test/java/com/lunhan/xxx/MySqlExportTest.java
+++ b/src/test/java/com/nanjing/water/MySqlExportTest.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.util.StringUtil;
+import com.nanjing.water.common.util.StringUtil;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git a/src/test/java/com/lunhan/xxx/Mysql2Gauss.java b/src/test/java/com/nanjing/water/Mysql2Gauss.java
similarity index 98%
rename from src/test/java/com/lunhan/xxx/Mysql2Gauss.java
rename to src/test/java/com/nanjing/water/Mysql2Gauss.java
index d480669..d80b281 100644
--- a/src/test/java/com/lunhan/xxx/Mysql2Gauss.java
+++ b/src/test/java/com/nanjing/water/Mysql2Gauss.java
@@ -1,6 +1,6 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
-import com.lunhan.xxx.common.util.ListUtil;
+import com.nanjing.water.common.util.ListUtil;
import java.sql.Connection;
import java.sql.DriverManager;
diff --git a/src/test/java/com/lunhan/xxx/SpringConfig.java b/src/test/java/com/nanjing/water/SpringConfig.java
similarity index 84%
rename from src/test/java/com/lunhan/xxx/SpringConfig.java
rename to src/test/java/com/nanjing/water/SpringConfig.java
index 4a4d865..6b45044 100644
--- a/src/test/java/com/lunhan/xxx/SpringConfig.java
+++ b/src/test/java/com/nanjing/water/SpringConfig.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
import org.springframework.context.annotation.ComponentScan;
diff --git a/src/test/java/com/lunhan/xxx/StringUtilTest.java b/src/test/java/com/nanjing/water/StringUtilTest.java
similarity index 85%
rename from src/test/java/com/lunhan/xxx/StringUtilTest.java
rename to src/test/java/com/nanjing/water/StringUtilTest.java
index b04dc64..227f86f 100644
--- a/src/test/java/com/lunhan/xxx/StringUtilTest.java
+++ b/src/test/java/com/nanjing/water/StringUtilTest.java
@@ -1,7 +1,7 @@
-package com.lunhan.xxx;
+package com.nanjing.water;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.lunhan.xxx.repository.po.TestInfoPO;
+import com.nanjing.water.repository.po.TestInfoPO;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
diff --git a/src/test/java/com/lunhan/xxx/po/UserPO.java b/src/test/java/com/nanjing/water/po/UserPO.java
similarity index 94%
rename from src/test/java/com/lunhan/xxx/po/UserPO.java
rename to src/test/java/com/nanjing/water/po/UserPO.java
index ee7b513..b705d6b 100644
--- a/src/test/java/com/lunhan/xxx/po/UserPO.java
+++ b/src/test/java/com/nanjing/water/po/UserPO.java
@@ -1,4 +1,4 @@
-package com.lunhan.xxx.po;
+package com.nanjing.water.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
diff --git a/src/test/java/com/nanjing/water/repository/mapper/UserMapper.java b/src/test/java/com/nanjing/water/repository/mapper/UserMapper.java
new file mode 100644
index 0000000..63b1861
--- /dev/null
+++ b/src/test/java/com/nanjing/water/repository/mapper/UserMapper.java
@@ -0,0 +1,9 @@
+package com.nanjing.water.repository.mapper;
+
+import com.nanjing.water.po.UserPO;
+import com.nanjing.water.repository.BasicMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface UserMapper extends BasicMapper<UserPO> {
+}
diff --git a/src/test/java/com/nanjing/water/repository/test123.java b/src/test/java/com/nanjing/water/repository/test123.java
new file mode 100644
index 0000000..b07507c
--- /dev/null
+++ b/src/test/java/com/nanjing/water/repository/test123.java
@@ -0,0 +1,4 @@
+package com.nanjing.water.repository;
+
+public class test123 {
+}
diff --git a/src/test/resources/application-dev.yml b/src/test/resources/application-dev.yml
index 6105c1c..1b7fa6c 100644
--- a/src/test/resources/application-dev.yml
+++ b/src/test/resources/application-dev.yml
@@ -46,7 +46,7 @@
path: ./logs
level:
root: info
- com.lunhan.xxx: info
+ com.nanjing.water: info
# mybatis-plus 配置：
mybatis-plus:
--
Gitblit v1.9.3