commit：集成knife4j

2026-01-17 18:46:36 +08:00 · 2020-10-29 18:53:09 +08:00
parent 6e57f10dfc
commit 96fddccc47
208 changed files with 1072 additions and 361 deletions
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyControllerAdvice.java
@@ -12,7 +12,7 @@ import java.util.Date;
 * Controller的环绕拦截类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@ControllerAdvice
 public class MyControllerAdvice {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/advice/MyExceptionHandler.java
@@ -24,7 +24,7 @@ import java.util.concurrent.TimeoutException;
 * 用不同的函数，处理不同类型的异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
@RestControllerAdvice("com.orange.demo")
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/DeletedFlagColumn.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 主要用于标记逻辑删除字段。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/JobUpdateTimeColumn.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 主要用于标记更新字段。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyDataSource.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 主要用于标记Service所依赖的数据源类型。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/MyRequestBody.java
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 * 标记Controller中的方法参数，参数解析器会根据该注解将请求中的JSON数据，映射到参数中的绑定字段。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target(ElementType.PARAMETER)
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/NoAuthInterface.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 主要用于标记无需Token验证的接口
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationConstDict.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 标识Model和常量字典之间的关联关系。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationDict.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 标识Model之间的字典关联关系。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToMany.java
@@ -4,9 +4,11 @@ import java.lang.annotation.*;

 /**
 * 标注多对多的Model关系。
+ * 重要提示：由于多对多关联表数据，很多时候都不需要跟随主表数据返回，所以该注解不会在
+ * 生成的时候自动添加到实体类字段上，需要的时候，用户可自行手动添加。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationManyToManyAggregation.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 主要用于多对多的Model关系。标注通过从表关联字段或者关联表关联字段计算主表聚合计算字段的规则。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToManyAggregation.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 主要用于一对多的Model关系。标注通过从表关联字段计算主表聚合计算字段的规则。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/RelationOneToOne.java
@@ -6,7 +6,7 @@ import java.lang.annotation.*;
 * 标识Model之间的一对一关联关系。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UploadFlagColumn.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/annotation/UploadFlagColumn.java
@@ -8,7 +8,7 @@ import java.lang.annotation.*;
 * 用于标记支持数据上传和下载的字段。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/AccessLogAspect.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/aop/AccessLogAspect.java
@@ -24,7 +24,7 @@ import java.util.List;
 * 记录接口的链路traceId、请求参数、应答数据、错误信息和调用时长。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Aspect
@Component
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/dao/BaseDaoMapper.java
@@ -14,7 +14,7 @@ import java.util.Map;
 *
 * @param <M> 主Model实体对象。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@RegisterMapper
 public interface BaseDaoMapper<M> extends Mapper<M>, InsertListMapper<M> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/BaseModelMapper.java
@@ -12,7 +12,7 @@ import java.util.stream.Collectors;
 * @param <D> Domain域对象类型。
 * @param <M> Model实体对象类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public interface BaseModelMapper<D, M> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/mapper/DummyModelMapper.java
@@ -8,7 +8,7 @@ import java.util.List;
 *
 * @param <M> 数据类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class DummyModelMapper<M> implements BaseModelMapper<M, M> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseDictService.java
@@ -16,7 +16,7 @@ import java.util.List;
 * @param <M> Model实体对象的类型。
 * @param <K> Model对象主键的类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public abstract class BaseDictService<M, K> extends BaseService<M, K> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/base/service/BaseService.java
@@ -34,7 +34,7 @@ import static java.util.stream.Collectors.*;
 * @param <M> Model对象的类型。
 * @param <K> Model对象主键的类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public abstract class BaseService<M, K> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/CacheConfig.java
@@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit;
 * 使用Caffeine作为本地缓存库
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Configuration
@EnableCaching
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/DictionaryCache.java
@@ -9,7 +9,7 @@ import java.util.Set;
 * @param <K> 字典表主键类型。
 * @param <V> 字典表对象类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public interface DictionaryCache<K, V> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapDictionaryCache.java
@@ -9,7 +9,7 @@ import java.util.function.Function;
 * @param <K> 字典表主键类型。
 * @param <V> 字典表对象类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MapDictionaryCache<K, V> implements DictionaryCache<K, V> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/MapTreeDictionaryCache.java
@@ -12,7 +12,7 @@ import java.util.function.Function;
 * @param <K> 字典表主键类型。
 * @param <V> 字典表对象类型。
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MapTreeDictionaryCache<K, V> extends MapDictionaryCache<K, V> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/SessionCacheHelper.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/cache/SessionCacheHelper.java
@@ -13,7 +13,7 @@ import java.util.Set;
 * Session数据缓存辅助类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@SuppressWarnings("unchecked")
@Component
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/CommonWebMvcConfig.java
@@ -21,7 +21,7 @@ import java.util.List;
 * 所有的项目拦截器、参数解析器、消息对象转换器都在这里集中配置。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Configuration
 public class CommonWebMvcConfig implements WebMvcConfigurer {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/EncryptConfig.java
@@ -8,7 +8,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 * 目前用于用户密码加密，UAA接入应用客户端的client_secret加密。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Configuration
 public class EncryptConfig {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/RestTemplateConfig.java
@@ -24,7 +24,7 @@ import java.util.List;
 * RestTemplate连接池配置对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Configuration
 public class RestTemplateConfig {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/config/TomcatConfig.java
@@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
 * tomcat配置对象。当前配置禁用了PUT和DELETE方法，防止渗透攻击。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Configuration
 public class TomcatConfig {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/AggregationType.java
@@ -7,7 +7,7 @@ import java.util.Map;
 * 聚合计算的常量类型对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public final class AggregationType {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ApplicationConstant.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.constant;
 * 应用程序的常量声明对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public final class ApplicationConstant {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/ErrorCodeEnum.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.constant;
 * 返回应答中的错误代码和错误信息。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public enum ErrorCodeEnum {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/constant/GlobalDeletedFlag.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.constant;
 * 数据记录逻辑删除标记常量。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public final class GlobalDeletedFlag {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/DataValidationException.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.exception;
 * 数据验证失败的自定义异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class DataValidationException extends RuntimeException {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidClassFieldException.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 * 无效的类对象字段的自定义异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
@EqualsAndHashCode(callSuper = true)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataFieldException.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 * 无效的实体对象字段的自定义异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
@EqualsAndHashCode(callSuper = true)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/InvalidDataModelException.java
@@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode;
 * 无效的实体对象的自定义异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
@EqualsAndHashCode(callSuper = true)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/MyRuntimeException.java
@@ -5,7 +5,7 @@ package com.orange.demo.common.core.exception;
 * NOTE：主要是为了避免SonarQube进行代码质量扫描时，给出警告。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MyRuntimeException extends RuntimeException {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataAffectException.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.exception;
 * 没有数据被修改的自定义异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class NoDataAffectException extends RuntimeException {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/NoDataPermException.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.exception;
 * 没有数据访问权限的自定义异常。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class NoDataPermException extends RuntimeException {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/exception/RedisCacheAccessException.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.exception;
 * Redis缓存访问失败。比如：获取分布式数据锁超时、等待线程中断等。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class RedisCacheAccessException  extends RuntimeException {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/interceptor/MyRequestArgumentResolver.java
@@ -29,7 +29,7 @@ import java.util.*;
 * 2、多个对象需要封装到一个对象里才可以用@RequestBody接收。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MyRequestArgumentResolver implements HandlerMethodArgumentResolver {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadCachedDataListener.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadCachedDataListener.java
@@ -11,7 +11,7 @@ import java.util.Map;
 * 应用程序启动后的事件监听对象。主要负责加载Model之间的字典关联和一对一关联所对应的Service结构关系。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Component
 public class LoadCachedDataListener implements ApplicationListener<ApplicationReadyEvent> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/listener/LoadServiceRelationListener.java
@@ -11,7 +11,7 @@ import java.util.Map;
 * 应用程序启动后的事件监听对象。主要负责加载Model之间的字典关联和一对一关联所对应的Service结构关系。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Component
 public class LoadServiceRelationListener implements ApplicationListener<ApplicationReadyEvent> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/CallResult.java
@@ -8,7 +8,7 @@ import lombok.Data;
 * 同时为了提升效率，减少查询次数，可以根据具体的需求，将部分验证关联对象存入data字段，以供Controller使用。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
 public class CallResult {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupCriteria.java
@@ -7,7 +7,7 @@ import lombok.Data;
 * Mybatis Mapper.xml中所需的分组条件对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
@AllArgsConstructor
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyGroupParam.java
@@ -20,7 +20,7 @@ import java.util.List;
 * 查询分组参数请求对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@EqualsAndHashCode(callSuper = true)
@Slf4j
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyOrderParam.java
@@ -18,7 +18,7 @@ import java.util.*;
 * Controller参数中的排序请求对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@EqualsAndHashCode(callSuper = true)
@Slf4j
@@ -44,6 +44,9 @@ public class MyOrderParam extends ArrayList<MyOrderParam.OrderInfo> {
        int i = 0;
        StringBuilder orderBy = new StringBuilder(128);
        for (OrderInfo orderInfo : orderParam) {
+            if (StringUtils.isBlank(orderInfo.getFieldName())) {
+                continue;
+            }
            OrderBaseData orderBaseData = parseOrderBaseData(orderInfo, modelClazz);
            if (StringUtils.isBlank(orderBaseData.tableName)) {
                throw new InvalidDataModelException(orderBaseData.modelName);
@@ -83,9 +86,6 @@ public class MyOrderParam extends ArrayList<MyOrderParam.OrderInfo> {

    private static OrderBaseData parseOrderBaseData(OrderInfo orderInfo, Class<?> modelClazz) {
        OrderBaseData orderBaseData = new OrderBaseData();
-        if (StringUtils.isBlank(orderInfo.getFieldName())) {
-            return orderBaseData;
-        }
        orderBaseData.fieldName = StringUtils.substringBefore(orderInfo.fieldName, DICT_MAP);
        String[] stringArray = StringUtils.split(orderBaseData.fieldName, '.');
        if (stringArray.length == 1) {
@@ -230,7 +230,7 @@ public class MyOrderParam extends ArrayList<MyOrderParam.OrderInfo> {
    @Data
    public static class OrderInfo {
        /**
-         * Java对象的字段名。目前主要包含三种格式：
+         * Java对象的字段名。如果fieldName为空，则忽略跳过。目前主要包含三种格式：
         * 1. 简单的属性名称，如userId，将会直接映射到与其关联的数据库字段。表名为当前ModelClazz所对应的表名。
         *    映射结果或为 my_main_table.user_id
         * 2. 字典属性名称，如userIdDictMap.id，由于仅仅支持字典中Id数据的排序，所以直接截取DictMap之前的字符串userId作为排序属性。
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageData.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageData.java
@@ -0,0 +1,23 @@
+package com.orange.demo.common.core.object;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 分页数据的应答返回对象。
+ *
+ * @author Jerry
+ * @date 2020-09-24
+ */
+@Data
+public class MyPageData<T> {
+    /**
+     * 数据列表。
+     */
+    private List<T> dataList;
+    /**
+     * 数据总数量。
+     */
+    private Long totalCount;
+}
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyPageParam.java
@@ -6,7 +6,7 @@ import lombok.Getter;
 * Controller参数中的分页请求对象
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Getter
 public class MyPageParam {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyRelationParam.java
@@ -8,7 +8,7 @@ import lombok.Data;
 * BaseService中的实体对象数据组装函数，会根据该参数对象进行数据组装。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
@Builder
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/MyWhereCriteria.java
@@ -16,7 +16,7 @@ import java.util.List;
 * Where中的条件语句。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
@Data
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/ResponseResult.java
@@ -13,7 +13,7 @@ import java.io.PrintWriter;
 * 接口返回对象
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
 public class ResponseResult<T> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/TokenData.java
@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 * 基于Jwt，用于前后端传递的令牌对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
@ToString
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/object/Tuple2.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.object;
 * 二元组对象。主要用于可以一次返回多个结果的场景，同时还能避免强制转换。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class Tuple2<T1, T2> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/BaseUpDownloader.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/BaseUpDownloader.java
@@ -19,7 +19,7 @@ import java.util.List;
 * 包含存储本地文件的功能，以及上传和下载所需的通用方法。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public abstract class BaseUpDownloader {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/LocalUpDownloader.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/LocalUpDownloader.java
@@ -22,7 +22,7 @@ import java.util.Objects;
 * 存储本地文件的上传下载实现类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
@Component
@@ -75,7 +75,7 @@ public class LocalUpDownloader extends BaseUpDownloader {
                i = bis.read(buff);
            }
        } catch (IOException e) {
-            log.error("Failed to call UpDownloadUtil.doDownload", e);
+            log.error("Failed to call LocalUpDownloader.doDownload", e);
        }
    }

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UpDownloaderFactory.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UpDownloaderFactory.java
@@ -9,7 +9,7 @@ import java.util.Map;
 * 业务对象根据上传下载存储类型，获取上传下载对象的工厂类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Component
 public class UpDownloaderFactory {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadResponseInfo.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadResponseInfo.java
@@ -6,7 +6,7 @@ import lombok.Data;
 * 数据上传操作的应答信息对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
 public class UploadResponseInfo {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreInfo.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreInfo.java
@@ -6,7 +6,7 @@ import lombok.Data;
 * 上传数据存储信息对象。这里之所以使用对象，主要是便于今后扩展。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
 public class UploadStoreInfo {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreTypeEnum.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/upload/UploadStoreTypeEnum.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.upload;
 * 上传数据存储介质类型枚举。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public enum UploadStoreTypeEnum {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/AopTargetUtil.java
@@ -11,7 +11,7 @@ import java.lang.reflect.Field;
 * 获取JDK动态代理/CGLIB代理对象代理的目标对象的工具类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public class AopTargetUtil {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ApplicationContextHolder.java
@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 * Spring 系统启动应用感知对象，主要用于获取Spring Bean的上下文对象，后续的代码中可以直接查找系统中加载的Bean对象。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Component
 public class ApplicationContextHolder implements ApplicationContextAware {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ContextUtil.java
@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
 * 获取Servlet HttpRequest和HttpResponse的工具类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class ContextUtil {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ExportUtil.java
@@ -23,7 +23,7 @@ import java.util.*;
 * 导出工具类，目前支持xlsx和csv两种类型。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public class ExportUtil {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ImportUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/ImportUtil.java
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
 * 导入工具类，目前支持xlsx和csv两种类型。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public class ImportUtil {
@@ -122,7 +122,7 @@ public class ImportUtil {
         * @param rowIndex 当前行号。
         * @param row      当前行数据列表对象。
         */
-        public void doImport(int rowIndex, List<Object> row) {
+        public void doImport(long rowIndex, List<Object> row) {
            if (row == null) {
                doProcess(batchRowList);
                doFinish();
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/IpUtil.java
@@ -16,7 +16,7 @@ import java.util.List;
 * Ip工具类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public class IpUtil {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/JwtUtil.java
@@ -12,7 +12,7 @@ import java.util.Map;
 * 基于JWT的Token生成工具类
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public class JwtUtil {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/LogMessageUtil.java
@@ -6,7 +6,7 @@ package com.orange.demo.common.core.util;
 * 提高代码的规范度和可维护性。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class LogMessageUtil {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyCommonUtil.java
@@ -16,7 +16,7 @@ import java.util.UUID;
 * 脚手架中常用的基本工具方法集合，一般而言工程内部使用的方法。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MyCommonUtil {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyDateUtil.java
@@ -16,7 +16,7 @@ import static org.joda.time.PeriodType.days;
 * 日期工具类，主要封装了部分joda-time中的方法，让很多代码一行完成，同时统一了日期到字符串的pattern格式。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MyDateUtil {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyModelUtil.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors;
 * 负责Model数据操作、类型转换和关系关联等行为的工具类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Slf4j
 public class MyModelUtil {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/MyPageUtil.java
@@ -3,6 +3,7 @@ package com.orange.demo.common.core.util;
 import cn.jimmyshi.beanquery.BeanQuery;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.Page;
+import com.orange.demo.common.core.object.MyPageData;

 import java.util.List;

@@ -10,7 +11,7 @@ import java.util.List;
 * 生成带有分页信息的数据列表
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class MyPageUtil {

@@ -37,13 +38,13 @@ public class MyPageUtil {
     * 用户构建带有分页信息的数据列表。
     *
     * @param dataList 数据列表，该参数必须是调用PageMethod.startPage之后，立即执行mybatis查询操作的结果集。
-     * @return 返回结果集和TotalCount。
+     * @return 返回分页数据对象。
     */
-    public static <T> JSONObject makeResponseData(List<T> dataList) {
-        JSONObject pageData = new JSONObject();
-        pageData.put(DATA_LIST_LITERAL, dataList);
+    public static <T> MyPageData<T> makeResponseData(List<T> dataList) {
+        MyPageData<T> pageData = new MyPageData<>();
+        pageData.setDataList(dataList);
        if (dataList instanceof Page) {
-            pageData.put(TOTAL_COUNT_LITERAL, ((Page<?>)dataList).getTotal());
+            pageData.setTotalCount(((Page<?>)dataList).getTotal());
        }
        return pageData;
    }
@@ -53,13 +54,13 @@ public class MyPageUtil {
     *
     * @param dataList   数据列表，该参数必须是调用PageMethod.startPage之后，立即执行mybatis查询操作的结果集。
     * @param totalCount 总数量。
-     * @return 返回结果集和TotalCount。
+     * @return 返回分页数据对象。
     */
-    public static <T> JSONObject makeResponseData(List<T> dataList, Long totalCount) {
-        JSONObject pageData = new JSONObject();
-        pageData.put(DATA_LIST_LITERAL, dataList);
+    public static <T> MyPageData<T> makeResponseData(List<T> dataList, Long totalCount) {
+        MyPageData<T> pageData = new MyPageData<>();
+        pageData.setDataList(dataList);
        if (totalCount != null) {
-            pageData.put(TOTAL_COUNT_LITERAL, totalCount);
+            pageData.setTotalCount(totalCount);
        }
        return pageData;
    }
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/RsaUtil.java
@@ -15,7 +15,7 @@ import java.util.Map;
 * Java RSA 加密工具类。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class RsaUtil {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/util/TreeNode.java
@@ -15,7 +15,7 @@ import java.util.function.Function;
 * @param <K> 节点之间关联键的类型。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Data
 public class TreeNode<T, K> {
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/AddGroup.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.validator;
 * 数据增加的验证分组。通常用于数据新增场景。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public interface AddGroup {
 }
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictRef.java
@@ -11,7 +11,7 @@ import java.lang.annotation.Target;
 * 定义在Model对象中，标注字段值引用自指定的常量字典，和ConstDictRefValidator对象配合完成数据验证。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/ConstDictValidator.java
@@ -10,7 +10,7 @@ import java.lang.reflect.Method;
 * 数据字段自定义验证，用于验证Model中字符串字段的最大长度和最小长度。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class ConstDictValidator implements ConstraintValidator<ConstDictRef, Object> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLength.java
@@ -11,7 +11,7 @@ import java.lang.annotation.Target;
 * 定义在Model或Dto对象中，UTF-8编码的字符串字段长度的上限和下限，和TextLengthValidator对象配合完成数据验证。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/TextLengthValidator.java
@@ -9,7 +9,7 @@ import javax.validation.ConstraintValidatorContext;
 * 数据字段自定义验证，用于验证Model中UTF-8编码的字符串字段的最大长度和最小长度。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public class TextLengthValidator implements ConstraintValidator<TextLength, String> {

--- a/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java
+++ b/orange-demo-single-service/common/common-core/src/main/java/com/orange/demo/common/core/validator/UpdateGroup.java
@@ -4,7 +4,7 @@ package com.orange.demo.common.core.validator;
 * 数据修改的验证分组。通常用于数据更新的场景。
 *
 * @author Jerry
- * @date 2020-10-19
+ * @date 2020-09-24
 */
 public interface UpdateGroup {