refactor: drop klp_pocketfactory/cgldb/double_rack and related code
- Remove klp-pocket module entirely (acid/galvanize1/common) - Remove klp-da OEE files (depended on pocket) - Remove klp-wms Dr* files (double-rack) - Strip double-rack code from WmsCoilPendingActionServiceImpl - Remove acid/galvanize1/double-rack datasources from prod/dev yml - Remove sql-server-api, da.oee, oee.acid config
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.klp.common.excel.CellMergeStrategy;
|
||||
import com.fad.common.excel.CellMergeStrategy;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.klp.common.jackson.DictDataJsonSerializer;
|
||||
import com.fad.common.jackson.DictDataJsonSerializer;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.klp.common.utils.poi.ExcelHandlerAdapter;
|
||||
import com.fad.common.utils.poi.ExcelHandlerAdapter;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.klp.common.enums.BusinessType;
|
||||
import com.klp.common.enums.OperatorType;
|
||||
import com.fad.common.enums.BusinessType;
|
||||
import com.fad.common.enums.OperatorType;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.klp.common.enums.LimitType;
|
||||
import com.fad.common.enums.LimitType;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.klp.common.enums.SensitiveStrategy;
|
||||
import com.klp.common.jackson.SensitiveJsonSerializer;
|
||||
import com.fad.common.enums.SensitiveStrategy;
|
||||
import com.fad.common.jackson.SensitiveJsonSerializer;
|
||||
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JacksonAnnotationsInside;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import com.klp.common.translation.handler.TranslationHandler;
|
||||
import com.fad.common.translation.handler.TranslationHandler;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
@@ -20,7 +20,7 @@ import java.lang.annotation.*;
|
||||
public @interface Translation {
|
||||
|
||||
/**
|
||||
* 类型 (需与实现类上的 {@link com.klp.common.annotation.TranslationType} 注解type对应)
|
||||
* 类型 (需与实现类上的 {@link com.fad.common.annotation.TranslationType} 注解type对应)
|
||||
* <p>
|
||||
* 默认取当前字段的值 如果设置了 @{@link Translation#mapper()} 则取映射字段的值
|
||||
*/
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.klp.common.annotation;
|
||||
package com.fad.common.annotation;
|
||||
|
||||
import java.lang.annotation.*;
|
||||
|
||||
/**
|
||||
* 翻译类型注解 (标注到{@link com.klp.common.translation.TranslationInterface} 的实现类)
|
||||
* 翻译类型注解 (标注到{@link com.fad.common.translation.TranslationInterface} 的实现类)
|
||||
*
|
||||
* @author Lion Li
|
||||
*/
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.klp.common.captcha;
|
||||
package com.fad.common.captcha;
|
||||
|
||||
import cn.hutool.captcha.generator.CodeGenerator;
|
||||
import cn.hutool.core.math.Calculator;
|
||||
import cn.hutool.core.util.CharUtil;
|
||||
import cn.hutool.core.util.RandomUtil;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
/**
|
||||
* 无符号计算生成器
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.config;
|
||||
package com.fad.common.config;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 缓存的key 常量
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 缓存组名称常量
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 通用常量信息
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 代码生成通用常量
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 返回状态码
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 翻译常量
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.constant;
|
||||
package com.fad.common.constant;
|
||||
|
||||
/**
|
||||
* 用户常量信息
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.convert;
|
||||
package com.fad.common.convert;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.convert;
|
||||
package com.fad.common.convert;
|
||||
|
||||
import cn.hutool.core.annotation.AnnotationUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
@@ -9,11 +9,11 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
|
||||
import com.alibaba.excel.metadata.data.ReadCellData;
|
||||
import com.alibaba.excel.metadata.data.WriteCellData;
|
||||
import com.alibaba.excel.metadata.property.ExcelContentProperty;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.core.service.DictService;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.klp.common.utils.poi.ExcelUtil;
|
||||
import com.klp.common.utils.spring.SpringUtils;
|
||||
import com.fad.common.annotation.ExcelDictFormat;
|
||||
import com.fad.common.core.service.DictService;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
import com.fad.common.utils.poi.ExcelUtil;
|
||||
import com.fad.common.utils.spring.SpringUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.convert;
|
||||
package com.fad.common.convert;
|
||||
|
||||
import cn.hutool.core.annotation.AnnotationUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
@@ -9,8 +9,8 @@ import com.alibaba.excel.metadata.GlobalConfiguration;
|
||||
import com.alibaba.excel.metadata.data.ReadCellData;
|
||||
import com.alibaba.excel.metadata.data.WriteCellData;
|
||||
import com.alibaba.excel.metadata.property.ExcelContentProperty;
|
||||
import com.klp.common.annotation.ExcelEnumFormat;
|
||||
import com.klp.common.utils.reflect.ReflectUtils;
|
||||
import com.fad.common.annotation.ExcelEnumFormat;
|
||||
import com.fad.common.utils.reflect.ReflectUtils;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.klp.common.core.controller;
|
||||
package com.fad.common.core.controller;
|
||||
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import com.klp.common.constant.HttpStatus;
|
||||
import com.klp.common.core.domain.R;
|
||||
import com.klp.common.core.domain.model.LoginUser;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.helper.LoginHelper;
|
||||
import com.klp.common.utils.PageUtils;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.constant.HttpStatus;
|
||||
import com.fad.common.core.domain.R;
|
||||
import com.fad.common.core.domain.model.LoginUser;
|
||||
import com.fad.common.core.page.TableDataInfo;
|
||||
import com.fad.common.helper.LoginHelper;
|
||||
import com.fad.common.utils.PageUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.klp.common.core.domain;
|
||||
package com.fad.common.core.domain;
|
||||
|
||||
import com.klp.common.constant.HttpStatus;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.constant.HttpStatus;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
import java.util.HashMap;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain;
|
||||
package com.fad.common.core.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.klp.common.core.domain;
|
||||
package com.fad.common.core.domain;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.metadata.OrderItem;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.klp.common.exception.ServiceException;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.klp.common.utils.sql.SqlUtil;
|
||||
import com.fad.common.exception.ServiceException;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
import com.fad.common.utils.sql.SqlUtil;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.domain;
|
||||
package com.fad.common.core.domain;
|
||||
|
||||
import com.klp.common.constant.HttpStatus;
|
||||
import com.fad.common.constant.HttpStatus;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain;
|
||||
package com.fad.common.core.domain;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.dto;
|
||||
package com.fad.common.core.domain.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.dto;
|
||||
package com.fad.common.core.domain.dto;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.klp.common.core.domain.entity;
|
||||
package com.fad.common.core.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.core.domain.TreeEntity;
|
||||
import com.fad.common.core.domain.TreeEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.klp.common.core.domain.entity;
|
||||
package com.fad.common.core.domain.entity;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.constant.UserConstants;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.fad.common.annotation.ExcelDictFormat;
|
||||
import com.fad.common.constant.UserConstants;
|
||||
import com.fad.common.convert.ExcelDictConvert;
|
||||
import com.fad.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.klp.common.core.domain.entity;
|
||||
package com.fad.common.core.domain.entity;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.fad.common.annotation.ExcelDictFormat;
|
||||
import com.fad.common.convert.ExcelDictConvert;
|
||||
import com.fad.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.klp.common.core.domain.entity;
|
||||
package com.fad.common.core.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.klp.common.core.domain.TreeEntity;
|
||||
import com.fad.common.core.domain.TreeEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.entity;
|
||||
package com.fad.common.core.domain.entity;
|
||||
|
||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||
import com.alibaba.excel.annotation.ExcelProperty;
|
||||
@@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableLogic;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.klp.common.annotation.ExcelDictFormat;
|
||||
import com.klp.common.constant.UserConstants;
|
||||
import com.klp.common.convert.ExcelDictConvert;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.fad.common.annotation.ExcelDictFormat;
|
||||
import com.fad.common.constant.UserConstants;
|
||||
import com.fad.common.convert.ExcelDictConvert;
|
||||
import com.fad.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.klp.common.core.domain.entity;
|
||||
package com.fad.common.core.domain.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.klp.common.annotation.Sensitive;
|
||||
import com.klp.common.constant.UserConstants;
|
||||
import com.klp.common.core.domain.BaseEntity;
|
||||
import com.klp.common.enums.SensitiveStrategy;
|
||||
import com.klp.common.xss.Xss;
|
||||
import com.fad.common.annotation.Sensitive;
|
||||
import com.fad.common.constant.UserConstants;
|
||||
import com.fad.common.core.domain.BaseEntity;
|
||||
import com.fad.common.enums.SensitiveStrategy;
|
||||
import com.fad.common.xss.Xss;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.event;
|
||||
package com.fad.common.core.domain.event;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.event;
|
||||
package com.fad.common.core.domain.event;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.model;
|
||||
package com.fad.common.core.domain.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.domain.model;
|
||||
package com.fad.common.core.domain.model;
|
||||
|
||||
import com.klp.common.constant.UserConstants;
|
||||
import com.fad.common.constant.UserConstants;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.domain.model;
|
||||
package com.fad.common.core.domain.model;
|
||||
|
||||
import com.klp.common.core.domain.dto.RoleDTO;
|
||||
import com.fad.common.core.domain.dto.RoleDTO;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.model;
|
||||
package com.fad.common.core.domain.model;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.model;
|
||||
package com.fad.common.core.domain.model;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.domain.model;
|
||||
package com.fad.common.core.domain.model;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.mapper;
|
||||
package com.fad.common.core.mapper;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.core.toolkit.*;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.extension.toolkit.Db;
|
||||
import com.klp.common.utils.BeanCopyUtils;
|
||||
import com.fad.common.utils.BeanCopyUtils;
|
||||
import org.apache.ibatis.logging.Log;
|
||||
import org.apache.ibatis.logging.LogFactory;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.page;
|
||||
package com.fad.common.core.page;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
/**
|
||||
* 分页数据
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.page;
|
||||
package com.fad.common.core.page;
|
||||
|
||||
import cn.hutool.http.HttpStatus;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.page;
|
||||
package com.fad.common.core.page;
|
||||
|
||||
import com.klp.common.utils.ServletUtils;
|
||||
import com.fad.common.utils.ServletUtils;
|
||||
|
||||
/**
|
||||
* 表格数据处理
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.service;
|
||||
package com.fad.common.core.service;
|
||||
|
||||
/**
|
||||
* 通用 参数配置服务
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.service;
|
||||
package com.fad.common.core.service;
|
||||
|
||||
/**
|
||||
* 通用 部门服务
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.service;
|
||||
package com.fad.common.core.service;
|
||||
|
||||
/**
|
||||
* 通用 字典服务
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.service;
|
||||
package com.fad.common.core.service;
|
||||
|
||||
/**
|
||||
* 通用 OSS服务
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.service;
|
||||
package com.fad.common.core.service;
|
||||
|
||||
/**
|
||||
* 脱敏服务
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.service;
|
||||
package com.fad.common.core.service;
|
||||
|
||||
/**
|
||||
* 通用 用户服务
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.text;
|
||||
package com.fad.common.core.text;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.core.text;
|
||||
package com.fad.common.core.text;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.validate;
|
||||
package com.fad.common.core.validate;
|
||||
|
||||
/**
|
||||
* 校验分组 add
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.validate;
|
||||
package com.fad.common.core.validate;
|
||||
|
||||
/**
|
||||
* 校验分组 edit
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.core.validate;
|
||||
package com.fad.common.core.validate;
|
||||
|
||||
/**
|
||||
* 校验分组 query
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.klp.common.encrypt;
|
||||
package com.fad.common.encrypt;
|
||||
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.klp.common.encrypt;
|
||||
package com.fad.common.encrypt;
|
||||
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
|
||||
/**
|
||||
* 加解者
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.klp.common.encrypt.encryptor;
|
||||
package com.fad.common.encrypt.encryptor;
|
||||
|
||||
import com.klp.common.encrypt.EncryptContext;
|
||||
import com.klp.common.encrypt.IEncryptor;
|
||||
import com.fad.common.encrypt.EncryptContext;
|
||||
import com.fad.common.encrypt.IEncryptor;
|
||||
|
||||
/**
|
||||
* 所有加密执行者的基类
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
package com.klp.common.encrypt.encryptor;
|
||||
package com.fad.common.encrypt.encryptor;
|
||||
|
||||
import cn.hutool.core.util.ArrayUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.crypto.SecureUtil;
|
||||
import cn.hutool.crypto.symmetric.AES;
|
||||
import com.klp.common.encrypt.EncryptContext;
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.fad.common.encrypt.EncryptContext;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package com.klp.common.encrypt.encryptor;
|
||||
package com.fad.common.encrypt.encryptor;
|
||||
|
||||
import cn.hutool.core.codec.Base64;
|
||||
import com.klp.common.encrypt.EncryptContext;
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.fad.common.encrypt.EncryptContext;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
|
||||
/**
|
||||
* Base64算法实现
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.klp.common.encrypt.encryptor;
|
||||
package com.fad.common.encrypt.encryptor;
|
||||
|
||||
import cn.hutool.core.codec.Base64;
|
||||
import cn.hutool.crypto.SecureUtil;
|
||||
import cn.hutool.crypto.asymmetric.KeyType;
|
||||
import cn.hutool.crypto.asymmetric.RSA;
|
||||
import com.klp.common.encrypt.EncryptContext;
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.encrypt.EncryptContext;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
package com.klp.common.encrypt.encryptor;
|
||||
package com.fad.common.encrypt.encryptor;
|
||||
|
||||
|
||||
import cn.hutool.core.codec.Base64;
|
||||
import cn.hutool.crypto.SmUtil;
|
||||
import cn.hutool.crypto.asymmetric.KeyType;
|
||||
import cn.hutool.crypto.asymmetric.SM2;
|
||||
import com.klp.common.encrypt.EncryptContext;
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.encrypt.EncryptContext;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
|
||||
/**
|
||||
* sm2算法实现
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package com.klp.common.encrypt.encryptor;
|
||||
package com.fad.common.encrypt.encryptor;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.crypto.SmUtil;
|
||||
import cn.hutool.crypto.symmetric.SM4;
|
||||
import com.klp.common.encrypt.EncryptContext;
|
||||
import com.klp.common.enums.AlgorithmType;
|
||||
import com.klp.common.enums.EncodeType;
|
||||
import com.fad.common.encrypt.EncryptContext;
|
||||
import com.fad.common.enums.AlgorithmType;
|
||||
import com.fad.common.enums.EncodeType;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import com.klp.common.encrypt.encryptor.*;
|
||||
import com.fad.common.encrypt.encryptor.*;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
/**
|
||||
* 操作状态
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
/**
|
||||
* 业务操作类型
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import cn.hutool.captcha.AbstractCaptcha;
|
||||
import cn.hutool.captcha.CircleCaptcha;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import cn.hutool.captcha.generator.CodeGenerator;
|
||||
import cn.hutool.captcha.generator.RandomGenerator;
|
||||
import com.klp.common.captcha.UnsignedMathGenerator;
|
||||
import com.fad.common.captcha.UnsignedMathGenerator;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -10,7 +10,7 @@ import lombok.Getter;
|
||||
* 语法支持 spel 模板表达式
|
||||
* <p>
|
||||
* 内置数据 user 当前用户 内容参考 LoginUser
|
||||
* 如需扩展数据 可使用 {@link com.klp.common.helper.DataPermissionHelper} 操作
|
||||
* 如需扩展数据 可使用 {@link com.fad.common.helper.DataPermissionHelper} 操作
|
||||
* 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService
|
||||
* 如需扩展更多自定义服务 可以参考 sdss 自行编写
|
||||
*
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
/**
|
||||
* 编码类型
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import org.springframework.lang.Nullable;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
/**
|
||||
* 限流类型
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
/**
|
||||
* 操作人类别
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
public enum PartTypeEnum {
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import cn.hutool.core.util.DesensitizedUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
/**
|
||||
* 用户状态
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.klp.common.enums;
|
||||
package com.fad.common.enums;
|
||||
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.fad.common.utils.StringUtils;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Getter;
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.klp.common.excel;
|
||||
package com.fad.common.excel;
|
||||
|
||||
import com.alibaba.excel.metadata.Head;
|
||||
import com.alibaba.excel.write.merge.AbstractMergeStrategy;
|
||||
import com.klp.common.annotation.CellMerge;
|
||||
import com.fad.common.annotation.CellMerge;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Data;
|
||||
import lombok.SneakyThrows;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.klp.common.excel;
|
||||
package com.fad.common.excel;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.alibaba.excel.context.AnalysisContext;
|
||||
import com.alibaba.excel.event.AnalysisEventListener;
|
||||
import com.alibaba.excel.exception.ExcelAnalysisException;
|
||||
import com.alibaba.excel.exception.ExcelDataConvertException;
|
||||
import com.klp.common.utils.JsonUtils;
|
||||
import com.klp.common.utils.StreamUtils;
|
||||
import com.klp.common.utils.ValidatorUtils;
|
||||
import com.fad.common.utils.JsonUtils;
|
||||
import com.fad.common.utils.StreamUtils;
|
||||
import com.fad.common.utils.ValidatorUtils;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.excel;
|
||||
package com.fad.common.excel;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.excel;
|
||||
package com.fad.common.excel;
|
||||
|
||||
import com.alibaba.excel.read.listener.ReadListener;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.klp.common.excel;
|
||||
package com.fad.common.excel;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user