diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index cf82237f..459cfa08 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -15,7 +15,7 @@ > 此报错都涉及到那些系统模块 -例如 ruoyi-system ruoyi-auth 等等 +例如 klp-system klp-auth 等等 ### 问题描述 diff --git a/.run/ruoyi-admin.run.xml b/.run/ruoyi-admin.run.xml deleted file mode 100644 index 56ae6c69..00000000 --- a/.run/ruoyi-admin.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml deleted file mode 100644 index 39741a78..00000000 --- a/.run/ruoyi-monitor-admin.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml deleted file mode 100644 index 56ae6c69..00000000 --- a/.run/ruoyi-server.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml deleted file mode 100644 index 80954627..00000000 --- a/.run/ruoyi-xxl-job-admin.run.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/LICENSE b/LICENSE index a6d9c107..49467b65 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2021 RuoYi-Flowable-Plus +Copyright (c) 2021 KLP Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 47a8da9e..37e604ec 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ ## 平台简介 -[![Gitee Repo star](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus/badge/star.svg?theme=dark)](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus/stargazers) -[![GitHub Repo stars](https://img.shields.io/github/stars/KonBAI-Q/RuoYi-Flowable-Plus?style=social)](https://github.com/KonBAI-Q/RuoYi-Flowable-Plus/stargazers) -[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus/blob/master/LICENSE) +[![Gitee Repo star](https://gitee.com/KonBAI-Q/klp-flowable-plus/badge/star.svg?theme=dark)](https://gitee.com/KonBAI-Q/klp-flowable-plus/stargazers) +[![GitHub Repo stars](https://img.shields.io/github/stars/KonBAI-Q/KLP?style=social)](https://github.com/KonBAI-Q/KLP/stargazers) +[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/KonBAI-Q/klp-flowable-plus/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7-blue.svg)]() [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]() -[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() +[![JDK-11](`https://img.shields.io/badge/JDK-11-green.svg)]() - 本项目基于 [RuoYi-Vue-Plus](https://gitee.com/dromara/RuoYi-Vue-Plus) 进行二次开发，采用 `Flowable` 扩展工作流应用场景，支持在线表单设计和丰富的工作流程设计能力。 - 本项目主要针对`Flowable`工作流场景开发，脚手架功能同步更新 [RuoYi-Vue-Plus](https://gitee.com/dromara/RuoYi-Vue-Plus) 项目。 @@ -13,7 +13,7 @@ - 项目处于开发阶段，工作流流程还存在不足。因此，目前仅推荐用于学习、毕业设计等个人使用。 ## 赞助商 -[![驰骋BPM](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus-vuepress/raw/master/imgs/chicheng-logo.png)](http://ccflow.org/?frm=KonBAI) +[![驰骋BPM](https://gitee.com/KonBAI-Q/klp-flowable-plus-vuepress/raw/master/imgs/chicheng-logo.png)](http://ccflow.org/?frm=KonBAI) ## 参考文档 - 项目文档：[RuoYi-Flowable-Plus开发文档](http://rfp-doc.konbai.work) @@ -21,20 +21,20 @@ - 脚手架文档：[RuoYi-Vue-Plus文档](https://gitee.com/dromara/RuoYi-Vue-Plus/wikis/pages) ## 项目地址 -- Gitee： -- GitHub： +- Gitee： +- GitHub： ## 在线演示 演示服务不限制CURD操作，希望大家按需使用，不要恶意添加脏数据或对服务器进行攻击等操作。（将不定期清理数据） -[RuoYi-Flowable-Plus 在线演示](http://159.75.158.189/) +[KLP 在线演示](http://159.75.158.189/) | | 账号 | 密码 | |---------------- | ----- | -------- | | 超管账户 | admin | admin123 | -| 监控中心（未运行） | ruoyi | 123456 | +| 监控中心（未运行） | klp | 123456 | | 任务调度中心 | admin | 123456 | -| 数据监控中心 | ruoyi | 123456 | +| 数据监控中心 | klp | 123456 | ## 技术交流群 @@ -44,8 +44,8 @@ 交流4群 [![加入QQ群](https://img.shields.io/badge/QQ群-683510042-blue.svg?style=flat)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=RBXhJKfZT0GSjEPa0CcViGmP_mnVE82j&authKey=J9shEDSoCujDRJO9wcpqzsbvCQskcEvo0idGd54I0uk735K90HhA0v5ywEkUdxK3&noverify=0&group_code=683510042)
## 参与开源 -- 如遇到问题，欢迎提交到 [issues](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus/issues)（请按模版进行填写信息）。 -- 欢迎提交 [PR](https://gitee.com/KonBAI-Q/ruoyi-flowable-plus/pulls) ，注意请提交到 `develop` 开发分支 统一测试发版。 +- 如遇到问题，欢迎提交到 [issues](https://gitee.com/KonBAI-Q/klp-flowable-plus/issues)（请按模版进行填写信息）。 +- 欢迎提交 [PR](https://gitee.com/KonBAI-Q/klp-flowable-plus/pulls) ，注意请提交到 `develop` 开发分支 统一测试发版。 ## 特别鸣谢 - [RuoYi-Vue-Plus](https://gitee.com/dromara/RuoYi-Vue-Plus) diff --git a/ruoyi-admin/Dockerfile b/klp-admin/Dockerfile similarity index 55% rename from ruoyi-admin/Dockerfile rename to klp-admin/Dockerfile index 6033f7e8..f9870006 100644 --- a/ruoyi-admin/Dockerfile +++ b/klp-admin/Dockerfile @@ -2,22 +2,22 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/server/logs \ - /ruoyi/server/temp \ - /ruoyi/skywalking/agent +RUN mkdir -p /klp/server/logs \ + /klp/server/temp \ + /klp/skywalking/agent -WORKDIR /ruoyi/server +WORKDIR /klp/server ENV SERVER_PORT=8080 EXPOSE ${SERVER_PORT} -ADD ./target/ruoyi-admin.jar ./app.jar +ADD ./target/klp-admin.jar ./app.jar ENTRYPOINT ["java", \ "-Djava.security.egd=file:/dev/./urandom", \ "-Dserver.port=${SERVER_PORT}", \ # 应用名称 如果想区分集群节点监控 改成不同的名称即可 -# "-Dskywalking.agent.service_name=ruoyi-server", \ -# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ +# "-Dskywalking.agent.service_name=klp-server", \ +# "-javaagent:/klp/skywalking/agent/skywalking-agent.jar", \ "-jar", "app.jar"] diff --git a/ruoyi-admin/pom.xml b/klp-admin/pom.xml similarity index 70% rename from ruoyi-admin/pom.xml rename to klp-admin/pom.xml index 23210b55..8b6aaca7 100644 --- a/ruoyi-admin/pom.xml +++ b/klp-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 jar - ruoyi-admin + klp-admin web服务入口 @@ -47,61 +47,56 @@ - com.ruoyi - ruoyi-framework + com.klp + klp-framework - com.ruoyi - ruoyi-system + com.klp + klp-system - com.ruoyi - ruoyi-job + com.klp + klp-job - com.ruoyi - ruoyi-oss + com.klp + klp-oss - com.ruoyi - ruoyi-generator + com.klp + klp-generator - com.ruoyi - ruoyi-demo + com.klp + klp-demo - com.ruoyi - ruoyi-flowable + com.klp + klp-flowable + + + com.klp + klp-wms + + + org.springframework.boot spring-boot-starter-test test - - - - - - - - - - - - diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/klp-admin/src/main/java/com/klp/KLPApplication.java similarity index 79% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to klp-admin/src/main/java/com/klp/KLPApplication.java index 01534282..1e0e260d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/klp-admin/src/main/java/com/klp/KLPApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.klp; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,15 +7,15 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt /** * 启动程序 * - * @author ruoyi + * @author klp */ @SpringBootApplication -public class RuoYiApplication { +public class KLPApplication { public static void main(String[] args) { System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication application = new SpringApplication(RuoYiApplication.class); + SpringApplication application = new SpringApplication(KLPApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Flowable-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/klp-admin/src/main/java/com/klp/KLPServletInitializer.java similarity index 63% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to klp-admin/src/main/java/com/klp/KLPServletInitializer.java index dd056268..1cd0fd17 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/klp-admin/src/main/java/com/klp/KLPServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.klp; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author klp */ -public class RuoYiServletInitializer extends SpringBootServletInitializer { +public class KLPServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(KLPApplication.class); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/klp-admin/src/main/java/com/klp/web/controller/common/CaptchaController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to klp-admin/src/main/java/com/klp/web/controller/common/CaptchaController.java index f5a603a4..1da8920d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/common/CaptchaController.java @@ -1,25 +1,25 @@ -package com.ruoyi.web.controller.common; +package com.klp.web.controller.common; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.RandomUtil; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.CaptchaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.email.MailUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.CaptchaProperties; -import com.ruoyi.framework.config.properties.MailProperties; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.core.SmsTemplate; -import com.ruoyi.sms.entity.SmsResult; -import com.ruoyi.system.service.ISysConfigService; +import com.klp.common.constant.CacheConstants; +import com.klp.common.constant.Constants; +import com.klp.common.core.domain.R; +import com.klp.common.enums.CaptchaType; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.email.MailUtils; +import com.klp.common.utils.redis.RedisUtils; +import com.klp.common.utils.reflect.ReflectUtils; +import com.klp.common.utils.spring.SpringUtils; +import com.klp.framework.config.properties.CaptchaProperties; +import com.klp.framework.config.properties.MailProperties; +import com.klp.sms.config.properties.SmsProperties; +import com.klp.sms.core.SmsTemplate; +import com.klp.sms.entity.SmsResult; +import com.klp.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.expression.Expression; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/klp-admin/src/main/java/com/klp/web/controller/monitor/CacheController.java similarity index 93% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to klp-admin/src/main/java/com/klp/web/controller/monitor/CacheController.java index f0ecce1b..4845a6a3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/monitor/CacheController.java @@ -1,15 +1,15 @@ -package com.ruoyi.web.controller.monitor; +package com.klp.web.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.collection.CollUtil; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.CacheUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.system.domain.SysCache; +import com.klp.common.constant.CacheConstants; +import com.klp.common.constant.CacheNames; +import com.klp.common.core.domain.R; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.redis.CacheUtils; +import com.klp.common.utils.redis.RedisUtils; +import com.klp.system.domain.SysCache; import lombok.RequiredArgsConstructor; import org.redisson.spring.data.connection.RedissonConnectionFactory; import org.springframework.data.redis.connection.RedisConnection; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/klp-admin/src/main/java/com/klp/web/controller/monitor/SysLogininforController.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to klp-admin/src/main/java/com/klp/web/controller/monitor/SysLogininforController.java index caae8b00..3ff26a72 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/monitor/SysLogininforController.java @@ -1,17 +1,17 @@ -package com.ruoyi.web.controller.monitor; +package com.klp.web.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.klp.common.annotation.Log; +import com.klp.common.constant.CacheConstants; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.common.utils.redis.RedisUtils; +import com.klp.system.domain.SysLogininfor; +import com.klp.system.service.ISysLogininforService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/klp-admin/src/main/java/com/klp/web/controller/monitor/SysOperlogController.java similarity index 80% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to klp-admin/src/main/java/com/klp/web/controller/monitor/SysOperlogController.java index 468b9c4c..d1781b94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/monitor/SysOperlogController.java @@ -1,15 +1,15 @@ -package com.ruoyi.web.controller.monitor; +package com.klp.web.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.domain.SysOperLog; +import com.klp.system.service.ISysOperLogService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/klp-admin/src/main/java/com/klp/web/controller/monitor/SysUserOnlineController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to klp-admin/src/main/java/com/klp/web/controller/monitor/SysUserOnlineController.java index 33d425a6..ebb4aa2a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/monitor/SysUserOnlineController.java @@ -1,20 +1,20 @@ -package com.ruoyi.web.controller.monitor; +package com.klp.web.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.dto.UserOnlineDTO; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.system.domain.SysUserOnline; +import com.klp.common.annotation.Log; +import com.klp.common.constant.CacheConstants; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.dto.UserOnlineDTO; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.StreamUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.redis.RedisUtils; +import com.klp.system.domain.SysUserOnline; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysConfigController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysConfigController.java index f5cb2a5e..d159cbc3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysConfigController.java @@ -1,16 +1,15 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.domain.SysConfig; +import com.klp.system.service.ISysConfigService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysDeptController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysDeptController.java index 512c644c..81193513 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysDeptController.java @@ -1,15 +1,15 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.klp.common.annotation.Log; +import com.klp.common.constant.UserConstants; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysDept; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.StringUtils; +import com.klp.system.service.ISysDeptService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysDictDataController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysDictDataController.java index 01613db8..a010b339 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysDictDataController.java @@ -1,17 +1,17 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysDictData; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.service.ISysDictDataService; +import com.klp.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysDictTypeController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysDictTypeController.java index e6beb64a..29c6107d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysDictTypeController.java @@ -1,16 +1,15 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysDictType; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.service.ISysDictTypeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysIndexController.java similarity index 79% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysIndexController.java index 69825740..c0a06063 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysIndexController.java @@ -1,8 +1,8 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaIgnore; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.config.KLPConfig; +import com.klp.common.utils.StringUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -19,7 +19,7 @@ public class SysIndexController { /** * 系统基础配置 */ - private final RuoYiConfig ruoyiConfig; + private final KLPConfig ruoyiConfig; /** * 访问首页，提示语 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysLoginController.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysLoginController.java index f982a5fa..d1f0ba67 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysLoginController.java @@ -1,19 +1,19 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaIgnore; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.EmailLoginBody; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.domain.model.SmsLoginBody; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysLoginService; +import com.klp.common.constant.Constants; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysMenu; +import com.klp.common.core.domain.entity.SysUser; +import com.klp.common.core.domain.model.EmailLoginBody; +import com.klp.common.core.domain.model.LoginBody; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.core.domain.model.SmsLoginBody; +import com.klp.common.helper.LoginHelper; +import com.klp.system.domain.vo.RouterVo; +import com.klp.system.service.ISysMenuService; +import com.klp.system.service.ISysUserService; +import com.klp.system.service.SysLoginService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysMenuController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysMenuController.java index 1f138615..10a2dd9a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysMenuController.java @@ -1,15 +1,15 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.lang.tree.Tree; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysMenuService; +import com.klp.common.annotation.Log; +import com.klp.common.constant.UserConstants; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysMenu; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.StringUtils; +import com.klp.system.service.ISysMenuService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysNoticeController.java similarity index 83% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysNoticeController.java index 54b30d60..1569d1ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysNoticeController.java @@ -1,14 +1,14 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.system.domain.SysNotice; +import com.klp.system.service.ISysNoticeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysOssConfigController.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysOssConfigController.java index 8dc4876e..153ac179 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysOssConfigController.java @@ -1,19 +1,19 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.bo.SysOssConfigBo; -import com.ruoyi.system.domain.vo.SysOssConfigVo; -import com.ruoyi.system.service.ISysOssConfigService; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.core.validate.QueryGroup; +import com.klp.common.enums.BusinessType; +import com.klp.system.domain.bo.SysOssConfigBo; +import com.klp.system.domain.vo.SysOssConfigVo; +import com.klp.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysOssController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysOssController.java index 2a7cc11c..f3d48fcf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysOssController.java @@ -1,18 +1,18 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.bo.SysOssBo; -import com.ruoyi.system.domain.vo.SysOssVo; -import com.ruoyi.system.service.ISysOssService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.QueryGroup; +import com.klp.common.enums.BusinessType; +import com.klp.system.domain.bo.SysOssBo; +import com.klp.system.domain.vo.SysOssVo; +import com.klp.system.service.ISysOssService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysPostController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysPostController.java index 4036364f..f97cca64 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysPostController.java @@ -1,16 +1,15 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.domain.SysPost; +import com.klp.system.service.ISysPostService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysProfileController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysProfileController.java index 9e646ec2..f5ecbe89 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysProfileController.java @@ -1,20 +1,18 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.io.FileUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.system.domain.SysOss; -import com.ruoyi.system.domain.vo.SysOssVo; -import com.ruoyi.system.service.ISysOssService; -import com.ruoyi.system.service.ISysUserService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysUser; +import com.klp.common.enums.BusinessType; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.file.MimeTypeUtils; +import com.klp.system.domain.vo.SysOssVo; +import com.klp.system.service.ISysOssService; +import com.klp.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysRegisterController.java similarity index 77% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysRegisterController.java index 26445820..cbedf672 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysRegisterController.java @@ -1,11 +1,11 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaIgnore; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.SysRegisterService; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.model.RegisterBody; +import com.klp.system.service.ISysConfigService; +import com.klp.system.service.SysRegisterService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysRoleController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysRoleController.java index f8edb5d8..f1d63c49 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysRoleController.java @@ -1,21 +1,21 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysPermissionService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysDept; +import com.klp.common.core.domain.entity.SysRole; +import com.klp.common.core.domain.entity.SysUser; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.domain.SysUserRole; +import com.klp.system.service.ISysDeptService; +import com.klp.system.service.ISysRoleService; +import com.klp.system.service.ISysUserService; +import com.klp.system.service.SysPermissionService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/klp-admin/src/main/java/com/klp/web/controller/system/SysUserController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to klp-admin/src/main/java/com/klp/web/controller/system/SysUserController.java index bab44ec8..9709d53c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/system/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.klp.web.controller.system; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; @@ -7,27 +7,27 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.vo.SysUserExportVo; -import com.ruoyi.system.domain.vo.SysUserImportVo; -import com.ruoyi.system.listener.SysUserImportListener; -import com.ruoyi.system.service.ISysDeptService; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.entity.SysDept; +import com.klp.common.core.domain.entity.SysRole; +import com.klp.common.core.domain.entity.SysUser; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.excel.ExcelResult; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.StreamUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.system.domain.vo.SysUserExportVo; +import com.klp.system.domain.vo.SysUserImportVo; +import com.klp.system.listener.SysUserImportListener; +import com.klp.system.service.ISysDeptService; +import com.klp.system.service.ISysPostService; +import com.klp.system.service.ISysRoleService; +import com.klp.system.service.ISysUserService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfCategoryController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfCategoryController.java index 8ab6af56..9bbb1dda 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfCategoryController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfCategoryController.java @@ -1,18 +1,18 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; import cn.dev33.satoken.annotation.SaCheckLogin; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.workflow.domain.WfCategory; -import com.ruoyi.workflow.domain.vo.WfCategoryVo; -import com.ruoyi.workflow.service.IWfCategoryService; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.workflow.domain.WfCategory; +import com.klp.workflow.domain.vo.WfCategoryVo; +import com.klp.workflow.service.IWfCategoryService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDeployController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfDeployController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDeployController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfDeployController.java index 2eef43e9..8a132f94 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfDeployController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfDeployController.java @@ -1,18 +1,18 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.flowable.core.domain.ProcessQuery; -import com.ruoyi.workflow.domain.vo.WfDeployVo; -import com.ruoyi.workflow.domain.vo.WfFormVo; -import com.ruoyi.workflow.service.IWfDeployFormService; -import com.ruoyi.workflow.service.IWfDeployService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.JsonUtils; +import com.klp.flowable.core.domain.ProcessQuery; +import com.klp.workflow.domain.vo.WfDeployVo; +import com.klp.workflow.domain.vo.WfFormVo; +import com.klp.workflow.service.IWfDeployFormService; +import com.klp.workflow.service.IWfDeployService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfFormController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfFormController.java index 1fc17821..6aee11ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfFormController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfFormController.java @@ -1,19 +1,19 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.workflow.domain.WfDeployForm; -import com.ruoyi.workflow.domain.bo.WfFormBo; -import com.ruoyi.workflow.domain.vo.WfFormVo; -import com.ruoyi.workflow.service.IWfDeployFormService; -import com.ruoyi.workflow.service.IWfFormService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.QueryGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.workflow.domain.WfDeployForm; +import com.klp.workflow.domain.bo.WfFormBo; +import com.klp.workflow.domain.vo.WfFormVo; +import com.klp.workflow.service.IWfDeployFormService; +import com.klp.workflow.service.IWfFormService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfInstanceController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfInstanceController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfInstanceController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfInstanceController.java index 5030e9a3..d44b1ef5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfInstanceController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfInstanceController.java @@ -1,9 +1,9 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.workflow.domain.bo.WfTaskBo; -import com.ruoyi.workflow.service.IWfInstanceService; +import com.klp.common.core.domain.R; +import com.klp.workflow.domain.bo.WfTaskBo; +import com.klp.workflow.service.IWfInstanceService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfModelController.java similarity index 86% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfModelController.java index a48074fc..8eaf6cc0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfModelController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfModelController.java @@ -1,24 +1,24 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.workflow.domain.WfCategory; -import com.ruoyi.workflow.domain.bo.WfModelBo; -import com.ruoyi.workflow.domain.vo.WfCategoryVo; -import com.ruoyi.workflow.domain.vo.WfModelExportVo; -import com.ruoyi.workflow.domain.vo.WfModelVo; -import com.ruoyi.workflow.service.IWfCategoryService; -import com.ruoyi.workflow.service.IWfModelService; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.workflow.domain.WfCategory; +import com.klp.workflow.domain.bo.WfModelBo; +import com.klp.workflow.domain.vo.WfCategoryVo; +import com.klp.workflow.domain.vo.WfModelExportVo; +import com.klp.workflow.domain.vo.WfModelVo; +import com.klp.workflow.service.IWfCategoryService; +import com.klp.workflow.service.IWfModelService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfProcessController.java similarity index 93% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfProcessController.java index 04f48ada..4470268f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfProcessController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfProcessController.java @@ -1,20 +1,20 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.flowable.core.domain.ProcessQuery; -import com.ruoyi.workflow.domain.bo.WfCopyBo; -import com.ruoyi.workflow.domain.vo.*; -import com.ruoyi.workflow.service.IWfCopyService; -import com.ruoyi.workflow.service.IWfProcessService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.flowable.core.domain.ProcessQuery; +import com.klp.workflow.domain.bo.WfCopyBo; +import com.klp.workflow.domain.vo.*; +import com.klp.workflow.service.IWfCopyService; +import com.klp.workflow.service.IWfProcessService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfTaskController.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java rename to klp-admin/src/main/java/com/klp/web/controller/workflow/WfTaskController.java index 97b0ec84..0708930e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/workflow/WfTaskController.java +++ b/klp-admin/src/main/java/com/klp/web/controller/workflow/WfTaskController.java @@ -1,10 +1,10 @@ -package com.ruoyi.web.controller.workflow; +package com.klp.web.controller.workflow; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.workflow.domain.bo.WfTaskBo; -import com.ruoyi.workflow.service.IWfTaskService; +import com.klp.common.core.domain.R; +import com.klp.workflow.domain.bo.WfTaskBo; +import com.klp.workflow.service.IWfTaskService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/klp-admin/src/main/resources/application-dev.yml similarity index 93% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to klp-admin/src/main/resources/application-dev.yml index f1615d43..c909dd46 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/klp-admin/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: klp password: 123456 --- # xxl-job 配置 @@ -49,9 +49,9 @@ spring: driverClassName: com.mysql.cj.jdbc.Driver # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562 # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题) - url: jdbc:mysql://localhost:3306/ry-flowable-plus?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true - username: root - password: root + url: jdbc:mysql://140.143.206.120:3306/klp-oa?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true + username: klp + password: KeLunPu123@ # 从库数据源 slave: lazy: true @@ -102,13 +102,13 @@ spring: spring: redis: # 地址 - host: localhost + host: 140.143.206.120 # 端口，默认为6379 port: 6379 # 数据库索引 database: 0 # 密码(如没有密码请注释掉) - # password: + password: KeLunPu123! # 连接超时时间 timeout: 10s # 是否开启ssl @@ -124,7 +124,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: ${klp.name} # 最小空闲连接数 connectionMinimumIdleSize: 8 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/klp-admin/src/main/resources/application-prod.yml similarity index 98% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to klp-admin/src/main/resources/application-prod.yml index 85f6e935..bcffbbd5 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/klp-admin/src/main/resources/application-prod.yml @@ -1,5 +1,5 @@ --- # 临时文件存储位置 避免临时文件被系统清理报错 -spring.servlet.multipart.location: /ruoyi/server/temp +spring.servlet.multipart.location: /klp/server/temp --- # 监控中心配置 spring.boot.admin.client: @@ -8,7 +8,7 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: klp password: 123456 --- # xxl-job 配置 @@ -127,7 +127,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: ${klp.name} # 最小空闲连接数 connectionMinimumIdleSize: 32 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application.yml b/klp-admin/src/main/resources/application.yml similarity index 93% rename from ruoyi-admin/src/main/resources/application.yml rename to klp-admin/src/main/resources/application.yml index 558d5833..63a9d950 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/klp-admin/src/main/resources/application.yml @@ -1,11 +1,11 @@ # 项目相关配置 -ruoyi: +klp: # 名称 - name: RuoYi-Flowable-Plus + name: fad-oa # 版本 - version: ${ruoyi-flowable-plus.version} + version: ${klp-flowable-plus.version} # 版权年份 - copyrightYear: 2022 + copyrightYear: 2025 # 实例演示开关 demoEnabled: true # 获取ip地址开关 @@ -49,7 +49,7 @@ server: # 日志配置 logging: level: - com.ruoyi: @logging.level@ + com.klp: @logging.level@ org.springframework: warn config: classpath:logback-plus.xml @@ -64,7 +64,7 @@ user: # Spring配置 spring: application: - name: ${ruoyi.name} + name: ${klp.name} # 资源信息 messages: # 国际化资源文件路径 @@ -143,11 +143,11 @@ security: mybatis-plus: # 不支持多包, 如有需要可在注解配置 或 提升扫包等级 # 例如 com.**.**.mapper - mapperPackage: com.ruoyi.**.mapper + mapperPackage: com.klp.**.mapper # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.klp.**.domain # 启动时是否检查 MyBatis XML 文件的存在，默认不检查 checkConfigLocation: false configuration: @@ -200,16 +200,16 @@ mybatis-encryptor: swagger: info: # 标题 - title: '标题：${ruoyi.name}后台管理系统_接口文档' + title: '标题：${klp.name}后台管理系统_接口文档' # 描述 description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' # 版本 - version: '版本号: ${ruoyi-flowable-plus.version}' + version: '版本号: ${klp-flowable-plus.version}' # 作者信息 contact: name: KonBAI email: 1527468660@qq.com - url: https://gitee.com/KonBAI-Q/ruoyi-flowable-plus + url: https://gitee.com/KonBAI-Q/klp-flowable-plus components: # 鉴权方式配置 security-schemes: @@ -228,11 +228,11 @@ springdoc: #这里定义了两个分组，可定义多个，也可以不定义 group-configs: - group: 1.演示模块 - packages-to-scan: com.ruoyi.demo + packages-to-scan: com.klp.demo - group: 2.系统模块 - packages-to-scan: com.ruoyi.web + packages-to-scan: com.klp.web - group: 3.代码生成模块 - packages-to-scan: com.ruoyi.generator + packages-to-scan: com.klp.generator # 防止XSS攻击 xss: diff --git a/ruoyi-admin/src/main/resources/banner.txt b/klp-admin/src/main/resources/banner.txt similarity index 70% rename from ruoyi-admin/src/main/resources/banner.txt rename to klp-admin/src/main/resources/banner.txt index f0428467..1a933903 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/klp-admin/src/main/resources/banner.txt @@ -4,4 +4,4 @@ | _ < | |_| || (_) || | | | | _| | || (_) |\ V V /| (_| || |_) || || __/ | __/ | || |_| |\__ \ |_| \_\ \__,_| \___/ |_| |_| |_| |_| \___/ \_/\_/ \__,_||_.__/ |_| \___| |_| |_| \__,_||___/ -${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} RuoYi-Flowable-Plus:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${ruoyi-flowable-plus.version} ${spring-boot.formatted-version} +${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} KLP:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${klp-flowable-plus.version} ${spring-boot.formatted-version} diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/klp-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to klp-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/klp-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to klp-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/klp-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to klp-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/ip2region.xdb b/klp-admin/src/main/resources/ip2region.xdb similarity index 100% rename from ruoyi-admin/src/main/resources/ip2region.xdb rename to klp-admin/src/main/resources/ip2region.xdb diff --git a/ruoyi-admin/src/main/resources/logback-plus.xml b/klp-admin/src/main/resources/logback-plus.xml similarity index 100% rename from ruoyi-admin/src/main/resources/logback-plus.xml rename to klp-admin/src/main/resources/logback-plus.xml diff --git a/ruoyi-admin/src/main/resources/spy.properties b/klp-admin/src/main/resources/spy.properties similarity index 100% rename from ruoyi-admin/src/main/resources/spy.properties rename to klp-admin/src/main/resources/spy.properties diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java b/klp-admin/src/test/java/com/klp/test/AssertUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java rename to klp-admin/src/test/java/com/klp/test/AssertUnitTest.java index 5b9c9f84..649fd11b 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java +++ b/klp-admin/src/test/java/com/klp/test/AssertUnitTest.java @@ -1,4 +1,4 @@ -package com.ruoyi.test; +package com.klp.test; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/klp-admin/src/test/java/com/klp/test/DemoUnitTest.java similarity index 86% rename from ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java rename to klp-admin/src/test/java/com/klp/test/DemoUnitTest.java index a40fd827..326cc625 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ b/klp-admin/src/test/java/com/klp/test/DemoUnitTest.java @@ -1,6 +1,6 @@ -package com.ruoyi.test; +package com.klp.test; -import com.ruoyi.common.config.RuoYiConfig; +import com.klp.common.config.KLPConfig; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -17,19 +17,19 @@ import java.util.concurrent.TimeUnit; public class DemoUnitTest { @Autowired - private RuoYiConfig ruoYiConfig; + private KLPConfig KLPConfig; @DisplayName("测试 @SpringBootTest @Test @DisplayName 注解") @Test public void testTest() { - System.out.println(ruoYiConfig); + System.out.println(KLPConfig); } @Disabled @DisplayName("测试 @Disabled 注解") @Test public void testDisabled() { - System.out.println(ruoYiConfig); + System.out.println(KLPConfig); } @Timeout(value = 2L, unit = TimeUnit.SECONDS) @@ -37,7 +37,7 @@ public class DemoUnitTest { @Test public void testTimeout() throws InterruptedException { Thread.sleep(3000); - System.out.println(ruoYiConfig); + System.out.println(KLPConfig); } diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java b/klp-admin/src/test/java/com/klp/test/ParamUnitTest.java similarity index 96% rename from ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java rename to klp-admin/src/test/java/com/klp/test/ParamUnitTest.java index 04bf1b5c..fbbc6fad 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java +++ b/klp-admin/src/test/java/com/klp/test/ParamUnitTest.java @@ -1,6 +1,6 @@ -package com.ruoyi.test; +package com.klp.test; -import com.ruoyi.common.enums.UserType; +import com.klp.common.enums.UserType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; diff --git a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java b/klp-admin/src/test/java/com/klp/test/TagUnitTest.java similarity index 97% rename from ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java rename to klp-admin/src/test/java/com/klp/test/TagUnitTest.java index 04240a07..82d35760 100644 --- a/ruoyi-admin/src/test/java/com/ruoyi/test/TagUnitTest.java +++ b/klp-admin/src/test/java/com/klp/test/TagUnitTest.java @@ -1,4 +1,4 @@ -package com.ruoyi.test; +package com.klp.test; import org.junit.jupiter.api.*; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ruoyi-common/pom.xml b/klp-common/pom.xml similarity index 97% rename from ruoyi-common/pom.xml rename to klp-common/pom.xml index 664d4d4c..a1161693 100644 --- a/ruoyi-common/pom.xml +++ b/klp-common/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 - ruoyi-common + klp-common common通用工具 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java b/klp-common/src/main/java/com/klp/common/annotation/CellMerge.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java rename to klp-common/src/main/java/com/klp/common/annotation/CellMerge.java index 4af822ed..361c73e9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/CellMerge.java +++ b/klp-common/src/main/java/com/klp/common/annotation/CellMerge.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; -import com.ruoyi.common.excel.CellMergeStrategy; +import com.klp.common.excel.CellMergeStrategy; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java b/klp-common/src/main/java/com/klp/common/annotation/DataColumn.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java rename to klp-common/src/main/java/com/klp/common/annotation/DataColumn.java index df416edc..98d1ac93 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataColumn.java +++ b/klp-common/src/main/java/com/klp/common/annotation/DataColumn.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java b/klp-common/src/main/java/com/klp/common/annotation/DataPermission.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java rename to klp-common/src/main/java/com/klp/common/annotation/DataPermission.java index 73d9c039..ff48901d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataPermission.java +++ b/klp-common/src/main/java/com/klp/common/annotation/DataPermission.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java b/klp-common/src/main/java/com/klp/common/annotation/DictDataMapper.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java rename to klp-common/src/main/java/com/klp/common/annotation/DictDataMapper.java index 564b2a4a..5cf1eb08 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DictDataMapper.java +++ b/klp-common/src/main/java/com/klp/common/annotation/DictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.jackson.DictDataJsonSerializer; +import com.klp.common.jackson.DictDataJsonSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/EncryptField.java b/klp-common/src/main/java/com/klp/common/annotation/EncryptField.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/EncryptField.java rename to klp-common/src/main/java/com/klp/common/annotation/EncryptField.java index 2d6a321f..ad98a4aa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/EncryptField.java +++ b/klp-common/src/main/java/com/klp/common/annotation/EncryptField.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java b/klp-common/src/main/java/com/klp/common/annotation/ExcelDictFormat.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java rename to klp-common/src/main/java/com/klp/common/annotation/ExcelDictFormat.java index 4bb0cc86..f09fc558 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java +++ b/klp-common/src/main/java/com/klp/common/annotation/ExcelDictFormat.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelEnumFormat.java b/klp-common/src/main/java/com/klp/common/annotation/ExcelEnumFormat.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelEnumFormat.java rename to klp-common/src/main/java/com/klp/common/annotation/ExcelEnumFormat.java index a8f550a4..126f3969 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelEnumFormat.java +++ b/klp-common/src/main/java/com/klp/common/annotation/ExcelEnumFormat.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/klp-common/src/main/java/com/klp/common/annotation/Log.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to klp-common/src/main/java/com/klp/common/annotation/Log.java index f9ba0012..6162bafb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/klp-common/src/main/java/com/klp/common/annotation/Log.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.klp.common.enums.BusinessType; +import com.klp.common.enums.OperatorType; import java.lang.annotation.*; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author klp */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/klp-common/src/main/java/com/klp/common/annotation/RateLimiter.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to klp-common/src/main/java/com/klp/common/annotation/RateLimiter.java index 6eeb2f2c..ab449a35 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/klp-common/src/main/java/com/klp/common/annotation/RateLimiter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; -import com.ruoyi.common.enums.LimitType; +import com.klp.common.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/klp-common/src/main/java/com/klp/common/annotation/RepeatSubmit.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to klp-common/src/main/java/com/klp/common/annotation/RepeatSubmit.java index d30962d0..3b94642b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/klp-common/src/main/java/com/klp/common/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java b/klp-common/src/main/java/com/klp/common/annotation/Sensitive.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java rename to klp-common/src/main/java/com/klp/common/annotation/Sensitive.java index 2ad9777c..2a26a4a5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Sensitive.java +++ b/klp-common/src/main/java/com/klp/common/annotation/Sensitive.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.jackson.SensitiveJsonSerializer; +import com.klp.common.enums.SensitiveStrategy; +import com.klp.common.jackson.SensitiveJsonSerializer; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Translation.java b/klp-common/src/main/java/com/klp/common/annotation/Translation.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Translation.java rename to klp-common/src/main/java/com/klp/common/annotation/Translation.java index ba8cd22c..dd6cfd56 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Translation.java +++ b/klp-common/src/main/java/com/klp/common/annotation/Translation.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.common.translation.handler.TranslationHandler; +import com.klp.common.translation.handler.TranslationHandler; import java.lang.annotation.*; @@ -20,7 +20,7 @@ import java.lang.annotation.*; public @interface Translation { /** - * 类型 (需与实现类上的 {@link com.ruoyi.common.annotation.TranslationType} 注解type对应) + * 类型 (需与实现类上的 {@link com.klp.common.annotation.TranslationType} 注解type对应) *

* 默认取当前字段的值 如果设置了 @{@link Translation#mapper()} 则取映射字段的值 */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TranslationType.java b/klp-common/src/main/java/com/klp/common/annotation/TranslationType.java similarity index 62% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/TranslationType.java rename to klp-common/src/main/java/com/klp/common/annotation/TranslationType.java index f592f6d8..aa710682 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TranslationType.java +++ b/klp-common/src/main/java/com/klp/common/annotation/TranslationType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.annotation; +package com.klp.common.annotation; import java.lang.annotation.*; /** - * 翻译类型注解 (标注到{@link com.ruoyi.common.translation.TranslationInterface} 的实现类) + * 翻译类型注解 (标注到{@link com.klp.common.translation.TranslationInterface} 的实现类) * * @author Lion Li */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java b/klp-common/src/main/java/com/klp/common/captcha/UnsignedMathGenerator.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java rename to klp-common/src/main/java/com/klp/common/captcha/UnsignedMathGenerator.java index 5dd00ec0..f668e861 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java +++ b/klp-common/src/main/java/com/klp/common/captcha/UnsignedMathGenerator.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.captcha; +package com.klp.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.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; /** * 无符号计算生成器 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/klp-common/src/main/java/com/klp/common/config/KLPConfig.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to klp-common/src/main/java/com/klp/common/config/KLPConfig.java index 8ce7a8c4..fbd48965 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/klp-common/src/main/java/com/klp/common/config/KLPConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.klp.common.config; import lombok.Data; import lombok.Getter; @@ -13,8 +13,8 @@ import org.springframework.stereotype.Component; @Data @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig { +@ConfigurationProperties(prefix = "klp") +public class KLPConfig { /** * 项目名称 @@ -48,7 +48,7 @@ public class RuoYiConfig { private static boolean addressEnabled; public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + KLPConfig.addressEnabled = addressEnabled; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/klp-common/src/main/java/com/klp/common/constant/CacheConstants.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to klp-common/src/main/java/com/klp/common/constant/CacheConstants.java index 0fb2c3f9..c4743f14 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/klp-common/src/main/java/com/klp/common/constant/CacheConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 缓存的key 常量 * - * @author ruoyi + * @author klp */ public interface CacheConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java b/klp-common/src/main/java/com/klp/common/constant/CacheNames.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java rename to klp-common/src/main/java/com/klp/common/constant/CacheNames.java index 7d4164b6..da5c1eaa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/CacheNames.java +++ b/klp-common/src/main/java/com/klp/common/constant/CacheNames.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 缓存组名称常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/klp-common/src/main/java/com/klp/common/constant/Constants.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to klp-common/src/main/java/com/klp/common/constant/Constants.java index e634ed29..70e096f8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/klp-common/src/main/java/com/klp/common/constant/Constants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 通用常量信息 * - * @author ruoyi + * @author klp */ public interface Constants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/klp-common/src/main/java/com/klp/common/constant/GenConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to klp-common/src/main/java/com/klp/common/constant/GenConstants.java index bb08d50a..bbf6c5f9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/klp-common/src/main/java/com/klp/common/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author klp */ public interface GenConstants { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/klp-common/src/main/java/com/klp/common/constant/HttpStatus.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to klp-common/src/main/java/com/klp/common/constant/HttpStatus.java index f007b8c8..95f4565f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/klp-common/src/main/java/com/klp/common/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 返回状态码 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/TransConstant.java b/klp-common/src/main/java/com/klp/common/constant/TransConstant.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/TransConstant.java rename to klp-common/src/main/java/com/klp/common/constant/TransConstant.java index 5c5e5f8e..7b7e4737 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/TransConstant.java +++ b/klp-common/src/main/java/com/klp/common/constant/TransConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 翻译常量 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/klp-common/src/main/java/com/klp/common/constant/UserConstants.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to klp-common/src/main/java/com/klp/common/constant/UserConstants.java index 4a095faa..215ed667 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/klp-common/src/main/java/com/klp/common/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.klp.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author klp */ public interface UserConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java b/klp-common/src/main/java/com/klp/common/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java rename to klp-common/src/main/java/com/klp/common/convert/ExcelBigNumberConvert.java index 432ab74e..0669e642 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java +++ b/klp-common/src/main/java/com/klp/common/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.klp.common.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/klp-common/src/main/java/com/klp/common/convert/ExcelDictConvert.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java rename to klp-common/src/main/java/com/klp/common/convert/ExcelDictConvert.java index 03dad1f8..b8b428a1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java +++ b/klp-common/src/main/java/com/klp/common/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.klp.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.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.utils.spring.SpringUtils; +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 lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelEnumConvert.java b/klp-common/src/main/java/com/klp/common/convert/ExcelEnumConvert.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelEnumConvert.java rename to klp-common/src/main/java/com/klp/common/convert/ExcelEnumConvert.java index c69d90cf..87f7e4fe 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelEnumConvert.java +++ b/klp-common/src/main/java/com/klp/common/convert/ExcelEnumConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.klp.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.ruoyi.common.annotation.ExcelEnumFormat; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.klp.common.annotation.ExcelEnumFormat; +import com.klp.common.utils.reflect.ReflectUtils; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/klp-common/src/main/java/com/klp/common/core/controller/BaseController.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to klp-common/src/main/java/com/klp/common/core/controller/BaseController.java index 1e0a5d52..3380a9b4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/klp-common/src/main/java/com/klp/common/core/controller/BaseController.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.controller; +package com.klp.common.core.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.core.domain.R; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.StringUtils; /** * web层通用数据处理 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java index bd316079..682f47db 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.klp.common.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java b/klp-common/src/main/java/com/klp/common/core/domain/PageQuery.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java rename to klp-common/src/main/java/com/klp/common/core/domain/PageQuery.java index 8a45905b..a56b037e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/PageQuery.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/PageQuery.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain; +package com.klp.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.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.sql.SqlUtil; import lombok.Data; import java.io.Serializable; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java b/klp-common/src/main/java/com/klp/common/core/domain/R.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java rename to klp-common/src/main/java/com/klp/common/core/domain/R.java index 381a6f60..9681c724 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/R.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.domain; +package com.klp.common.core.domain; -import com.ruoyi.common.constant.HttpStatus; +import com.klp.common.constant.HttpStatus; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java index c7bb9b4f..056cd151 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.klp.common.core.domain; import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java b/klp-common/src/main/java/com/klp/common/core/domain/dto/RoleDTO.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java rename to klp-common/src/main/java/com/klp/common/core/domain/dto/RoleDTO.java index e25243f5..60ef3bb1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/RoleDTO.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.dto; +package com.klp.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java b/klp-common/src/main/java/com/klp/common/core/domain/dto/UserOnlineDTO.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java rename to klp-common/src/main/java/com/klp/common/core/domain/dto/UserOnlineDTO.java index cdd3905a..1588813c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/UserOnlineDTO.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/dto/UserOnlineDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.dto; +package com.klp.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; @@ -8,7 +8,7 @@ import java.io.Serializable; /** * 当前在线会话 * - * @author ruoyi + * @author klp */ @Data diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysDept.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to klp-common/src/main/java/com/klp/common/core/domain/entity/SysDept.java index ba4a382c..a599dc33 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysDept.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.entity; +package com.klp.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.TreeEntity; +import com.klp.common.core.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysDictData.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to klp-common/src/main/java/com/klp/common/core/domain/entity/SysDictData.java index 4ed2c548..6d95f119 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysDictData.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.entity; +package com.klp.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.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +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 lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysDictType.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to klp-common/src/main/java/com/klp/common/core/domain/entity/SysDictType.java index 76c20e10..57b61af3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysDictType.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain.entity; +package com.klp.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.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java index 38bd9365..c72ad5b4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysMenu.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.entity; +package com.klp.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.core.domain.TreeEntity; +import com.klp.common.core.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysRole.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to klp-common/src/main/java/com/klp/common/core/domain/entity/SysRole.java index 59495699..d590059b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.klp.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.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +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 lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysUser.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to klp-common/src/main/java/com/klp/common/core/domain/entity/SysUser.java index d9139c51..dfd64816 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/entity/SysUser.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.entity; +package com.klp.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.xss.Xss; +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 lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java b/klp-common/src/main/java/com/klp/common/core/domain/event/LogininforEvent.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java rename to klp-common/src/main/java/com/klp/common/core/domain/event/LogininforEvent.java index 733f97f9..f17e763f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/LogininforEvent.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/event/LogininforEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.event; +package com.klp.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java b/klp-common/src/main/java/com/klp/common/core/domain/event/OperLogEvent.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java rename to klp-common/src/main/java/com/klp/common/core/domain/event/OperLogEvent.java index 3a299781..efff5115 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/event/OperLogEvent.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/event/OperLogEvent.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.event; +package com.klp.common.core.domain.event; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/EmailLoginBody.java b/klp-common/src/main/java/com/klp/common/core/domain/model/EmailLoginBody.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/EmailLoginBody.java rename to klp-common/src/main/java/com/klp/common/core/domain/model/EmailLoginBody.java index b7bf81bd..d3419bd9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/EmailLoginBody.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/model/EmailLoginBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.klp.common.core.domain.model; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/klp-common/src/main/java/com/klp/common/core/domain/model/LoginBody.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to klp-common/src/main/java/com/klp/common/core/domain/model/LoginBody.java index 4a4cfb51..49356d86 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/model/LoginBody.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.domain.model; +package com.klp.common.core.domain.model; -import com.ruoyi.common.constant.UserConstants; +import com.klp.common.constant.UserConstants; import lombok.Data; import org.hibernate.validator.constraints.Length; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/klp-common/src/main/java/com/klp/common/core/domain/model/LoginUser.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to klp-common/src/main/java/com/klp/common/core/domain/model/LoginUser.java index 367cbac7..fee84530 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/model/LoginUser.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.domain.model; +package com.klp.common.core.domain.model; -import com.ruoyi.common.core.domain.dto.RoleDTO; +import com.klp.common.core.domain.dto.RoleDTO; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/klp-common/src/main/java/com/klp/common/core/domain/model/RegisterBody.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to klp-common/src/main/java/com/klp/common/core/domain/model/RegisterBody.java index 88367e7b..d30ae2fd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/model/RegisterBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.klp.common.core.domain.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java b/klp-common/src/main/java/com/klp/common/core/domain/model/SmsLoginBody.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java rename to klp-common/src/main/java/com/klp/common/core/domain/model/SmsLoginBody.java index b12e74c1..17adb986 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/SmsLoginBody.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/model/SmsLoginBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.klp.common.core.domain.model; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java b/klp-common/src/main/java/com/klp/common/core/domain/model/XcxLoginUser.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java rename to klp-common/src/main/java/com/klp/common/core/domain/model/XcxLoginUser.java index 83313a0f..890efa7c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/XcxLoginUser.java +++ b/klp-common/src/main/java/com/klp/common/core/domain/model/XcxLoginUser.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.klp.common.core.domain.model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java b/klp-common/src/main/java/com/klp/common/core/mapper/BaseMapperPlus.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java rename to klp-common/src/main/java/com/klp/common/core/mapper/BaseMapperPlus.java index 0a8539ad..a3ca7a69 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java +++ b/klp-common/src/main/java/com/klp/common/core/mapper/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.mapper; +package com.klp.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.ruoyi.common.utils.BeanCopyUtils; +import com.klp.common.utils.BeanCopyUtils; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/klp-common/src/main/java/com/klp/common/core/page/TableDataInfo.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to klp-common/src/main/java/com/klp/common/core/page/TableDataInfo.java index 5f3f2d1a..1bfed87c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/klp-common/src/main/java/com/klp/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.klp.common.core.page; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.IPage; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java b/klp-common/src/main/java/com/klp/common/core/service/ConfigService.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java rename to klp-common/src/main/java/com/klp/common/core/service/ConfigService.java index c6badf65..034d1fde 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java +++ b/klp-common/src/main/java/com/klp/common/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.klp.common.core.service; /** * 通用 参数配置服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DeptService.java b/klp-common/src/main/java/com/klp/common/core/service/DeptService.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/DeptService.java rename to klp-common/src/main/java/com/klp/common/core/service/DeptService.java index c27f4618..e3f364d3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DeptService.java +++ b/klp-common/src/main/java/com/klp/common/core/service/DeptService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.klp.common.core.service; /** * 通用 部门服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java b/klp-common/src/main/java/com/klp/common/core/service/DictService.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java rename to klp-common/src/main/java/com/klp/common/core/service/DictService.java index b334c82a..f3bf1d0c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java +++ b/klp-common/src/main/java/com/klp/common/core/service/DictService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.klp.common.core.service; /** * 通用 字典服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OssService.java b/klp-common/src/main/java/com/klp/common/core/service/OssService.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/OssService.java rename to klp-common/src/main/java/com/klp/common/core/service/OssService.java index 65dda7c6..36792303 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OssService.java +++ b/klp-common/src/main/java/com/klp/common/core/service/OssService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.klp.common.core.service; /** * 通用 OSS服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java b/klp-common/src/main/java/com/klp/common/core/service/SensitiveService.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java rename to klp-common/src/main/java/com/klp/common/core/service/SensitiveService.java index 7b27bb45..36471923 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/SensitiveService.java +++ b/klp-common/src/main/java/com/klp/common/core/service/SensitiveService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.klp.common.core.service; /** * 脱敏服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java b/klp-common/src/main/java/com/klp/common/core/service/UserService.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java rename to klp-common/src/main/java/com/klp/common/core/service/UserService.java index 0d982407..a74adde8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java +++ b/klp-common/src/main/java/com/klp/common/core/service/UserService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.klp.common.core.service; /** * 通用 用户服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java b/klp-common/src/main/java/com/klp/common/core/validate/AddGroup.java similarity index 66% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java rename to klp-common/src/main/java/com/klp/common/core/validate/AddGroup.java index e1934e1e..b2c5a0fa 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java +++ b/klp-common/src/main/java/com/klp/common/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.klp.common.core.validate; /** * 校验分组 add diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java b/klp-common/src/main/java/com/klp/common/core/validate/EditGroup.java similarity index 67% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java rename to klp-common/src/main/java/com/klp/common/core/validate/EditGroup.java index 3c6ca7f8..f357902b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java +++ b/klp-common/src/main/java/com/klp/common/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.klp.common.core.validate; /** * 校验分组 edit diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java b/klp-common/src/main/java/com/klp/common/core/validate/QueryGroup.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java rename to klp-common/src/main/java/com/klp/common/core/validate/QueryGroup.java index bbbfe038..287347ba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java +++ b/klp-common/src/main/java/com/klp/common/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.klp.common.core.validate; /** * 校验分组 query diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java b/klp-common/src/main/java/com/klp/common/encrypt/EncryptContext.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java rename to klp-common/src/main/java/com/klp/common/encrypt/EncryptContext.java index 1b82d51b..c3335211 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/EncryptContext.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/EncryptContext.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.encrypt; +package com.klp.common.encrypt; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; import lombok.Data; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/IEncryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/IEncryptor.java similarity index 81% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/IEncryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/IEncryptor.java index 7986a9b7..09ef6df0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/IEncryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/IEncryptor.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.encrypt; +package com.klp.common.encrypt; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; /** * 加解者 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/AbstractEncryptor.java similarity index 65% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/encryptor/AbstractEncryptor.java index 86053361..ec79d396 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AbstractEncryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/AbstractEncryptor.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.klp.common.encrypt.encryptor; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.encrypt.IEncryptor; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.encrypt.IEncryptor; /** * 所有加密执行者的基类 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/AesEncryptor.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/encryptor/AesEncryptor.java index ee4d8266..d1f676a4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/AesEncryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/AesEncryptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.klp.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.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; import java.nio.charset.StandardCharsets; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/Base64Encryptor.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/encryptor/Base64Encryptor.java index 519158d0..53ae74a1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Base64Encryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/Base64Encryptor.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.klp.common.encrypt.encryptor; import cn.hutool.core.codec.Base64; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; /** * Base64算法实现 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/RsaEncryptor.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/encryptor/RsaEncryptor.java index 2563fc21..c2998b7b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/RsaEncryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/RsaEncryptor.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.klp.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.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; +import com.klp.common.utils.StringUtils; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/Sm2Encryptor.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/encryptor/Sm2Encryptor.java index a84f7f7e..524667ba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm2Encryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/Sm2Encryptor.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.klp.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.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; +import com.klp.common.utils.StringUtils; /** * sm2算法实现 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/Sm4Encryptor.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java rename to klp-common/src/main/java/com/klp/common/encrypt/encryptor/Sm4Encryptor.java index 7d2e5097..61be1ad2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/encrypt/encryptor/Sm4Encryptor.java +++ b/klp-common/src/main/java/com/klp/common/encrypt/encryptor/Sm4Encryptor.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.encrypt.encryptor; +package com.klp.common.encrypt.encryptor; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SmUtil; import cn.hutool.crypto.symmetric.SM4; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; import java.nio.charset.StandardCharsets; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java b/klp-common/src/main/java/com/klp/common/enums/AlgorithmType.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java rename to klp-common/src/main/java/com/klp/common/enums/AlgorithmType.java index 124a139d..2f46a174 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/AlgorithmType.java +++ b/klp-common/src/main/java/com/klp/common/enums/AlgorithmType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; -import com.ruoyi.common.encrypt.encryptor.*; +import com.klp.common.encrypt.encryptor.*; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/klp-common/src/main/java/com/klp/common/enums/BusinessStatus.java similarity index 74% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to klp-common/src/main/java/com/klp/common/enums/BusinessStatus.java index ce32cb41..94803317 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/klp-common/src/main/java/com/klp/common/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; /** * 操作状态 * - * @author ruoyi + * @author klp */ public enum BusinessStatus { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/klp-common/src/main/java/com/klp/common/enums/BusinessType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to klp-common/src/main/java/com/klp/common/enums/BusinessType.java index 2d2f2e46..24c954f2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/klp-common/src/main/java/com/klp/common/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; /** * 业务操作类型 * - * @author ruoyi + * @author klp */ public enum BusinessType { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java b/klp-common/src/main/java/com/klp/common/enums/CaptchaCategory.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java rename to klp-common/src/main/java/com/klp/common/enums/CaptchaCategory.java index 35d3ea3c..a842252b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java +++ b/klp-common/src/main/java/com/klp/common/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java b/klp-common/src/main/java/com/klp/common/enums/CaptchaType.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java rename to klp-common/src/main/java/com/klp/common/enums/CaptchaType.java index b1c50ca7..8495e913 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java +++ b/klp-common/src/main/java/com/klp/common/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.ruoyi.common.captcha.UnsignedMathGenerator; +import com.klp.common.captcha.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java b/klp-common/src/main/java/com/klp/common/enums/DataBaseType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java rename to klp-common/src/main/java/com/klp/common/enums/DataBaseType.java index 5d0f05ad..f9b7b91a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataBaseType.java +++ b/klp-common/src/main/java/com/klp/common/enums/DataBaseType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java b/klp-common/src/main/java/com/klp/common/enums/DataScopeType.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java rename to klp-common/src/main/java/com/klp/common/enums/DataScopeType.java index 64324652..2e5187c6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataScopeType.java +++ b/klp-common/src/main/java/com/klp/common/enums/DataScopeType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; @@ -10,7 +10,7 @@ import lombok.Getter; * 语法支持 spel 模板表达式 *

* 内置数据 user 当前用户 内容参考 LoginUser - * 如需扩展数据 可使用 {@link com.ruoyi.common.helper.DataPermissionHelper} 操作 + * 如需扩展数据 可使用 {@link com.klp.common.helper.DataPermissionHelper} 操作 * 内置服务 sdss 系统数据权限服务 内容参考 SysDataScopeService * 如需扩展更多自定义服务 可以参考 sdss 自行编写 * diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java b/klp-common/src/main/java/com/klp/common/enums/DeviceType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java rename to klp-common/src/main/java/com/klp/common/enums/DeviceType.java index 118a2128..7fdcf351 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DeviceType.java +++ b/klp-common/src/main/java/com/klp/common/enums/DeviceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/EncodeType.java b/klp-common/src/main/java/com/klp/common/enums/EncodeType.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/EncodeType.java rename to klp-common/src/main/java/com/klp/common/enums/EncodeType.java index 4d469597..87076072 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/EncodeType.java +++ b/klp-common/src/main/java/com/klp/common/enums/EncodeType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; /** * 编码类型 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/klp-common/src/main/java/com/klp/common/enums/HttpMethod.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to klp-common/src/main/java/com/klp/common/enums/HttpMethod.java index bd1bfcc4..bb1de616 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/klp-common/src/main/java/com/klp/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; import org.springframework.lang.Nullable; @@ -8,7 +8,7 @@ import java.util.Map; /** * 请求方式 * - * @author ruoyi + * @author klp */ public enum HttpMethod { GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/klp-common/src/main/java/com/klp/common/enums/LimitType.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to klp-common/src/main/java/com/klp/common/enums/LimitType.java index ac88c624..ae0dc2a3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java +++ b/klp-common/src/main/java/com/klp/common/enums/LimitType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; /** * 限流类型 * - * @author ruoyi + * @author klp */ public enum LimitType { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java b/klp-common/src/main/java/com/klp/common/enums/LoginType.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java rename to klp-common/src/main/java/com/klp/common/enums/LoginType.java index 875e4762..59ab811a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LoginType.java +++ b/klp-common/src/main/java/com/klp/common/enums/LoginType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/klp-common/src/main/java/com/klp/common/enums/OperatorType.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to klp-common/src/main/java/com/klp/common/enums/OperatorType.java index 3c4127d9..f3c8593b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/klp-common/src/main/java/com/klp/common/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; /** * 操作人类别 * - * @author ruoyi + * @author klp */ public enum OperatorType { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java b/klp-common/src/main/java/com/klp/common/enums/SensitiveStrategy.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java rename to klp-common/src/main/java/com/klp/common/enums/SensitiveStrategy.java index f667173c..a50a1b0d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/SensitiveStrategy.java +++ b/klp-common/src/main/java/com/klp/common/enums/SensitiveStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; import cn.hutool.core.util.DesensitizedUtil; import lombok.AllArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/klp-common/src/main/java/com/klp/common/enums/UserStatus.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to klp-common/src/main/java/com/klp/common/enums/UserStatus.java index 673ddebd..82711367 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/klp-common/src/main/java/com/klp/common/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; /** * 用户状态 * - * @author ruoyi + * @author klp */ public enum UserStatus { OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java b/klp-common/src/main/java/com/klp/common/enums/UserType.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java rename to klp-common/src/main/java/com/klp/common/enums/UserType.java index ec6510d9..3d122d8f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserType.java +++ b/klp-common/src/main/java/com/klp/common/enums/UserType.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.enums; +package com.klp.common.enums; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java b/klp-common/src/main/java/com/klp/common/excel/CellMergeStrategy.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java rename to klp-common/src/main/java/com/klp/common/excel/CellMergeStrategy.java index 6102eec5..1ea3d46d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/CellMergeStrategy.java +++ b/klp-common/src/main/java/com/klp/common/excel/CellMergeStrategy.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.excel; +package com.klp.common.excel; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.merge.AbstractMergeStrategy; -import com.ruoyi.common.annotation.CellMerge; +import com.klp.common.annotation.CellMerge; import lombok.AllArgsConstructor; import lombok.Data; import lombok.SneakyThrows; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java b/klp-common/src/main/java/com/klp/common/excel/DefaultExcelListener.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java rename to klp-common/src/main/java/com/klp/common/excel/DefaultExcelListener.java index 2a3fc3b1..1d4dcf06 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java +++ b/klp-common/src/main/java/com/klp/common/excel/DefaultExcelListener.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.excel; +package com.klp.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.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.ValidatorUtils; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.StreamUtils; +import com.klp.common.utils.ValidatorUtils; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelResult.java b/klp-common/src/main/java/com/klp/common/excel/DefaultExcelResult.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelResult.java rename to klp-common/src/main/java/com/klp/common/excel/DefaultExcelResult.java index 5ef65bf8..e97fc468 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelResult.java +++ b/klp-common/src/main/java/com/klp/common/excel/DefaultExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.klp.common.excel; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java b/klp-common/src/main/java/com/klp/common/excel/ExcelListener.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java rename to klp-common/src/main/java/com/klp/common/excel/ExcelListener.java index 2064cad3..22be9932 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java +++ b/klp-common/src/main/java/com/klp/common/excel/ExcelListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.klp.common.excel; import com.alibaba.excel.read.listener.ReadListener; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java b/klp-common/src/main/java/com/klp/common/excel/ExcelResult.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java rename to klp-common/src/main/java/com/klp/common/excel/ExcelResult.java index 63f8b8ac..b1f05386 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java +++ b/klp-common/src/main/java/com/klp/common/excel/ExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.klp.common.excel; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/klp-common/src/main/java/com/klp/common/exception/DemoModeException.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to klp-common/src/main/java/com/klp/common/exception/DemoModeException.java index 9178131d..26bab528 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/klp-common/src/main/java/com/klp/common/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.klp.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author klp */ public class DemoModeException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/klp-common/src/main/java/com/klp/common/exception/GlobalException.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to klp-common/src/main/java/com/klp/common/exception/GlobalException.java index 080785c9..f9dfbaad 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/klp-common/src/main/java/com/klp/common/exception/GlobalException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.klp.common.exception; /** * 全局异常 * - * @author ruoyi + * @author klp */ public class GlobalException extends RuntimeException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/klp-common/src/main/java/com/klp/common/exception/ServiceException.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to klp-common/src/main/java/com/klp/common/exception/ServiceException.java index 53f41b3b..a16ac313 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/klp-common/src/main/java/com/klp/common/exception/ServiceException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.klp.common.exception; /** * 业务异常 * - * @author ruoyi + * @author klp */ public final class ServiceException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/klp-common/src/main/java/com/klp/common/exception/UtilException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to klp-common/src/main/java/com/klp/common/exception/UtilException.java index 01cc8782..1262a1dc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/klp-common/src/main/java/com/klp/common/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.klp.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author klp */ public class UtilException extends RuntimeException { private static final long serialVersionUID = 8247610319171014183L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/klp-common/src/main/java/com/klp/common/exception/base/BaseException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to klp-common/src/main/java/com/klp/common/exception/base/BaseException.java index dc0b84bf..2a259e5d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/klp-common/src/main/java/com/klp/common/exception/base/BaseException.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.exception.base; +package com.klp.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.MessageUtils; +import com.klp.common.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; /** * 基础异常 * - * @author ruoyi + * @author klp */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/klp-common/src/main/java/com/klp/common/exception/file/FileException.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to klp-common/src/main/java/com/klp/common/exception/file/FileException.java index 794f4e1a..fa45d30f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/klp-common/src/main/java/com/klp/common/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.klp.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.klp.common.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author klp */ public class FileException extends BaseException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/klp-common/src/main/java/com/klp/common/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to klp-common/src/main/java/com/klp/common/exception/file/FileNameLengthLimitExceededException.java index 64a5020d..34106a0e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/klp-common/src/main/java/com/klp/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.klp.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author klp */ public class FileNameLengthLimitExceededException extends FileException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/klp-common/src/main/java/com/klp/common/exception/file/FileSizeLimitExceededException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to klp-common/src/main/java/com/klp/common/exception/file/FileSizeLimitExceededException.java index 93e9e1c6..54f23391 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/klp-common/src/main/java/com/klp/common/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.klp.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author klp */ public class FileSizeLimitExceededException extends FileException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/klp-common/src/main/java/com/klp/common/exception/user/CaptchaException.java similarity index 79% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to klp-common/src/main/java/com/klp/common/exception/user/CaptchaException.java index 2345c204..3a72b32b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/klp-common/src/main/java/com/klp/common/exception/user/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.klp.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author klp */ public class CaptchaException extends UserException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/klp-common/src/main/java/com/klp/common/exception/user/CaptchaExpireException.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to klp-common/src/main/java/com/klp/common/exception/user/CaptchaExpireException.java index bb4c0376..3010d0c9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/klp-common/src/main/java/com/klp/common/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.klp.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author klp */ public class CaptchaExpireException extends UserException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/klp-common/src/main/java/com/klp/common/exception/user/UserException.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to klp-common/src/main/java/com/klp/common/exception/user/UserException.java index 99a88805..2a324334 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/klp-common/src/main/java/com/klp/common/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.user; +package com.klp.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.klp.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author klp */ public class UserException extends BaseException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/klp-common/src/main/java/com/klp/common/exception/user/UserPasswordNotMatchException.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to klp-common/src/main/java/com/klp/common/exception/user/UserPasswordNotMatchException.java index 863ba765..ffcffdc9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/klp-common/src/main/java/com/klp/common/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.klp.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author klp */ public class UserPasswordNotMatchException extends UserException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/klp-common/src/main/java/com/klp/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to klp-common/src/main/java/com/klp/common/exception/user/UserPasswordRetryLimitExceedException.java index 3d2b640e..e4d4b176 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/klp-common/src/main/java/com/klp/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.klp.common.exception.user; /** * 用户错误最大次数异常类 * - * @author ruoyi + * @author klp */ public class UserPasswordRetryLimitExceedException extends UserException { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/klp-common/src/main/java/com/klp/common/filter/RepeatableFilter.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to klp-common/src/main/java/com/klp/common/filter/RepeatableFilter.java index 8927366e..f64e50e5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/klp-common/src/main/java/com/klp/common/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.filter; +package com.klp.common.filter; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import org.springframework.http.MediaType; import javax.servlet.*; @@ -10,7 +10,7 @@ import java.io.IOException; /** * Repeatable 过滤器 * - * @author ruoyi + * @author klp */ public class RepeatableFilter implements Filter { @Override diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/klp-common/src/main/java/com/klp/common/filter/RepeatedlyRequestWrapper.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to klp-common/src/main/java/com/klp/common/filter/RepeatedlyRequestWrapper.java index c1cbe3f2..a64b561c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/klp-common/src/main/java/com/klp/common/filter/RepeatedlyRequestWrapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.filter; +package com.klp.common.filter; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.constant.Constants; +import com.klp.common.constant.Constants; import javax.servlet.ReadListener; import javax.servlet.ServletInputStream; @@ -16,7 +16,7 @@ import java.io.InputStreamReader; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author klp */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { private final byte[] body; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/klp-common/src/main/java/com/klp/common/filter/XssFilter.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to klp-common/src/main/java/com/klp/common/filter/XssFilter.java index 72772c1b..2f636491 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/klp-common/src/main/java/com/klp/common/filter/XssFilter.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.filter; +package com.klp.common.filter; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.enums.HttpMethod; +import com.klp.common.utils.StringUtils; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -13,7 +13,7 @@ import java.util.List; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author klp */ public class XssFilter implements Filter { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/klp-common/src/main/java/com/klp/common/filter/XssHttpServletRequestWrapper.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to klp-common/src/main/java/com/klp/common/filter/XssHttpServletRequestWrapper.java index a7fbd4ca..fb74ca13 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/klp-common/src/main/java/com/klp/common/filter/XssHttpServletRequestWrapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.filter; +package com.klp.common.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HtmlUtil; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets; /** * XSS过滤处理 * - * @author ruoyi + * @author klp */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java b/klp-common/src/main/java/com/klp/common/helper/DataBaseHelper.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java rename to klp-common/src/main/java/com/klp/common/helper/DataBaseHelper.java index 33e0a78f..533d27bb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java +++ b/klp-common/src/main/java/com/klp/common/helper/DataBaseHelper.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.helper; +package com.klp.common.helper; import cn.hutool.core.convert.Convert; import com.baomidou.dynamic.datasource.DynamicRoutingDataSource; -import com.ruoyi.common.enums.DataBaseType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.enums.DataBaseType; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java b/klp-common/src/main/java/com/klp/common/helper/DataPermissionHelper.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java rename to klp-common/src/main/java/com/klp/common/helper/DataPermissionHelper.java index c3b8b47c..89e27571 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java +++ b/klp-common/src/main/java/com/klp/common/helper/DataPermissionHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.helper; +package com.klp.common.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java b/klp-common/src/main/java/com/klp/common/helper/LoginHelper.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java rename to klp-common/src/main/java/com/klp/common/helper/LoginHelper.java index c0c87759..40aef670 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/LoginHelper.java +++ b/klp-common/src/main/java/com/klp/common/helper/LoginHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.helper; +package com.klp.common.helper; import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.model.SaStorage; @@ -6,10 +6,10 @@ import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.DeviceType; -import com.ruoyi.common.enums.UserType; +import com.klp.common.constant.UserConstants; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.enums.DeviceType; +import com.klp.common.enums.UserType; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java b/klp-common/src/main/java/com/klp/common/jackson/DictDataJsonSerializer.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java rename to klp-common/src/main/java/com/klp/common/jackson/DictDataJsonSerializer.java index 5fbf0519..21966050 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/DictDataJsonSerializer.java +++ b/klp-common/src/main/java/com/klp/common/jackson/DictDataJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.jackson; +package com.klp.common.jackson; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.DictDataMapper; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.annotation.DictDataMapper; +import com.klp.common.core.service.DictService; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java b/klp-common/src/main/java/com/klp/common/jackson/SensitiveJsonSerializer.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java rename to klp-common/src/main/java/com/klp/common/jackson/SensitiveJsonSerializer.java index 41e57816..3b5e4509 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java +++ b/klp-common/src/main/java/com/klp/common/jackson/SensitiveJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.jackson; +package com.klp.common.jackson; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.core.service.SensitiveService; -import com.ruoyi.common.enums.SensitiveStrategy; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.annotation.Sensitive; +import com.klp.common.core.service.SensitiveService; +import com.klp.common.enums.SensitiveStrategy; +import com.klp.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeansException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java b/klp-common/src/main/java/com/klp/common/translation/TranslationInterface.java similarity index 61% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java rename to klp-common/src/main/java/com/klp/common/translation/TranslationInterface.java index 91af97ca..39c6f811 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/TranslationInterface.java +++ b/klp-common/src/main/java/com/klp/common/translation/TranslationInterface.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.translation; +package com.klp.common.translation; /** - * 翻译接口 (实现类需标注 {@link com.ruoyi.common.annotation.TranslationType} 注解标明翻译类型) + * 翻译接口 (实现类需标注 {@link com.klp.common.annotation.TranslationType} 注解标明翻译类型) * * @author Lion Li */ diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationBeanSerializerModifier.java b/klp-common/src/main/java/com/klp/common/translation/handler/TranslationBeanSerializerModifier.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationBeanSerializerModifier.java rename to klp-common/src/main/java/com/klp/common/translation/handler/TranslationBeanSerializerModifier.java index 0bcaf285..ee4f2403 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationBeanSerializerModifier.java +++ b/klp-common/src/main/java/com/klp/common/translation/handler/TranslationBeanSerializerModifier.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.translation.handler; +package com.klp.common.translation.handler; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java b/klp-common/src/main/java/com/klp/common/translation/handler/TranslationHandler.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java rename to klp-common/src/main/java/com/klp/common/translation/handler/TranslationHandler.java index ede72067..b71bc2c6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/handler/TranslationHandler.java +++ b/klp-common/src/main/java/com/klp/common/translation/handler/TranslationHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.translation.handler; +package com.klp.common.translation.handler; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.core.JsonGenerator; @@ -7,10 +7,10 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.ContextualSerializer; -import com.ruoyi.common.annotation.Translation; -import com.ruoyi.common.translation.TranslationInterface; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.klp.common.annotation.Translation; +import com.klp.common.translation.TranslationInterface; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.reflect.ReflectUtils; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java b/klp-common/src/main/java/com/klp/common/translation/impl/DeptNameTranslationImpl.java similarity index 65% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java rename to klp-common/src/main/java/com/klp/common/translation/impl/DeptNameTranslationImpl.java index ada3c253..2944a0eb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DeptNameTranslationImpl.java +++ b/klp-common/src/main/java/com/klp/common/translation/impl/DeptNameTranslationImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.translation.impl; +package com.klp.common.translation.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.DeptService; -import com.ruoyi.common.translation.TranslationInterface; +import com.klp.common.annotation.TranslationType; +import com.klp.common.constant.TransConstant; +import com.klp.common.core.service.DeptService; +import com.klp.common.translation.TranslationInterface; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; @@ -18,7 +18,7 @@ import org.springframework.stereotype.Component; public class DeptNameTranslationImpl implements TranslationInterface { private final DeptService deptService; - + @Override public String translation(Object key, String other) { return deptService.selectDeptNameByIds(key.toString()); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java b/klp-common/src/main/java/com/klp/common/translation/impl/DictTypeTranslationImpl.java similarity index 67% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java rename to klp-common/src/main/java/com/klp/common/translation/impl/DictTypeTranslationImpl.java index 1e97b66c..f1b32a6f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/DictTypeTranslationImpl.java +++ b/klp-common/src/main/java/com/klp/common/translation/impl/DictTypeTranslationImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.translation.impl; +package com.klp.common.translation.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.translation.TranslationInterface; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.annotation.TranslationType; +import com.klp.common.constant.TransConstant; +import com.klp.common.core.service.DictService; +import com.klp.common.translation.TranslationInterface; +import com.klp.common.utils.StringUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java b/klp-common/src/main/java/com/klp/common/translation/impl/OssUrlTranslationImpl.java similarity index 65% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java rename to klp-common/src/main/java/com/klp/common/translation/impl/OssUrlTranslationImpl.java index 863e4d68..ace45b30 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/OssUrlTranslationImpl.java +++ b/klp-common/src/main/java/com/klp/common/translation/impl/OssUrlTranslationImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.translation.impl; +package com.klp.common.translation.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.OssService; -import com.ruoyi.common.translation.TranslationInterface; +import com.klp.common.annotation.TranslationType; +import com.klp.common.constant.TransConstant; +import com.klp.common.core.service.OssService; +import com.klp.common.translation.TranslationInterface; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java b/klp-common/src/main/java/com/klp/common/translation/impl/UserNameTranslationImpl.java similarity index 69% rename from ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java rename to klp-common/src/main/java/com/klp/common/translation/impl/UserNameTranslationImpl.java index eccf1c8b..a09e64be 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/translation/impl/UserNameTranslationImpl.java +++ b/klp-common/src/main/java/com/klp/common/translation/impl/UserNameTranslationImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.translation.impl; +package com.klp.common.translation.impl; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.constant.TransConstant; -import com.ruoyi.common.core.service.UserService; -import com.ruoyi.common.translation.TranslationInterface; +import com.klp.common.annotation.TranslationType; +import com.klp.common.constant.TransConstant; +import com.klp.common.core.service.UserService; +import com.klp.common.translation.TranslationInterface; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/klp-common/src/main/java/com/klp/common/utils/BeanCopyUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java rename to klp-common/src/main/java/com/klp/common/utils/BeanCopyUtils.java index e1bafee2..5741a555 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/BeanCopyUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.SimpleCache; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/klp-common/src/main/java/com/klp/common/utils/DateUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to klp-common/src/main/java/com/klp/common/utils/DateUtils.java index c64f1f8a..b47c2b0b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -17,7 +17,7 @@ import java.util.Date; /** * 时间工具类 * - * @author ruoyi + * @author klp */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java b/klp-common/src/main/java/com/klp/common/utils/EncryptUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java rename to klp-common/src/main/java/com/klp/common/utils/EncryptUtils.java index 691b6c0f..f2f6a3ed 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/EncryptUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/EncryptUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.ArrayUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/klp-common/src/main/java/com/klp/common/utils/JsonUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java rename to klp-common/src/main/java/com/klp/common/utils/JsonUtils.java index e5c471e5..e61e6ade 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ArrayUtil; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/klp-common/src/main/java/com/klp/common/utils/MessageUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to klp-common/src/main/java/com/klp/common/utils/MessageUtils.java index c9c091d6..90831446 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/MessageUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.context.MessageSource; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/klp-common/src/main/java/com/klp/common/utils/ServletUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to klp-common/src/main/java/com/klp/common/utils/ServletUtils.java index 288a1a1a..7721211f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/ServletUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.ServletUtil; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.constant.Constants; +import com.klp.common.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.http.MediaType; @@ -27,7 +27,7 @@ import java.util.Map; /** * 客户端工具类 * - * @author ruoyi + * @author klp */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class ServletUtils extends ServletUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java b/klp-common/src/main/java/com/klp/common/utils/StreamUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java rename to klp-common/src/main/java/com/klp/common/utils/StreamUtils.java index a03e5bee..d8081f97 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StreamUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/StreamUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.map.MapUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/klp-common/src/main/java/com/klp/common/utils/StringUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to klp-common/src/main/java/com/klp/common/utils/StringUtils.java index 2a5bd488..b521f9b2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/klp-common/src/main/java/com/klp/common/utils/Threads.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to klp-common/src/main/java/com/klp/common/utils/Threads.java index 1952929d..d626f3e1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/klp-common/src/main/java/com/klp/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -9,7 +9,7 @@ import java.util.concurrent.*; /** * 线程相关工具类. * - * @author ruoyi + * @author klp */ @Slf4j @NoArgsConstructor(access = AccessLevel.PRIVATE) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/klp-common/src/main/java/com/klp/common/utils/TreeBuildUtils.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java rename to klp-common/src/main/java/com/klp/common/utils/TreeBuildUtils.java index f9f8fa14..86b49f90 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/TreeBuildUtils.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; import cn.hutool.core.lang.tree.parser.NodeParser; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.klp.common.utils.reflect.ReflectUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java b/klp-common/src/main/java/com/klp/common/utils/ValidatorUtils.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java rename to klp-common/src/main/java/com/klp/common/utils/ValidatorUtils.java index 1fe2eaf6..febef6f7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/ValidatorUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils; +package com.klp.common.utils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java b/klp-common/src/main/java/com/klp/common/utils/email/MailUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java rename to klp-common/src/main/java/com/klp/common/utils/email/MailUtils.java index 32a3f825..e686212c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/email/MailUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.email; +package com.klp.common.utils.email; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -6,8 +6,8 @@ import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.mail.*; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/klp-common/src/main/java/com/klp/common/utils/file/FileUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to klp-common/src/main/java/com/klp/common/utils/file/FileUtils.java index 1ef22290..e689e5b7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.klp.common.utils.file; import cn.hutool.core.io.FileUtil; import lombok.AccessLevel; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/klp-common/src/main/java/com/klp/common/utils/file/MimeTypeUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to klp-common/src/main/java/com/klp/common/utils/file/MimeTypeUtils.java index 6ca97fe6..2e41dd83 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/file/MimeTypeUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils.file; +package com.klp.common.utils.file; /** * 媒体类型工具类 * - * @author ruoyi + * @author klp */ public class MimeTypeUtils { public static final String IMAGE_PNG = "image/png"; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/klp-common/src/main/java/com/klp/common/utils/ip/AddressUtils.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to klp-common/src/main/java/com/klp/common/utils/ip/AddressUtils.java index 9bf203bf..83c07864 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/ip/AddressUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils.ip; +package com.klp.common.utils.ip; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/RegionUtils.java b/klp-common/src/main/java/com/klp/common/utils/ip/RegionUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/RegionUtils.java rename to klp-common/src/main/java/com/klp/common/utils/ip/RegionUtils.java index 581061a5..4ce719a9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/RegionUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/ip/RegionUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.utils.ip; +package com.klp.common.utils.ip; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.resource.ClassPathResource; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.file.FileUtils; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.file.FileUtils; import lombok.extern.slf4j.Slf4j; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java index cf2ba885..06fc93c0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/klp-common/src/main/java/com/klp/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.klp.common.utils.poi; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.resource.ClassPathResource; @@ -10,13 +10,13 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import com.ruoyi.common.convert.ExcelBigNumberConvert; -import com.ruoyi.common.excel.CellMergeStrategy; -import com.ruoyi.common.excel.DefaultExcelListener; -import com.ruoyi.common.excel.ExcelListener; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; +import com.klp.common.convert.ExcelBigNumberConvert; +import com.klp.common.excel.CellMergeStrategy; +import com.klp.common.excel.DefaultExcelListener; +import com.klp.common.excel.ExcelListener; +import com.klp.common.excel.ExcelResult; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.file.FileUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java b/klp-common/src/main/java/com/klp/common/utils/redis/CacheUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java rename to klp-common/src/main/java/com/klp/common/utils/redis/CacheUtils.java index 9e0b09b0..51faa1e3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/CacheUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/redis/CacheUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.klp.common.utils.redis; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.RMap; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java b/klp-common/src/main/java/com/klp/common/utils/redis/QueueUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java rename to klp-common/src/main/java/com/klp/common/utils/redis/QueueUtils.java index 7a4bce4b..7e5e3ba1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/QueueUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/redis/QueueUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.klp.common.utils.redis; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java b/klp-common/src/main/java/com/klp/common/utils/redis/RedisUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java rename to klp-common/src/main/java/com/klp/common/utils/redis/RedisUtils.java index 16238089..4a2939e4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/redis/RedisUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/redis/RedisUtils.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.redis; +package com.klp.common.utils.redis; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/klp-common/src/main/java/com/klp/common/utils/reflect/ReflectUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to klp-common/src/main/java/com/klp/common/utils/reflect/ReflectUtils.java index 0e0d7e7f..728bfa62 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.reflect; +package com.klp.common.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/klp-common/src/main/java/com/klp/common/utils/spring/SpringUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to klp-common/src/main/java/com/klp/common/utils/spring/SpringUtils.java index 8b37e416..72587adc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/klp-common/src/main/java/com/klp/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.klp.common.utils.spring; import cn.hutool.extra.spring.SpringUtil; import org.springframework.aop.framework.AopContext; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/klp-common/src/main/java/com/klp/common/utils/sql/SqlUtil.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to klp-common/src/main/java/com/klp/common/utils/sql/SqlUtil.java index 78914961..c5c303d3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/klp-common/src/main/java/com/klp/common/utils/sql/SqlUtil.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.utils.sql; +package com.klp.common.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.exception.UtilException; +import com.klp.common.utils.StringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; /** * sql操作工具类 * - * @author ruoyi + * @author klp */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class SqlUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java b/klp-common/src/main/java/com/klp/common/xss/Xss.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java rename to klp-common/src/main/java/com/klp/common/xss/Xss.java index 0a26d60a..cecee452 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/klp-common/src/main/java/com/klp/common/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.klp.common.xss; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java b/klp-common/src/main/java/com/klp/common/xss/XssValidator.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java rename to klp-common/src/main/java/com/klp/common/xss/XssValidator.java index 03102df6..8ae84c72 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/klp-common/src/main/java/com/klp/common/xss/XssValidator.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.klp.common.xss; import cn.hutool.core.util.ReUtil; import cn.hutool.http.HtmlUtil; diff --git a/ruoyi-demo/pom.xml b/klp-demo/pom.xml similarity index 76% rename from ruoyi-demo/pom.xml rename to klp-demo/pom.xml index 23285120..94c91962 100644 --- a/ruoyi-demo/pom.xml +++ b/klp-demo/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 - ruoyi-demo + klp-demo demo模块 @@ -19,13 +19,13 @@ - com.ruoyi - ruoyi-common + com.klp + klp-common - com.ruoyi - ruoyi-sms + com.klp + klp-sms diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java b/klp-demo/src/main/java/com/klp/demo/controller/MailController.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java rename to klp-demo/src/main/java/com/klp/demo/controller/MailController.java index 6db4dc4e..1329f716 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/MailController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.email.MailUtils; +import com.klp.common.core.domain.R; +import com.klp.common.utils.email.MailUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/klp-demo/src/main/java/com/klp/demo/controller/RedisCacheController.java similarity index 95% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java rename to klp-demo/src/main/java/com/klp/demo/controller/RedisCacheController.java index 7342cba9..17fe4a20 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/RedisCacheController.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.constant.CacheNames; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.constant.CacheNames; +import com.klp.common.core.domain.R; +import com.klp.common.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/klp-demo/src/main/java/com/klp/demo/controller/RedisLockController.java similarity index 96% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java rename to klp-demo/src/main/java/com/klp/demo/controller/RedisLockController.java index ebc923d1..e3a73318 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/RedisLockController.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import com.ruoyi.common.core.domain.R; +import com.klp.common.core.domain.R; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/klp-demo/src/main/java/com/klp/demo/controller/RedisPubSubController.java similarity index 90% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java rename to klp-demo/src/main/java/com/klp/demo/controller/RedisPubSubController.java index 0c2af395..f50c0301 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.core.domain.R; +import com.klp.common.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/klp-demo/src/main/java/com/klp/demo/controller/RedisRateLimiterController.java similarity index 90% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java rename to klp-demo/src/main/java/com/klp/demo/controller/RedisRateLimiterController.java index d0401956..8f148cf0 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.LimitType; +import com.klp.common.annotation.RateLimiter; +import com.klp.common.core.domain.R; +import com.klp.common.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/klp-demo/src/main/java/com/klp/demo/controller/SmsController.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java rename to klp-demo/src/main/java/com/klp/demo/controller/SmsController.java index cc6012f4..d83e863c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/SmsController.java @@ -1,9 +1,9 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.sms.config.properties.SmsProperties; -import com.ruoyi.sms.core.SmsTemplate; +import com.klp.common.core.domain.R; +import com.klp.common.utils.spring.SpringUtils; +import com.klp.sms.config.properties.SmsProperties; +import com.klp.sms.core.SmsTemplate; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/klp-demo/src/main/java/com/klp/demo/controller/Swagger3DemoController.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java rename to klp-demo/src/main/java/com/klp/demo/controller/Swagger3DemoController.java index 0398b14d..308c7606 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/Swagger3DemoController.java @@ -1,6 +1,6 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.core.domain.R; +import com.klp.common.core.domain.R; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestBatchController.java similarity index 92% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestBatchController.java index 3bd2867e..48a7aae5 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestBatchController.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.mapper.TestDemoMapper; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.demo.domain.TestDemo; +import com.klp.demo.mapper.TestDemoMapper; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestDemoController.java similarity index 83% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestDemoController.java index 873facc3..58749668 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestDemoController.java @@ -1,25 +1,25 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.ValidatorUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.bo.TestDemoBo; -import com.ruoyi.demo.domain.bo.TestDemoImportVo; -import com.ruoyi.demo.domain.vo.TestDemoVo; -import com.ruoyi.demo.service.ITestDemoService; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.core.validate.QueryGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.excel.ExcelResult; +import com.klp.common.utils.ValidatorUtils; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.demo.domain.TestDemo; +import com.klp.demo.domain.bo.TestDemoBo; +import com.klp.demo.domain.bo.TestDemoImportVo; +import com.klp.demo.domain.vo.TestDemoVo; +import com.klp.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestEncryptController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestEncryptController.java similarity index 89% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestEncryptController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestEncryptController.java index 6abe4e18..c41c7a71 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestEncryptController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestEncryptController.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.demo.domain.TestDemoEncrypt; -import com.ruoyi.demo.mapper.TestDemoEncryptMapper; +import com.klp.common.core.domain.R; +import com.klp.demo.domain.TestDemoEncrypt; +import com.klp.demo.mapper.TestDemoEncryptMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestExcelController.java similarity index 97% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestExcelController.java index 51b81c58..6b912e82 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestExcelController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; import cn.hutool.core.collection.CollUtil; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.klp.common.utils.poi.ExcelUtil; import lombok.AllArgsConstructor; import lombok.Data; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestI18nController.java similarity index 93% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestI18nController.java index 0cc529a6..11fb7b75 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.MessageUtils; +import com.klp.common.core.domain.R; +import com.klp.common.utils.MessageUtils; import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.validation.annotation.Validated; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestSensitiveController.java similarity index 85% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestSensitiveController.java index 6bf904ca..c8dd2028 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestSensitiveController.java @@ -1,9 +1,9 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; -import com.ruoyi.common.annotation.Sensitive; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.enums.SensitiveStrategy; +import com.klp.common.annotation.Sensitive; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.enums.SensitiveStrategy; import lombok.Data; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * * @author Lion Li * @version 3.6.0 - * @see com.ruoyi.common.core.service.SensitiveService + * @see com.klp.common.core.service.SensitiveService */ @RestController @RequestMapping("/demo/sensitive") diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/klp-demo/src/main/java/com/klp/demo/controller/TestTreeController.java similarity index 82% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java rename to klp-demo/src/main/java/com/klp/demo/controller/TestTreeController.java index db54230c..d712d36a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/TestTreeController.java @@ -1,18 +1,18 @@ -package com.ruoyi.demo.controller; +package com.klp.demo.controller; import cn.dev33.satoken.annotation.SaCheckPermission; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.domain.bo.TestTreeBo; -import com.ruoyi.demo.domain.vo.TestTreeVo; -import com.ruoyi.demo.service.ITestTreeService; +import com.klp.common.annotation.Log; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.core.validate.QueryGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.demo.domain.bo.TestTreeBo; +import com.klp.demo.domain.vo.TestTreeVo; +import com.klp.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/klp-demo/src/main/java/com/klp/demo/controller/package-info.java b/klp-demo/src/main/java/com/klp/demo/controller/package-info.java new file mode 100644 index 00000000..b6194846 --- /dev/null +++ b/klp-demo/src/main/java/com/klp/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.klp.demo.controller; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java b/klp-demo/src/main/java/com/klp/demo/controller/queue/BoundedQueueController.java similarity index 95% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java rename to klp-demo/src/main/java/com/klp/demo/controller/queue/BoundedQueueController.java index 968a4193..b1f932f2 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/queue/BoundedQueueController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller.queue; +package com.klp.demo.controller.queue; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.QueueUtils; +import com.klp.common.core.domain.R; +import com.klp.common.utils.redis.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/klp-demo/src/main/java/com/klp/demo/controller/queue/DelayedQueueController.java similarity index 95% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java rename to klp-demo/src/main/java/com/klp/demo/controller/queue/DelayedQueueController.java index e6dbee86..8e0e8c65 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/queue/DelayedQueueController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller.queue; +package com.klp.demo.controller.queue; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.QueueUtils; +import com.klp.common.core.domain.R; +import com.klp.common.utils.redis.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java b/klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityDemo.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java rename to klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityDemo.java index c86c92aa..6ca5f701 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityDemo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.controller.queue; +package com.klp.demo.controller.queue; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityQueueController.java similarity index 95% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java rename to klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityQueueController.java index 4a60232c..1a11a22b 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java +++ b/klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityQueueController.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.controller.queue; +package com.klp.demo.controller.queue; import cn.hutool.core.util.RandomUtil; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.utils.redis.QueueUtils; +import com.klp.common.core.domain.R; +import com.klp.common.utils.redis.QueueUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/klp-demo/src/main/java/com/klp/demo/domain/TestDemo.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java rename to klp-demo/src/main/java/com/klp/demo/domain/TestDemo.java index dc19ce2c..498a397e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/TestDemo.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.domain; +package com.klp.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.core.domain.BaseEntity; +import com.klp.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemoEncrypt.java b/klp-demo/src/main/java/com/klp/demo/domain/TestDemoEncrypt.java similarity index 94% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemoEncrypt.java rename to klp-demo/src/main/java/com/klp/demo/domain/TestDemoEncrypt.java index 4672185c..d4367d9a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemoEncrypt.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/TestDemoEncrypt.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.domain; +package com.klp.demo.domain; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.enums.AlgorithmType; +import com.klp.common.annotation.EncryptField; +import com.klp.common.enums.AlgorithmType; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/klp-demo/src/main/java/com/klp/demo/domain/TestTree.java similarity index 92% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java rename to klp-demo/src/main/java/com/klp/demo/domain/TestTree.java index b480aa0c..e828df32 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/TestTree.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.domain; +package com.klp.demo.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import com.ruoyi.common.core.domain.TreeEntity; +import com.klp.common.core.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoBo.java similarity index 86% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java rename to klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoBo.java index 54ecae11..3282f0f6 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoBo.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.domain.bo; +package com.klp.demo.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java b/klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoImportVo.java similarity index 96% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java rename to klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoImportVo.java index 8f417fb2..5bd09325 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoImportVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.domain.bo; +package com.klp.demo.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/klp-demo/src/main/java/com/klp/demo/domain/bo/TestTreeBo.java similarity index 83% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java rename to klp-demo/src/main/java/com/klp/demo/domain/bo/TestTreeBo.java index a51b3fe3..89c2852a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/bo/TestTreeBo.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.domain.bo; +package com.klp.demo.domain.bo; -import com.ruoyi.common.core.domain.TreeEntity; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.klp.common.core.domain.TreeEntity; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/klp-demo/src/main/java/com/klp/demo/domain/package-info.java b/klp-demo/src/main/java/com/klp/demo/domain/package-info.java new file mode 100644 index 00000000..e4c23644 --- /dev/null +++ b/klp-demo/src/main/java/com/klp/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.klp.demo.domain; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/klp-demo/src/main/java/com/klp/demo/domain/vo/TestDemoVo.java similarity index 97% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java rename to klp-demo/src/main/java/com/klp/demo/domain/vo/TestDemoVo.java index c4a46edf..bbcbebf1 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/vo/TestDemoVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.domain.vo; +package com.klp.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/klp-demo/src/main/java/com/klp/demo/domain/vo/TestTreeVo.java similarity index 96% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java rename to klp-demo/src/main/java/com/klp/demo/domain/vo/TestTreeVo.java index 6836c06b..b340f25c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java +++ b/klp-demo/src/main/java/com/klp/demo/domain/vo/TestTreeVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.domain.vo; +package com.klp.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoEncryptMapper.java b/klp-demo/src/main/java/com/klp/demo/mapper/TestDemoEncryptMapper.java similarity index 57% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoEncryptMapper.java rename to klp-demo/src/main/java/com/klp/demo/mapper/TestDemoEncryptMapper.java index 5c76097d..a92bbac4 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoEncryptMapper.java +++ b/klp-demo/src/main/java/com/klp/demo/mapper/TestDemoEncryptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.mapper; +package com.klp.demo.mapper; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.demo.domain.TestDemoEncrypt; +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.demo.domain.TestDemoEncrypt; /** * 测试加密功能 diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/klp-demo/src/main/java/com/klp/demo/mapper/TestDemoMapper.java similarity index 86% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java rename to klp-demo/src/main/java/com/klp/demo/mapper/TestDemoMapper.java index 11a3d50e..4eb2c369 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java +++ b/klp-demo/src/main/java/com/klp/demo/mapper/TestDemoMapper.java @@ -1,14 +1,14 @@ -package com.ruoyi.demo.mapper; +package com.klp.demo.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.vo.TestDemoVo; +import com.klp.common.annotation.DataColumn; +import com.klp.common.annotation.DataPermission; +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.demo.domain.TestDemo; +import com.klp.demo.domain.vo.TestDemoVo; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java b/klp-demo/src/main/java/com/klp/demo/mapper/TestTreeMapper.java similarity index 53% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java rename to klp-demo/src/main/java/com/klp/demo/mapper/TestTreeMapper.java index e37a9a75..44d1ad54 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java +++ b/klp-demo/src/main/java/com/klp/demo/mapper/TestTreeMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.mapper; +package com.klp.demo.mapper; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.demo.domain.TestTree; -import com.ruoyi.demo.domain.vo.TestTreeVo; +import com.klp.common.annotation.DataColumn; +import com.klp.common.annotation.DataPermission; +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.demo.domain.TestTree; +import com.klp.demo.domain.vo.TestTreeVo; /** * 测试树表Mapper接口 diff --git a/klp-demo/src/main/java/com/klp/demo/mapper/package-info.java b/klp-demo/src/main/java/com/klp/demo/mapper/package-info.java new file mode 100644 index 00000000..da6c608c --- /dev/null +++ b/klp-demo/src/main/java/com/klp/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.klp.demo.mapper; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/klp-demo/src/main/java/com/klp/demo/service/ITestDemoService.java similarity index 83% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java rename to klp-demo/src/main/java/com/klp/demo/service/ITestDemoService.java index f6b82fd6..f3bb0816 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java +++ b/klp-demo/src/main/java/com/klp/demo/service/ITestDemoService.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.service; +package com.klp.demo.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.bo.TestDemoBo; -import com.ruoyi.demo.domain.vo.TestDemoVo; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.demo.domain.TestDemo; +import com.klp.demo.domain.bo.TestDemoBo; +import com.klp.demo.domain.vo.TestDemoVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java b/klp-demo/src/main/java/com/klp/demo/service/ITestTreeService.java similarity index 88% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java rename to klp-demo/src/main/java/com/klp/demo/service/ITestTreeService.java index 366e5150..69d2b6ad 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java +++ b/klp-demo/src/main/java/com/klp/demo/service/ITestTreeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.service; +package com.klp.demo.service; -import com.ruoyi.demo.domain.bo.TestTreeBo; -import com.ruoyi.demo.domain.vo.TestTreeVo; +import com.klp.demo.domain.bo.TestTreeBo; +import com.klp.demo.domain.vo.TestTreeVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/klp-demo/src/main/java/com/klp/demo/service/impl/TestDemoServiceImpl.java similarity index 89% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java rename to klp-demo/src/main/java/com/klp/demo/service/impl/TestDemoServiceImpl.java index 7ed7cd5b..b3ea36a0 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java +++ b/klp-demo/src/main/java/com/klp/demo/service/impl/TestDemoServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.demo.service.impl; +package com.klp.demo.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.bo.TestDemoBo; -import com.ruoyi.demo.domain.vo.TestDemoVo; -import com.ruoyi.demo.mapper.TestDemoMapper; -import com.ruoyi.demo.service.ITestDemoService; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.utils.StringUtils; +import com.klp.demo.domain.TestDemo; +import com.klp.demo.domain.bo.TestDemoBo; +import com.klp.demo.domain.vo.TestDemoVo; +import com.klp.demo.mapper.TestDemoMapper; +import com.klp.demo.service.ITestDemoService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/klp-demo/src/main/java/com/klp/demo/service/impl/TestTreeServiceImpl.java similarity index 89% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java rename to klp-demo/src/main/java/com/klp/demo/service/impl/TestTreeServiceImpl.java index 3e7fa20d..deb4fef6 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java +++ b/klp-demo/src/main/java/com/klp/demo/service/impl/TestTreeServiceImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.demo.service.impl; +package com.klp.demo.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.demo.domain.TestTree; -import com.ruoyi.demo.domain.bo.TestTreeBo; -import com.ruoyi.demo.domain.vo.TestTreeVo; -import com.ruoyi.demo.mapper.TestTreeMapper; -import com.ruoyi.demo.service.ITestTreeService; +import com.klp.common.utils.StringUtils; +import com.klp.demo.domain.TestTree; +import com.klp.demo.domain.bo.TestTreeBo; +import com.klp.demo.domain.vo.TestTreeVo; +import com.klp.demo.mapper.TestTreeMapper; +import com.klp.demo.service.ITestTreeService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/klp-demo/src/main/java/com/klp/demo/service/impl/package-info.java b/klp-demo/src/main/java/com/klp/demo/service/impl/package-info.java new file mode 100644 index 00000000..19a38c03 --- /dev/null +++ b/klp-demo/src/main/java/com/klp/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.klp.demo.service.impl; diff --git a/klp-demo/src/main/java/com/klp/demo/service/package-info.java b/klp-demo/src/main/java/com/klp/demo/service/package-info.java new file mode 100644 index 00000000..a92efdf4 --- /dev/null +++ b/klp-demo/src/main/java/com/klp/demo/service/package-info.java @@ -0,0 +1 @@ +package com.klp.demo.service; diff --git a/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/klp-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to klp-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/klp-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to klp-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/klp-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 80% rename from ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to klp-demo/src/main/resources/mapper/demo/TestDemoMapper.xml index 3caf98a7..5e8dba41 100644 --- a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml +++ b/klp-demo/src/main/resources/mapper/demo/TestDemoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT * FROM test_demo ${ew.customSqlSegment} diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/klp-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 84% rename from ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to klp-demo/src/main/resources/mapper/demo/TestTreeMapper.xml index 0943d5b1..b0c72498 100644 --- a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/klp-demo/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -19,4 +19,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-demo/src/main/resources/mapper/package-info.md b/klp-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-demo/src/main/resources/mapper/package-info.md rename to klp-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/klp-extend/klp-monitor-admin/Dockerfile similarity index 61% rename from ruoyi-extend/ruoyi-monitor-admin/Dockerfile rename to klp-extend/klp-monitor-admin/Dockerfile index 02b741f4..168c11cf 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile +++ b/klp-extend/klp-monitor-admin/Dockerfile @@ -2,12 +2,12 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/monitor/logs +RUN mkdir -p /klp/monitor/logs -WORKDIR /ruoyi/monitor +WORKDIR /klp/monitor EXPOSE 9090 -ADD ./target/ruoyi-monitor-admin.jar ./app.jar +ADD ./target/klp-monitor-admin.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/klp-extend/klp-monitor-admin/pom.xml similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/pom.xml rename to klp-extend/klp-monitor-admin/pom.xml index 4fedc792..b23f9d7b 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/klp-extend/klp-monitor-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-extend - com.ruoyi + klp-extend + com.klp 0.8.3 4.0.0 jar - ruoyi-monitor-admin + klp-monitor-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/MonitorAdminApplication.java similarity index 92% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java rename to klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/MonitorAdminApplication.java index d4f038c9..05862ffb 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java +++ b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/MonitorAdminApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin; +package com.klp.monitor.admin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/AdminServerConfig.java b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/config/AdminServerConfig.java similarity index 96% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/AdminServerConfig.java rename to klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/config/AdminServerConfig.java index e2a9c51d..84be28f3 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/AdminServerConfig.java +++ b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/config/AdminServerConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin.config; +package com.klp.monitor.admin.config; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/config/SecurityConfig.java similarity index 97% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java rename to klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/config/SecurityConfig.java index 627fa835..b0b3c81c 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java +++ b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin.config; +package com.klp.monitor.admin.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/notifier/CustomNotifier.java b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/notifier/CustomNotifier.java similarity index 97% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/notifier/CustomNotifier.java rename to klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/notifier/CustomNotifier.java index 4d0a7a03..e4904c56 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/notifier/CustomNotifier.java +++ b/klp-extend/klp-monitor-admin/src/main/java/com/klp/monitor/admin/notifier/CustomNotifier.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin.notifier; +package com.klp.monitor.admin.notifier; import de.codecentric.boot.admin.server.domain.entities.Instance; import de.codecentric.boot.admin.server.domain.entities.InstanceRepository; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/klp-extend/klp-monitor-admin/src/main/resources/application.yml similarity index 85% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml rename to klp-extend/klp-monitor-admin/src/main/resources/application.yml index 1b729ef1..3fa11de1 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/klp-extend/klp-monitor-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 9090 spring: application: - name: ruoyi-monitor-admin + name: klp-monitor-admin profiles: active: @profiles.active@ @@ -13,7 +13,7 @@ logging: spring: security: user: - name: ruoyi + name: klp password: 123456 boot: admin: @@ -31,7 +31,7 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/ruoyi-monitor-admin.log + external-file: ./logs/klp-monitor-admin.log --- # 监控配置 spring.boot.admin.client: @@ -41,5 +41,5 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: klp password: 123456 diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/klp-extend/klp-monitor-admin/src/main/resources/banner.txt similarity index 63% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt rename to klp-extend/klp-monitor-admin/src/main/resources/banner.txt index 8feb0830..37818ab7 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt +++ b/klp-extend/klp-monitor-admin/src/main/resources/banner.txt @@ -4,4 +4,4 @@ | | | || (_) || | | || || |_| (_) || | / ___ \| (_| || | | | | || || | | | |_| |_| \___/ |_| |_||_| \__|\___/ |_| /_/ \_\\__,_||_| |_| |_||_||_| |_| -${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} RuoYi-Flowable-Plus:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${ruoyi-flowable-plus.version} ${spring-boot.formatted-version} +${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} KLP:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${klp-flowable-plus.version} ${spring-boot.formatted-version} diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml b/klp-extend/klp-monitor-admin/src/main/resources/logback-plus.xml similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml rename to klp-extend/klp-monitor-admin/src/main/resources/logback-plus.xml index 16bb9376..606466bd 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback-plus.xml +++ b/klp-extend/klp-monitor-admin/src/main/resources/logback-plus.xml @@ -2,7 +2,7 @@ logback - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile b/klp-extend/klp-xxl-job-admin/Dockerfile similarity index 71% rename from ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile rename to klp-extend/klp-xxl-job-admin/Dockerfile index bd61580a..51ec2720 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile +++ b/klp-extend/klp-xxl-job-admin/Dockerfile @@ -2,15 +2,15 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/xxljob/logs +RUN mkdir -p /klp/xxljob/logs -WORKDIR /ruoyi/xxljob +WORKDIR /klp/xxljob ENV TZ=PRC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone EXPOSE 9100 -ADD ./target/ruoyi-xxl-job-admin.jar ./app.jar +ADD ./target/klp-xxl-job-admin.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/klp-extend/klp-xxl-job-admin/pom.xml similarity index 96% rename from ruoyi-extend/ruoyi-xxl-job-admin/pom.xml rename to klp-extend/klp-xxl-job-admin/pom.xml index ef29a342..627177fe 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/klp-extend/klp-xxl-job-admin/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ruoyi-extend - com.ruoyi + klp-extend + com.klp 0.8.3 - ruoyi-xxl-job-admin + klp-xxl-job-admin jar diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java rename to klp-extend/klp-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/klp-extend/klp-xxl-job-admin/src/main/resources/application-dev.yml similarity index 98% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml rename to klp-extend/klp-xxl-job-admin/src/main/resources/application-dev.yml index fa04b568..85cd4152 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml +++ b/klp-extend/klp-xxl-job-admin/src/main/resources/application-dev.yml @@ -6,7 +6,7 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: klp password: 123456 --- # 数据库配置 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/klp-extend/klp-xxl-job-admin/src/main/resources/application-prod.yml similarity index 98% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml rename to klp-extend/klp-xxl-job-admin/src/main/resources/application-prod.yml index d4193d0b..e4ebc2fc 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml +++ b/klp-extend/klp-xxl-job-admin/src/main/resources/application-prod.yml @@ -6,7 +6,7 @@ spring.boot.admin.client: url: http://localhost:9090/admin instance: service-host-type: IP - username: ruoyi + username: klp password: 123456 --- # 数据库配置 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/klp-extend/klp-xxl-job-admin/src/main/resources/application.yml similarity index 93% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml rename to klp-extend/klp-xxl-job-admin/src/main/resources/application.yml index 6d082921..9c556a02 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml +++ b/klp-extend/klp-xxl-job-admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: context-path: /xxl-job-admin spring: application: - name: ruoyi-xxl-job-admin + name: klp-xxl-job-admin profiles: active: @profiles.active@ mvc: @@ -46,7 +46,7 @@ management: health: show-details: ALWAYS logfile: - external-file: ./logs/ruoyi-xxl-job-admin.log + external-file: ./logs/klp-xxl-job-admin.log --- # xxljob系统配置 xxl: diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt b/klp-extend/klp-xxl-job-admin/src/main/resources/banner.txt similarity index 63% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt rename to klp-extend/klp-xxl-job-admin/src/main/resources/banner.txt index 8a56afb7..ca072b73 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt +++ b/klp-extend/klp-xxl-job-admin/src/main/resources/banner.txt @@ -4,4 +4,4 @@ / \ > < | | | |_| || (_) || |_) | / ___ \| (_| || | | | | || || | | | /_/\_\/_/\_\|_| \___/ \___/ |_.__/ /_/ \_\\__,_||_| |_| |_||_||_| |_| -${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} RuoYi-Flowable-Plus:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${ruoyi-flowable-plus.version} ${spring-boot.formatted-version} +${AnsiColor.GREEN} :: RuoYi :: ${AnsiColor.BLUE} KLP:${AnsiColor.RED}${spring.profiles.active}${AnsiColor.BRIGHT_WHITE} :: Application Version: ${klp-flowable-plus.version} ${spring-boot.formatted-version} diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_en.properties b/klp-extend/klp-xxl-job-admin/src/main/resources/i18n/message_en.properties similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_en.properties rename to klp-extend/klp-xxl-job-admin/src/main/resources/i18n/message_en.properties diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/klp-extend/klp-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties rename to klp-extend/klp-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/klp-extend/klp-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties rename to klp-extend/klp-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/logback-plus.xml similarity index 93% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/logback-plus.xml index 9c2e7723..9a9728b2 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback-plus.xml +++ b/klp-extend/klp-xxl-job-admin/src/main/resources/logback-plus.xml @@ -2,7 +2,7 @@ logback - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml b/klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml rename to klp-extend/klp-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png b/klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/favicon.ico b/klp-extend/klp-xxl-job-admin/src/main/resources/static/favicon.ico similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/favicon.ico rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/favicon.ico diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/common.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/common.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/common.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/common.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/index.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/index.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/index.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/index.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/login.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/login.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/login.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/login.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/js/user.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/js/user.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif b/klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif rename to klp-extend/klp-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/help.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/help.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/help.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/help.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/index.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/index.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/login.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/login.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/login.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/login.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/user/user.index.ftl b/klp-extend/klp-xxl-job-admin/src/main/resources/templates/user/user.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/user/user.index.ftl rename to klp-extend/klp-xxl-job-admin/src/main/resources/templates/user/user.index.ftl diff --git a/ruoyi-extend/pom.xml b/klp-extend/pom.xml similarity index 66% rename from ruoyi-extend/pom.xml rename to klp-extend/pom.xml index a62ce186..29d829b1 100644 --- a/ruoyi-extend/pom.xml +++ b/klp-extend/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 - ruoyi-extend + klp-extend pom - ruoyi-monitor-admin - ruoyi-xxl-job-admin + klp-monitor-admin + klp-xxl-job-admin diff --git a/ruoyi-flowable/pom.xml b/klp-flowable/pom.xml similarity index 79% rename from ruoyi-flowable/pom.xml rename to klp-flowable/pom.xml index 23ac8753..6eca9b6a 100644 --- a/ruoyi-flowable/pom.xml +++ b/klp-flowable/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 - ruoyi-flowable + klp-flowable flowable工作流 @@ -18,8 +18,8 @@ - com.ruoyi - ruoyi-common + com.klp + klp-common diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java b/klp-flowable/src/main/java/com/klp/flowable/common/constant/ProcessConstants.java similarity index 97% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java rename to klp-flowable/src/main/java/com/klp/flowable/common/constant/ProcessConstants.java index 320387e2..ee80c19e 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/ProcessConstants.java +++ b/klp-flowable/src/main/java/com/klp/flowable/common/constant/ProcessConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.common.constant; +package com.klp.flowable.common.constant; /** * 流程常量信息 diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/TaskConstants.java b/klp-flowable/src/main/java/com/klp/flowable/common/constant/TaskConstants.java similarity index 90% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/TaskConstants.java rename to klp-flowable/src/main/java/com/klp/flowable/common/constant/TaskConstants.java index bf5e6d49..da26affa 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/constant/TaskConstants.java +++ b/klp-flowable/src/main/java/com/klp/flowable/common/constant/TaskConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.common.constant; +package com.klp.flowable.common.constant; /** * @author konbai diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FlowComment.java b/klp-flowable/src/main/java/com/klp/flowable/common/enums/FlowComment.java similarity index 94% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FlowComment.java rename to klp-flowable/src/main/java/com/klp/flowable/common/enums/FlowComment.java index 165d6952..82d93d0c 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FlowComment.java +++ b/klp-flowable/src/main/java/com/klp/flowable/common/enums/FlowComment.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.common.enums; +package com.klp.flowable.common.enums; /** * 流程意见类型 diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FormType.java b/klp-flowable/src/main/java/com/klp/flowable/common/enums/FormType.java similarity index 90% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FormType.java rename to klp-flowable/src/main/java/com/klp/flowable/common/enums/FormType.java index adce3516..1fb544e4 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/FormType.java +++ b/klp-flowable/src/main/java/com/klp/flowable/common/enums/FormType.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.common.enums; +package com.klp.flowable.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/ProcessStatus.java b/klp-flowable/src/main/java/com/klp/flowable/common/enums/ProcessStatus.java similarity index 90% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/ProcessStatus.java rename to klp-flowable/src/main/java/com/klp/flowable/common/enums/ProcessStatus.java index 08e89fa9..c93b9ad0 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/common/enums/ProcessStatus.java +++ b/klp-flowable/src/main/java/com/klp/flowable/common/enums/ProcessStatus.java @@ -1,6 +1,6 @@ -package com.ruoyi.flowable.common.enums; +package com.klp.flowable.common.enums; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/GlobalEventListenerConfig.java b/klp-flowable/src/main/java/com/klp/flowable/config/GlobalEventListenerConfig.java similarity index 90% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/GlobalEventListenerConfig.java rename to klp-flowable/src/main/java/com/klp/flowable/config/GlobalEventListenerConfig.java index acc4eb51..d6c00ca9 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/GlobalEventListenerConfig.java +++ b/klp-flowable/src/main/java/com/klp/flowable/config/GlobalEventListenerConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.flowable.config; +package com.klp.flowable.config; -import com.ruoyi.flowable.listener.GlobalEventListener; +import com.klp.flowable.listener.GlobalEventListener; import lombok.AllArgsConstructor; import org.flowable.common.engine.api.delegate.event.FlowableEngineEventType; import org.flowable.engine.RuntimeService; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java b/klp-flowable/src/main/java/com/klp/flowable/config/MyDefaultProcessDiagramCanvas.java similarity index 99% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java rename to klp-flowable/src/main/java/com/klp/flowable/config/MyDefaultProcessDiagramCanvas.java index 8a77b922..b2530c17 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/config/MyDefaultProcessDiagramCanvas.java +++ b/klp-flowable/src/main/java/com/klp/flowable/config/MyDefaultProcessDiagramCanvas.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.config; +package com.klp.flowable.config; import org.flowable.bpmn.model.AssociationDirection; import org.flowable.image.impl.DefaultProcessDiagramCanvas; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/FormConf.java b/klp-flowable/src/main/java/com/klp/flowable/core/FormConf.java similarity index 96% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/FormConf.java rename to klp-flowable/src/main/java/com/klp/flowable/core/FormConf.java index 2deb2590..d5af5c90 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/FormConf.java +++ b/klp-flowable/src/main/java/com/klp/flowable/core/FormConf.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.core; +package com.klp.flowable.core; import lombok.Data; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java b/klp-flowable/src/main/java/com/klp/flowable/core/domain/ProcessQuery.java similarity index 93% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java rename to klp-flowable/src/main/java/com/klp/flowable/core/domain/ProcessQuery.java index fea76199..048953ec 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/core/domain/ProcessQuery.java +++ b/klp-flowable/src/main/java/com/klp/flowable/core/domain/ProcessQuery.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.core.domain; +package com.klp.flowable.core.domain; import lombok.Data; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java b/klp-flowable/src/main/java/com/klp/flowable/factory/FlowServiceFactory.java similarity index 95% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java rename to klp-flowable/src/main/java/com/klp/flowable/factory/FlowServiceFactory.java index 2c22ddad..e1070e2a 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/factory/FlowServiceFactory.java +++ b/klp-flowable/src/main/java/com/klp/flowable/factory/FlowServiceFactory.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.factory; +package com.klp.flowable.factory; import lombok.Getter; import org.flowable.engine.*; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/CustomProcessDiagramCanvas.java b/klp-flowable/src/main/java/com/klp/flowable/flow/CustomProcessDiagramCanvas.java similarity index 99% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/CustomProcessDiagramCanvas.java rename to klp-flowable/src/main/java/com/klp/flowable/flow/CustomProcessDiagramCanvas.java index 87792479..5efc7caf 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/CustomProcessDiagramCanvas.java +++ b/klp-flowable/src/main/java/com/klp/flowable/flow/CustomProcessDiagramCanvas.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.flow; +package com.klp.flowable.flow; import org.flowable.bpmn.model.AssociationDirection; import org.flowable.bpmn.model.GraphicInfo; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/CustomProcessDiagramGenerator.java b/klp-flowable/src/main/java/com/klp/flowable/flow/CustomProcessDiagramGenerator.java similarity index 99% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/CustomProcessDiagramGenerator.java rename to klp-flowable/src/main/java/com/klp/flowable/flow/CustomProcessDiagramGenerator.java index 16ceebbb..383b5571 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/CustomProcessDiagramGenerator.java +++ b/klp-flowable/src/main/java/com/klp/flowable/flow/CustomProcessDiagramGenerator.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.flow; +package com.klp.flowable.flow; import org.flowable.bpmn.model.Process; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FindNextNodeUtil.java b/klp-flowable/src/main/java/com/klp/flowable/flow/FindNextNodeUtil.java similarity index 99% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FindNextNodeUtil.java rename to klp-flowable/src/main/java/com/klp/flowable/flow/FindNextNodeUtil.java index 3b202f0c..363c8d05 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FindNextNodeUtil.java +++ b/klp-flowable/src/main/java/com/klp/flowable/flow/FindNextNodeUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.flow; +package com.klp.flowable.flow; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableConfig.java b/klp-flowable/src/main/java/com/klp/flowable/flow/FlowableConfig.java similarity index 95% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableConfig.java rename to klp-flowable/src/main/java/com/klp/flowable/flow/FlowableConfig.java index 05501ad3..8b467809 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableConfig.java +++ b/klp-flowable/src/main/java/com/klp/flowable/flow/FlowableConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.flow; +package com.klp.flowable.flow; import org.flowable.spring.SpringProcessEngineConfiguration; import org.flowable.spring.boot.EngineConfigurationConfigurer; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableUtils.java b/klp-flowable/src/main/java/com/klp/flowable/flow/FlowableUtils.java similarity index 99% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableUtils.java rename to klp-flowable/src/main/java/com/klp/flowable/flow/FlowableUtils.java index c896b82c..ad2454e6 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/flow/FlowableUtils.java +++ b/klp-flowable/src/main/java/com/klp/flowable/flow/FlowableUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.flowable.flow; +package com.klp.flowable.flow; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.exception.ServiceException; +import com.klp.common.exception.ServiceException; import lombok.extern.slf4j.Slf4j; import org.flowable.bpmn.model.*; import org.flowable.engine.impl.bpmn.behavior.ParallelMultiInstanceBehavior; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java b/klp-flowable/src/main/java/com/klp/flowable/listener/GlobalEventListener.java similarity index 89% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java rename to klp-flowable/src/main/java/com/klp/flowable/listener/GlobalEventListener.java index 04ffc1cf..9b65df61 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/GlobalEventListener.java +++ b/klp-flowable/src/main/java/com/klp/flowable/listener/GlobalEventListener.java @@ -1,9 +1,9 @@ -package com.ruoyi.flowable.listener; +package com.klp.flowable.listener; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.flowable.common.constant.ProcessConstants; -import com.ruoyi.flowable.common.enums.ProcessStatus; +import com.klp.flowable.common.constant.ProcessConstants; +import com.klp.flowable.common.enums.ProcessStatus; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; import org.flowable.engine.RuntimeService; import org.flowable.engine.delegate.event.AbstractFlowableEngineEventListener; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/UserTaskListener.java b/klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java similarity index 94% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/UserTaskListener.java rename to klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java index fa7121b6..1ec6011c 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/listener/UserTaskListener.java +++ b/klp-flowable/src/main/java/com/klp/flowable/listener/UserTaskListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.listener; +package com.klp.flowable.listener; import org.flowable.engine.delegate.TaskListener; import org.flowable.task.service.delegate.DelegateTask; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ModelUtils.java b/klp-flowable/src/main/java/com/klp/flowable/utils/ModelUtils.java similarity index 99% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ModelUtils.java rename to klp-flowable/src/main/java/com/klp/flowable/utils/ModelUtils.java index 7f1980fa..d5a5fcbc 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ModelUtils.java +++ b/klp-flowable/src/main/java/com/klp/flowable/utils/ModelUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.flowable.utils; +package com.klp.flowable.utils; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ProcessFormUtils.java b/klp-flowable/src/main/java/com/klp/flowable/utils/ProcessFormUtils.java similarity index 95% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ProcessFormUtils.java rename to klp-flowable/src/main/java/com/klp/flowable/utils/ProcessFormUtils.java index bd7847d0..6f78fd49 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ProcessFormUtils.java +++ b/klp-flowable/src/main/java/com/klp/flowable/utils/ProcessFormUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.flowable.utils; +package com.klp.flowable.utils; import cn.hutool.core.convert.Convert; -import com.ruoyi.flowable.core.FormConf; +import com.klp.flowable.core.FormConf; import java.util.List; import java.util.Map; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ProcessUtils.java b/klp-flowable/src/main/java/com/klp/flowable/utils/ProcessUtils.java similarity index 96% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ProcessUtils.java rename to klp-flowable/src/main/java/com/klp/flowable/utils/ProcessUtils.java index 3d9387d7..f673bf3e 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/ProcessUtils.java +++ b/klp-flowable/src/main/java/com/klp/flowable/utils/ProcessUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.flowable.utils; +package com.klp.flowable.utils; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.flowable.core.domain.ProcessQuery; +import com.klp.common.utils.DateUtils; +import com.klp.common.utils.StringUtils; +import com.klp.flowable.core.domain.ProcessQuery; import org.flowable.common.engine.api.query.Query; import org.flowable.common.engine.impl.db.SuspensionState; import org.flowable.engine.history.HistoricProcessInstanceQuery; diff --git a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/TaskUtils.java b/klp-flowable/src/main/java/com/klp/flowable/utils/TaskUtils.java similarity index 83% rename from ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/TaskUtils.java rename to klp-flowable/src/main/java/com/klp/flowable/utils/TaskUtils.java index 838215f3..b197af93 100644 --- a/ruoyi-flowable/src/main/java/com/ruoyi/flowable/utils/TaskUtils.java +++ b/klp-flowable/src/main/java/com/klp/flowable/utils/TaskUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.flowable.utils; +package com.klp.flowable.utils; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.flowable.common.constant.TaskConstants; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.helper.LoginHelper; +import com.klp.flowable.common.constant.TaskConstants; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-framework/pom.xml b/klp-framework/pom.xml similarity index 90% rename from ruoyi-framework/pom.xml rename to klp-framework/pom.xml index cf1f6c06..a199b11d 100644 --- a/ruoyi-framework/pom.xml +++ b/klp-framework/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 - ruoyi-framework + klp-framework framework框架核心 @@ -63,8 +63,8 @@ - com.ruoyi - ruoyi-common + com.klp + klp-common diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/klp-framework/src/main/java/com/klp/framework/aspectj/LogAspect.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to klp-framework/src/main/java/com/klp/framework/aspectj/LogAspect.java index 00918327..9444aa19 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/klp-framework/src/main/java/com/klp/framework/aspectj/LogAspect.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.aspectj; +package com.klp.framework.aspectj; import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.event.OperLogEvent; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.annotation.Log; +import com.klp.common.core.domain.event.OperLogEvent; +import com.klp.common.enums.BusinessStatus; +import com.klp.common.enums.HttpMethod; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.ServletUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/klp-framework/src/main/java/com/klp/framework/aspectj/RateLimiterAspect.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to klp-framework/src/main/java/com/klp/framework/aspectj/RateLimiterAspect.java index a9d61fb6..5efbb8de 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/klp-framework/src/main/java/com/klp/framework/aspectj/RateLimiterAspect.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.aspectj; +package com.klp.framework.aspectj; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.enums.LimitType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.annotation.RateLimiter; +import com.klp.common.constant.CacheConstants; +import com.klp.common.enums.LimitType; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.MessageUtils; +import com.klp.common.utils.ServletUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.redis.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/klp-framework/src/main/java/com/klp/framework/aspectj/RepeatSubmitAspect.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java rename to klp-framework/src/main/java/com/klp/framework/aspectj/RepeatSubmitAspect.java index 7c2fa2a4..3c3d2208 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java +++ b/klp-framework/src/main/java/com/klp/framework/aspectj/RepeatSubmitAspect.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.aspectj; +package com.klp.framework.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ObjectUtil; import cn.hutool.crypto.SecureUtil; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.constant.CacheConstants; +import com.klp.common.core.domain.R; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.MessageUtils; +import com.klp.common.utils.ServletUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/klp-framework/src/main/java/com/klp/framework/config/ApplicationConfig.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/ApplicationConfig.java index 072eef96..26f159de 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/klp-framework/src/main/java/com/klp/framework/config/AsyncConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/AsyncConfig.java index d011b583..b8fefca8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/AsyncConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.exception.ServiceException; +import com.klp.common.exception.ServiceException; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/klp-framework/src/main/java/com/klp/framework/config/CaptchaConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/CaptchaConfig.java index b284216f..9267e805 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/EncryptorConfig.java b/klp-framework/src/main/java/com/klp/framework/config/EncryptorConfig.java similarity index 78% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/EncryptorConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/EncryptorConfig.java index ed90d206..4add86a8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/EncryptorConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/EncryptorConfig.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; -import com.ruoyi.framework.config.properties.EncryptorProperties; -import com.ruoyi.framework.manager.EncryptorManager; -import com.ruoyi.framework.encrypt.MybatisDecryptInterceptor; -import com.ruoyi.framework.encrypt.MybatisEncryptInterceptor; +import com.klp.framework.config.properties.EncryptorProperties; +import com.klp.framework.manager.EncryptorManager; +import com.klp.framework.encrypt.MybatisDecryptInterceptor; +import com.klp.framework.encrypt.MybatisEncryptInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/klp-framework/src/main/java/com/klp/framework/config/FilterConfig.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/FilterConfig.java index 0770c216..c7a1f2e2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/FilterConfig.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.XssProperties; +import com.klp.common.filter.RepeatableFilter; +import com.klp.common.filter.XssFilter; +import com.klp.common.utils.StringUtils; +import com.klp.framework.config.properties.XssProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/klp-framework/src/main/java/com/klp/framework/config/I18nConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/I18nConfig.java index e64fa3a7..92d59257 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/I18nConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.hutool.core.util.StrUtil; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java b/klp-framework/src/main/java/com/klp/framework/config/JacksonConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/JacksonConfig.java index eace537a..9f621110 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/JacksonConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.ruoyi.framework.jackson.BigNumberSerializer; +import com.klp.framework.jackson.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java b/klp-framework/src/main/java/com/klp/framework/config/MailConfig.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/MailConfig.java index 20769aa1..b1c93754 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MailConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/MailConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.hutool.extra.mail.MailAccount; -import com.ruoyi.framework.config.properties.MailProperties; +import com.klp.framework.config.properties.MailProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/klp-framework/src/main/java/com/klp/framework/config/MybatisPlusConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/MybatisPlusConfig.java index ffd2c155..31acb8d9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.hutool.core.net.NetUtil; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.ruoyi.framework.handler.CreateAndUpdateMetaObjectHandler; -import com.ruoyi.framework.interceptor.PlusDataPermissionInterceptor; +import com.klp.framework.handler.CreateAndUpdateMetaObjectHandler; +import com.klp.framework.interceptor.PlusDataPermissionInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/klp-framework/src/main/java/com/klp/framework/config/RedisConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/RedisConfig.java index 8016ab86..ab67fc79 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/RedisConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.hutool.core.util.ObjectUtil; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.framework.config.properties.RedissonProperties; -import com.ruoyi.framework.handler.KeyPrefixHandler; -import com.ruoyi.framework.manager.PlusSpringCacheManager; +import com.klp.framework.config.properties.RedissonProperties; +import com.klp.framework.handler.KeyPrefixHandler; +import com.klp.framework.manager.PlusSpringCacheManager; import lombok.extern.slf4j.Slf4j; import org.redisson.codec.JsonJacksonCodec; import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer; @@ -106,7 +106,7 @@ public class RedisConfig { * # 集群配置 * clusterServersConfig: * # 客户端名称 - * clientName: ${ruoyi.name} + * clientName: ${klp.name} * # master最小空闲连接数 * masterConnectionMinimumIdleSize: 32 * # master连接池大小 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/klp-framework/src/main/java/com/klp/framework/config/ResourcesConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/ResourcesConfig.java index ea83338b..d3c4a79c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/ResourcesConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; -import com.ruoyi.framework.interceptor.PlusWebInvokeTimeInterceptor; +import com.klp.framework.interceptor.PlusWebInvokeTimeInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java b/klp-framework/src/main/java/com/klp/framework/config/SaTokenConfig.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/SaTokenConfig.java index b45eace4..2277313c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SaTokenConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/SaTokenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.interceptor.SaInterceptor; @@ -7,11 +7,11 @@ import cn.dev33.satoken.router.SaRouter; import cn.dev33.satoken.stp.StpInterface; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.SecurityProperties; -import com.ruoyi.framework.handler.AllUrlHandler; -import com.ruoyi.framework.satoken.dao.PlusSaTokenDao; -import com.ruoyi.framework.satoken.service.SaPermissionImpl; +import com.klp.common.utils.spring.SpringUtils; +import com.klp.framework.config.properties.SecurityProperties; +import com.klp.framework.handler.AllUrlHandler; +import com.klp.framework.satoken.dao.PlusSaTokenDao; +import com.klp.framework.satoken.service.SaPermissionImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/klp-framework/src/main/java/com/klp/framework/config/SwaggerConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/SwaggerConfig.java index 88af7e72..a3b0ba6a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/SwaggerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.SwaggerProperties; -import com.ruoyi.framework.handler.OpenApiHandler; +import com.klp.common.utils.StringUtils; +import com.klp.framework.config.properties.SwaggerProperties; +import com.klp.framework.handler.OpenApiHandler; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.Paths; import io.swagger.v3.oas.models.info.Info; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/klp-framework/src/main/java/com/klp/framework/config/ThreadPoolConfig.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/ThreadPoolConfig.java index a85ad1e5..dee71d69 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/ThreadPoolConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.framework.config.properties.ThreadPoolProperties; +import com.klp.common.utils.Threads; +import com.klp.framework.config.properties.ThreadPoolProperties; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java b/klp-framework/src/main/java/com/klp/framework/config/TranslationConfig.java similarity index 82% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/TranslationConfig.java index c68bf607..c30696c6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TranslationConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/TranslationConfig.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.annotation.TranslationType; -import com.ruoyi.common.translation.TranslationInterface; -import com.ruoyi.common.translation.handler.TranslationBeanSerializerModifier; -import com.ruoyi.common.translation.handler.TranslationHandler; +import com.klp.common.annotation.TranslationType; +import com.klp.common.translation.TranslationInterface; +import com.klp.common.translation.handler.TranslationBeanSerializerModifier; +import com.klp.common.translation.handler.TranslationHandler; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java b/klp-framework/src/main/java/com/klp/framework/config/UndertowConfig.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/UndertowConfig.java index 64e745a8..4717717d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/UndertowConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/UndertowConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import io.undertow.server.DefaultByteBufferPool; import io.undertow.websockets.jsr.WebSocketDeploymentInfo; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java b/klp-framework/src/main/java/com/klp/framework/config/ValidatorConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java rename to klp-framework/src/main/java/com/klp/framework/config/ValidatorConfig.java index 0a2007c8..dbe0eebb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java +++ b/klp-framework/src/main/java/com/klp/framework/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.klp.framework.config; import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/CaptchaProperties.java similarity index 81% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/CaptchaProperties.java index 1b41c66c..b457f6c2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; -import com.ruoyi.common.enums.CaptchaCategory; -import com.ruoyi.common.enums.CaptchaType; +import com.klp.common.enums.CaptchaCategory; +import com.klp.common.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/EncryptorProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/EncryptorProperties.java similarity index 84% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/EncryptorProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/EncryptorProperties.java index 8b2000d6..2038a88e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/EncryptorProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/EncryptorProperties.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; +import com.klp.common.enums.AlgorithmType; +import com.klp.common.enums.EncodeType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/MailProperties.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/MailProperties.java index 95e6cb8b..d7b0d9dc 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/MailProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/RedissonProperties.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/RedissonProperties.java index b0bf285f..66457325 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/SecurityProperties.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/SecurityProperties.java index b3741818..8539e6e3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/SwaggerProperties.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/SwaggerProperties.java index ac6fc424..64ddb115 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/SwaggerProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.ExternalDocumentation; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/ThreadPoolProperties.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/ThreadPoolProperties.java index fe067332..56f11703 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/ThreadPoolProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java b/klp-framework/src/main/java/com/klp/framework/config/properties/XssProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java rename to klp-framework/src/main/java/com/klp/framework/config/properties/XssProperties.java index d8a68a86..6f93d90c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java +++ b/klp-framework/src/main/java/com/klp/framework/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.klp.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java b/klp-framework/src/main/java/com/klp/framework/encrypt/MybatisDecryptInterceptor.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java rename to klp-framework/src/main/java/com/klp/framework/encrypt/MybatisDecryptInterceptor.java index 90b31334..435b7300 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisDecryptInterceptor.java +++ b/klp-framework/src/main/java/com/klp/framework/encrypt/MybatisDecryptInterceptor.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.encrypt; +package com.klp.framework.encrypt; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.EncryptorProperties; -import com.ruoyi.framework.manager.EncryptorManager; +import com.klp.common.annotation.EncryptField; +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.klp.framework.config.properties.EncryptorProperties; +import com.klp.framework.manager.EncryptorManager; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.resultset.ResultSetHandler; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java b/klp-framework/src/main/java/com/klp/framework/encrypt/MybatisEncryptInterceptor.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java rename to klp-framework/src/main/java/com/klp/framework/encrypt/MybatisEncryptInterceptor.java index f5ffb2b1..49122332 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/encrypt/MybatisEncryptInterceptor.java +++ b/klp-framework/src/main/java/com/klp/framework/encrypt/MybatisEncryptInterceptor.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.encrypt; +package com.klp.framework.encrypt; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.enums.AlgorithmType; -import com.ruoyi.common.enums.EncodeType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.EncryptorProperties; -import com.ruoyi.framework.manager.EncryptorManager; +import com.klp.common.annotation.EncryptField; +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.klp.framework.config.properties.EncryptorProperties; +import com.klp.framework.manager.EncryptorManager; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.parameter.ParameterHandler; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AllUrlHandler.java b/klp-framework/src/main/java/com/klp/framework/handler/AllUrlHandler.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AllUrlHandler.java rename to klp-framework/src/main/java/com/klp/framework/handler/AllUrlHandler.java index 76e5ffdd..31b11f28 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/AllUrlHandler.java +++ b/klp-framework/src/main/java/com/klp/framework/handler/AllUrlHandler.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.handler; +package com.klp.framework.handler; import cn.hutool.core.util.ReUtil; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.Data; import org.springframework.beans.factory.InitializingBean; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/klp-framework/src/main/java/com/klp/framework/handler/CreateAndUpdateMetaObjectHandler.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java rename to klp-framework/src/main/java/com/klp/framework/handler/CreateAndUpdateMetaObjectHandler.java index 3f0e122e..4fb63c7a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java +++ b/klp-framework/src/main/java/com/klp/framework/handler/CreateAndUpdateMetaObjectHandler.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.handler; +package com.klp.framework.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.exception.ServiceException; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java b/klp-framework/src/main/java/com/klp/framework/handler/KeyPrefixHandler.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java rename to klp-framework/src/main/java/com/klp/framework/handler/KeyPrefixHandler.java index 161c271b..61e1c409 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java +++ b/klp-framework/src/main/java/com/klp/framework/handler/KeyPrefixHandler.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.handler; +package com.klp.framework.handler; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.utils.StringUtils; import org.redisson.api.NameMapper; /** diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OpenApiHandler.java b/klp-framework/src/main/java/com/klp/framework/handler/OpenApiHandler.java similarity index 99% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OpenApiHandler.java rename to klp-framework/src/main/java/com/klp/framework/handler/OpenApiHandler.java index 608cae5d..258069a3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/OpenApiHandler.java +++ b/klp-framework/src/main/java/com/klp/framework/handler/OpenApiHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.handler; +package com.klp.framework.handler; import cn.hutool.core.io.IoUtil; import io.swagger.v3.core.jackson.TypeNameResolver; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/klp-framework/src/main/java/com/klp/framework/handler/PlusDataPermissionHandler.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java rename to klp-framework/src/main/java/com/klp/framework/handler/PlusDataPermissionHandler.java index 3825a0ba..02d03fc2 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java +++ b/klp-framework/src/main/java/com/klp/framework/handler/PlusDataPermissionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.handler; +package com.klp.framework.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; @@ -6,17 +6,17 @@ import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.DataColumn; -import com.ruoyi.common.annotation.DataPermission; -import com.ruoyi.common.core.domain.dto.RoleDTO; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.DataScopeType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.DataPermissionHelper; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.annotation.DataColumn; +import com.klp.common.annotation.DataPermission; +import com.klp.common.core.domain.dto.RoleDTO; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.enums.DataScopeType; +import com.klp.common.exception.ServiceException; +import com.klp.common.helper.DataPermissionHelper; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.StreamUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java b/klp-framework/src/main/java/com/klp/framework/interceptor/PlusDataPermissionInterceptor.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java rename to klp-framework/src/main/java/com/klp/framework/interceptor/PlusDataPermissionInterceptor.java index 508f4216..374d5e2b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusDataPermissionInterceptor.java +++ b/klp-framework/src/main/java/com/klp/framework/interceptor/PlusDataPermissionInterceptor.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.interceptor; +package com.klp.framework.interceptor; import com.baomidou.mybatisplus.core.plugins.InterceptorIgnoreHelper; import com.baomidou.mybatisplus.core.toolkit.PluginUtils; import com.baomidou.mybatisplus.extension.parser.JsqlParserSupport; import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -import com.ruoyi.framework.handler.PlusDataPermissionHandler; +import com.klp.framework.handler.PlusDataPermissionHandler; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.delete.Delete; import net.sf.jsqlparser.statement.select.PlainSelect; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java b/klp-framework/src/main/java/com/klp/framework/interceptor/PlusWebInvokeTimeInterceptor.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java rename to klp-framework/src/main/java/com/klp/framework/interceptor/PlusWebInvokeTimeInterceptor.java index 78bffab4..807ebc02 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/PlusWebInvokeTimeInterceptor.java +++ b/klp-framework/src/main/java/com/klp/framework/interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.interceptor; +package com.klp.framework.interceptor; import cn.hutool.core.io.IoUtil; import cn.hutool.core.map.MapUtil; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.klp.common.filter.RepeatedlyRequestWrapper; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.time.StopWatch; import org.springframework.http.MediaType; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java b/klp-framework/src/main/java/com/klp/framework/jackson/BigNumberSerializer.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java rename to klp-framework/src/main/java/com/klp/framework/jackson/BigNumberSerializer.java index a4aee155..59790b71 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java +++ b/klp-framework/src/main/java/com/klp/framework/jackson/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.jackson; +package com.klp.framework.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/klp-framework/src/main/java/com/klp/framework/listener/UserActionListener.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java rename to klp-framework/src/main/java/com/klp/framework/listener/UserActionListener.java index a9de17e6..d5e83784 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java +++ b/klp-framework/src/main/java/com/klp/framework/listener/UserActionListener.java @@ -1,18 +1,18 @@ -package com.ruoyi.framework.listener; +package com.klp.framework.listener; import cn.dev33.satoken.config.SaTokenConfig; import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.stp.SaLoginModel; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.core.domain.dto.UserOnlineDTO; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.constant.CacheConstants; +import com.klp.common.core.domain.dto.UserOnlineDTO; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.enums.UserType; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.ServletUtils; +import com.klp.common.utils.ip.AddressUtils; +import com.klp.common.utils.redis.RedisUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/EncryptorManager.java b/klp-framework/src/main/java/com/klp/framework/manager/EncryptorManager.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/EncryptorManager.java rename to klp-framework/src/main/java/com/klp/framework/manager/EncryptorManager.java index 94515aab..17c15a6e 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/EncryptorManager.java +++ b/klp-framework/src/main/java/com/klp/framework/manager/EncryptorManager.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.manager; +package com.klp.framework.manager; import cn.hutool.core.util.ReflectUtil; -import com.ruoyi.common.annotation.EncryptField; -import com.ruoyi.common.encrypt.EncryptContext; -import com.ruoyi.common.encrypt.IEncryptor; +import com.klp.common.annotation.EncryptField; +import com.klp.common.encrypt.EncryptContext; +import com.klp.common.encrypt.IEncryptor; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java b/klp-framework/src/main/java/com/klp/framework/manager/PlusSpringCacheManager.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java rename to klp-framework/src/main/java/com/klp/framework/manager/PlusSpringCacheManager.java index d8bfce7c..1c0e2b15 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/PlusSpringCacheManager.java +++ b/klp-framework/src/main/java/com/klp/framework/manager/PlusSpringCacheManager.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ruoyi.framework.manager; +package com.klp.framework.manager; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.utils.redis.RedisUtils; import org.redisson.api.RMap; import org.redisson.api.RMapCache; import org.redisson.spring.cache.CacheConfig; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/klp-framework/src/main/java/com/klp/framework/manager/ShutdownManager.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to klp-framework/src/main/java/com/klp/framework/manager/ShutdownManager.java index 9d27874e..2a0dfd79 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/klp-framework/src/main/java/com/klp/framework/manager/ShutdownManager.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.manager; +package com.klp.framework.manager; -import com.ruoyi.common.utils.Threads; +import com.klp.common.utils.Threads; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java b/klp-framework/src/main/java/com/klp/framework/satoken/dao/PlusSaTokenDao.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java rename to klp-framework/src/main/java/com/klp/framework/satoken/dao/PlusSaTokenDao.java index 2e4e8902..21dc1266 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/dao/PlusSaTokenDao.java +++ b/klp-framework/src/main/java/com/klp/framework/satoken/dao/PlusSaTokenDao.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.satoken.dao; +package com.klp.framework.satoken.dao; import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.util.SaFoxUtil; -import com.ruoyi.common.utils.redis.RedisUtils; +import com.klp.common.utils.redis.RedisUtils; import java.time.Duration; import java.util.ArrayList; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java b/klp-framework/src/main/java/com/klp/framework/satoken/service/SaPermissionImpl.java similarity index 87% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java rename to klp-framework/src/main/java/com/klp/framework/satoken/service/SaPermissionImpl.java index 632cc716..736d98eb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/service/SaPermissionImpl.java +++ b/klp-framework/src/main/java/com/klp/framework/satoken/service/SaPermissionImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.satoken.service; +package com.klp.framework.satoken.service; import cn.dev33.satoken.stp.StpInterface; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserType; -import com.ruoyi.common.helper.LoginHelper; +import com.klp.common.core.domain.model.LoginUser; +import com.klp.common.enums.UserType; +import com.klp.common.helper.LoginHelper; import java.util.ArrayList; import java.util.List; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/klp-framework/src/main/java/com/klp/framework/web/exception/GlobalExceptionHandler.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to klp-framework/src/main/java/com/klp/framework/web/exception/GlobalExceptionHandler.java index 40f2d27c..cec8ee50 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/klp-framework/src/main/java/com/klp/framework/web/exception/GlobalExceptionHandler.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.web.exception; +package com.klp.framework.web.exception; import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotPermissionException; import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StreamUtils; +import com.klp.common.core.domain.R; +import com.klp.common.exception.DemoModeException; +import com.klp.common.exception.ServiceException; +import com.klp.common.utils.StreamUtils; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.MyBatisSystemException; import org.springframework.context.support.DefaultMessageSourceResolvable; diff --git a/ruoyi-generator/pom.xml b/klp-generator/pom.xml similarity index 77% rename from ruoyi-generator/pom.xml rename to klp-generator/pom.xml index fb960ac0..7361a7fb 100644 --- a/ruoyi-generator/pom.xml +++ b/klp-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flowable-plus - com.ruoyi + klp-oa + com.klp 0.8.3 4.0.0 - ruoyi-generator + klp-generator generator代码生成 @@ -25,8 +25,8 @@ - com.ruoyi - ruoyi-common + com.klp + klp-common diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/klp-generator/src/main/java/com/klp/generator/config/GenConfig.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to klp-generator/src/main/java/com/klp/generator/config/GenConfig.java index 187426f7..c4f5ebb1 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/klp-generator/src/main/java/com/klp/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.klp.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author klp */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/klp-generator/src/main/java/com/klp/generator/controller/GenController.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to klp-generator/src/main/java/com/klp/generator/controller/GenController.java index 77df9fd9..acdedf63 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/klp-generator/src/main/java/com/klp/generator/controller/GenController.java @@ -1,17 +1,17 @@ -package com.ruoyi.generator.controller; +package com.klp.generator.controller; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableService; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.enums.BusinessType; +import com.klp.generator.domain.GenTable; +import com.klp.generator.domain.GenTableColumn; +import com.klp.generator.service.IGenTableService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -199,7 +199,7 @@ public class GenController extends BaseController { response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"klp.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IoUtil.write(response.getOutputStream(), false, data); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/klp-generator/src/main/java/com/klp/generator/domain/GenTable.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to klp-generator/src/main/java/com/klp/generator/domain/GenTable.java index 45e9168e..e0076a08 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/klp-generator/src/main/java/com/klp/generator/domain/GenTable.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.domain; +package com.klp.generator.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.constant.GenConstants; +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.commons.lang3.ArrayUtils; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/klp-generator/src/main/java/com/klp/generator/domain/GenTableColumn.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to klp-generator/src/main/java/com/klp/generator/domain/GenTableColumn.java index f6dbcaaf..7492272a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/klp-generator/src/main/java/com/klp/generator/domain/GenTableColumn.java @@ -1,11 +1,11 @@ -package com.ruoyi.generator.domain; +package com.klp.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.klp.common.core.domain.BaseEntity; +import com.klp.common.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import org.apache.ibatis.type.JdbcType; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/klp-generator/src/main/java/com/klp/generator/mapper/GenTableColumnMapper.java similarity index 78% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to klp-generator/src/main/java/com/klp/generator/mapper/GenTableColumnMapper.java index 93578f2e..095f8d83 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/klp-generator/src/main/java/com/klp/generator/mapper/GenTableColumnMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.mapper; +package com.klp.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.generator.domain.GenTableColumn; +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.generator.domain.GenTableColumn; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/klp-generator/src/main/java/com/klp/generator/mapper/GenTableMapper.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to klp-generator/src/main/java/com/klp/generator/mapper/GenTableMapper.java index f70a11eb..881455ff 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/klp-generator/src/main/java/com/klp/generator/mapper/GenTableMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.mapper; +package com.klp.generator.mapper; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.mapper.BaseMapperPlus; -import com.ruoyi.generator.domain.GenTable; +import com.klp.common.core.mapper.BaseMapperPlus; +import com.klp.generator.domain.GenTable; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/klp-generator/src/main/java/com/klp/generator/service/GenTableServiceImpl.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to klp-generator/src/main/java/com/klp/generator/service/GenTableServiceImpl.java index 34c45692..1b87c10c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/klp-generator/src/main/java/com/klp/generator/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.service; +package com.klp.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; @@ -10,23 +10,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.helper.LoginHelper; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StreamUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.klp.common.constant.Constants; +import com.klp.common.constant.GenConstants; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.exception.ServiceException; +import com.klp.common.helper.LoginHelper; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.StreamUtils; +import com.klp.common.utils.StringUtils; +import com.klp.common.utils.file.FileUtils; +import com.klp.generator.domain.GenTable; +import com.klp.generator.domain.GenTableColumn; +import com.klp.generator.mapper.GenTableColumnMapper; +import com.klp.generator.mapper.GenTableMapper; +import com.klp.generator.util.GenUtils; +import com.klp.generator.util.VelocityInitializer; +import com.klp.generator.util.VelocityUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.velocity.Template; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/klp-generator/src/main/java/com/klp/generator/service/IGenTableService.java similarity index 91% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to klp-generator/src/main/java/com/klp/generator/service/IGenTableService.java index c432d067..f5e88004 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/klp-generator/src/main/java/com/klp/generator/service/IGenTableService.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.service; +package com.klp.generator.service; -import com.ruoyi.common.core.domain.PageQuery; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.page.TableDataInfo; +import com.klp.generator.domain.GenTable; +import com.klp.generator.domain.GenTableColumn; import java.util.List; import java.util.Map; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/klp-generator/src/main/java/com/klp/generator/util/GenUtils.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to klp-generator/src/main/java/com/klp/generator/util/GenUtils.java index f04beb98..db994639 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/klp-generator/src/main/java/com/klp/generator/util/GenUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.generator.util; +package com.klp.generator.util; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.klp.common.constant.GenConstants; +import com.klp.common.utils.StringUtils; +import com.klp.generator.config.GenConfig; +import com.klp.generator.domain.GenTable; +import com.klp.generator.domain.GenTableColumn; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.commons.lang3.RegExUtils; @@ -14,7 +14,7 @@ import java.util.Arrays; /** * 代码生成器 工具类 * - * @author ruoyi + * @author klp */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class GenUtils { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/klp-generator/src/main/java/com/klp/generator/util/VelocityInitializer.java similarity index 90% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to klp-generator/src/main/java/com/klp/generator/util/VelocityInitializer.java index 67769a8d..0e1e2ee5 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/klp-generator/src/main/java/com/klp/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package com.ruoyi.generator.util; +package com.klp.generator.util; -import com.ruoyi.common.constant.Constants; +import com.klp.common.constant.Constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.app.Velocity; @@ -10,7 +10,7 @@ import java.util.Properties; /** * VelocityEngine工厂 * - * @author ruoyi + * @author klp */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class VelocityInitializer { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/klp-generator/src/main/java/com/klp/generator/util/VelocityUtils.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to klp-generator/src/main/java/com/klp/generator/util/VelocityUtils.java index 2277e2c3..c02bb103 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/klp-generator/src/main/java/com/klp/generator/util/VelocityUtils.java @@ -1,16 +1,16 @@ -package com.ruoyi.generator.util; +package com.klp.generator.util; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.helper.DataBaseHelper; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.klp.common.constant.GenConstants; +import com.klp.common.helper.DataBaseHelper; +import com.klp.common.utils.DateUtils; +import com.klp.common.utils.JsonUtils; +import com.klp.common.utils.StringUtils; +import com.klp.generator.domain.GenTable; +import com.klp.generator.domain.GenTableColumn; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.apache.velocity.VelocityContext; @@ -20,7 +20,7 @@ import java.util.*; /** * 模板处理工具类 * - * @author ruoyi + * @author klp */ @NoArgsConstructor(access = AccessLevel.PRIVATE) public class VelocityUtils { diff --git a/ruoyi-generator/src/main/resources/generator.yml b/klp-generator/src/main/resources/generator.yml similarity index 85% rename from ruoyi-generator/src/main/resources/generator.yml rename to klp-generator/src/main/resources/generator.yml index d7e9a1aa..872dbed3 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/klp-generator/src/main/resources/generator.yml @@ -1,9 +1,9 @@ # 代码生成 gen: # 作者 - author: ruoyi + author: klp # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system + packageName: com.klp.system # 自动去除表前缀，默认是false autoRemovePre: false # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/klp-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 94% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to klp-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index e81203ef..6be38d7c 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/klp-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + @@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select table_name, table_comment, create_time, update_time from information_schema.tables where table_schema = (select database()) @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time from user_tables dt, user_tab_comments dtc, user_objects uo where dt.table_name = dtc.table_name @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + select table_name, table_comment, create_time, update_time from ( SELECT c.relname AS table_name, @@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + SELECT cast(D.NAME as nvarchar) as table_name, cast(F.VALUE as nvarchar) as table_comment, crdate as create_time, @@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" +