chore(build): 更新项目依赖版本并优化代码格式

- 升级 Spring Boot 父项目版本至 3.5.9
- 更新 MySQL 连接器版本至 9.4.0
- 更新 MyBatis-Plus 版本至 3.5.14
- 更新 Fastjson2 版本至 2.0.59
- 更新 Hutool 版本至 5.8.41
- 更新 JJWT 版本至 0.12.6
- 更新 Knife4j 版本至 4.5.0
- 更新 Undertow 版本至 2.3.20.Final
- 更新 Oshi 版本至 6.6.5
- 更新 Guava 版本至 33.5.0-jre
- 格式化注解文件中的代码缩进
- 移除多余的空行和注释格式调整
This commit is contained in:
2025-12-30 12:53:51 +08:00
parent 377b0989f8
commit 83f75831f0
207 changed files with 7424 additions and 6977 deletions
@@ -27,15 +27,20 @@ import lombok.Setter;
* @date 2025-07-23
*/
public class KitArgs {
@Getter
@Setter
public static class FindByLongId extends KitObject {
@NotNull(message = "id必填") private Long id;
@NotNull(message = "id必填")
private Long id;
}
@Getter
@Setter
public static class DeleteById extends KitObject {
@NotNull(message = "id必填") private Long id;
@NotNull(message = "id必填")
private Long id;
}
}
@@ -28,6 +28,9 @@ import lombok.Setter;
@Setter
@EqualsAndHashCode(callSuper = false)
public class KitBaseCreateTimeTb extends KitObject {
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) @TableField(fill = FieldFill.INSERT) private Date
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
@TableField(fill = FieldFill.INSERT)
private Date
createTime;
}
@@ -28,9 +28,13 @@ import lombok.Setter;
@Setter
@EqualsAndHashCode(callSuper = false)
public class KitBaseTimeTb extends KitObject {
@TableField(fill = FieldFill.INSERT) @Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) private Date
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date
createTime;
@TableField(fill = FieldFill.INSERT_UPDATE) @Schema(name = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date updateTime;
}
@@ -28,6 +28,8 @@ import lombok.Setter;
@Setter
@EqualsAndHashCode(callSuper = false)
public class KitBaseUpdateTimeTb extends KitObject {
@Schema(name = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true) @TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
@TableField(fill = FieldFill.INSERT_UPDATE)
private Date updateTime;
}
@@ -32,9 +32,14 @@ import org.springframework.data.annotation.CreatedBy;
@EqualsAndHashCode(callSuper = false)
public class KitBaseUserCreateTimeTb extends KitObject {
@CreatedBy @TableField(fill = FieldFill.INSERT) @Schema(name = "创建人", hidden = true) private String createBy;
@CreatedBy
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建人", hidden = true)
private String createBy;
@TableField(fill = FieldFill.INSERT) @Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) private Date
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date
createTime;
@Override
@@ -53,8 +58,12 @@ public class KitBaseUserCreateTimeTb extends KitObject {
}
/* 分组校验 */
public @interface Create {}
public @interface Create {
}
/* 分组校验 */
public @interface Update {}
public @interface Update {
}
}
@@ -35,13 +35,24 @@ import org.springframework.data.annotation.LastModifiedBy;
@Getter
@Setter
public class KitBaseUserTimeLogicTb extends KitObject {
@CreatedBy @TableField(value = "create_by", fill = FieldFill.INSERT) @Schema(name = "创建人", hidden = true)
@CreatedBy
@TableField(value = "create_by", fill = FieldFill.INSERT)
@Schema(name = "创建人", hidden = true)
private String createBy;
@LastModifiedBy @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新人", hidden = true) private String updateBy;
@TableField(value = "create_time", fill = FieldFill.INSERT) @Schema(name = "创建时间", hidden = true) private Date
@LastModifiedBy
@TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新人", hidden = true)
private String updateBy;
@TableField(value = "create_time", fill = FieldFill.INSERT)
@Schema(name = "创建时间", hidden = true)
private Date
createTime;
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE) @Schema(name = "更新时间", hidden = true)
@TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新时间", hidden = true)
private Date updateTime;
@Schema(name = "数据有效性", hidden = true) @TableLogic @TableField("available") private Integer available;
@Schema(name = "数据有效性", hidden = true)
@TableLogic
@TableField("available")
private Integer available;
}
@@ -33,15 +33,24 @@ import org.springframework.data.annotation.LastModifiedBy;
@EqualsAndHashCode(callSuper = false)
public class KitBaseUserTimeTb extends KitObject {
@CreatedBy @TableField(fill = FieldFill.INSERT) @Schema(name = "创建人", hidden = true) private String createBy;
@CreatedBy
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建人", hidden = true)
private String createBy;
@LastModifiedBy @TableField(fill = FieldFill.INSERT_UPDATE) @Schema(name = "更新人", hidden = true) private String
@LastModifiedBy
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新人", hidden = true)
private String
updateBy;
@TableField(fill = FieldFill.INSERT) @Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true) private Date
@TableField(fill = FieldFill.INSERT)
@Schema(name = "创建时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date
createTime;
@TableField(fill = FieldFill.INSERT_UPDATE) @Schema(name = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
@TableField(fill = FieldFill.INSERT_UPDATE)
@Schema(name = "更新时间: yyyy-MM-dd HH:mm:ss", hidden = true)
private Date updateTime;
@Override
@@ -60,8 +69,12 @@ public class KitBaseUserTimeTb extends KitObject {
}
/* 分组校验 */
public @interface Create {}
public @interface Create {
}
/* 分组校验 */
public @interface Update {}
public @interface Update {
}
}
@@ -26,5 +26,7 @@ import java.io.Serializable;
* @date 2022-01-12
*/
public class KitObject implements Serializable {
@Serial private static final long serialVersionUID = 1L;
@Serial
private static final long serialVersionUID = 1L;
}
@@ -34,9 +34,14 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class KitPageArgs<T> implements Serializable {
@NotNull(message = "参数page不能为空") @Min(value = 1, message = "参数page最小值为1")
@Schema(name = "页码", example = "1") private Integer page;
@NotNull(message = "参数size不能为空") @Min(value = 1, message = "参数size最小值为1")
@Schema(name = "每页数据量", example = "10") private Integer size;
@NotNull(message = "参数page不能为空")
@Min(value = 1, message = "参数page最小值为1")
@Schema(name = "页码", example = "1")
private Integer page;
@NotNull(message = "参数size不能为空")
@Min(value = 1, message = "参数size最小值为1")
@Schema(name = "每页数据量", example = "10")
private Integer size;
private T args;
}
@@ -32,6 +32,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class KitPageResult<T> extends KitObject {
private List<T> content;
private long totalElements;
@@ -35,6 +35,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@EqualsAndHashCode(callSuper = false)
public class KitSelectOptionVo extends KitObject {
private String label;
private String value;
private Map<String, Object> ext;
@@ -20,6 +20,7 @@ package cn.odboy.constant;
* 常用静态常量
*/
public interface SystemConst {
/**
* win 系统
*/
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Component;
@Slf4j
@Component
public class BeanLoadFinishListener implements ApplicationListener<ContextRefreshedEvent> {
@Override
public void onApplicationEvent(ContextRefreshedEvent event) {
log.info("所有的Bean都加载完毕了");
@@ -32,6 +32,7 @@ import org.springframework.core.env.Environment;
*/
@Slf4j
public class BootApplication {
protected static void inited(ConfigurableApplicationContext application) throws UnknownHostException {
Environment env = application.getEnvironment();
String ip = InetAddress.getLocalHost().getHostAddress();
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Component;
@Slf4j
@Component
public class KitScriptHelper {
public Object evalObj(String script, Map<String, Object> args) {
try (Context rhino = Context.enter()) {
Scriptable scope = rhino.initStandardObjects();
@@ -16,11 +16,11 @@
package cn.odboy.framework.exception;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
import lombok.Getter;
import org.springframework.http.HttpStatus;
import static org.springframework.http.HttpStatus.BAD_REQUEST;
/**
* 统一异常处理
*/
@@ -16,11 +16,11 @@
package cn.odboy.framework.exception;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
import lombok.Getter;
import org.springframework.http.HttpStatus;
import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR;
@Getter
public class ServerException extends RuntimeException {
@@ -33,6 +33,7 @@ import java.lang.annotation.Target;
@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)
public @interface ExecutionTimeStatisticsFace {
/**
* 接口描述
*/
@@ -33,6 +33,7 @@ import org.springframework.stereotype.Component;
@Aspect
@Component
public class ExecutionTimeStatisticsFaceAspect {
@Around("@annotation(executionTimeStatisticsFace)")
public Object aroundFace(ProceedingJoinPoint joinPoint, ExecutionTimeStatisticsFace executionTimeStatisticsFace)
throws Throwable {
@@ -31,7 +31,9 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/healthCheck")
@Tag(name = "系统:健康检查接口")
public class HealthCheckController {
@Autowired private KitHealthCheckPointService kitHealthCheckPointService;
@Autowired
private KitHealthCheckPointService kitHealthCheckPointService;
/**
* 就绪检查
@@ -19,6 +19,7 @@ package cn.odboy.framework.monitor.service;
import org.springframework.http.ResponseEntity;
public interface KitHealthCheckPointService {
/**
* 就绪检查
*/
@@ -29,6 +29,7 @@ import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
public @interface KitMpQuery {
/**
* 基本对象的属性名
*/
@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
*/
@Slf4j
public class MpCustomP6SpyLogger implements MessageFormattingStrategy {
/**
* 重置颜色
*/
@@ -32,6 +32,7 @@ import org.apache.ibatis.session.Configuration;
* @date 2025-01-11
*/
public class MpInsertBatchSqlInjector extends DefaultSqlInjector {
@Override
public List<AbstractMethod> getMethodList(Configuration configuration, Class<?> mapperClass, TableInfo tableInfo) {
List<AbstractMethod> methodList = super.getMethodList(configuration, mapperClass, tableInfo);
@@ -28,6 +28,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@Configuration
@EnableTransactionManagement
public class MybatisPlusConfig {
@Bean
public MybatisPlusInterceptor paginationInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
@@ -30,6 +30,7 @@ import java.util.List;
* @date 2025-05-15
*/
public class KitMpAnyQUtil {
public static <T> T selectOne(BaseMapper<T> baseMapper, Object queryParams) {
QueryWrapper<T> queryWrapper = KitMpQUtil.build(queryParams);
return baseMapper.selectOne(queryWrapper);
@@ -49,6 +49,7 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Data
public class KitMpCmdGenUtil {
// 项目根路径。生成结果 C:\Users\Administrator\Documents\GitHub\cutejava\cutejava
private static final String projectRootPath = System.getProperty("user.dir") + "/";
/**
@@ -42,6 +42,7 @@ import lombok.extern.slf4j.Slf4j;
*/
@Slf4j
public class KitMpQUtil {
public static <R, Q> QueryWrapper<R> build(Q query) {
QueryWrapper<R> queryWrapper = new QueryWrapper<>();
if (query == null) {
@@ -188,10 +189,16 @@ public class KitMpQUtil {
@TableName("test_domain")
private static class TestDomain {
@NotNull(groups = KitBaseUserTimeTb.Update.class) @TableId(value = "user_id", type = IdType.AUTO) private Long
@NotNull(groups = KitBaseUserTimeTb.Update.class)
@TableId(value = "user_id", type = IdType.AUTO)
private Long
id;
@TableField(value = "dept_id") private Long deptId;
@NotBlank private String username;
@NotBlank private String nickName;
@TableField(value = "dept_id")
private Long deptId;
@NotBlank
private String username;
@NotBlank
private String nickName;
}
}
@@ -42,6 +42,7 @@ import org.springframework.data.domain.Pageable;
* @date 2022-04-03
*/
public interface KitMpMapper<E> extends BaseMapper<E> {
/**
* 批量插入
*
@@ -32,6 +32,7 @@ import java.util.List;
* @date 2022-04-03
*/
public interface KitMpService<T> extends IService<T> {
<G> int saveFeatureClazz(G resources);
<G> int saveFeatureClazzList(List<G> resources);
@@ -39,6 +39,7 @@ import org.apache.ibatis.binding.MapperMethod;
* @date 2022-04-03
*/
public class KitMpServiceImpl<M extends KitMpMapper<T>, T> extends ServiceImpl<M, T> {
/**
* 快速插入
*
@@ -36,6 +36,7 @@ import org.springframework.stereotype.Component;
@Component
@ConfigurationProperties(prefix = "app")
public class AppProperties {
private ContentRsaEncodeSettingModel rsa;
private JwtAuthSettingModel jwt;
private UserLoginSettingModel login;
@@ -23,6 +23,7 @@ import lombok.Setter;
@Getter
@Setter
public class CaptchaModel extends KitObject {
/**
* 验证码有效时间, 单位: 秒
*/
@@ -26,5 +26,6 @@ import lombok.Setter;
@Getter
@Setter
public class ContentRsaEncodeSettingModel extends KitObject {
private String privateKey;
}
@@ -26,6 +26,7 @@ import lombok.Setter;
@Getter
@Setter
public class JwtAuthSettingModel extends KitObject {
/**
* 必须使用最少88位的Base64对该令牌进行编码
*/
@@ -23,6 +23,7 @@ import lombok.Setter;
@Getter
@Setter
public class OSSConfigModel extends KitObject {
/**
* 服务地址
*/
@@ -22,6 +22,7 @@ import lombok.Setter;
@Getter
@Setter
public class StorageOSSModel {
/**
* 上传大小, 单位: M
*/
@@ -29,6 +29,7 @@ import lombok.Setter;
@Getter
@Setter
public class ThreadPoolSettingModel extends KitObject {
/**
* 核心线程池大小
*/
@@ -38,6 +38,7 @@ import lombok.Setter;
@Getter
@Setter
public class UserLoginCaptchaSettingModel extends KitObject {
private CaptchaCodeEnum codeType;
/**
@@ -109,6 +110,7 @@ public class UserLoginCaptchaSettingModel extends KitObject {
}
static class FixedArithmeticCaptcha extends ArithmeticCaptcha {
public FixedArithmeticCaptcha(int width, int height) {
super(width, height);
}
@@ -28,6 +28,7 @@ import lombok.Setter;
@Getter
@Setter
public class UserLoginSettingModel extends KitObject {
/**
* 账号单用户 登录
*/
@@ -33,6 +33,7 @@ import org.springframework.stereotype.Component;
@Configuration
@Scope("singleton")
public class QuartzConfig {
/**
* 解决Job中注入Spring Bean为null的问题
*/
@@ -28,6 +28,7 @@ import org.springframework.util.ReflectionUtils;
*/
@Slf4j
public class QuartzRunnable implements Callable<Object> {
private final Object target;
private final Method method;
private final String params;
@@ -45,6 +45,7 @@ import org.springframework.stereotype.Component;
@Component
@SuppressWarnings({"unchecked", "all"})
public class KitRedisHelper {
private static final Logger log = LoggerFactory.getLogger(KitRedisHelper.class);
private RedisTemplate<Object, Object> redisTemplate;
@@ -48,6 +48,7 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
@EnableCaching
@AutoConfigureBefore(RedisAutoConfiguration.class)
public class RedisConfiguration {
/**
* 自动识别json对象白名单配置(仅允许解析的包名, 范围越小越安全)<br/> 未配置可能导致, 登录失败, 反复登录等问题
*/
@@ -38,7 +38,9 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@EnableAsync
@Configuration
public class AsyncTheadPoolConfig implements AsyncConfigurer {
@Autowired private AppProperties properties;
@Autowired
private AppProperties properties;
/**
* 自定义线程池, 用法 @Async
@@ -27,6 +27,7 @@ import org.springframework.stereotype.Component;
@Component
public class DateStringArraysToListDateConverter implements Converter<String[], List<Date>> {
private static final ThreadLocal<SimpleDateFormat> SDF =
ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
@Component
public class DateStringToDateConverter implements Converter<String, Date> {
private static final ThreadLocal<SimpleDateFormat> SDF =
ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"));
@@ -47,9 +47,13 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
@EnableWebMvc
public class ConfigurerAdapter implements WebMvcConfigurer {
@Autowired private DateStringArraysToListDateConverter dateStringArraysToListDateConverter;
@Autowired private DateStringToDateConverter dateStringToDateConverter;
@Autowired private KitFileLocalUploadHelper fileUploadPathHelper;
@Autowired
private DateStringArraysToListDateConverter dateStringArraysToListDateConverter;
@Autowired
private DateStringToDateConverter dateStringToDateConverter;
@Autowired
private KitFileLocalUploadHelper fileUploadPathHelper;
@Bean
public CorsFilter corsFilter() {
@@ -28,6 +28,7 @@ import org.springframework.stereotype.Component;
*/
@Component
public class KitFileLocalUploadHelper {
/**
* 单位MB
*/
@@ -35,7 +36,8 @@ public class KitFileLocalUploadHelper {
private static final String PATH_WINDOWS = "C:\\${appName}\\file\\";
private static final String PATH_MAC = "/Users${username}/${appName}/file/";
private static final String PATH_LINUX = "/home/${appName}/file/";
@Value("${spring.application.name}") private String appName;
@Value("${spring.application.name}")
private String appName;
public String getPath() {
String os = System.getProperty("os.name");
@@ -7,14 +7,14 @@ import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.stereotype.Component;
/**
* 解决启动io.undertow.websockets.jsr UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be
* used的警告
* 解决启动io.undertow.websockets.jsr UT026010: Buffer pool was not set on WebSocketDeploymentInfo, the default pool will be used的警告
*
* @author odboy
* @date 2025-10-30
*/
@Component
public class UndertowWebSocketConfig implements WebServerFactoryCustomizer<UndertowServletWebServerFactory> {
private int calculateThreadLocalCacheSize(int processorCount) {
// 每个I/O线程缓存2-4个缓冲区
return Math.max(2, processorCount / 2);
@@ -29,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
*/
@Slf4j
public class KitWsClientManager {
/**
* concurrent包的线程安全Map, 用来存放每个客户端对应的MyWebSocket对象。(分布式必出问题)
*/
@@ -23,6 +23,7 @@ import lombok.Setter;
@Getter
@Setter
public class KitWsMessage extends KitObject {
private String bizCode;
private String data;
@@ -35,6 +35,7 @@ import org.springframework.stereotype.Component;
@ServerEndpoint("/websocket/{sid}")
@Getter
public class KitWsServer {
/**
* 与某个客户端的连接会话, 需要通过它来给客户端发送数据
*/
@@ -23,6 +23,7 @@ import lombok.Setter;
@Getter
@Setter
public class WsSidVo extends KitObject {
private String username;
private String bizCode;
private String param;
@@ -28,6 +28,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public class WsMessageUtil {
public static WsSidVo parseSid(String sid) {
// sid {username}_{bizCode}_{param}
String[] sids = sid.split("_");
@@ -30,6 +30,7 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
@UtilityClass
public final class KitBrowserUtil {
private static final String UNKNOWN = "unknown";
/**
@@ -27,6 +27,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public final class KitClassUtil {
@SuppressWarnings({"unchecked", "all"})
public static List<Field> getAllFields(Class clazz, List<Field> fields) {
if (clazz != null) {
@@ -40,6 +40,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public final class KitCollUtil extends cn.hutool.core.collection.CollUtil {
private static <T, K> Predicate<T> distinctPredicate(Function<? super T, ? extends K> keyMapper) {
Map<Object, Boolean> map = new HashMap<>(3);
return (t) -> null == map.putIfAbsent(keyMapper.apply(t), true);
@@ -29,6 +29,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public class KitDateUtil {
/**
* 获取当前时间毫秒数
*
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
* @date 2025-04-05
*/
public final class KitDistributedIdUtil {
/**
* 起始毫秒时间戳, 2020-12-30
*/
@@ -197,6 +198,7 @@ public final class KitDistributedIdUtil {
* 单例实例持有者类
*/
private static class InstanceHolder {
private static final KitDistributedIdUtil INSTANCE = new KitDistributedIdUtil(20, 12, 5, 5, 12);
}
}
@@ -16,6 +16,11 @@
package cn.odboy.util;
import static cn.odboy.constant.SystemConst.SYMBOL_ADD;
import static cn.odboy.constant.SystemConst.SYMBOL_AT;
import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL;
import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.poi.excel.BigExcelWriter;
@@ -45,11 +50,6 @@ import org.apache.poi.util.IOUtils;
import org.apache.poi.xssf.streaming.SXSSFSheet;
import org.springframework.web.multipart.MultipartFile;
import static cn.odboy.constant.SystemConst.SYMBOL_ADD;
import static cn.odboy.constant.SystemConst.SYMBOL_AT;
import static cn.odboy.constant.SystemConst.SYMBOL_EQUAL;
import static cn.odboy.constant.SystemConst.SYMBOL_SUBTRACT;
/**
* File工具类, 扩展 hutool 工具包
*/
@@ -29,6 +29,7 @@ import net.dreamlu.mica.ip2region.core.IpInfo;
*/
@UtilityClass
public final class KitIPUtil {
/**
* 注入bean
*/
@@ -30,12 +30,15 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public final class KitJsonUtil {
public static <K, V> Map<K, V> toMap(String jsonStr, Class<K> kClass, Class<V> vClass) {
return JSON.parseObject(jsonStr, new TypeReference<>() {});
return JSON.parseObject(jsonStr, new TypeReference<>() {
});
}
public static <V> List<V> toList(String jsonStr, Class<V> vClass) {
return JSON.parseObject(jsonStr, new TypeReference<>() {});
return JSON.parseObject(jsonStr, new TypeReference<>() {
});
}
public static void main(String[] args) {
@@ -32,6 +32,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public final class KitListUtil {
/**
* 根据对象T的属性去重
*
@@ -44,9 +45,8 @@ public final class KitListUtil {
}
/**
* list转map, 保留新值 -> Map<String, User> userMap = items.stream().collect(Collectors.toMap(User::getName, user ->
* user)) <br> list转map, 保留旧值 -> Map<String, User> userMap = users.stream().collect(Collectors.toMap(User::getName,
* user -> user, (existing, replacement) -> existing));
* list转map, 保留新值 -> Map<String, User> userMap = items.stream().collect(Collectors.toMap(User::getName, user -> user)) <br> list转map, 保留旧值 -> Map<String,
* User> userMap = users.stream().collect(Collectors.toMap(User::getName, user -> user, (existing, replacement) -> existing));
*/
public static void main(String[] args) {
List<KitBaseUserTimeTb> entities = new ArrayList<>();
@@ -26,6 +26,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public final class KitLogFmtUtil {
/**
* 替换字符串中的占位符 {} 为传入的参数
*
@@ -32,6 +32,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public class KitResourceTemplateUtil {
public static String render(String moduleName, String filename, Dict params) {
String path = StrUtil.isBlank(moduleName) ? "template" : "template/" + moduleName;
TemplateEngine engine =
@@ -32,6 +32,7 @@ import org.aspectj.lang.reflect.MethodSignature;
* @date 2025-05-08
*/
public class KitReturnValueHandleUtil {
public static Object getDefaultValue(ProceedingJoinPoint joinPoint) {
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
Method method = signature.getMethod();
@@ -34,8 +34,7 @@ public final class KitStringUtil {
/**
* 驼峰命名法工具
*
* @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld"
* toUnderScoreCase("helloWorld") = "hello_world"
* @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld" toUnderScoreCase("helloWorld") = "hello_world"
*/
public static String toCamelCase(String s) {
if (s == null) {
@@ -65,8 +64,7 @@ public final class KitStringUtil {
/**
* 驼峰命名法工具
*
* @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld"
* toUnderScoreCase("helloWorld") = "hello_world"
* @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld" toUnderScoreCase("helloWorld") = "hello_world"
*/
public static String toCapitalizeCamelCase(String s) {
if (s == null) {
@@ -79,8 +77,7 @@ public final class KitStringUtil {
/**
* 驼峰命名法工具
*
* @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld"
* toUnderScoreCase("helloWorld") = "hello_world"
* @return toCamelCase(" hello_world ") == "helloWorld" toCapitalizeCamelCase("hello_world") == "HelloWorld" toUnderScoreCase("helloWorld") = "hello_world"
*/
public static String toUnderScoreCase(String s) {
if (s == null) {
@@ -27,6 +27,7 @@ import oshi.hardware.CentralProcessor;
* @date 2025-08-11
*/
public class KitSystemUtil {
public static int getCpuCount() {
SystemInfo systemInfo = new SystemInfo();
CentralProcessor processor = systemInfo.getHardware().getProcessor();
@@ -34,6 +34,7 @@ import lombok.experimental.UtilityClass;
*/
@UtilityClass
public final class KitValidUtil {
private static final Validator VALIDATOR;
static {
@@ -21,8 +21,8 @@ import cn.odboy.system.dal.model.SystemUserLoginArgs;
import cn.odboy.system.service.SystemAuthService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.Map;
import jakarta.servlet.http.HttpServletRequest;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -24,9 +24,9 @@ import cn.odboy.system.service.SystemDeptService;
import cn.odboy.util.KitPageUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,10 +24,10 @@ import cn.odboy.system.service.SystemDictService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,9 +24,9 @@ import cn.odboy.system.service.SystemJobService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,8 +23,8 @@ import cn.odboy.system.service.SystemLocalStorageService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.io.IOException;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -21,7 +21,6 @@ import cn.odboy.framework.exception.BadRequestException;
import cn.odboy.system.dal.dataobject.SystemMenuTb;
import cn.odboy.system.dal.model.SystemMenuVo;
import cn.odboy.system.dal.model.SystemQueryMenuArgs;
import cn.odboy.system.dal.mysql.SystemMenuMapper;
import cn.odboy.system.service.SystemMenuService;
import cn.odboy.util.KitPageUtil;
import io.swagger.annotations.Api;
@@ -47,8 +46,6 @@ public class SystemMenuController {
@Autowired
private SystemMenuService systemMenuService;
@Autowired
private SystemMenuMapper systemMenuMapper;
@ApiOperation("导出菜单数据")
@GetMapping(value = "/download")
@@ -23,10 +23,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,8 +24,8 @@ import cn.odboy.system.service.SystemOssStorageService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.io.IOException;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -25,9 +25,9 @@ import cn.odboy.system.service.SystemQuartzJobService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
@@ -26,10 +26,10 @@ import cn.odboy.system.service.SystemRoleService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -23,16 +23,14 @@ import cn.odboy.system.dal.model.SystemQueryUserArgs;
import cn.odboy.system.dal.model.SystemUpdateUserPasswordArgs;
import cn.odboy.system.dal.model.SystemUserVo;
import cn.odboy.system.framework.permission.core.KitSecurityHelper;
import cn.odboy.system.service.SystemDataService;
import cn.odboy.system.service.SystemDeptService;
import cn.odboy.system.service.SystemUserService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.List;
import java.util.Set;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -53,10 +51,6 @@ public class SystemUserController {
@Autowired
private SystemUserService systemUserService;
@Autowired
private SystemDataService systemDataService;
@Autowired
private SystemDeptService systemDeptService;
@ApiOperation("导出用户数据")
@@ -35,16 +35,30 @@ import lombok.Setter;
@TableName("system_dept")
public class SystemDeptTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class) @TableId(value = "dept_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true) private Long id;
@TableField(exist = false) @JSONField(serialize = false) @ApiModelProperty(value = "角色") private Set<SystemRoleTb>
@NotNull(groups = Update.class)
@TableId(value = "dept_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@TableField(exist = false)
@JSONField(serialize = false)
@ApiModelProperty(value = "角色")
private Set<SystemRoleTb>
roles;
@TableField(exist = false) @ApiModelProperty(value = "子部门") private List<SystemDeptTb> children;
@ApiModelProperty(value = "排序") private Integer deptSort;
@NotBlank @ApiModelProperty(value = "部门名称") private String name;
@NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled;
@ApiModelProperty(value = "上级部门") private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true) private Integer subCount = 0;
@TableField(exist = false)
@ApiModelProperty(value = "子部门")
private List<SystemDeptTb> children;
@ApiModelProperty(value = "排序")
private Integer deptSort;
@NotBlank
@ApiModelProperty(value = "部门名称")
private String name;
@NotNull
@ApiModelProperty(value = "是否启用")
private Boolean enabled;
@ApiModelProperty(value = "上级部门")
private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true)
private Integer subCount = 0;
@Override
public boolean equals(Object o) {
@@ -30,10 +30,17 @@ import lombok.Setter;
@TableName("system_dict_detail")
public class SystemDictDetailTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true)
@TableId(value = "id", type = IdType.AUTO) private Long id;
@TableField(value = "dict_id") @ApiModelProperty(hidden = true) private Long dictId;
@ApiModelProperty(value = "字典标签") private String label;
@ApiModelProperty(value = "字典值") private String value;
@ApiModelProperty(value = "排序") private Integer dictSort = 999;
@NotNull(groups = Update.class)
@ApiModelProperty(value = "ID", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@TableField(value = "dict_id")
@ApiModelProperty(hidden = true)
private Long dictId;
@ApiModelProperty(value = "字典标签")
private String label;
@ApiModelProperty(value = "字典值")
private String value;
@ApiModelProperty(value = "排序")
private Integer dictSort = 999;
}
@@ -32,8 +32,14 @@ import lombok.Setter;
@TableName("system_dict")
public class SystemDictTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class) @ApiModelProperty(value = "ID", hidden = true)
@TableId(value = "id", type = IdType.AUTO) private Long id;
@NotBlank @ApiModelProperty(value = "名称") private String name;
@ApiModelProperty(value = "描述") @TableField(updateStrategy = FieldStrategy.ALWAYS) private String description;
@NotNull(groups = Update.class)
@ApiModelProperty(value = "ID", hidden = true)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@NotBlank
@ApiModelProperty(value = "名称")
private String name;
@ApiModelProperty(value = "描述")
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String description;
}
@@ -31,10 +31,21 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
public class SystemEmailConfigTb extends KitObject {
@TableId("config_id") private Long id;
@NotBlank @ApiModelProperty(value = "邮件服务器SMTP地址") private String host;
@NotBlank @ApiModelProperty(value = "邮件服务器 SMTP 端口") private String port;
@NotBlank @ApiModelProperty(value = "发件者用户名") private String user;
@NotBlank @ApiModelProperty(value = "密码") private String password;
@NotBlank @ApiModelProperty(value = "收件人") private String fromUser;
@TableId("config_id")
private Long id;
@NotBlank
@ApiModelProperty(value = "邮件服务器SMTP地址")
private String host;
@NotBlank
@ApiModelProperty(value = "邮件服务器 SMTP 端口")
private String port;
@NotBlank
@ApiModelProperty(value = "发件者用户名")
private String user;
@NotBlank
@ApiModelProperty(value = "密码")
private String password;
@NotBlank
@ApiModelProperty(value = "收件人")
private String fromUser;
}
@@ -31,11 +31,19 @@ import lombok.Setter;
@TableName("system_job")
public class SystemJobTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class) @TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true) private Long id;
@NotBlank @ApiModelProperty(value = "岗位名称") private String name;
@NotNull @ApiModelProperty(value = "岗位排序") private Long jobSort;
@NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled;
@NotNull(groups = Update.class)
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@NotBlank
@ApiModelProperty(value = "岗位名称")
private String name;
@NotNull
@ApiModelProperty(value = "岗位排序")
private Long jobSort;
@NotNull
@ApiModelProperty(value = "是否启用")
private Boolean enabled;
@Override
public boolean equals(Object o) {
@@ -30,14 +30,23 @@ import lombok.Setter;
@TableName("system_local_storage")
public class SystemLocalStorageTb extends KitBaseUserTimeTb {
@TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) private Long id;
@ApiModelProperty(value = "真实文件名") private String realName;
@ApiModelProperty(value = "文件名") private String name;
@ApiModelProperty(value = "后缀") private String suffix;
@ApiModelProperty(value = "路径") private String path;
@ApiModelProperty(value = "类型") private String type;
@ApiModelProperty(value = "大小") private String size;
@ApiModelProperty(value = "日期分组") private String dateGroup;
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@ApiModelProperty(value = "真实文件名")
private String realName;
@ApiModelProperty(value = "文件名")
private String name;
@ApiModelProperty(value = "后缀")
private String suffix;
@ApiModelProperty(value = "路径")
private String path;
@ApiModelProperty(value = "类型")
private String type;
@ApiModelProperty(value = "大小")
private String size;
@ApiModelProperty(value = "日期分组")
private String dateGroup;
public void copy(SystemLocalStorageTb source) {
BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
@@ -34,24 +34,43 @@ import lombok.Setter;
@TableName("system_menu")
public class SystemMenuTb extends KitBaseUserTimeTb {
@NotNull(groups = {Update.class}) @TableId(value = "menu_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true) private Long id;
@TableField(exist = false) @JSONField(serialize = false) @ApiModelProperty(value = "菜单角色")
@NotNull(groups = {Update.class})
@TableId(value = "menu_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@TableField(exist = false)
@JSONField(serialize = false)
@ApiModelProperty(value = "菜单角色")
private Set<SystemRoleTb> roles;
@TableField(exist = false) private List<SystemMenuTb> children;
@ApiModelProperty(value = "菜单标题") private String title;
@TableField(value = "name") @ApiModelProperty(value = "菜单组件名称") private String componentName;
@ApiModelProperty(value = "排序") private Integer menuSort = 999;
@ApiModelProperty(value = "组件路径") private String component;
@ApiModelProperty(value = "路由地址") private String path;
@ApiModelProperty(value = "菜单类型,目录、菜单、按钮") private Integer type;
@ApiModelProperty(value = "权限标识") private String permission;
@ApiModelProperty(value = "菜单图标") private String icon;
@ApiModelProperty(value = "缓存") private Boolean cache;
@ApiModelProperty(value = "是否隐藏") private Boolean hidden;
@ApiModelProperty(value = "上级菜单") private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true) private Integer subCount = 0;
@ApiModelProperty(value = "外链菜单") private Boolean iFrame;
@TableField(exist = false)
private List<SystemMenuTb> children;
@ApiModelProperty(value = "菜单标题")
private String title;
@TableField(value = "name")
@ApiModelProperty(value = "菜单组件名称")
private String componentName;
@ApiModelProperty(value = "排序")
private Integer menuSort = 999;
@ApiModelProperty(value = "组件路径")
private String component;
@ApiModelProperty(value = "路由地址")
private String path;
@ApiModelProperty(value = "菜单类型,目录、菜单、按钮")
private Integer type;
@ApiModelProperty(value = "权限标识")
private String permission;
@ApiModelProperty(value = "菜单图标")
private String icon;
@ApiModelProperty(value = "缓存")
private Boolean cache;
@ApiModelProperty(value = "是否隐藏")
private Boolean hidden;
@ApiModelProperty(value = "上级菜单")
private Long pid;
@ApiModelProperty(value = "子节点数目", hidden = true)
private Integer subCount = 0;
@ApiModelProperty(value = "外链菜单")
private Boolean iFrame;
@Override
public boolean equals(Object o) {
@@ -46,45 +46,57 @@ public class SystemOperationLogTb extends KitObject {
/**
* id
*/
@ApiModelProperty("id") @TableId(value = "id", type = IdType.AUTO) private Long id;
@ApiModelProperty("id")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 业务名称
*/
@TableField("biz_name") private String bizName;
@TableField("biz_name")
private String bizName;
/**
* 业务方法
*/
@TableField("method") private String method;
@TableField("method")
private String method;
/**
* 业务参数
*/
@TableField("params") private String params;
@TableField("params")
private String params;
/**
* 访问来源IP
*/
@TableField("request_ip") private String requestIp;
@TableField("request_ip")
private String requestIp;
/**
* 执行时间
*/
@TableField("execute_time") private Long executeTime;
@TableField("execute_time")
private Long executeTime;
/**
* 用户名
*/
@TableField("username") private String username;
@TableField("username")
private String username;
/**
* 访问来源地址
*/
@TableField("address") private String address;
@TableField("address")
private String address;
/**
* 浏览器信息
*/
@TableField("browser_info") private String browserInfo;
@TableField("browser_info")
private String browserInfo;
/**
* 异常详情
*/
@TableField("exception_detail") private String exceptionDetail;
@TableField("exception_detail")
private String exceptionDetail;
/**
* 创建时间
*/
@TableField(value = "create_time", fill = FieldFill.INSERT) private Date createTime;
@TableField(value = "create_time", fill = FieldFill.INSERT)
private Date createTime;
}
@@ -39,17 +39,43 @@ import lombok.Setter;
@ApiModel(value = "SystemOssStorage对象", description = "OSS存储")
public class SystemOssStorageTb extends KitBaseUserTimeTb {
@ApiModelProperty("ID") @TableId(value = "id", type = IdType.AUTO) private Long id;
@TableField("service_type") @ApiModelProperty("类型,比如minio") private String serviceType;
@TableField("endpoint") @ApiModelProperty("服务地址") private String endpoint;
@TableField("bucket_name") @ApiModelProperty("存储桶名称") private String bucketName;
@TableField("file_name") @ApiModelProperty("完整文件名称") private String fileName;
@TableField("file_size") @ApiModelProperty("文件大小, 单位:字节") private Long fileSize;
@TableField("file_mime") @ApiModelProperty("文件类型") private String fileMime;
@ApiModelProperty("短文件名") @TableField("file_prefix") private String filePrefix;
@ApiModelProperty("文件后缀") @TableField("file_suffix") private String fileSuffix;
@TableField("file_md5") @ApiModelProperty("文件md5") private String fileMd5;
@TableField("file_url") @ApiModelProperty("文件链接") private String fileUrl;
@TableField("file_code") @ApiModelProperty("文件编码") private String fileCode;
@TableField("object_name") @ApiModelProperty("对象路径") private String objectName;
@ApiModelProperty("ID")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@TableField("service_type")
@ApiModelProperty("类型,比如minio")
private String serviceType;
@TableField("endpoint")
@ApiModelProperty("服务地址")
private String endpoint;
@TableField("bucket_name")
@ApiModelProperty("存储桶名称")
private String bucketName;
@TableField("file_name")
@ApiModelProperty("完整文件名称")
private String fileName;
@TableField("file_size")
@ApiModelProperty("文件大小, 单位:字节")
private Long fileSize;
@TableField("file_mime")
@ApiModelProperty("文件类型")
private String fileMime;
@ApiModelProperty("短文件名")
@TableField("file_prefix")
private String filePrefix;
@ApiModelProperty("文件后缀")
@TableField("file_suffix")
private String fileSuffix;
@TableField("file_md5")
@ApiModelProperty("文件md5")
private String fileMd5;
@TableField("file_url")
@ApiModelProperty("文件链接")
private String fileUrl;
@TableField("file_code")
@ApiModelProperty("文件编码")
private String fileCode;
@TableField("object_name")
@ApiModelProperty("对象路径")
private String objectName;
}
@@ -33,18 +33,38 @@ import lombok.Setter;
public class SystemQuartzJobTb extends KitBaseUserTimeTb {
public static final String JOB_KEY = "JOB_KEY";
@TableId(value = "id", type = IdType.AUTO) @NotNull(groups = {Update.class}) private Long id;
@TableField(exist = false) @ApiModelProperty(value = "用于子任务唯一标识", hidden = true) private String uuid;
@ApiModelProperty(value = "定时器名称") private String jobName;
@NotBlank @ApiModelProperty(value = "Bean名称") private String beanName;
@NotBlank @ApiModelProperty(value = "方法名称") private String methodName;
@ApiModelProperty(value = "参数") private String params;
@NotBlank @ApiModelProperty(value = "cron表达式") private String cronExpression;
@ApiModelProperty(value = "状态:暂停或启动") private Boolean isPause = false;
@ApiModelProperty(value = "负责人") private String personInCharge;
@ApiModelProperty(value = "报警邮箱") private String email;
@ApiModelProperty(value = "子任务") private String subTask;
@ApiModelProperty(value = "失败后暂停") private Boolean pauseAfterFailure;
@NotBlank @ApiModelProperty(value = "备注") @TableField(updateStrategy = FieldStrategy.ALWAYS) private String
@TableId(value = "id", type = IdType.AUTO)
@NotNull(groups = {Update.class})
private Long id;
@TableField(exist = false)
@ApiModelProperty(value = "用于子任务唯一标识", hidden = true)
private String uuid;
@ApiModelProperty(value = "定时器名称")
private String jobName;
@NotBlank
@ApiModelProperty(value = "Bean名称")
private String beanName;
@NotBlank
@ApiModelProperty(value = "方法名称")
private String methodName;
@ApiModelProperty(value = "参数")
private String params;
@NotBlank
@ApiModelProperty(value = "cron表达式")
private String cronExpression;
@ApiModelProperty(value = "状态:暂停或启动")
private Boolean isPause = false;
@ApiModelProperty(value = "负责人")
private String personInCharge;
@ApiModelProperty(value = "报警邮箱")
private String email;
@ApiModelProperty(value = "子任务")
private String subTask;
@ApiModelProperty(value = "失败后暂停")
private Boolean pauseAfterFailure;
@NotBlank
@ApiModelProperty(value = "备注")
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String
description;
}
@@ -31,14 +31,26 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
public class SystemQuartzLogTb extends KitObject {
@TableId(value = "id", type = IdType.AUTO) @ApiModelProperty(value = "ID", hidden = true) private Long id;
@ApiModelProperty(value = "任务名称", hidden = true) private String jobName;
@ApiModelProperty(value = "bean名称", hidden = true) private String beanName;
@ApiModelProperty(value = "方法名称", hidden = true) private String methodName;
@ApiModelProperty(value = "参数", hidden = true) private String params;
@ApiModelProperty(value = "cron表达式", hidden = true) private String cronExpression;
@ApiModelProperty(value = "状态", hidden = true) private Boolean isSuccess;
@ApiModelProperty(value = "异常详情", hidden = true) private String exceptionDetail;
@ApiModelProperty(value = "执行耗时", hidden = true) private Long time;
@TableField(fill = FieldFill.INSERT) @ApiModelProperty(value = "创建时间", hidden = true) private Date createTime;
@TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@ApiModelProperty(value = "任务名称", hidden = true)
private String jobName;
@ApiModelProperty(value = "bean名称", hidden = true)
private String beanName;
@ApiModelProperty(value = "方法名称", hidden = true)
private String methodName;
@ApiModelProperty(value = "参数", hidden = true)
private String params;
@ApiModelProperty(value = "cron表达式", hidden = true)
private String cronExpression;
@ApiModelProperty(value = "状态", hidden = true)
private Boolean isSuccess;
@ApiModelProperty(value = "异常详情", hidden = true)
private String exceptionDetail;
@ApiModelProperty(value = "执行耗时", hidden = true)
private Long time;
@TableField(fill = FieldFill.INSERT)
@ApiModelProperty(value = "创建时间", hidden = true)
private Date createTime;
}
@@ -26,6 +26,8 @@ import lombok.Setter;
@TableName("system_roles_depts")
public class SystemRoleDeptTb extends KitObject {
@TableField(value = "role_id") private Long roleId;
@TableField(value = "dept_id") private Long deptId;
@TableField(value = "role_id")
private Long roleId;
@TableField(value = "dept_id")
private Long deptId;
}
@@ -13,6 +13,8 @@ import lombok.Setter;
@TableName("system_roles_menus")
public class SystemRoleMenuTb {
@TableField(value = "role_id") private Long roleId;
@TableField(value = "menu_id") private Long menuId;
@TableField(value = "role_id")
private Long roleId;
@TableField(value = "menu_id")
private Long menuId;
}
@@ -37,13 +37,21 @@ import lombok.Setter;
@TableName("system_role")
public class SystemRoleTb extends KitBaseUserTimeTb {
@NotNull(groups = {Update.class}) @TableId(value = "role_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true) private Long id;
@NotBlank @ApiModelProperty(value = "名称", hidden = true) private String name;
@ApiModelProperty(value = "数据权限,全部 、 本级 、 自定义") private String dataScope =
@NotNull(groups = {Update.class})
@TableId(value = "role_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@NotBlank
@ApiModelProperty(value = "名称", hidden = true)
private String name;
@ApiModelProperty(value = "数据权限,全部 、 本级 、 自定义")
private String dataScope =
SystemDataScopeEnum.THIS_LEVEL.getValue();
@ApiModelProperty(value = "级别,数值越小,级别越大") private Integer level = 3;
@ApiModelProperty(value = "描述") @TableField(updateStrategy = FieldStrategy.ALWAYS) private String description;
@ApiModelProperty(value = "级别,数值越小,级别越大")
private Integer level = 3;
@ApiModelProperty(value = "描述")
@TableField(updateStrategy = FieldStrategy.ALWAYS)
private String description;
@Override
public boolean equals(Object o) {
@@ -13,6 +13,8 @@ import lombok.Setter;
@TableName("system_users_jobs")
public class SystemUserJobTb {
@TableField(value = "user_id") private Long userId;
@TableField(value = "job_id") private Long jobId;
@TableField(value = "user_id")
private Long userId;
@TableField(value = "job_id")
private Long jobId;
}
@@ -26,6 +26,8 @@ import lombok.Setter;
@TableName("system_users_roles")
public class SystemUserRoleTb extends KitObject {
@TableField(value = "user_id") private Long userId;
@TableField(value = "role_id") private Long roleId;
@TableField(value = "user_id")
private Long userId;
@TableField(value = "role_id")
private Long roleId;
}
@@ -34,21 +34,44 @@ import lombok.Setter;
@TableName("system_user")
public class SystemUserTb extends KitBaseUserTimeTb {
@NotNull(groups = Update.class) @TableId(value = "user_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true) private Long id;
@TableField(value = "dept_id") @ApiModelProperty(hidden = true) private Long deptId;
@ApiModelProperty(value = "用户部门") @TableField(exist = false) private SystemDeptTb dept;
@NotBlank @ApiModelProperty(value = "用户名称") private String username;
@NotBlank @ApiModelProperty(value = "用户昵称") private String nickName;
@Email @NotBlank @ApiModelProperty(value = "邮箱") private String email;
@NotBlank @ApiModelProperty(value = "电话号码") private String phone;
@ApiModelProperty(value = "用户性别") private String gender;
@ApiModelProperty(value = "头像真实名称", hidden = true) private String avatarName;
@ApiModelProperty(value = "头像存储的路径", hidden = true) private String avatarPath;
@ApiModelProperty(value = "密码") private String password;
@NotNull @ApiModelProperty(value = "是否启用") private Boolean enabled;
@ApiModelProperty(value = "是否为admin账号", hidden = true) private Boolean isAdmin = false;
@ApiModelProperty(value = "最后修改密码的时间", hidden = true) private Date pwdResetTime;
@NotNull(groups = Update.class)
@TableId(value = "user_id", type = IdType.AUTO)
@ApiModelProperty(value = "ID", hidden = true)
private Long id;
@TableField(value = "dept_id")
@ApiModelProperty(hidden = true)
private Long deptId;
@ApiModelProperty(value = "用户部门")
@TableField(exist = false)
private SystemDeptTb dept;
@NotBlank
@ApiModelProperty(value = "用户名称")
private String username;
@NotBlank
@ApiModelProperty(value = "用户昵称")
private String nickName;
@Email
@NotBlank
@ApiModelProperty(value = "邮箱")
private String email;
@NotBlank
@ApiModelProperty(value = "电话号码")
private String phone;
@ApiModelProperty(value = "用户性别")
private String gender;
@ApiModelProperty(value = "头像真实名称", hidden = true)
private String avatarName;
@ApiModelProperty(value = "头像存储的路径", hidden = true)
private String avatarPath;
@ApiModelProperty(value = "密码")
private String password;
@NotNull
@ApiModelProperty(value = "是否启用")
private Boolean enabled;
@ApiModelProperty(value = "是否为admin账号", hidden = true)
private Boolean isAdmin = false;
@ApiModelProperty(value = "最后修改密码的时间", hidden = true)
private Date pwdResetTime;
@Override
public boolean equals(Object o) {
@@ -24,7 +24,10 @@ import lombok.Setter;
@Setter
public class SystemCheckEmailCaptchaArgs extends KitObject {
@NotBlank(message = "邮箱不能为空") private String email;
@NotBlank(message = "验证码不能为空") private String code;
@NotBlank(message = "验证码业务标识不能为空") private String bizCode;
@NotBlank(message = "邮箱不能为空")
private String email;
@NotBlank(message = "验证码不能为空")
private String code;
@NotBlank(message = "验证码业务标识不能为空")
private String bizCode;
}
@@ -25,8 +25,10 @@ import lombok.EqualsAndHashCode;
@EqualsAndHashCode(callSuper = false)
public class SystemCreateDeptArgs extends KitObject {
@NotBlank(message = "部门名称必填") private String name;
@NotNull(message = "部门排序必填") private Integer deptSort;
@NotBlank(message = "部门名称必填")
private String name;
@NotNull(message = "部门排序必填")
private Integer deptSort;
private Boolean enabled;
private String isTop;
private Long pid;

Some files were not shown because too many files have changed in this diff Show More