diff --git a/README.md b/README.md deleted file mode 100644 index 10c6b52..0000000 --- a/README.md +++ /dev/null @@ -1,94 +0,0 @@ -

- logo -

-

RuoYi v3.9.0

-

基于SpringBoot+Vue前后端分离的Java快速开发框架

-

- - - -

- -## 平台简介 - -* 本仓库为RuoYi-Vue的单应用版本，保持同步更新。 -* 配套前端代码地址[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue/tree/master/ruoyi-ui)，技术栈（[Vue2](https://cn.vuejs.org) + [Element](https://github.com/ElemeFE/element) + [Vue CLI](https://cli.vuejs.org/zh)）。 -* 配套前端代码地址[RuoYi-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Vue3)，技术栈（[Vue3](https://v3.cn.vuejs.org) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev)）。 -* 前端采用Vue、Element UI。 -* 后端采用Spring Boot、Spring Security、Redis & Jwt。 -* 权限认证使用Jwt，支持多终端认证系统。 -* 支持加载动态权限菜单，多方式轻松权限控制。 -* 高效率开发，使用代码生成器可以一键生成前后端代码。 -* 不分离版本，请移步[RuoYi](https://gitee.com/y_project/RuoYi)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) -* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   - -## 内置功能 - -1. 用户管理：用户是系统操作者，该功能主要完成系统用户配置。 -2. 部门管理：配置系统组织机构（公司、部门、小组），树结构展现支持数据权限。 -3. 岗位管理：配置系统用户所属担任职务。 -4. 菜单管理：配置系统菜单，操作权限，按钮权限标识等。 -5. 角色管理：角色菜单权限分配、设置角色按机构进行数据范围权限划分。 -6. 字典管理：对系统中经常使用的一些较为固定的数据进行维护。 -7. 参数管理：对系统动态配置常用参数。 -8. 通知公告：系统通知公告信息发布维护。 -9. 操作日志：系统正常操作日志记录和查询；系统异常信息日志记录和查询。 -10. 登录日志：系统登录日志记录查询包含登录异常。 -11. 在线用户：当前系统中活跃用户状态监控。 -12. 定时任务：在线（添加、修改、删除)任务调度包含执行结果日志。 -13. 代码生成：前后端代码的生成（java、html、xml、sql）支持CRUD下载 。 -14. 系统接口：根据业务代码自动生成相关的api接口文档。 -15. 服务监控：监视当前系统CPU、内存、磁盘、堆栈等相关信息。 -16. 缓存监控：对系统的缓存信息查询，命令统计等。 -17. 在线构建器：拖动表单元素生成相应的HTML代码。 -18. 连接池监视：监视当前系统数据库连接池状态，可进行分析SQL找出系统性能瓶颈。 - -## 在线体验 - -- admin/admin123 -- 陆陆续续收到一些打赏，为了更好的体验已用于演示服务器升级。谢谢各位小伙伴。 - -演示地址：http://vue.ruoyi.vip -文档地址：http://doc.ruoyi.vip - -## 演示图 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -## 若依前后端分离交流群 - -QQ群： [![加入QQ群](https://img.shields.io/badge/已满-937441-blue.svg)](https://jq.qq.com/?_wv=1027&k=5bVB1og) [![加入QQ群](https://img.shields.io/badge/已满-887144332-blue.svg)](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [![加入QQ群](https://img.shields.io/badge/已满-180251782-blue.svg)](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [![加入QQ群](https://img.shields.io/badge/已满-104180207-blue.svg)](https://jq.qq.com/?_wv=1027&k=51G72yr) [![加入QQ群](https://img.shields.io/badge/已满-186866453-blue.svg)](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [![加入QQ群](https://img.shields.io/badge/已满-201396349-blue.svg)](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [![加入QQ群](https://img.shields.io/badge/已满-101456076-blue.svg)](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [![加入QQ群](https://img.shields.io/badge/已满-101539465-blue.svg)](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [![加入QQ群](https://img.shields.io/badge/已满-264312783-blue.svg)](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) [![加入QQ群](https://img.shields.io/badge/已满-167385320-blue.svg)](https://jq.qq.com/?_wv=1027&k=SWCtLnMz) [![加入QQ群](https://img.shields.io/badge/已满-104748341-blue.svg)](https://jq.qq.com/?_wv=1027&k=96Dkdq0k) [![加入QQ群](https://img.shields.io/badge/已满-160110482-blue.svg)](https://jq.qq.com/?_wv=1027&k=0fsNiYZt) [![加入QQ群](https://img.shields.io/badge/已满-170801498-blue.svg)](https://jq.qq.com/?_wv=1027&k=7xw4xUG1) [![加入QQ群](https://img.shields.io/badge/已满-108482800-blue.svg)](https://jq.qq.com/?_wv=1027&k=eCx8eyoJ) [![加入QQ群](https://img.shields.io/badge/已满-101046199-blue.svg)](https://jq.qq.com/?_wv=1027&k=SpyH2875) [![加入QQ群](https://img.shields.io/badge/已满-136919097-blue.svg)](https://jq.qq.com/?_wv=1027&k=tKEt51dz) [![加入QQ群](https://img.shields.io/badge/已满-143961921-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=0vBbSb0ztbBgVtn3kJS-Q4HUNYwip89G&authKey=8irq5PhutrZmWIvsUsklBxhj57l%2F1nOZqjzigkXZVoZE451GG4JHPOqW7AW6cf0T&noverify=0&group_code=143961921) [![加入QQ群](https://img.shields.io/badge/已满-174951577-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=ZFAPAbp09S2ltvwrJzp7wGlbopsc0rwi&authKey=HB2cxpxP2yspk%2Bo3WKTBfktRCccVkU26cgi5B16u0KcAYrVu7sBaE7XSEqmMdFQp&noverify=0&group_code=174951577) [![加入QQ群](https://img.shields.io/badge/已满-161281055-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Fn2aF5IHpwsy8j6VlalNJK6qbwFLFHat&authKey=uyIT%2B97x2AXj3odyXpsSpVaPMC%2Bidw0LxG5MAtEqlrcBcWJUA%2FeS43rsF1Tg7IRJ&noverify=0&group_code=161281055) [![加入QQ群](https://img.shields.io/badge/已满-138988063-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=XIzkm_mV2xTsUtFxo63bmicYoDBA6Ifm&authKey=dDW%2F4qsmw3x9govoZY9w%2FoWAoC4wbHqGal%2BbqLzoS6VBarU8EBptIgPKN%2FviyC8j&noverify=0&group_code=138988063) [![加入QQ群](https://img.shields.io/badge/已满-151450850-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=DkugnCg68PevlycJSKSwjhFqfIgrWWwR&authKey=pR1Pa5lPIeGF%2FFtIk6d%2FGB5qFi0EdvyErtpQXULzo03zbhopBHLWcuqdpwY241R%2F&noverify=0&group_code=151450850) [![加入QQ群](https://img.shields.io/badge/已满-224622315-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=F58bgRa-Dp-rsQJThiJqIYv8t4-lWfXh&authKey=UmUs4CVG5OPA1whvsa4uSespOvyd8%2FAr9olEGaWAfdLmfKQk%2FVBp2YU3u2xXXt76&noverify=0&group_code=224622315) [![加入QQ群](https://img.shields.io/badge/已满-287842588-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Nxb2EQ5qozWa218Wbs7zgBnjLSNk_tVT&authKey=obBKXj6SBKgrFTJZx0AqQnIYbNOvBB2kmgwWvGhzxR67RoRr84%2Bus5OadzMcdJl5&noverify=0&group_code=287842588) [![加入QQ群](https://img.shields.io/badge/已满-187944233-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=numtK1M_I4eVd2Gvg8qtbuL8JgX42qNh&authKey=giV9XWMaFZTY%2FqPlmWbkB9g3fi0Ev5CwEtT9Tgei0oUlFFCQLDp4ozWRiVIzubIm&noverify=0&group_code=187944233) [![加入QQ群](https://img.shields.io/badge/已满-228578329-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G6r5KGCaa3pqdbUSXNIgYloyb8e0_L0D&authKey=4w8tF1eGW7%2FedWn%2FHAypQksdrML%2BDHolQSx7094Agm7Luakj9EbfPnSTxSi2T1LQ&noverify=0&group_code=228578329) [![加入QQ群](https://img.shields.io/badge/已满-191164766-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=GsOo-OLz53J8y_9TPoO6XXSGNRTgbFxA&authKey=R7Uy%2Feq%2BZsoKNqHvRKhiXpypW7DAogoWapOawUGHokJSBIBIre2%2FoiAZeZBSLuBc&noverify=0&group_code=191164766) [![加入QQ群](https://img.shields.io/badge/174569686-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=PmYavuzsOthVqfdAPbo4uAeIbu7Ttjgc&authKey=p52l8%2FXa4PS1JcEmS3VccKSwOPJUZ1ZfQ69MEKzbrooNUljRtlKjvsXf04bxNp3G&noverify=0&group_code=174569686) 点击按钮入群。 \ No newline at end of file diff --git a/pom.xml b/pom.xml index c79c959..c7e25a2 100644 --- a/pom.xml +++ b/pom.xml @@ -3,20 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.ruoyi - ruoyi + com.delivery + delivery 3.9.0 jar - ruoyi - http://www.ruoyi.vip - 若依管理系统 + Delivery + 配送管理系统 org.springframework.boot spring-boot-starter-parent 2.5.15 - + @@ -73,7 +72,7 @@ org.springframework.boot spring-boot-devtools - true + true @@ -227,50 +226,57 @@ ${kaptcha.version} - servlet-api javax.servlet + servlet-api - + - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + true + + + + - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + - \ No newline at end of file + diff --git a/src/main/java/com/ruoyi/RuoYiApplication.java b/src/main/java/com/delivery/DeliveryApplication.java similarity index 66% rename from src/main/java/com/ruoyi/RuoYiApplication.java rename to src/main/java/com/delivery/DeliveryApplication.java index 32eb6f1..25806e3 100644 --- a/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/src/main/java/com/delivery/DeliveryApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.delivery; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,23 +6,22 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; /** * 启动程序 - * - * @author ruoyi + * + * @author delivery */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication -{ - public static void main(String[] args) - { +public class DeliveryApplication { + + public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication.run(RuoYiApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 若依启动成功 ლ(´ڡ`ლ)ﾞ \n" + + SpringApplication.run(DeliveryApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ Delivery 启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + " |(_ o _) / _( )_ .' \n" + " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + + " | |\\ \\ | || |(_,_)' \n" + " | | \\ `' /| `-' / \n" + " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); diff --git a/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/src/main/java/com/delivery/DeliveryServletInitializer.java similarity index 56% rename from src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to src/main/java/com/delivery/DeliveryServletInitializer.java index 6de67dc..d53dc7f 100644 --- a/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/src/main/java/com/delivery/DeliveryServletInitializer.java @@ -1,18 +1,17 @@ -package com.ruoyi; +package com.delivery; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * web容器中进行部署 - * - * @author ruoyi + * + * @author delivery */ -public class RuoYiServletInitializer extends SpringBootServletInitializer -{ +public class DeliveryServletInitializer extends SpringBootServletInitializer { + @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) - { - return application.sources(RuoYiApplication.class); + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(DeliveryApplication.class); } } diff --git a/src/main/java/com/ruoyi/common/constant/CacheConstants.java b/src/main/java/com/delivery/common/constant/CacheConstants.java similarity index 95% rename from src/main/java/com/ruoyi/common/constant/CacheConstants.java rename to src/main/java/com/delivery/common/constant/CacheConstants.java index 0080343..c2e22ae 100644 --- a/src/main/java/com/ruoyi/common/constant/CacheConstants.java +++ b/src/main/java/com/delivery/common/constant/CacheConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.delivery.common.constant; /** * 缓存的key 常量 diff --git a/src/main/java/com/ruoyi/common/constant/Constants.java b/src/main/java/com/delivery/common/constant/Constants.java similarity index 54% rename from src/main/java/com/ruoyi/common/constant/Constants.java rename to src/main/java/com/delivery/common/constant/Constants.java index 831a75f..e255404 100644 --- a/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/src/main/java/com/delivery/common/constant/Constants.java @@ -1,173 +1,66 @@ -package com.ruoyi.common.constant; +package com.delivery.common.constant; import java.util.Locale; import io.jsonwebtoken.Claims; /** * 通用常量信息 - * - * @author ruoyi + * + * @author delivery */ public class Constants { - /** - * UTF-8 字符集 - */ public static final String UTF8 = "UTF-8"; - - /** - * GBK 字符集 - */ public static final String GBK = "GBK"; - - /** - * 系统语言 - */ public static final Locale DEFAULT_LOCALE = Locale.SIMPLIFIED_CHINESE; - - /** - * www主域 - */ public static final String WWW = "www."; - - /** - * http请求 - */ public static final String HTTP = "http://"; - - /** - * https请求 - */ public static final String HTTPS = "https://"; - - /** - * 通用成功标识 - */ public static final String SUCCESS = "0"; - - /** - * 通用失败标识 - */ public static final String FAIL = "1"; - - /** - * 登录成功 - */ public static final String LOGIN_SUCCESS = "Success"; - - /** - * 注销 - */ public static final String LOGOUT = "Logout"; - - /** - * 注册 - */ public static final String REGISTER = "Register"; - - /** - * 登录失败 - */ public static final String LOGIN_FAIL = "Error"; - - /** - * 所有权限标识 - */ public static final String ALL_PERMISSION = "*:*:*"; - - /** - * 管理员角色权限标识 - */ public static final String SUPER_ADMIN = "admin"; - - /** - * 角色权限分隔符 - */ public static final String ROLE_DELIMETER = ","; - - /** - * 权限标识分隔符 - */ public static final String PERMISSION_DELIMETER = ","; - - /** - * 验证码有效期（分钟） - */ public static final Integer CAPTCHA_EXPIRATION = 2; - - /** - * 令牌 - */ public static final String TOKEN = "token"; - - /** - * 令牌前缀 - */ public static final String TOKEN_PREFIX = "Bearer "; - - /** - * 令牌前缀 - */ public static final String LOGIN_USER_KEY = "login_user_key"; - - /** - * 用户ID - */ public static final String JWT_USERID = "userid"; - - /** - * 用户名称 - */ public static final String JWT_USERNAME = Claims.SUBJECT; - - /** - * 用户头像 - */ public static final String JWT_AVATAR = "avatar"; - - /** - * 创建时间 - */ public static final String JWT_CREATED = "created"; - - /** - * 用户权限 - */ public static final String JWT_AUTHORITIES = "authorities"; - - /** - * 资源映射路径 前缀 - */ public static final String RESOURCE_PREFIX = "/profile"; - - /** - * RMI 远程方法调用 - */ public static final String LOOKUP_RMI = "rmi:"; - - /** - * LDAP 远程方法调用 - */ public static final String LOOKUP_LDAP = "ldap:"; - - /** - * LDAPS 远程方法调用 - */ public static final String LOOKUP_LDAPS = "ldaps:"; /** * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全） */ - public static final String[] JSON_WHITELIST_STR = { "com.ruoyi" }; + public static final String[] JSON_WHITELIST_STR = { "com.delivery" }; /** * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加） */ - public static final String[] JOB_WHITELIST_STR = { "com.ruoyi.framework.task" }; + public static final String[] JOB_WHITELIST_STR = { "com.delivery.framework.task" }; /** * 定时任务违规的字符 */ - public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml", - "org.springframework", "org.apache", "com.ruoyi.common.utils.file", "com.ruoyi.framework.config", "com.ruoyi.project.tool" }; + public static final String[] JOB_ERROR_STR = { + "java.net.URL", + "javax.naming.InitialContext", + "org.yaml.snakeyaml", + "org.springframework", + "org.apache", + "com.delivery.common.utils.file", + "com.delivery.framework.config", + "com.delivery.project.tool" + }; } diff --git a/src/main/java/com/ruoyi/common/constant/GenConstants.java b/src/main/java/com/delivery/common/constant/GenConstants.java similarity index 98% rename from src/main/java/com/ruoyi/common/constant/GenConstants.java rename to src/main/java/com/delivery/common/constant/GenConstants.java index 7d899d4..9900a3d 100644 --- a/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/src/main/java/com/delivery/common/constant/GenConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.delivery.common.constant; /** * 代码生成通用常量 diff --git a/src/main/java/com/ruoyi/common/constant/HttpStatus.java b/src/main/java/com/delivery/common/constant/HttpStatus.java similarity index 97% rename from src/main/java/com/ruoyi/common/constant/HttpStatus.java rename to src/main/java/com/delivery/common/constant/HttpStatus.java index a983c77..d46ba7e 100644 --- a/src/main/java/com/ruoyi/common/constant/HttpStatus.java +++ b/src/main/java/com/delivery/common/constant/HttpStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.delivery.common.constant; /** * 返回状态码 diff --git a/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java b/src/main/java/com/delivery/common/constant/ScheduleConstants.java similarity index 96% rename from src/main/java/com/ruoyi/common/constant/ScheduleConstants.java rename to src/main/java/com/delivery/common/constant/ScheduleConstants.java index 62ad815..1da2e06 100644 --- a/src/main/java/com/ruoyi/common/constant/ScheduleConstants.java +++ b/src/main/java/com/delivery/common/constant/ScheduleConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.delivery.common.constant; /** * 任务调度通用常量 diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/delivery/common/constant/UserConstants.java similarity index 98% rename from src/main/java/com/ruoyi/common/constant/UserConstants.java rename to src/main/java/com/delivery/common/constant/UserConstants.java index 8dc7faa..4e08ce6 100644 --- a/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/src/main/java/com/delivery/common/constant/UserConstants.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.constant; +package com.delivery.common.constant; /** * 用户常量信息 diff --git a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java b/src/main/java/com/delivery/common/core/text/CharsetKit.java similarity index 96% rename from src/main/java/com/ruoyi/common/core/text/CharsetKit.java rename to src/main/java/com/delivery/common/core/text/CharsetKit.java index 84124aa..0335875 100644 --- a/src/main/java/com/ruoyi/common/core/text/CharsetKit.java +++ b/src/main/java/com/delivery/common/core/text/CharsetKit.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.text; +package com.delivery.common.core.text; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 字符集工具类 diff --git a/src/main/java/com/ruoyi/common/core/text/Convert.java b/src/main/java/com/delivery/common/core/text/Convert.java similarity index 99% rename from src/main/java/com/ruoyi/common/core/text/Convert.java rename to src/main/java/com/delivery/common/core/text/Convert.java index cbf118e..747d44e 100644 --- a/src/main/java/com/ruoyi/common/core/text/Convert.java +++ b/src/main/java/com/delivery/common/core/text/Convert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.text; +package com.delivery.common.core.text; import java.math.BigDecimal; import java.math.BigInteger; @@ -7,7 +7,7 @@ import java.nio.ByteBuffer; import java.nio.charset.Charset; import java.text.NumberFormat; import java.util.Set; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; import org.apache.commons.lang3.ArrayUtils; /** diff --git a/src/main/java/com/ruoyi/common/core/text/StrFormatter.java b/src/main/java/com/delivery/common/core/text/StrFormatter.java similarity index 97% rename from src/main/java/com/ruoyi/common/core/text/StrFormatter.java rename to src/main/java/com/delivery/common/core/text/StrFormatter.java index c78ac77..4637387 100644 --- a/src/main/java/com/ruoyi/common/core/text/StrFormatter.java +++ b/src/main/java/com/delivery/common/core/text/StrFormatter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.text; +package com.delivery.common.core.text; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 字符串格式化 diff --git a/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/src/main/java/com/delivery/common/enums/HttpMethod.java similarity index 95% rename from src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to src/main/java/com/delivery/common/enums/HttpMethod.java index be6f739..4101e77 100644 --- a/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/src/main/java/com/delivery/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.delivery.common.enums; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/ruoyi/common/enums/UserStatus.java b/src/main/java/com/delivery/common/enums/UserStatus.java similarity index 92% rename from src/main/java/com/ruoyi/common/enums/UserStatus.java rename to src/main/java/com/delivery/common/enums/UserStatus.java index d7ff44a..0eb5576 100644 --- a/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/src/main/java/com/delivery/common/enums/UserStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.delivery.common.enums; /** * 用户状态 diff --git a/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/src/main/java/com/delivery/common/exception/DemoModeException.java similarity index 84% rename from src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to src/main/java/com/delivery/common/exception/DemoModeException.java index f6ad2ab..ef09159 100644 --- a/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/src/main/java/com/delivery/common/exception/DemoModeException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.delivery.common.exception; /** * 演示模式异常 diff --git a/src/main/java/com/ruoyi/common/exception/GlobalException.java b/src/main/java/com/delivery/common/exception/GlobalException.java similarity index 96% rename from src/main/java/com/ruoyi/common/exception/GlobalException.java rename to src/main/java/com/delivery/common/exception/GlobalException.java index 81a71b5..b8629ba 100644 --- a/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/src/main/java/com/delivery/common/exception/GlobalException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.delivery.common.exception; /** * 全局异常 diff --git a/src/main/java/com/ruoyi/common/exception/ServiceException.java b/src/main/java/com/delivery/common/exception/ServiceException.java similarity index 97% rename from src/main/java/com/ruoyi/common/exception/ServiceException.java rename to src/main/java/com/delivery/common/exception/ServiceException.java index fcc7ab6..650b933 100644 --- a/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/src/main/java/com/delivery/common/exception/ServiceException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.delivery.common.exception; /** * 业务异常 diff --git a/src/main/java/com/ruoyi/common/exception/UtilException.java b/src/main/java/com/delivery/common/exception/UtilException.java similarity index 92% rename from src/main/java/com/ruoyi/common/exception/UtilException.java rename to src/main/java/com/delivery/common/exception/UtilException.java index 980fa46..771982c 100644 --- a/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/src/main/java/com/delivery/common/exception/UtilException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception; +package com.delivery.common.exception; /** * 工具类异常 diff --git a/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/src/main/java/com/delivery/common/exception/base/BaseException.java similarity index 92% rename from src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to src/main/java/com/delivery/common/exception/base/BaseException.java index b55d72e..fc5248c 100644 --- a/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/src/main/java/com/delivery/common/exception/base/BaseException.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.exception.base; +package com.delivery.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.MessageUtils; +import com.delivery.common.utils.StringUtils; /** * 基础异常 diff --git a/src/main/java/com/ruoyi/common/exception/file/FileException.java b/src/main/java/com/delivery/common/exception/file/FileException.java similarity index 72% rename from src/main/java/com/ruoyi/common/exception/file/FileException.java rename to src/main/java/com/delivery/common/exception/file/FileException.java index 871f09b..16bc6eb 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/src/main/java/com/delivery/common/exception/file/FileException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.file; +package com.delivery.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.delivery.common.exception.base.BaseException; /** * 文件信息异常类 diff --git a/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/src/main/java/com/delivery/common/exception/file/FileNameLengthLimitExceededException.java similarity index 89% rename from src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to src/main/java/com/delivery/common/exception/file/FileNameLengthLimitExceededException.java index 70e0ec9..ec984a9 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/src/main/java/com/delivery/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.delivery.common.exception.file; /** * 文件名称超长限制异常类 diff --git a/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/src/main/java/com/delivery/common/exception/file/FileSizeLimitExceededException.java similarity index 88% rename from src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to src/main/java/com/delivery/common/exception/file/FileSizeLimitExceededException.java index ec6ab05..3f9247a 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/src/main/java/com/delivery/common/exception/file/FileSizeLimitExceededException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.delivery.common.exception.file; /** * 文件名大小限制异常类 diff --git a/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java b/src/main/java/com/delivery/common/exception/file/FileUploadException.java similarity index 96% rename from src/main/java/com/ruoyi/common/exception/file/FileUploadException.java rename to src/main/java/com/delivery/common/exception/file/FileUploadException.java index f45e7ef..c07ebc6 100644 --- a/src/main/java/com/ruoyi/common/exception/file/FileUploadException.java +++ b/src/main/java/com/delivery/common/exception/file/FileUploadException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.delivery.common.exception.file; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java b/src/main/java/com/delivery/common/exception/file/InvalidExtensionException.java similarity index 98% rename from src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java rename to src/main/java/com/delivery/common/exception/file/InvalidExtensionException.java index 011f308..ecc0c5e 100644 --- a/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java +++ b/src/main/java/com/delivery/common/exception/file/InvalidExtensionException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.file; +package com.delivery.common.exception.file; import java.util.Arrays; diff --git a/src/main/java/com/ruoyi/common/exception/job/TaskException.java b/src/main/java/com/delivery/common/exception/job/TaskException.java similarity index 93% rename from src/main/java/com/ruoyi/common/exception/job/TaskException.java rename to src/main/java/com/delivery/common/exception/job/TaskException.java index a567b40..056e7af 100644 --- a/src/main/java/com/ruoyi/common/exception/job/TaskException.java +++ b/src/main/java/com/delivery/common/exception/job/TaskException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.job; +package com.delivery.common.exception.job; /** * 计划策略异常 diff --git a/src/main/java/com/ruoyi/common/exception/user/BlackListException.java b/src/main/java/com/delivery/common/exception/user/BlackListException.java similarity index 84% rename from src/main/java/com/ruoyi/common/exception/user/BlackListException.java rename to src/main/java/com/delivery/common/exception/user/BlackListException.java index 2bf5038..43f1b3e 100644 --- a/src/main/java/com/ruoyi/common/exception/user/BlackListException.java +++ b/src/main/java/com/delivery/common/exception/user/BlackListException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; /** * 黑名单IP异常类 diff --git a/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/src/main/java/com/delivery/common/exception/user/CaptchaException.java similarity index 85% rename from src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to src/main/java/com/delivery/common/exception/user/CaptchaException.java index 389dbc7..90da046 100644 --- a/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/src/main/java/com/delivery/common/exception/user/CaptchaException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; /** * 验证码错误异常类 diff --git a/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/src/main/java/com/delivery/common/exception/user/CaptchaExpireException.java similarity index 85% rename from src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to src/main/java/com/delivery/common/exception/user/CaptchaExpireException.java index 85f9486..68d1d3f 100644 --- a/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/src/main/java/com/delivery/common/exception/user/CaptchaExpireException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; /** * 验证码失效异常类 diff --git a/src/main/java/com/ruoyi/common/exception/user/UserException.java b/src/main/java/com/delivery/common/exception/user/UserException.java similarity index 72% rename from src/main/java/com/ruoyi/common/exception/user/UserException.java rename to src/main/java/com/delivery/common/exception/user/UserException.java index c292d70..b188d96 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/src/main/java/com/delivery/common/exception/user/UserException.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.delivery.common.exception.base.BaseException; /** * 用户信息异常类 diff --git a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java b/src/main/java/com/delivery/common/exception/user/UserNotExistsException.java similarity index 85% rename from src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java rename to src/main/java/com/delivery/common/exception/user/UserNotExistsException.java index eff8181..0b6ec1c 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserNotExistsException.java +++ b/src/main/java/com/delivery/common/exception/user/UserNotExistsException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; /** * 用户不存在异常类 diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/src/main/java/com/delivery/common/exception/user/UserPasswordNotMatchException.java similarity index 87% rename from src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to src/main/java/com/delivery/common/exception/user/UserPasswordNotMatchException.java index a7f3e5f..5d19fa6 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/src/main/java/com/delivery/common/exception/user/UserPasswordNotMatchException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; /** * 用户密码不正确或不符合规范异常类 diff --git a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java b/src/main/java/com/delivery/common/exception/user/UserPasswordRetryLimitExceedException.java similarity index 89% rename from src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java rename to src/main/java/com/delivery/common/exception/user/UserPasswordRetryLimitExceedException.java index c887cf1..dc01748 100644 --- a/src/main/java/com/ruoyi/common/exception/user/UserPasswordRetryLimitExceedException.java +++ b/src/main/java/com/delivery/common/exception/user/UserPasswordRetryLimitExceedException.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.exception.user; +package com.delivery.common.exception.user; /** * 用户错误最大次数异常类 diff --git a/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java b/src/main/java/com/delivery/common/filter/PropertyPreExcludeFilter.java similarity index 92% rename from src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java rename to src/main/java/com/delivery/common/filter/PropertyPreExcludeFilter.java index e1e431b..bc7580c 100644 --- a/src/main/java/com/ruoyi/common/filter/PropertyPreExcludeFilter.java +++ b/src/main/java/com/delivery/common/filter/PropertyPreExcludeFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.delivery.common.filter; import com.alibaba.fastjson2.filter.SimplePropertyPreFilter; diff --git a/src/main/java/com/ruoyi/common/filter/RefererFilter.java b/src/main/java/com/delivery/common/filter/RefererFilter.java similarity index 98% rename from src/main/java/com/ruoyi/common/filter/RefererFilter.java rename to src/main/java/com/delivery/common/filter/RefererFilter.java index 79e8989..396b36f 100644 --- a/src/main/java/com/ruoyi/common/filter/RefererFilter.java +++ b/src/main/java/com/delivery/common/filter/RefererFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.delivery.common.filter; import java.io.IOException; import java.util.Arrays; diff --git a/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/src/main/java/com/delivery/common/filter/RepeatableFilter.java similarity index 93% rename from src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to src/main/java/com/delivery/common/filter/RepeatableFilter.java index a1bcfe2..19f816b 100644 --- a/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/src/main/java/com/delivery/common/filter/RepeatableFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.delivery.common.filter; import java.io.IOException; import javax.servlet.Filter; @@ -9,7 +9,7 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * Repeatable 过滤器 diff --git a/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/src/main/java/com/delivery/common/filter/RepeatedlyRequestWrapper.java similarity index 93% rename from src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to src/main/java/com/delivery/common/filter/RepeatedlyRequestWrapper.java index 407d1ba..9f10660 100644 --- a/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/src/main/java/com/delivery/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.delivery.common.filter; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -9,8 +9,8 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.common.constant.Constants; +import com.delivery.common.utils.http.HttpHelper; +import com.delivery.common.constant.Constants; /** * 构建可重复读取inputStream的request diff --git a/src/main/java/com/ruoyi/common/filter/XssFilter.java b/src/main/java/com/delivery/common/filter/XssFilter.java similarity index 94% rename from src/main/java/com/ruoyi/common/filter/XssFilter.java rename to src/main/java/com/delivery/common/filter/XssFilter.java index 5c4cbe4..a708dc8 100644 --- a/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/src/main/java/com/delivery/common/filter/XssFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.delivery.common.filter; import java.io.IOException; import java.util.ArrayList; @@ -11,8 +11,8 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.enums.HttpMethod; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.enums.HttpMethod; /** * 防止XSS攻击的过滤器 diff --git a/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/src/main/java/com/delivery/common/filter/XssHttpServletRequestWrapper.java similarity index 95% rename from src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to src/main/java/com/delivery/common/filter/XssHttpServletRequestWrapper.java index 05149f0..0552d28 100644 --- a/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/src/main/java/com/delivery/common/filter/XssHttpServletRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.delivery.common.filter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -9,8 +9,8 @@ import javax.servlet.http.HttpServletRequestWrapper; import org.apache.commons.io.IOUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.html.EscapeUtil; /** * XSS过滤处理 diff --git a/src/main/java/com/ruoyi/common/utils/Arith.java b/src/main/java/com/delivery/common/utils/Arith.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/Arith.java rename to src/main/java/com/delivery/common/utils/Arith.java index 9f95c0f..85f5b8f 100644 --- a/src/main/java/com/ruoyi/common/utils/Arith.java +++ b/src/main/java/com/delivery/common/utils/Arith.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/delivery/common/utils/DateUtils.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/DateUtils.java rename to src/main/java/com/delivery/common/utils/DateUtils.java index fb2ae21..7ef7291 100644 --- a/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/src/main/java/com/delivery/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; diff --git a/src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java b/src/main/java/com/delivery/common/utils/DesensitizedUtil.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java rename to src/main/java/com/delivery/common/utils/DesensitizedUtil.java index f8a4c02..231311f 100644 --- a/src/main/java/com/ruoyi/common/utils/DesensitizedUtil.java +++ b/src/main/java/com/delivery/common/utils/DesensitizedUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; /** * 脱敏工具类 diff --git a/src/main/java/com/ruoyi/common/utils/DictUtils.java b/src/main/java/com/delivery/common/utils/DictUtils.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/DictUtils.java rename to src/main/java/com/delivery/common/utils/DictUtils.java index 16271dd..d37b302 100644 --- a/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/src/main/java/com/delivery/common/utils/DictUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.util.Collection; import java.util.List; import com.alibaba.fastjson2.JSONArray; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.project.system.domain.SysDictData; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.framework.redis.RedisCache; +import com.delivery.project.system.domain.SysDictData; /** * 字典工具类 diff --git a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java b/src/main/java/com/delivery/common/utils/ExceptionUtil.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/ExceptionUtil.java rename to src/main/java/com/delivery/common/utils/ExceptionUtil.java index 214e4a0..6fe2d6b 100644 --- a/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java +++ b/src/main/java/com/delivery/common/utils/ExceptionUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.io.PrintWriter; import java.io.StringWriter; diff --git a/src/main/java/com/ruoyi/common/utils/LogUtils.java b/src/main/java/com/delivery/common/utils/LogUtils.java similarity index 87% rename from src/main/java/com/ruoyi/common/utils/LogUtils.java rename to src/main/java/com/delivery/common/utils/LogUtils.java index 0de30c6..0945729 100644 --- a/src/main/java/com/ruoyi/common/utils/LogUtils.java +++ b/src/main/java/com/delivery/common/utils/LogUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; /** * 处理并记录日志文件 diff --git a/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/src/main/java/com/delivery/common/utils/MessageUtils.java similarity index 87% rename from src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to src/main/java/com/delivery/common/utils/MessageUtils.java index 7dac75a..606bfbb 100644 --- a/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/src/main/java/com/delivery/common/utils/MessageUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.delivery.common.utils.spring.SpringUtils; /** * 获取i18n资源文件 diff --git a/src/main/java/com/ruoyi/common/utils/PageUtils.java b/src/main/java/com/delivery/common/utils/PageUtils.java similarity index 80% rename from src/main/java/com/ruoyi/common/utils/PageUtils.java rename to src/main/java/com/delivery/common/utils/PageUtils.java index b5349aa..b4ca59d 100644 --- a/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/src/main/java/com/delivery/common/utils/PageUtils.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import com.github.pagehelper.PageHelper; -import com.ruoyi.common.utils.sql.SqlUtil; -import com.ruoyi.framework.web.page.PageDomain; -import com.ruoyi.framework.web.page.TableSupport; +import com.delivery.common.utils.sql.SqlUtil; +import com.delivery.framework.web.page.PageDomain; +import com.delivery.framework.web.page.TableSupport; /** * 分页工具类 diff --git a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/src/main/java/com/delivery/common/utils/SecurityUtils.java similarity index 93% rename from src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to src/main/java/com/delivery/common/utils/SecurityUtils.java index 467c9a1..3d34861 100644 --- a/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/src/main/java/com/delivery/common/utils/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.util.Collection; import java.util.List; @@ -7,11 +7,11 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.util.PatternMatchUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.system.domain.SysRole; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.HttpStatus; +import com.delivery.common.exception.ServiceException; +import com.delivery.framework.security.LoginUser; +import com.delivery.project.system.domain.SysRole; /** * 安全服务工具类 diff --git a/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/src/main/java/com/delivery/common/utils/ServletUtils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to src/main/java/com/delivery/common/utils/ServletUtils.java index febb603..1f029da 100644 --- a/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/src/main/java/com/delivery/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -14,8 +14,8 @@ import javax.servlet.http.HttpSession; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.Convert; +import com.delivery.common.constant.Constants; +import com.delivery.common.core.text.Convert; /** * 客户端工具类 diff --git a/src/main/java/com/ruoyi/common/utils/StringUtils.java b/src/main/java/com/delivery/common/utils/StringUtils.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/StringUtils.java rename to src/main/java/com/delivery/common/utils/StringUtils.java index c92759b..05cf0cf 100644 --- a/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/src/main/java/com/delivery/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.util.ArrayList; import java.util.Collection; @@ -7,8 +7,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import org.springframework.util.AntPathMatcher; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.StrFormatter; +import com.delivery.common.constant.Constants; +import com.delivery.common.core.text.StrFormatter; /** * 字符串工具类 diff --git a/src/main/java/com/ruoyi/common/utils/Threads.java b/src/main/java/com/delivery/common/utils/Threads.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/Threads.java rename to src/main/java/com/delivery/common/utils/Threads.java index 71fe6d5..c1a9434 100644 --- a/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/src/main/java/com/delivery/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.delivery.common.utils; import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; diff --git a/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java b/src/main/java/com/delivery/common/utils/bean/BeanUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java rename to src/main/java/com/delivery/common/utils/bean/BeanUtils.java index 4463662..cf2b3f2 100644 --- a/src/main/java/com/ruoyi/common/utils/bean/BeanUtils.java +++ b/src/main/java/com/delivery/common/utils/bean/BeanUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.delivery.common.utils.bean; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java b/src/main/java/com/delivery/common/utils/bean/BeanValidators.java similarity index 94% rename from src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java rename to src/main/java/com/delivery/common/utils/bean/BeanValidators.java index 80bfed7..aab62b5 100644 --- a/src/main/java/com/ruoyi/common/utils/bean/BeanValidators.java +++ b/src/main/java/com/delivery/common/utils/bean/BeanValidators.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.bean; +package com.delivery.common.utils.bean; import java.util.Set; import javax.validation.ConstraintViolation; diff --git a/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java b/src/main/java/com/delivery/common/utils/file/FileTypeUtils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java rename to src/main/java/com/delivery/common/utils/file/FileTypeUtils.java index 68130b9..bbb84ef 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileTypeUtils.java +++ b/src/main/java/com/delivery/common/utils/file/FileTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.delivery.common.utils.file; import java.io.File; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/src/main/java/com/delivery/common/utils/file/FileUploadUtils.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java rename to src/main/java/com/delivery/common/utils/file/FileUploadUtils.java index 0229869..d698312 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/src/main/java/com/delivery/common/utils/file/FileUploadUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.delivery.common.utils.file; import java.io.File; import java.io.IOException; @@ -6,15 +6,15 @@ import java.nio.file.Paths; import java.util.Objects; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.file.FileNameLengthLimitExceededException; -import com.ruoyi.common.exception.file.FileSizeLimitExceededException; -import com.ruoyi.common.exception.file.InvalidExtensionException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.common.utils.uuid.Seq; -import com.ruoyi.framework.config.RuoYiConfig; +import com.delivery.common.constant.Constants; +import com.delivery.common.exception.file.FileNameLengthLimitExceededException; +import com.delivery.common.exception.file.FileSizeLimitExceededException; +import com.delivery.common.exception.file.InvalidExtensionException; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.uuid.IdUtils; +import com.delivery.common.utils.uuid.Seq; +import com.delivery.framework.config.DeliveryConfig; /** * 文件上传工具类 @@ -36,7 +36,7 @@ public class FileUploadUtils /** * 默认上传的地址 */ - private static String defaultBaseDir = RuoYiConfig.getProfile(); + private static String defaultBaseDir = DeliveryConfig.getProfile(); public static void setDefaultBaseDir(String defaultBaseDir) { @@ -170,7 +170,7 @@ public class FileUploadUtils public static final String getPathFileName(String uploadDir, String fileName) throws IOException { - int dirLastIndex = RuoYiConfig.getProfile().length() + 1; + int dirLastIndex = DeliveryConfig.getProfile().length() + 1; String currentDir = StringUtils.substring(uploadDir, dirLastIndex); return Constants.RESOURCE_PREFIX + "/" + currentDir + "/" + fileName; } diff --git a/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/src/main/java/com/delivery/common/utils/file/FileUtils.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to src/main/java/com/delivery/common/utils/file/FileUtils.java index 00d7b3d..b91ee51 100644 --- a/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/src/main/java/com/delivery/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.delivery.common.utils.file; import java.io.File; import java.io.FileInputStream; @@ -14,11 +14,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.framework.config.RuoYiConfig; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.uuid.IdUtils; +import com.delivery.framework.config.DeliveryConfig; /** * 文件处理工具类 @@ -74,7 +74,7 @@ public class FileUtils */ public static String writeImportBytes(byte[] data) throws IOException { - return writeBytes(data, RuoYiConfig.getImportPath()); + return writeBytes(data, DeliveryConfig.getImportPath()); } /** diff --git a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java b/src/main/java/com/delivery/common/utils/file/ImageUtils.java similarity index 90% rename from src/main/java/com/ruoyi/common/utils/file/ImageUtils.java rename to src/main/java/com/delivery/common/utils/file/ImageUtils.java index 857736d..0c0c812 100644 --- a/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java +++ b/src/main/java/com/delivery/common/utils/file/ImageUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.delivery.common.utils.file; import java.io.ByteArrayInputStream; import java.io.FileInputStream; @@ -9,9 +9,9 @@ import java.util.Arrays; import org.apache.poi.util.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.RuoYiConfig; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.config.DeliveryConfig; /** * 图片处理工具类 @@ -79,7 +79,7 @@ public class ImageUtils else { // 本机地址 - String localPath = RuoYiConfig.getProfile(); + String localPath = DeliveryConfig.getProfile(); String downloadPath = localPath + StringUtils.substringAfter(url, Constants.RESOURCE_PREFIX); in = new FileInputStream(downloadPath); } diff --git a/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java b/src/main/java/com/delivery/common/utils/file/MimeTypeUtils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java rename to src/main/java/com/delivery/common/utils/file/MimeTypeUtils.java index f968f1a..914d1c0 100644 --- a/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java +++ b/src/main/java/com/delivery/common/utils/file/MimeTypeUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.delivery.common.utils.file; /** * 媒体类型工具类 diff --git a/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java b/src/main/java/com/delivery/common/utils/html/EscapeUtil.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java rename to src/main/java/com/delivery/common/utils/html/EscapeUtil.java index f52e83e..578b0f0 100644 --- a/src/main/java/com/ruoyi/common/utils/html/EscapeUtil.java +++ b/src/main/java/com/delivery/common/utils/html/EscapeUtil.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.utils.html; +package com.delivery.common.utils.html; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 转义和反转义工具类 diff --git a/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java b/src/main/java/com/delivery/common/utils/html/HTMLFilter.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java rename to src/main/java/com/delivery/common/utils/html/HTMLFilter.java index 63f1c9d..33aa1ae 100644 --- a/src/main/java/com/ruoyi/common/utils/html/HTMLFilter.java +++ b/src/main/java/com/delivery/common/utils/html/HTMLFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.html; +package com.delivery.common.utils.html; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java b/src/main/java/com/delivery/common/utils/http/HttpHelper.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/http/HttpHelper.java rename to src/main/java/com/delivery/common/utils/http/HttpHelper.java index 589d123..b0cbb98 100644 --- a/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java +++ b/src/main/java/com/delivery/common/utils/http/HttpHelper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.delivery.common.utils.http; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java b/src/main/java/com/delivery/common/utils/http/HttpUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/http/HttpUtils.java rename to src/main/java/com/delivery/common/utils/http/HttpUtils.java index 534d21c..b8aa6f4 100644 --- a/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java +++ b/src/main/java/com/delivery/common/utils/http/HttpUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.http; +package com.delivery.common.utils.http; import java.io.BufferedReader; import java.io.IOException; @@ -19,8 +19,8 @@ import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.StringUtils; import org.springframework.http.MediaType; /** diff --git a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/src/main/java/com/delivery/common/utils/ip/AddressUtils.java similarity index 83% rename from src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to src/main/java/com/delivery/common/utils/ip/AddressUtils.java index 31c3388..ba22d86 100644 --- a/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/src/main/java/com/delivery/common/utils/ip/AddressUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils.ip; +package com.delivery.common.utils.ip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpUtils; -import com.ruoyi.framework.config.RuoYiConfig; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.http.HttpUtils; +import com.delivery.framework.config.DeliveryConfig; /** * 获取地址类 @@ -31,7 +31,7 @@ public class AddressUtils { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) + if (DeliveryConfig.isAddressEnabled()) { try { diff --git a/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java b/src/main/java/com/delivery/common/utils/ip/IpUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/ip/IpUtils.java rename to src/main/java/com/delivery/common/utils/ip/IpUtils.java index 8e89e30..b1fc182 100644 --- a/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java +++ b/src/main/java/com/delivery/common/utils/ip/IpUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.utils.ip; +package com.delivery.common.utils.ip; import java.net.InetAddress; import java.net.UnknownHostException; import javax.servlet.http.HttpServletRequest; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.ServletUtils; +import com.delivery.common.utils.StringUtils; /** * 获取IP方法 diff --git a/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java b/src/main/java/com/delivery/common/utils/job/AbstractQuartzJob.java similarity index 84% rename from src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java rename to src/main/java/com/delivery/common/utils/job/AbstractQuartzJob.java index 79572e4..7cf06d3 100644 --- a/src/main/java/com/ruoyi/common/utils/job/AbstractQuartzJob.java +++ b/src/main/java/com/delivery/common/utils/job/AbstractQuartzJob.java @@ -1,19 +1,19 @@ -package com.ruoyi.common.utils.job; +package com.delivery.common.utils.job; import java.util.Date; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.monitor.domain.SysJob; -import com.ruoyi.project.monitor.domain.SysJobLog; -import com.ruoyi.project.monitor.service.ISysJobLogService; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.ScheduleConstants; +import com.delivery.common.utils.ExceptionUtil; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.bean.BeanUtils; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.project.monitor.domain.SysJob; +import com.delivery.project.monitor.domain.SysJobLog; +import com.delivery.project.monitor.service.ISysJobLogService; /** * 抽象quartz调用 diff --git a/src/main/java/com/ruoyi/common/utils/job/CronUtils.java b/src/main/java/com/delivery/common/utils/job/CronUtils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/job/CronUtils.java rename to src/main/java/com/delivery/common/utils/job/CronUtils.java index 0763a8d..9f46153 100644 --- a/src/main/java/com/ruoyi/common/utils/job/CronUtils.java +++ b/src/main/java/com/delivery/common/utils/job/CronUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.job; +package com.delivery.common.utils.job; import java.text.ParseException; import java.util.Date; diff --git a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java b/src/main/java/com/delivery/common/utils/job/JobInvokeUtil.java similarity index 96% rename from src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java rename to src/main/java/com/delivery/common/utils/job/JobInvokeUtil.java index 88293d8..56d0ada 100644 --- a/src/main/java/com/ruoyi/common/utils/job/JobInvokeUtil.java +++ b/src/main/java/com/delivery/common/utils/job/JobInvokeUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.job; +package com.delivery.common.utils.job; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.LinkedList; import java.util.List; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.monitor.domain.SysJob; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.project.monitor.domain.SysJob; /** * 任务执行工具 diff --git a/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java b/src/main/java/com/delivery/common/utils/job/QuartzDisallowConcurrentExecution.java similarity index 82% rename from src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java rename to src/main/java/com/delivery/common/utils/job/QuartzDisallowConcurrentExecution.java index 7097088..d59270c 100644 --- a/src/main/java/com/ruoyi/common/utils/job/QuartzDisallowConcurrentExecution.java +++ b/src/main/java/com/delivery/common/utils/job/QuartzDisallowConcurrentExecution.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils.job; +package com.delivery.common.utils.job; import org.quartz.DisallowConcurrentExecution; import org.quartz.JobExecutionContext; -import com.ruoyi.project.monitor.domain.SysJob; +import com.delivery.project.monitor.domain.SysJob; /** * 定时任务处理（禁止并发执行） diff --git a/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java b/src/main/java/com/delivery/common/utils/job/QuartzJobExecution.java similarity index 79% rename from src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java rename to src/main/java/com/delivery/common/utils/job/QuartzJobExecution.java index 55aa7e0..b73517f 100644 --- a/src/main/java/com/ruoyi/common/utils/job/QuartzJobExecution.java +++ b/src/main/java/com/delivery/common/utils/job/QuartzJobExecution.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.job; +package com.delivery.common.utils.job; import org.quartz.JobExecutionContext; -import com.ruoyi.project.monitor.domain.SysJob; +import com.delivery.project.monitor.domain.SysJob; /** * 定时任务处理（允许并发执行） diff --git a/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java b/src/main/java/com/delivery/common/utils/job/ScheduleUtils.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java rename to src/main/java/com/delivery/common/utils/job/ScheduleUtils.java index ee650c5..23d0eee 100644 --- a/src/main/java/com/ruoyi/common/utils/job/ScheduleUtils.java +++ b/src/main/java/com/delivery/common/utils/job/ScheduleUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.job; +package com.delivery.common.utils.job; import org.quartz.CronScheduleBuilder; import org.quartz.CronTrigger; @@ -10,13 +10,13 @@ import org.quartz.Scheduler; import org.quartz.SchedulerException; import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.exception.job.TaskException.Code; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.monitor.domain.SysJob; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.ScheduleConstants; +import com.delivery.common.exception.job.TaskException; +import com.delivery.common.exception.job.TaskException.Code; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.project.monitor.domain.SysJob; /** * 定时任务工具类 diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java b/src/main/java/com/delivery/common/utils/poi/ExcelHandlerAdapter.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java rename to src/main/java/com/delivery/common/utils/poi/ExcelHandlerAdapter.java index ccab288..0ac5525 100644 --- a/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java +++ b/src/main/java/com/delivery/common/utils/poi/ExcelHandlerAdapter.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.delivery.common.utils.poi; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Workbook; diff --git a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/src/main/java/com/delivery/common/utils/poi/ExcelUtil.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to src/main/java/com/delivery/common/utils/poi/ExcelUtil.java index 9f82842..6a83845 100644 --- a/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/src/main/java/com/delivery/common/utils/poi/ExcelUtil.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.poi; +package com.delivery.common.utils.poi; import java.io.File; import java.io.FileOutputStream; @@ -70,21 +70,21 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.openxmlformats.schemas.drawingml.x2006.spreadsheetDrawing.CTMarker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileTypeUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.ImageUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type; -import com.ruoyi.framework.aspectj.lang.annotation.Excels; -import com.ruoyi.framework.config.RuoYiConfig; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.delivery.common.core.text.Convert; +import com.delivery.common.exception.UtilException; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.DictUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.file.FileTypeUtils; +import com.delivery.common.utils.file.FileUtils; +import com.delivery.common.utils.file.ImageUtils; +import com.delivery.common.utils.reflect.ReflectUtils; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.aspectj.lang.annotation.Excel.Type; +import com.delivery.framework.aspectj.lang.annotation.Excels; +import com.delivery.framework.config.DeliveryConfig; +import com.delivery.framework.web.domain.AjaxResult; /** * Excel相关处理 @@ -1459,7 +1459,7 @@ public class ExcelUtil */ public String getAbsoluteFile(String filename) { - String downloadPath = RuoYiConfig.getDownloadPath() + filename; + String downloadPath = DeliveryConfig.getDownloadPath() + filename; File desc = new File(downloadPath); if (!desc.getParentFile().exists()) { diff --git a/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/src/main/java/com/delivery/common/utils/reflect/ReflectUtils.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to src/main/java/com/delivery/common/utils/reflect/ReflectUtils.java index b19953e..c3ffe8a 100644 --- a/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/src/main/java/com/delivery/common/utils/reflect/ReflectUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.reflect; +package com.delivery.common.utils.reflect; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -12,8 +12,8 @@ import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; +import com.delivery.common.core.text.Convert; +import com.delivery.common.utils.DateUtils; /** * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数. diff --git a/src/main/java/com/ruoyi/common/utils/sign/Base64.java b/src/main/java/com/delivery/common/utils/sign/Base64.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/sign/Base64.java rename to src/main/java/com/delivery/common/utils/sign/Base64.java index ca1cd92..d95c19c 100644 --- a/src/main/java/com/ruoyi/common/utils/sign/Base64.java +++ b/src/main/java/com/delivery/common/utils/sign/Base64.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.delivery.common.utils.sign; /** * Base64工具类 diff --git a/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java b/src/main/java/com/delivery/common/utils/sign/Md5Utils.java similarity index 97% rename from src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java rename to src/main/java/com/delivery/common/utils/sign/Md5Utils.java index c1c58db..a1bc34d 100644 --- a/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java +++ b/src/main/java/com/delivery/common/utils/sign/Md5Utils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.sign; +package com.delivery.common.utils.sign; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; diff --git a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/src/main/java/com/delivery/common/utils/spring/SpringUtils.java similarity index 98% rename from src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to src/main/java/com/delivery/common/utils/spring/SpringUtils.java index 4e3f603..dab3584 100644 --- a/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/src/main/java/com/delivery/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.delivery.common.utils.spring; import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.AopContext; @@ -9,7 +9,7 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * spring工具类 方便在非spring管理环境中获取bean diff --git a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/src/main/java/com/delivery/common/utils/sql/SqlUtil.java similarity index 92% rename from src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to src/main/java/com/delivery/common/utils/sql/SqlUtil.java index 48720dc..d3669e0 100644 --- a/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/src/main/java/com/delivery/common/utils/sql/SqlUtil.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.sql; +package com.delivery.common.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.exception.UtilException; +import com.delivery.common.utils.StringUtils; /** * sql操作工具类 diff --git a/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java b/src/main/java/com/delivery/common/utils/uuid/IdUtils.java similarity index 95% rename from src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java rename to src/main/java/com/delivery/common/utils/uuid/IdUtils.java index 2c84427..99b9797 100644 --- a/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java +++ b/src/main/java/com/delivery/common/utils/uuid/IdUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.uuid; +package com.delivery.common.utils.uuid; /** * ID生成器工具类 diff --git a/src/main/java/com/ruoyi/common/utils/uuid/Seq.java b/src/main/java/com/delivery/common/utils/uuid/Seq.java similarity index 94% rename from src/main/java/com/ruoyi/common/utils/uuid/Seq.java rename to src/main/java/com/delivery/common/utils/uuid/Seq.java index bf99611..7fabec5 100644 --- a/src/main/java/com/ruoyi/common/utils/uuid/Seq.java +++ b/src/main/java/com/delivery/common/utils/uuid/Seq.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils.uuid; +package com.delivery.common.utils.uuid; import java.util.concurrent.atomic.AtomicInteger; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.StringUtils; /** * @author ruoyi 序列生成类 diff --git a/src/main/java/com/ruoyi/common/utils/uuid/UUID.java b/src/main/java/com/delivery/common/utils/uuid/UUID.java similarity index 99% rename from src/main/java/com/ruoyi/common/utils/uuid/UUID.java rename to src/main/java/com/delivery/common/utils/uuid/UUID.java index 4f939ef..70addc3 100644 --- a/src/main/java/com/ruoyi/common/utils/uuid/UUID.java +++ b/src/main/java/com/delivery/common/utils/uuid/UUID.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.utils.uuid; +package com.delivery.common.utils.uuid; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Random; import java.util.concurrent.ThreadLocalRandom; -import com.ruoyi.common.exception.UtilException; +import com.delivery.common.exception.UtilException; /** * 提供通用唯一识别码（universally unique identifier）（UUID）实现 diff --git a/src/main/java/com/ruoyi/common/xss/Xss.java b/src/main/java/com/delivery/common/xss/Xss.java similarity index 95% rename from src/main/java/com/ruoyi/common/xss/Xss.java rename to src/main/java/com/delivery/common/xss/Xss.java index 7bfdf04..5caa324 100644 --- a/src/main/java/com/ruoyi/common/xss/Xss.java +++ b/src/main/java/com/delivery/common/xss/Xss.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.xss; +package com.delivery.common.xss; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/src/main/java/com/ruoyi/common/xss/XssValidator.java b/src/main/java/com/delivery/common/xss/XssValidator.java similarity index 92% rename from src/main/java/com/ruoyi/common/xss/XssValidator.java rename to src/main/java/com/delivery/common/xss/XssValidator.java index 42f425c..ede8acc 100644 --- a/src/main/java/com/ruoyi/common/xss/XssValidator.java +++ b/src/main/java/com/delivery/common/xss/XssValidator.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.xss; +package com.delivery.common.xss; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import java.util.regex.Matcher; diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/delivery/framework/aspectj/DataScopeAspect.java similarity index 91% rename from src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to src/main/java/com/delivery/framework/aspectj/DataScopeAspect.java index 6f96369..45b2f5d 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/src/main/java/com/delivery/framework/aspectj/DataScopeAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.delivery.framework.aspectj; import java.util.ArrayList; import java.util.List; @@ -6,16 +6,16 @@ import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataScope; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.context.PermissionContextHolder; -import com.ruoyi.framework.web.domain.BaseEntity; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.core.text.Convert; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.aspectj.lang.annotation.DataScope; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.context.PermissionContextHolder; +import com.delivery.framework.web.domain.BaseEntity; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; /** * 数据过滤处理 diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/src/main/java/com/delivery/framework/aspectj/DataSourceAspect.java similarity index 81% rename from src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to src/main/java/com/delivery/framework/aspectj/DataSourceAspect.java index c2bb892..d0374d6 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/src/main/java/com/delivery/framework/aspectj/DataSourceAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.delivery.framework.aspectj; import java.util.Objects; import org.aspectj.lang.ProceedingJoinPoint; @@ -11,9 +11,9 @@ import org.slf4j.LoggerFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataSource; -import com.ruoyi.framework.datasource.DynamicDataSourceContextHolder; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.aspectj.lang.annotation.DataSource; +import com.delivery.framework.datasource.DynamicDataSourceContextHolder; /** * 多数据源处理 @@ -27,8 +27,8 @@ public class DataSourceAspect { protected Logger logger = LoggerFactory.getLogger(getClass()); - @Pointcut("@annotation(com.ruoyi.framework.aspectj.lang.annotation.DataSource)" - + "|| @within(com.ruoyi.framework.aspectj.lang.annotation.DataSource)") + @Pointcut("@annotation(com.delivery.framework.aspectj.lang.annotation.DataSource)" + + "|| @within(com.delivery.framework.aspectj.lang.annotation.DataSource)") public void dsPointCut() { diff --git a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/src/main/java/com/delivery/framework/aspectj/LogAspect.java similarity index 91% rename from src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to src/main/java/com/delivery/framework/aspectj/LogAspect.java index 704a4bf..4160b98 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/src/main/java/com/delivery/framework/aspectj/LogAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.delivery.framework.aspectj; import java.util.Collection; import java.util.Map; @@ -17,21 +17,21 @@ import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.filter.PropertyPreExcludeFilter; -import com.ruoyi.common.utils.ExceptionUtil; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessStatus; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.monitor.domain.SysOperLog; -import com.ruoyi.project.system.domain.SysUser; +import com.delivery.common.core.text.Convert; +import com.delivery.common.enums.HttpMethod; +import com.delivery.common.filter.PropertyPreExcludeFilter; +import com.delivery.common.utils.ExceptionUtil; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.ServletUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.ip.IpUtils; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessStatus; +import com.delivery.framework.manager.AsyncManager; +import com.delivery.framework.manager.factory.AsyncFactory; +import com.delivery.framework.security.LoginUser; +import com.delivery.project.monitor.domain.SysOperLog; +import com.delivery.project.system.domain.SysUser; /** * 操作日志记录处理 diff --git a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/src/main/java/com/delivery/framework/aspectj/RateLimiterAspect.java similarity index 89% rename from src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to src/main/java/com/delivery/framework/aspectj/RateLimiterAspect.java index 820c34b..3f7ca97 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/src/main/java/com/delivery/framework/aspectj/RateLimiterAspect.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj; +package com.delivery.framework.aspectj; import java.lang.reflect.Method; import java.util.Collections; @@ -13,11 +13,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.script.RedisScript; import org.springframework.stereotype.Component; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.aspectj.lang.annotation.RateLimiter; -import com.ruoyi.framework.aspectj.lang.enums.LimitType; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.ip.IpUtils; +import com.delivery.framework.aspectj.lang.annotation.RateLimiter; +import com.delivery.framework.aspectj.lang.enums.LimitType; /** * 限流处理 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Anonymous.java similarity index 87% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/Anonymous.java index 2fb432c..07d53d3 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Anonymous.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Anonymous.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/DataScope.java similarity index 92% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/DataScope.java index eff418f..a19c9d7 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/DataScope.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/DataSource.java similarity index 85% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/DataSource.java index e5a780e..b06b29b 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataSource.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/DataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -6,7 +6,7 @@ import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.framework.aspectj.lang.enums.DataSourceType; +import com.delivery.framework.aspectj.lang.enums.DataSourceType; /** * 自定义多数据源切换注解 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Excel.java similarity index 97% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/Excel.java index dc7fd87..5d8297c 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excel.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Excel.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,7 +7,7 @@ import java.lang.annotation.Target; import java.math.BigDecimal; import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.IndexedColors; -import com.ruoyi.common.utils.poi.ExcelHandlerAdapter; +import com.delivery.common.utils.poi.ExcelHandlerAdapter; /** * 自定义导出Excel数据注解 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Excels.java similarity index 85% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/Excels.java index fdcd9da..36c0b88 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Excels.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Excels.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Log.java similarity index 84% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/Log.java index 984d369..79207b2 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Log.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Log.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.aspectj.lang.enums.OperatorType; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.aspectj.lang.enums.OperatorType; /** * 自定义操作日志记录注解 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/RateLimiter.java similarity index 80% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/RateLimiter.java index 5aa6af6..26c1cf1 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/RateLimiter.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/RateLimiter.java @@ -1,12 +1,12 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.framework.aspectj.lang.enums.LimitType; +import com.delivery.common.constant.CacheConstants; +import com.delivery.framework.aspectj.lang.enums.LimitType; /** * 限流注解 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Sensitive.java b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Sensitive.java similarity index 75% rename from src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Sensitive.java rename to src/main/java/com/delivery/framework/aspectj/lang/annotation/Sensitive.java index ae121fa..a93a423 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/Sensitive.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/annotation/Sensitive.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.annotation; +package com.delivery.framework.aspectj.lang.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -6,8 +6,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import com.fasterxml.jackson.annotation.JacksonAnnotationsInside; import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.ruoyi.framework.aspectj.lang.enums.DesensitizedType; -import com.ruoyi.framework.config.SensitiveJsonSerializer; +import com.delivery.framework.aspectj.lang.enums.DesensitizedType; +import com.delivery.framework.config.SensitiveJsonSerializer; /** * 数据脱敏注解 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java b/src/main/java/com/delivery/framework/aspectj/lang/enums/BusinessStatus.java similarity index 76% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java rename to src/main/java/com/delivery/framework/aspectj/lang/enums/BusinessStatus.java index 2e1c7af..508379e 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessStatus.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/enums/BusinessStatus.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.delivery.framework.aspectj.lang.enums; /** * 操作状态 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java b/src/main/java/com/delivery/framework/aspectj/lang/enums/BusinessType.java similarity index 91% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java rename to src/main/java/com/delivery/framework/aspectj/lang/enums/BusinessType.java index 2810215..e88483c 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/BusinessType.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/enums/BusinessType.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.delivery.framework.aspectj.lang.enums; /** * 业务操作类型 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java b/src/main/java/com/delivery/framework/aspectj/lang/enums/DataSourceType.java similarity index 75% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java rename to src/main/java/com/delivery/framework/aspectj/lang/enums/DataSourceType.java index 103cd80..62d97ac 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DataSourceType.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/enums/DataSourceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.delivery.framework.aspectj.lang.enums; /** * 数据源 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DesensitizedType.java b/src/main/java/com/delivery/framework/aspectj/lang/enums/DesensitizedType.java similarity index 92% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/DesensitizedType.java rename to src/main/java/com/delivery/framework/aspectj/lang/enums/DesensitizedType.java index 52fca0f..a114665 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/DesensitizedType.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/enums/DesensitizedType.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.delivery.framework.aspectj.lang.enums; import java.util.function.Function; -import com.ruoyi.common.utils.DesensitizedUtil; +import com.delivery.common.utils.DesensitizedUtil; /** * 脱敏类型 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/LimitType.java b/src/main/java/com/delivery/framework/aspectj/lang/enums/LimitType.java similarity index 79% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/LimitType.java rename to src/main/java/com/delivery/framework/aspectj/lang/enums/LimitType.java index 599312d..92ef9f3 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/LimitType.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/enums/LimitType.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.delivery.framework.aspectj.lang.enums; /** * 限流类型 diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java b/src/main/java/com/delivery/framework/aspectj/lang/enums/OperatorType.java similarity index 81% rename from src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java rename to src/main/java/com/delivery/framework/aspectj/lang/enums/OperatorType.java index e3d87db..d8762b3 100644 --- a/src/main/java/com/ruoyi/framework/aspectj/lang/enums/OperatorType.java +++ b/src/main/java/com/delivery/framework/aspectj/lang/enums/OperatorType.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.aspectj.lang.enums; +package com.delivery.framework.aspectj.lang.enums; /** * 操作人类别 diff --git a/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/src/main/java/com/delivery/framework/config/ApplicationConfig.java similarity index 91% rename from src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to src/main/java/com/delivery/framework/config/ApplicationConfig.java index 55de6f7..f312115 100644 --- a/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/src/main/java/com/delivery/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.util.TimeZone; import org.mybatis.spring.annotation.MapperScan; @@ -16,7 +16,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan("com.ruoyi.project.**.mapper") +@MapperScan("com.delivery.project.**.mapper") public class ApplicationConfig { /** diff --git a/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/src/main/java/com/delivery/framework/config/CaptchaConfig.java similarity index 96% rename from src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to src/main/java/com/delivery/framework/config/CaptchaConfig.java index 43e78ae..c931776 100644 --- a/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/src/main/java/com/delivery/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.util.Properties; import org.springframework.context.annotation.Bean; @@ -63,7 +63,7 @@ public class CaptchaConfig // KAPTCHA_SESSION_KEY properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath"); // 验证码文本生成器 - properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.ruoyi.framework.config.KaptchaTextCreator"); + properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.delivery.framework.config.KaptchaTextCreator"); // 验证码文本字符间距 默认为2 properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3"); // 验证码文本字符长度 默认为5 diff --git a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java b/src/main/java/com/delivery/framework/config/DeliveryConfig.java similarity index 89% rename from src/main/java/com/ruoyi/framework/config/RuoYiConfig.java rename to src/main/java/com/delivery/framework/config/DeliveryConfig.java index fe1407e..ebfff4d 100644 --- a/src/main/java/com/ruoyi/framework/config/RuoYiConfig.java +++ b/src/main/java/com/delivery/framework/config/DeliveryConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -9,8 +9,8 @@ import org.springframework.stereotype.Component; * @author ruoyi */ @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig +@ConfigurationProperties(prefix = "delivery") +public class DeliveryConfig { /** 项目名称 */ private String name; @@ -64,7 +64,7 @@ public class RuoYiConfig public void setProfile(String profile) { - RuoYiConfig.profile = profile; + DeliveryConfig.profile = profile; } public static boolean isAddressEnabled() @@ -74,7 +74,7 @@ public class RuoYiConfig public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + DeliveryConfig.addressEnabled = addressEnabled; } /** diff --git a/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/src/main/java/com/delivery/framework/config/DruidConfig.java similarity index 94% rename from src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to src/main/java/com/delivery/framework/config/DruidConfig.java index 7a8fd82..4d39d71 100644 --- a/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/src/main/java/com/delivery/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.io.IOException; import java.util.HashMap; @@ -19,10 +19,10 @@ import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.aspectj.lang.enums.DataSourceType; -import com.ruoyi.framework.config.properties.DruidProperties; -import com.ruoyi.framework.datasource.DynamicDataSource; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.framework.aspectj.lang.enums.DataSourceType; +import com.delivery.framework.config.properties.DruidProperties; +import com.delivery.framework.datasource.DynamicDataSource; /** * druid 配置多数据源 diff --git a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java b/src/main/java/com/delivery/framework/config/FastJson2JsonRedisSerializer.java similarity index 94% rename from src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java rename to src/main/java/com/delivery/framework/config/FastJson2JsonRedisSerializer.java index 4adbb7f..614701f 100644 --- a/src/main/java/com/ruoyi/framework/config/FastJson2JsonRedisSerializer.java +++ b/src/main/java/com/delivery/framework/config/FastJson2JsonRedisSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.nio.charset.Charset; import org.springframework.data.redis.serializer.RedisSerializer; @@ -7,7 +7,7 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONReader; import com.alibaba.fastjson2.JSONWriter; import com.alibaba.fastjson2.filter.Filter; -import com.ruoyi.common.constant.Constants; +import com.delivery.common.constant.Constants; /** * Redis使用FastJson序列化 diff --git a/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/src/main/java/com/delivery/framework/config/FilterConfig.java similarity index 90% rename from src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to src/main/java/com/delivery/framework/config/FilterConfig.java index 7ca2e0f..9e23b54 100644 --- a/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/src/main/java/com/delivery/framework/config/FilterConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.util.HashMap; import java.util.Map; @@ -8,11 +8,11 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.filter.RefererFilter; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.constant.Constants; +import com.delivery.common.filter.RefererFilter; +import com.delivery.common.filter.RepeatableFilter; +import com.delivery.common.filter.XssFilter; +import com.delivery.common.utils.StringUtils; /** * Filter配置 diff --git a/src/main/java/com/ruoyi/framework/config/GenConfig.java b/src/main/java/com/delivery/framework/config/GenConfig.java similarity index 97% rename from src/main/java/com/ruoyi/framework/config/GenConfig.java rename to src/main/java/com/delivery/framework/config/GenConfig.java index b6a411a..0ae4d22 100644 --- a/src/main/java/com/ruoyi/framework/config/GenConfig.java +++ b/src/main/java/com/delivery/framework/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/src/main/java/com/delivery/framework/config/I18nConfig.java similarity index 93% rename from src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to src/main/java/com/delivery/framework/config/I18nConfig.java index 163fd01..03cfc44 100644 --- a/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/src/main/java/com/delivery/framework/config/I18nConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,7 +7,7 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.i18n.LocaleChangeInterceptor; import org.springframework.web.servlet.i18n.SessionLocaleResolver; -import com.ruoyi.common.constant.Constants; +import com.delivery.common.constant.Constants; /** * 资源文件配置加载 diff --git a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/src/main/java/com/delivery/framework/config/KaptchaTextCreator.java similarity index 97% rename from src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java rename to src/main/java/com/delivery/framework/config/KaptchaTextCreator.java index d2902f4..1086f6c 100644 --- a/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java +++ b/src/main/java/com/delivery/framework/config/KaptchaTextCreator.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.util.Random; import com.google.code.kaptcha.text.impl.DefaultTextCreator; diff --git a/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java b/src/main/java/com/delivery/framework/config/MyBatisConfig.java similarity index 98% rename from src/main/java/com/ruoyi/framework/config/MyBatisConfig.java rename to src/main/java/com/delivery/framework/config/MyBatisConfig.java index 057c941..f738f7f 100644 --- a/src/main/java/com/ruoyi/framework/config/MyBatisConfig.java +++ b/src/main/java/com/delivery/framework/config/MyBatisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.io.IOException; import java.util.ArrayList; @@ -22,7 +22,7 @@ import org.springframework.core.type.classreading.CachingMetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReader; import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.util.ClassUtils; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * Mybatis支持*匹配扫描包 diff --git a/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/src/main/java/com/delivery/framework/config/RedisConfig.java similarity index 98% rename from src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to src/main/java/com/delivery/framework/config/RedisConfig.java index 3f4f485..349cd38 100644 --- a/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/src/main/java/com/delivery/framework/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import org.springframework.cache.annotation.CachingConfigurerSupport; import org.springframework.cache.annotation.EnableCaching; diff --git a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/src/main/java/com/delivery/framework/config/ResourcesConfig.java similarity index 90% rename from src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to src/main/java/com/delivery/framework/config/ResourcesConfig.java index 852beeb..51500a1 100644 --- a/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/src/main/java/com/delivery/framework/config/ResourcesConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; @@ -11,8 +11,8 @@ import org.springframework.web.filter.CorsFilter; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; +import com.delivery.common.constant.Constants; +import com.delivery.framework.interceptor.RepeatSubmitInterceptor; /** * 通用配置 @@ -30,7 +30,7 @@ public class ResourcesConfig implements WebMvcConfigurer { /** 本地文件上传路径 */ registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**") - .addResourceLocations("file:" + RuoYiConfig.getProfile() + "/"); + .addResourceLocations("file:" + DeliveryConfig.getProfile() + "/"); /** swagger配置 */ registry.addResourceHandler("/swagger-ui/**") diff --git a/src/main/java/com/ruoyi/framework/config/ScheduleConfig.java b/src/main/java/com/delivery/framework/config/ScheduleConfig.java similarity index 100% rename from src/main/java/com/ruoyi/framework/config/ScheduleConfig.java rename to src/main/java/com/delivery/framework/config/ScheduleConfig.java diff --git a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/src/main/java/com/delivery/framework/config/SecurityConfig.java similarity index 94% rename from src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to src/main/java/com/delivery/framework/config/SecurityConfig.java index 511842b..ddb0c4c 100644 --- a/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/src/main/java/com/delivery/framework/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -16,10 +16,10 @@ import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.security.web.authentication.logout.LogoutFilter; import org.springframework.web.filter.CorsFilter; -import com.ruoyi.framework.config.properties.PermitAllUrlProperties; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.delivery.framework.config.properties.PermitAllUrlProperties; +import com.delivery.framework.security.filter.JwtAuthenticationTokenFilter; +import com.delivery.framework.security.handle.AuthenticationEntryPointImpl; +import com.delivery.framework.security.handle.LogoutSuccessHandlerImpl; /** * spring security配置 diff --git a/src/main/java/com/ruoyi/framework/config/SensitiveJsonSerializer.java b/src/main/java/com/delivery/framework/config/SensitiveJsonSerializer.java similarity index 87% rename from src/main/java/com/ruoyi/framework/config/SensitiveJsonSerializer.java rename to src/main/java/com/delivery/framework/config/SensitiveJsonSerializer.java index a0ada33..7bbcedb 100644 --- a/src/main/java/com/ruoyi/framework/config/SensitiveJsonSerializer.java +++ b/src/main/java/com/delivery/framework/config/SensitiveJsonSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import java.io.IOException; import java.util.Objects; @@ -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.utils.SecurityUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Sensitive; -import com.ruoyi.framework.aspectj.lang.enums.DesensitizedType; -import com.ruoyi.framework.security.LoginUser; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.framework.aspectj.lang.annotation.Sensitive; +import com.delivery.framework.aspectj.lang.enums.DesensitizedType; +import com.delivery.framework.security.LoginUser; /** * 数据脱敏序列化过滤 diff --git a/src/main/java/com/ruoyi/framework/config/ServerConfig.java b/src/main/java/com/delivery/framework/config/ServerConfig.java similarity index 90% rename from src/main/java/com/ruoyi/framework/config/ServerConfig.java rename to src/main/java/com/delivery/framework/config/ServerConfig.java index b5b7de3..4a1aac7 100644 --- a/src/main/java/com/ruoyi/framework/config/ServerConfig.java +++ b/src/main/java/com/delivery/framework/config/ServerConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.ServletUtils; +import com.delivery.common.utils.ServletUtils; /** * 服务相关配置 diff --git a/src/main/java/com/delivery/framework/config/SwaggerConfig.java b/src/main/java/com/delivery/framework/config/SwaggerConfig.java new file mode 100644 index 0000000..1c7c288 --- /dev/null +++ b/src/main/java/com/delivery/framework/config/SwaggerConfig.java @@ -0,0 +1,105 @@ +package com.delivery.framework.config; + +import java.util.ArrayList; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import io.swagger.annotations.ApiOperation; +import io.swagger.models.auth.In; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.ApiKey; +import springfox.documentation.service.AuthorizationScope; +import springfox.documentation.service.Contact; +import springfox.documentation.service.SecurityReference; +import springfox.documentation.service.SecurityScheme; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.contexts.SecurityContext; +import springfox.documentation.spring.web.plugins.Docket; + +/** + * Swagger 的接口配置 + * @author delivery + */ +@Configuration +public class SwaggerConfig { + + /** 系统基础配置 */ + @Autowired + private DeliveryConfig deliveryConfig; + + /** 是否开启swagger */ + @Value("${swagger.enabled}") + private boolean enabled; + + /** 设置请求的统一前缀 */ + @Value("${swagger.pathMapping}") + private String pathMapping; + + /** + * 创建API + */ + @Bean + public Docket createRestApi() { + return new Docket(DocumentationType.OAS_30) + .enable(enabled) + .apiInfo(apiInfo()) + .select() + // 推荐用注解扫描（与原版一致） + .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) + // 如需限定基础包，改成 .apis(RequestHandlerSelectors.basePackage("com.delivery.project")) + .paths(PathSelectors.any()) + .build() + .securitySchemes(securitySchemes()) + .securityContexts(securityContexts()) + .pathMapping(pathMapping); + } + + /** + * 安全模式，这里指定token通过Authorization请求头传递 + */ + private List securitySchemes() { + List list = new ArrayList<>(); + list.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); + return list; + } + + /** + * 安全上下文 + */ + private List securityContexts() { + List contexts = new ArrayList<>(); + contexts.add(SecurityContext.builder() + .securityReferences(defaultAuth()) + .operationSelector(o -> o.requestMappingPattern().matches("/.*")) + .build()); + return contexts; + } + + /** + * 默认的安全引用 + */ + private List defaultAuth() { + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); + AuthorizationScope[] scopes = new AuthorizationScope[] { authorizationScope }; + List refs = new ArrayList<>(); + refs.add(new SecurityReference("Authorization", scopes)); + return refs; + } + + /** + * 文档信息 + */ + private ApiInfo apiInfo() { + return new ApiInfoBuilder() + .title("配送管理系统（Delivery）接口文档") + .description("用于配送业务的统一后端接口，包括订单、车辆、轨迹、统计等模块。") + .contact(new Contact(deliveryConfig.getName(), null, null)) + .version("版本号: " + deliveryConfig.getVersion()) + .build(); + } +} diff --git a/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/src/main/java/com/delivery/framework/config/ThreadPoolConfig.java similarity index 96% rename from src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to src/main/java/com/delivery/framework/config/ThreadPoolConfig.java index 7840141..b352e55 100644 --- a/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/src/main/java/com/delivery/framework/config/ThreadPoolConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.delivery.framework.config; -import com.ruoyi.common.utils.Threads; +import com.delivery.common.utils.Threads; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java b/src/main/java/com/delivery/framework/config/properties/DruidProperties.java similarity index 98% rename from src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java rename to src/main/java/com/delivery/framework/config/properties/DruidProperties.java index c8a5c8a..10a1f1e 100644 --- a/src/main/java/com/ruoyi/framework/config/properties/DruidProperties.java +++ b/src/main/java/com/delivery/framework/config/properties/DruidProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.delivery.framework.config.properties; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java b/src/main/java/com/delivery/framework/config/properties/PermitAllUrlProperties.java similarity index 95% rename from src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java rename to src/main/java/com/delivery/framework/config/properties/PermitAllUrlProperties.java index a913610..a18fc00 100644 --- a/src/main/java/com/ruoyi/framework/config/properties/PermitAllUrlProperties.java +++ b/src/main/java/com/delivery/framework/config/properties/PermitAllUrlProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.delivery.framework.config.properties; import java.util.ArrayList; import java.util.List; @@ -16,7 +16,7 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import com.ruoyi.framework.aspectj.lang.annotation.Anonymous; +import com.delivery.framework.aspectj.lang.annotation.Anonymous; /** * 设置Anonymous注解允许匿名访问的url diff --git a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java b/src/main/java/com/delivery/framework/datasource/DynamicDataSource.java similarity index 93% rename from src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java rename to src/main/java/com/delivery/framework/datasource/DynamicDataSource.java index e70b8cf..0d7f7a3 100644 --- a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSource.java +++ b/src/main/java/com/delivery/framework/datasource/DynamicDataSource.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.delivery.framework.datasource; import java.util.Map; import javax.sql.DataSource; diff --git a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java b/src/main/java/com/delivery/framework/datasource/DynamicDataSourceContextHolder.java similarity index 96% rename from src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java rename to src/main/java/com/delivery/framework/datasource/DynamicDataSourceContextHolder.java index 9770af6..e98e68b 100644 --- a/src/main/java/com/ruoyi/framework/datasource/DynamicDataSourceContextHolder.java +++ b/src/main/java/com/delivery/framework/datasource/DynamicDataSourceContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.datasource; +package com.delivery.framework.datasource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/src/main/java/com/delivery/framework/interceptor/RepeatSubmitInterceptor.java similarity index 88% rename from src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java rename to src/main/java/com/delivery/framework/interceptor/RepeatSubmitInterceptor.java index d8ac4c9..aec6efe 100644 --- a/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java +++ b/src/main/java/com/delivery/framework/interceptor/RepeatSubmitInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor; +package com.delivery.framework.interceptor; import java.lang.reflect.Method; import javax.servlet.http.HttpServletRequest; @@ -7,9 +7,9 @@ import org.springframework.stereotype.Component; import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerInterceptor; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.framework.interceptor.annotation.RepeatSubmit; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.delivery.common.utils.ServletUtils; +import com.delivery.framework.interceptor.annotation.RepeatSubmit; +import com.delivery.framework.web.domain.AjaxResult; /** * 防止重复提交拦截器 diff --git a/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java b/src/main/java/com/delivery/framework/interceptor/annotation/RepeatSubmit.java similarity index 92% rename from src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java rename to src/main/java/com/delivery/framework/interceptor/annotation/RepeatSubmit.java index 1191d21..251e992 100644 --- a/src/main/java/com/ruoyi/framework/interceptor/annotation/RepeatSubmit.java +++ b/src/main/java/com/delivery/framework/interceptor/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.annotation; +package com.delivery.framework.interceptor.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/src/main/java/com/delivery/framework/interceptor/impl/SameUrlDataInterceptor.java similarity index 88% rename from src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java rename to src/main/java/com/delivery/framework/interceptor/impl/SameUrlDataInterceptor.java index 299eff7..2e62ca4 100644 --- a/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java +++ b/src/main/java/com/delivery/framework/interceptor/impl/SameUrlDataInterceptor.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.interceptor.impl; +package com.delivery.framework.interceptor.impl; import java.util.HashMap; import java.util.Map; @@ -8,13 +8,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.filter.RepeatedlyRequestWrapper; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.http.HttpHelper; -import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor; -import com.ruoyi.framework.interceptor.annotation.RepeatSubmit; -import com.ruoyi.framework.redis.RedisCache; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.filter.RepeatedlyRequestWrapper; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.http.HttpHelper; +import com.delivery.framework.interceptor.RepeatSubmitInterceptor; +import com.delivery.framework.interceptor.annotation.RepeatSubmit; +import com.delivery.framework.redis.RedisCache; /** * 判断请求url和数据是否和上一次相同， diff --git a/src/main/java/com/ruoyi/framework/manager/AsyncManager.java b/src/main/java/com/delivery/framework/manager/AsyncManager.java similarity index 87% rename from src/main/java/com/ruoyi/framework/manager/AsyncManager.java rename to src/main/java/com/delivery/framework/manager/AsyncManager.java index 7387a02..9c2dd70 100644 --- a/src/main/java/com/ruoyi/framework/manager/AsyncManager.java +++ b/src/main/java/com/delivery/framework/manager/AsyncManager.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.manager; +package com.delivery.framework.manager; import java.util.TimerTask; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.delivery.common.utils.Threads; +import com.delivery.common.utils.spring.SpringUtils; /** * 异步任务管理器 diff --git a/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/src/main/java/com/delivery/framework/manager/ShutdownManager.java similarity index 95% rename from src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to src/main/java/com/delivery/framework/manager/ShutdownManager.java index e36ca3c..7efcbf2 100644 --- a/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/src/main/java/com/delivery/framework/manager/ShutdownManager.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.manager; +package com.delivery.framework.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java b/src/main/java/com/delivery/framework/manager/factory/AsyncFactory.java similarity index 83% rename from src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java rename to src/main/java/com/delivery/framework/manager/factory/AsyncFactory.java index 1360b40..045ca7d 100644 --- a/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java +++ b/src/main/java/com/delivery/framework/manager/factory/AsyncFactory.java @@ -1,19 +1,19 @@ -package com.ruoyi.framework.manager.factory; +package com.delivery.framework.manager.factory; import java.util.TimerTask; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.LogUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.project.monitor.domain.SysLogininfor; -import com.ruoyi.project.monitor.domain.SysOperLog; -import com.ruoyi.project.monitor.service.ISysLogininforService; -import com.ruoyi.project.monitor.service.ISysOperLogService; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.LogUtils; +import com.delivery.common.utils.ServletUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.ip.AddressUtils; +import com.delivery.common.utils.ip.IpUtils; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.project.monitor.domain.SysLogininfor; +import com.delivery.project.monitor.domain.SysOperLog; +import com.delivery.project.monitor.service.ISysLogininforService; +import com.delivery.project.monitor.service.ISysOperLogService; import eu.bitwalker.useragentutils.UserAgent; /** diff --git a/src/main/java/com/ruoyi/framework/redis/RedisCache.java b/src/main/java/com/delivery/framework/redis/RedisCache.java similarity index 99% rename from src/main/java/com/ruoyi/framework/redis/RedisCache.java rename to src/main/java/com/delivery/framework/redis/RedisCache.java index 0aebd37..e7dfc71 100644 --- a/src/main/java/com/ruoyi/framework/redis/RedisCache.java +++ b/src/main/java/com/delivery/framework/redis/RedisCache.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.redis; +package com.delivery.framework.redis; import java.util.Collection; import java.util.Iterator; diff --git a/src/main/java/com/ruoyi/framework/security/LoginBody.java b/src/main/java/com/delivery/framework/security/LoginBody.java similarity index 95% rename from src/main/java/com/ruoyi/framework/security/LoginBody.java rename to src/main/java/com/delivery/framework/security/LoginBody.java index ddfac39..80413ed 100644 --- a/src/main/java/com/ruoyi/framework/security/LoginBody.java +++ b/src/main/java/com/delivery/framework/security/LoginBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security; +package com.delivery.framework.security; /** * 用户登录对象 diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/delivery/framework/security/LoginUser.java similarity index 97% rename from src/main/java/com/ruoyi/framework/security/LoginUser.java rename to src/main/java/com/delivery/framework/security/LoginUser.java index 6445e09..e1020bd 100644 --- a/src/main/java/com/ruoyi/framework/security/LoginUser.java +++ b/src/main/java/com/delivery/framework/security/LoginUser.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.security; +package com.delivery.framework.security; import java.util.Collection; import java.util.Set; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import com.alibaba.fastjson2.annotation.JSONField; -import com.ruoyi.project.system.domain.SysUser; +import com.delivery.project.system.domain.SysUser; /** * 登录用户身份权限 diff --git a/src/main/java/com/ruoyi/framework/security/RegisterBody.java b/src/main/java/com/delivery/framework/security/RegisterBody.java similarity index 71% rename from src/main/java/com/ruoyi/framework/security/RegisterBody.java rename to src/main/java/com/delivery/framework/security/RegisterBody.java index 42be381..a07e1d3 100644 --- a/src/main/java/com/ruoyi/framework/security/RegisterBody.java +++ b/src/main/java/com/delivery/framework/security/RegisterBody.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security; +package com.delivery.framework.security; /** * 用户注册对象 diff --git a/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java b/src/main/java/com/delivery/framework/security/context/AuthenticationContextHolder.java similarity index 91% rename from src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java rename to src/main/java/com/delivery/framework/security/context/AuthenticationContextHolder.java index 6c776ce..f5a4185 100644 --- a/src/main/java/com/ruoyi/framework/security/context/AuthenticationContextHolder.java +++ b/src/main/java/com/delivery/framework/security/context/AuthenticationContextHolder.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.context; +package com.delivery.framework.security.context; import org.springframework.security.core.Authentication; diff --git a/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java b/src/main/java/com/delivery/framework/security/context/PermissionContextHolder.java similarity index 88% rename from src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java rename to src/main/java/com/delivery/framework/security/context/PermissionContextHolder.java index 5472f3d..47bdd2f 100644 --- a/src/main/java/com/ruoyi/framework/security/context/PermissionContextHolder.java +++ b/src/main/java/com/delivery/framework/security/context/PermissionContextHolder.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.security.context; +package com.delivery.framework.security.context; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; -import com.ruoyi.common.core.text.Convert; +import com.delivery.common.core.text.Convert; /** * 权限信息 diff --git a/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/src/main/java/com/delivery/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 86% rename from src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to src/main/java/com/delivery/framework/security/filter/JwtAuthenticationTokenFilter.java index fa8a654..252128c 100644 --- a/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/src/main/java/com/delivery/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.filter; +package com.delivery.framework.security.filter; import java.io.IOException; import javax.servlet.FilterChain; @@ -11,10 +11,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.service.TokenService; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.service.TokenService; /** * token过滤器 验证token有效性 diff --git a/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/src/main/java/com/delivery/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 81% rename from src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to src/main/java/com/delivery/framework/security/handle/AuthenticationEntryPointImpl.java index f605021..2bd1fdf 100644 --- a/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/src/main/java/com/delivery/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.delivery.framework.security.handle; import java.io.IOException; import java.io.Serializable; @@ -8,10 +8,10 @@ import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.delivery.common.constant.HttpStatus; +import com.delivery.common.utils.ServletUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.web.domain.AjaxResult; /** * 认证失败处理类 返回未授权 diff --git a/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/src/main/java/com/delivery/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 76% rename from src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to src/main/java/com/delivery/framework/security/handle/LogoutSuccessHandlerImpl.java index 16328d4..54aaccc 100644 --- a/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/src/main/java/com/delivery/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.handle; +package com.delivery.framework.security.handle; import java.io.IOException; import javax.servlet.ServletException; @@ -9,14 +9,14 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; import com.alibaba.fastjson2.JSON; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.service.TokenService; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.ServletUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.manager.AsyncManager; +import com.delivery.framework.manager.factory.AsyncFactory; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.service.TokenService; +import com.delivery.framework.web.domain.AjaxResult; /** * 自定义退出处理类 返回成功 diff --git a/src/main/java/com/ruoyi/framework/security/service/PermissionService.java b/src/main/java/com/delivery/framework/security/service/PermissionService.java similarity index 92% rename from src/main/java/com/ruoyi/framework/security/service/PermissionService.java rename to src/main/java/com/delivery/framework/security/service/PermissionService.java index 426d0a7..c92c020 100644 --- a/src/main/java/com/ruoyi/framework/security/service/PermissionService.java +++ b/src/main/java/com/delivery/framework/security/service/PermissionService.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import java.util.Set; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.context.PermissionContextHolder; -import com.ruoyi.project.system.domain.SysRole; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.context.PermissionContextHolder; +import com.delivery.project.system.domain.SysRole; /** * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 diff --git a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java b/src/main/java/com/delivery/framework/security/service/SysLoginService.java similarity index 83% rename from src/main/java/com/ruoyi/framework/security/service/SysLoginService.java rename to src/main/java/com/delivery/framework/security/service/SysLoginService.java index 0de8d82..46fde35 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysLoginService.java +++ b/src/main/java/com/delivery/framework/security/service/SysLoginService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import javax.annotation.Resource; import org.springframework.beans.factory.annotation.Autowired; @@ -7,26 +7,26 @@ import org.springframework.security.authentication.BadCredentialsException; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.exception.user.BlackListException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserNotExistsException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.project.system.service.ISysConfigService; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.exception.user.BlackListException; +import com.delivery.common.exception.user.CaptchaException; +import com.delivery.common.exception.user.CaptchaExpireException; +import com.delivery.common.exception.user.UserNotExistsException; +import com.delivery.common.exception.user.UserPasswordNotMatchException; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.MessageUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.ip.IpUtils; +import com.delivery.framework.manager.AsyncManager; +import com.delivery.framework.manager.factory.AsyncFactory; +import com.delivery.framework.redis.RedisCache; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.context.AuthenticationContextHolder; +import com.delivery.project.system.service.ISysConfigService; +import com.delivery.project.system.service.ISysUserService; /** * 登录校验方法 diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java b/src/main/java/com/delivery/framework/security/service/SysPasswordService.java similarity index 82% rename from src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java rename to src/main/java/com/delivery/framework/security/service/SysPasswordService.java index 9a61731..c6da596 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysPasswordService.java +++ b/src/main/java/com/delivery/framework/security/service/SysPasswordService.java @@ -1,17 +1,17 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.exception.user.UserPasswordRetryLimitExceedException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.context.AuthenticationContextHolder; -import com.ruoyi.project.system.domain.SysUser; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.exception.user.UserPasswordNotMatchException; +import com.delivery.common.exception.user.UserPasswordRetryLimitExceedException; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.framework.redis.RedisCache; +import com.delivery.framework.security.context.AuthenticationContextHolder; +import com.delivery.project.system.domain.SysUser; /** * 登录密码方法 diff --git a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java b/src/main/java/com/delivery/framework/security/service/SysPermissionService.java similarity index 85% rename from src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java rename to src/main/java/com/delivery/framework/security/service/SysPermissionService.java index 94421ec..45c634a 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java +++ b/src/main/java/com/delivery/framework/security/service/SysPermissionService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import java.util.HashSet; import java.util.List; @@ -6,12 +6,12 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysMenuService; -import com.ruoyi.project.system.service.ISysRoleService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.service.ISysMenuService; +import com.delivery.project.system.service.ISysRoleService; /** * 用户权限处理 diff --git a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java b/src/main/java/com/delivery/framework/security/service/SysRegisterService.java similarity index 76% rename from src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java rename to src/main/java/com/delivery/framework/security/service/SysRegisterService.java index 733c44d..37f75a4 100644 --- a/src/main/java/com/ruoyi/framework/security/service/SysRegisterService.java +++ b/src/main/java/com/delivery/framework/security/service/SysRegisterService.java @@ -1,23 +1,23 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.manager.AsyncManager; -import com.ruoyi.framework.manager.factory.AsyncFactory; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.RegisterBody; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysConfigService; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.exception.user.CaptchaException; +import com.delivery.common.exception.user.CaptchaExpireException; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.MessageUtils; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.manager.AsyncManager; +import com.delivery.framework.manager.factory.AsyncFactory; +import com.delivery.framework.redis.RedisCache; +import com.delivery.framework.security.RegisterBody; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.service.ISysConfigService; +import com.delivery.project.system.service.ISysUserService; /** * 注册校验方法 diff --git a/src/main/java/com/ruoyi/framework/security/service/TokenService.java b/src/main/java/com/delivery/framework/security/service/TokenService.java similarity index 92% rename from src/main/java/com/ruoyi/framework/security/service/TokenService.java rename to src/main/java/com/delivery/framework/security/service/TokenService.java index 57e06a5..59bbeee 100644 --- a/src/main/java/com/ruoyi/framework/security/service/TokenService.java +++ b/src/main/java/com/delivery/framework/security/service/TokenService.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import java.util.HashMap; import java.util.Map; @@ -9,15 +9,15 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.LoginUser; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.ServletUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.ip.AddressUtils; +import com.delivery.common.utils.ip.IpUtils; +import com.delivery.common.utils.uuid.IdUtils; +import com.delivery.framework.redis.RedisCache; +import com.delivery.framework.security.LoginUser; import eu.bitwalker.useragentutils.UserAgent; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java b/src/main/java/com/delivery/framework/security/service/UserDetailsServiceImpl.java similarity index 81% rename from src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java rename to src/main/java/com/delivery/framework/security/service/UserDetailsServiceImpl.java index 82960c6..ebc3487 100644 --- a/src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java +++ b/src/main/java/com/delivery/framework/security/service/UserDetailsServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.security.service; +package com.delivery.framework.security.service; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -6,13 +6,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Service; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.enums.UserStatus; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.MessageUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.security.LoginUser; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.service.ISysUserService; /** * 用户验证处理 diff --git a/src/main/java/com/ruoyi/framework/task/RyTask.java b/src/main/java/com/delivery/framework/task/RyTask.java similarity index 88% rename from src/main/java/com/ruoyi/framework/task/RyTask.java rename to src/main/java/com/delivery/framework/task/RyTask.java index eb7f5b9..6dcbe38 100644 --- a/src/main/java/com/ruoyi/framework/task/RyTask.java +++ b/src/main/java/com/delivery/framework/task/RyTask.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.task; +package com.delivery.framework.task; import org.springframework.stereotype.Component; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 定时任务调度测试 diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/delivery/framework/web/controller/BaseController.java similarity index 86% rename from src/main/java/com/ruoyi/framework/web/controller/BaseController.java rename to src/main/java/com/delivery/framework/web/controller/BaseController.java index 79ed4df..9469488 100644 --- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java +++ b/src/main/java/com/delivery/framework/web/controller/BaseController.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.controller; +package com.delivery.framework.web.controller; import java.beans.PropertyEditorSupport; import java.util.Date; @@ -9,17 +9,17 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.InitBinder; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.sql.SqlUtil; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.PageDomain; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.framework.web.page.TableSupport; +import com.delivery.common.constant.HttpStatus; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.PageUtils; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.sql.SqlUtil; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.PageDomain; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.framework.web.page.TableSupport; /** * web层通用数据处理 diff --git a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java b/src/main/java/com/delivery/framework/web/domain/AjaxResult.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java rename to src/main/java/com/delivery/framework/web/domain/AjaxResult.java index 579dd59..a360b11 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/AjaxResult.java +++ b/src/main/java/com/delivery/framework/web/domain/AjaxResult.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.web.domain; +package com.delivery.framework.web.domain; import java.util.HashMap; import java.util.Objects; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.constant.HttpStatus; +import com.delivery.common.utils.StringUtils; /** * 操作消息提醒 diff --git a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/src/main/java/com/delivery/framework/web/domain/BaseEntity.java similarity index 98% rename from src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java rename to src/main/java/com/delivery/framework/web/domain/BaseEntity.java index 0cd6233..843b25a 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java +++ b/src/main/java/com/delivery/framework/web/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain; +package com.delivery.framework.web.domain; import java.io.Serializable; import java.util.Date; diff --git a/src/main/java/com/ruoyi/framework/web/domain/R.java b/src/main/java/com/delivery/framework/web/domain/R.java similarity index 95% rename from src/main/java/com/ruoyi/framework/web/domain/R.java rename to src/main/java/com/delivery/framework/web/domain/R.java index bd4f69f..e6554f6 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/R.java +++ b/src/main/java/com/delivery/framework/web/domain/R.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.web.domain; +package com.delivery.framework.web.domain; import java.io.Serializable; -import com.ruoyi.common.constant.HttpStatus; +import com.delivery.common.constant.HttpStatus; /** * 响应信息主体 diff --git a/src/main/java/com/ruoyi/framework/web/domain/Server.java b/src/main/java/com/delivery/framework/web/domain/Server.java similarity index 93% rename from src/main/java/com/ruoyi/framework/web/domain/Server.java rename to src/main/java/com/delivery/framework/web/domain/Server.java index 63b03da..cef2af4 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/Server.java +++ b/src/main/java/com/delivery/framework/web/domain/Server.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.web.domain; +package com.delivery.framework.web.domain; import java.net.UnknownHostException; import java.util.LinkedList; import java.util.List; import java.util.Properties; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.ip.IpUtils; -import com.ruoyi.framework.web.domain.server.Cpu; -import com.ruoyi.framework.web.domain.server.Jvm; -import com.ruoyi.framework.web.domain.server.Mem; -import com.ruoyi.framework.web.domain.server.Sys; -import com.ruoyi.framework.web.domain.server.SysFile; +import com.delivery.common.utils.Arith; +import com.delivery.common.utils.ip.IpUtils; +import com.delivery.framework.web.domain.server.Cpu; +import com.delivery.framework.web.domain.server.Jvm; +import com.delivery.framework.web.domain.server.Mem; +import com.delivery.framework.web.domain.server.Sys; +import com.delivery.framework.web.domain.server.SysFile; import oshi.SystemInfo; import oshi.hardware.CentralProcessor; import oshi.hardware.CentralProcessor.TickType; diff --git a/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java b/src/main/java/com/delivery/framework/web/domain/TreeEntity.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java rename to src/main/java/com/delivery/framework/web/domain/TreeEntity.java index b071425..8a3dea1 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/TreeEntity.java +++ b/src/main/java/com/delivery/framework/web/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain; +package com.delivery.framework.web.domain; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java b/src/main/java/com/delivery/framework/web/domain/TreeSelect.java similarity index 87% rename from src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java rename to src/main/java/com/delivery/framework/web/domain/TreeSelect.java index f83c8b4..71e2d88 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/TreeSelect.java +++ b/src/main/java/com/delivery/framework/web/domain/TreeSelect.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.web.domain; +package com.delivery.framework.web.domain; import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.domain.SysMenu; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.project.system.domain.SysDept; +import com.delivery.project.system.domain.SysMenu; /** * Treeselect树结构实体类 diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java b/src/main/java/com/delivery/framework/web/domain/server/Cpu.java similarity index 94% rename from src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java rename to src/main/java/com/delivery/framework/web/domain/server/Cpu.java index a13a66c..422465c 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Cpu.java +++ b/src/main/java/com/delivery/framework/web/domain/server/Cpu.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.web.domain.server; +package com.delivery.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.delivery.common.utils.Arith; /** * CPU相关信息 diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java b/src/main/java/com/delivery/framework/web/domain/server/Jvm.java similarity index 94% rename from src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java rename to src/main/java/com/delivery/framework/web/domain/server/Jvm.java index 1fdc6ac..fe62624 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java +++ b/src/main/java/com/delivery/framework/web/domain/server/Jvm.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.web.domain.server; +package com.delivery.framework.web.domain.server; import java.lang.management.ManagementFactory; -import com.ruoyi.common.utils.Arith; -import com.ruoyi.common.utils.DateUtils; +import com.delivery.common.utils.Arith; +import com.delivery.common.utils.DateUtils; /** * JVM相关信息 diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java b/src/main/java/com/delivery/framework/web/domain/server/Mem.java similarity index 90% rename from src/main/java/com/ruoyi/framework/web/domain/server/Mem.java rename to src/main/java/com/delivery/framework/web/domain/server/Mem.java index 13eec52..c36a1d9 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Mem.java +++ b/src/main/java/com/delivery/framework/web/domain/server/Mem.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.web.domain.server; +package com.delivery.framework.web.domain.server; -import com.ruoyi.common.utils.Arith; +import com.delivery.common.utils.Arith; /** * 內存相关信息 diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java b/src/main/java/com/delivery/framework/web/domain/server/Sys.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/domain/server/Sys.java rename to src/main/java/com/delivery/framework/web/domain/server/Sys.java index 45d64d9..a1b9687 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/Sys.java +++ b/src/main/java/com/delivery/framework/web/domain/server/Sys.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.delivery.framework.web.domain.server; /** * 系统相关信息 diff --git a/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java b/src/main/java/com/delivery/framework/web/domain/server/SysFile.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java rename to src/main/java/com/delivery/framework/web/domain/server/SysFile.java index 1320cde..7d7e5b4 100644 --- a/src/main/java/com/ruoyi/framework/web/domain/server/SysFile.java +++ b/src/main/java/com/delivery/framework/web/domain/server/SysFile.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.domain.server; +package com.delivery.framework.web.domain.server; /** * 系统文件相关信息 diff --git a/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/src/main/java/com/delivery/framework/web/exception/GlobalExceptionHandler.java similarity index 92% rename from src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to src/main/java/com/delivery/framework/web/exception/GlobalExceptionHandler.java index 19721ed..5cc0ce2 100644 --- a/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/delivery/framework/web/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.exception; +package com.delivery.framework.web.exception; import javax.servlet.http.HttpServletRequest; import org.slf4j.Logger; @@ -11,13 +11,13 @@ import org.springframework.web.bind.MissingPathVariableException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException; -import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.html.EscapeUtil; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.delivery.common.constant.HttpStatus; +import com.delivery.common.core.text.Convert; +import com.delivery.common.exception.DemoModeException; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.html.EscapeUtil; +import com.delivery.framework.web.domain.AjaxResult; /** * 全局异常处理器 diff --git a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java b/src/main/java/com/delivery/framework/web/page/PageDomain.java similarity index 95% rename from src/main/java/com/ruoyi/framework/web/page/PageDomain.java rename to src/main/java/com/delivery/framework/web/page/PageDomain.java index 27df44c..2a1ba6c 100644 --- a/src/main/java/com/ruoyi/framework/web/page/PageDomain.java +++ b/src/main/java/com/delivery/framework/web/page/PageDomain.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.web.page; +package com.delivery.framework.web.page; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 分页数据 diff --git a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java b/src/main/java/com/delivery/framework/web/page/TableDataInfo.java similarity index 96% rename from src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java rename to src/main/java/com/delivery/framework/web/page/TableDataInfo.java index 89578e3..62d6de6 100644 --- a/src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java +++ b/src/main/java/com/delivery/framework/web/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.web.page; +package com.delivery.framework.web.page; import java.io.Serializable; import java.util.List; diff --git a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java b/src/main/java/com/delivery/framework/web/page/TableSupport.java similarity index 90% rename from src/main/java/com/ruoyi/framework/web/page/TableSupport.java rename to src/main/java/com/delivery/framework/web/page/TableSupport.java index 8433d10..5d0ab66 100644 --- a/src/main/java/com/ruoyi/framework/web/page/TableSupport.java +++ b/src/main/java/com/delivery/framework/web/page/TableSupport.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.web.page; +package com.delivery.framework.web.page; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.ServletUtils; +import com.delivery.common.core.text.Convert; +import com.delivery.common.utils.ServletUtils; /** * 表格数据处理 diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/delivery/project/common/CaptchaController.java similarity index 86% rename from src/main/java/com/ruoyi/project/common/CaptchaController.java rename to src/main/java/com/delivery/project/common/CaptchaController.java index 0948ce3..e53271a 100644 --- a/src/main/java/com/ruoyi/project/common/CaptchaController.java +++ b/src/main/java/com/delivery/project/common/CaptchaController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.common; +package com.delivery.project.common; import java.awt.image.BufferedImage; import java.io.IOException; @@ -12,13 +12,13 @@ import org.springframework.util.FastByteArrayOutputStream; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import com.google.code.kaptcha.Producer; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.sign.Base64; -import com.ruoyi.common.utils.uuid.IdUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.service.ISysConfigService; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.constant.Constants; +import com.delivery.common.utils.sign.Base64; +import com.delivery.common.utils.uuid.IdUtils; +import com.delivery.framework.redis.RedisCache; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.system.service.ISysConfigService; /** * 验证码操作处理 @@ -38,7 +38,7 @@ public class CaptchaController private RedisCache redisCache; // 验证码类型 - @Value("${ruoyi.captchaType}") + @Value("${delivery.captchaType}") private String captchaType; @Autowired diff --git a/src/main/java/com/ruoyi/project/common/CommonController.java b/src/main/java/com/delivery/project/common/CommonController.java similarity index 89% rename from src/main/java/com/ruoyi/project/common/CommonController.java rename to src/main/java/com/delivery/project/common/CommonController.java index 6183a9d..e60846b 100644 --- a/src/main/java/com/ruoyi/project/common/CommonController.java +++ b/src/main/java/com/delivery/project/common/CommonController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.common; +package com.delivery.project.common; import java.util.ArrayList; import java.util.List; @@ -13,12 +13,12 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.framework.config.RuoYiConfig; -import com.ruoyi.framework.config.ServerConfig; -import com.ruoyi.framework.web.domain.AjaxResult; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.file.FileUploadUtils; +import com.delivery.common.utils.file.FileUtils; +import com.delivery.framework.config.DeliveryConfig; +import com.delivery.framework.config.ServerConfig; +import com.delivery.framework.web.domain.AjaxResult; /** * 通用请求处理 @@ -52,7 +52,7 @@ public class CommonController throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName)); } String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1); - String filePath = RuoYiConfig.getDownloadPath() + fileName; + String filePath = DeliveryConfig.getDownloadPath() + fileName; response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE); FileUtils.setAttachmentResponseHeader(response, realFileName); @@ -77,7 +77,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = DeliveryConfig.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); String url = serverConfig.getUrl() + fileName; @@ -103,7 +103,7 @@ public class CommonController try { // 上传文件路径 - String filePath = RuoYiConfig.getUploadPath(); + String filePath = DeliveryConfig.getUploadPath(); List urls = new ArrayList(); List fileNames = new ArrayList(); List newFileNames = new ArrayList(); @@ -145,7 +145,7 @@ public class CommonController throw new Exception(StringUtils.format("资源文件({})非法，不允许下载。 ", resource)); } // 本地资源路径 - String localPath = RuoYiConfig.getProfile(); + String localPath = DeliveryConfig.getProfile(); // 数据库资源地址 String downloadPath = localPath + FileUtils.stripPrefix(resource); // 下载名称 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java b/src/main/java/com/delivery/project/monitor/controller/CacheController.java similarity index 94% rename from src/main/java/com/ruoyi/project/monitor/controller/CacheController.java rename to src/main/java/com/delivery/project/monitor/controller/CacheController.java index ca95160..d72dcc7 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java +++ b/src/main/java/com/delivery/project/monitor/controller/CacheController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import java.util.ArrayList; import java.util.Collection; @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.monitor.domain.SysCache; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.monitor.domain.SysCache; /** * 缓存监控 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java b/src/main/java/com/delivery/project/monitor/controller/ServerController.java similarity index 80% rename from src/main/java/com/ruoyi/project/monitor/controller/ServerController.java rename to src/main/java/com/delivery/project/monitor/controller/ServerController.java index e1f55f1..a059e69 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java +++ b/src/main/java/com/delivery/project/monitor/controller/ServerController.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.domain.Server; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.domain.Server; /** * 服务器监控 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/src/main/java/com/delivery/project/monitor/controller/SysJobController.java similarity index 90% rename from src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java rename to src/main/java/com/delivery/project/monitor/controller/SysJobController.java index 7af189c..51fa7f5 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java +++ b/src/main/java/com/delivery/project/monitor/controller/SysJobController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,19 +13,19 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.job.CronUtils; -import com.ruoyi.common.utils.job.ScheduleUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.monitor.domain.SysJob; -import com.ruoyi.project.monitor.service.ISysJobService; +import com.delivery.common.constant.Constants; +import com.delivery.common.exception.job.TaskException; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.job.CronUtils; +import com.delivery.common.utils.job.ScheduleUtils; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.monitor.domain.SysJob; +import com.delivery.project.monitor.service.ISysJobService; /** * 调度任务信息操作处理 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/src/main/java/com/delivery/project/monitor/controller/SysJobLogController.java similarity index 83% rename from src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java rename to src/main/java/com/delivery/project/monitor/controller/SysJobLogController.java index 2061c55..09a0ced 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java +++ b/src/main/java/com/delivery/project/monitor/controller/SysJobLogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.monitor.domain.SysJobLog; -import com.ruoyi.project.monitor.service.ISysJobLogService; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.monitor.domain.SysJobLog; +import com.delivery.project.monitor.service.ISysJobLogService; /** * 调度日志操作处理 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java b/src/main/java/com/delivery/project/monitor/controller/SysLogininforController.java similarity index 81% rename from src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java rename to src/main/java/com/delivery/project/monitor/controller/SysLogininforController.java index 4371d9a..7b06e96 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java +++ b/src/main/java/com/delivery/project/monitor/controller/SysLogininforController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.security.service.SysPasswordService; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.monitor.domain.SysLogininfor; -import com.ruoyi.project.monitor.service.ISysLogininforService; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.security.service.SysPasswordService; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.monitor.domain.SysLogininfor; +import com.delivery.project.monitor.service.ISysLogininforService; /** * 系统访问记录 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java b/src/main/java/com/delivery/project/monitor/controller/SysOperlogController.java similarity index 80% rename from src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java rename to src/main/java/com/delivery/project/monitor/controller/SysOperlogController.java index 703077e..56f9456 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java +++ b/src/main/java/com/delivery/project/monitor/controller/SysOperlogController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.monitor.domain.SysOperLog; -import com.ruoyi.project.monitor.service.ISysOperLogService; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.monitor.domain.SysOperLog; +import com.delivery.project.monitor.service.ISysOperLogService; /** * 操作日志记录 diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java b/src/main/java/com/delivery/project/monitor/controller/SysUserOnlineController.java similarity index 79% rename from src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java rename to src/main/java/com/delivery/project/monitor/controller/SysUserOnlineController.java index 913d93f..a67f4d2 100644 --- a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java +++ b/src/main/java/com/delivery/project/monitor/controller/SysUserOnlineController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.controller; +package com.delivery.project.monitor.controller; import java.util.ArrayList; import java.util.Collection; @@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.monitor.domain.SysUserOnline; -import com.ruoyi.project.system.service.ISysUserOnlineService; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.redis.RedisCache; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.monitor.domain.SysUserOnline; +import com.delivery.project.system.service.ISysUserOnlineService; /** * 在线用户监控 diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysCache.java b/src/main/java/com/delivery/project/monitor/domain/SysCache.java similarity index 93% rename from src/main/java/com/ruoyi/project/monitor/domain/SysCache.java rename to src/main/java/com/delivery/project/monitor/domain/SysCache.java index ac32647..3a1ba6f 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysCache.java +++ b/src/main/java/com/delivery/project/monitor/domain/SysCache.java @@ -1,6 +1,6 @@ -package com.ruoyi.project.monitor.domain; +package com.delivery.project.monitor.domain; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 缓存信息 diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java b/src/main/java/com/delivery/project/monitor/domain/SysJob.java similarity index 91% rename from src/main/java/com/ruoyi/project/monitor/domain/SysJob.java rename to src/main/java/com/delivery/project/monitor/domain/SysJob.java index 25e77f2..26ce56f 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysJob.java +++ b/src/main/java/com/delivery/project/monitor/domain/SysJob.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.domain; +package com.delivery.project.monitor.domain; import java.util.Date; import javax.validation.constraints.NotBlank; @@ -6,12 +6,12 @@ import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.job.CronUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.common.constant.ScheduleConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.job.CronUtils; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 定时任务调度表 sys_job diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java b/src/main/java/com/delivery/project/monitor/domain/SysJobLog.java similarity index 95% rename from src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java rename to src/main/java/com/delivery/project/monitor/domain/SysJobLog.java index c7a3cd2..f4fab7d 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysJobLog.java +++ b/src/main/java/com/delivery/project/monitor/domain/SysJobLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.project.monitor.domain; +package com.delivery.project.monitor.domain; import java.util.Date; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.web.domain.BaseEntity; /** * 定时任务调度日志表 sys_job_log diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java b/src/main/java/com/delivery/project/monitor/domain/SysLogininfor.java similarity index 91% rename from src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java rename to src/main/java/com/delivery/project/monitor/domain/SysLogininfor.java index 147a0a5..70538cf 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java +++ b/src/main/java/com/delivery/project/monitor/domain/SysLogininfor.java @@ -1,10 +1,10 @@ -package com.ruoyi.project.monitor.domain; +package com.delivery.project.monitor.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 系统访问记录表 sys_logininfor diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java b/src/main/java/com/delivery/project/monitor/domain/SysOperLog.java similarity index 95% rename from src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java rename to src/main/java/com/delivery/project/monitor/domain/SysOperLog.java index 5dad339..24ef0ab 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysOperLog.java +++ b/src/main/java/com/delivery/project/monitor/domain/SysOperLog.java @@ -1,10 +1,10 @@ -package com.ruoyi.project.monitor.domain; +package com.delivery.project.monitor.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 操作日志记录表 oper_log diff --git a/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java b/src/main/java/com/delivery/project/monitor/domain/SysUserOnline.java similarity index 97% rename from src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java rename to src/main/java/com/delivery/project/monitor/domain/SysUserOnline.java index 387d49c..55aaa2f 100644 --- a/src/main/java/com/ruoyi/project/monitor/domain/SysUserOnline.java +++ b/src/main/java/com/delivery/project/monitor/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.domain; +package com.delivery.project.monitor.domain; /** * 当前在线会话 diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java b/src/main/java/com/delivery/project/monitor/mapper/SysJobLogMapper.java similarity index 92% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java rename to src/main/java/com/delivery/project/monitor/mapper/SysJobLogMapper.java index 39137dd..07aa98d 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobLogMapper.java +++ b/src/main/java/com/delivery/project/monitor/mapper/SysJobLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.mapper; +package com.delivery.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysJobLog; +import com.delivery.project.monitor.domain.SysJobLog; /** * 调度任务日志信息 数据层 diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java b/src/main/java/com/delivery/project/monitor/mapper/SysJobMapper.java similarity index 92% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java rename to src/main/java/com/delivery/project/monitor/mapper/SysJobMapper.java index ab11461..2df411e 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysJobMapper.java +++ b/src/main/java/com/delivery/project/monitor/mapper/SysJobMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.mapper; +package com.delivery.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysJob; +import com.delivery.project.monitor.domain.SysJob; /** * 调度任务信息 数据层 diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java b/src/main/java/com/delivery/project/monitor/mapper/SysLogininforMapper.java similarity index 88% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java rename to src/main/java/com/delivery/project/monitor/mapper/SysLogininforMapper.java index 05b8c9b..62bf938 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysLogininforMapper.java +++ b/src/main/java/com/delivery/project/monitor/mapper/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.mapper; +package com.delivery.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysLogininfor; +import com.delivery.project.monitor.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 diff --git a/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java b/src/main/java/com/delivery/project/monitor/mapper/SysOperLogMapper.java similarity index 90% rename from src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java rename to src/main/java/com/delivery/project/monitor/mapper/SysOperLogMapper.java index ed5d573..e274f0d 100644 --- a/src/main/java/com/ruoyi/project/monitor/mapper/SysOperLogMapper.java +++ b/src/main/java/com/delivery/project/monitor/mapper/SysOperLogMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.mapper; +package com.delivery.project.monitor.mapper; import java.util.List; -import com.ruoyi.project.monitor.domain.SysOperLog; +import com.delivery.project.monitor.domain.SysOperLog; /** * 操作日志 数据层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java b/src/main/java/com/delivery/project/monitor/service/ISysJobLogService.java similarity index 91% rename from src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java rename to src/main/java/com/delivery/project/monitor/service/ISysJobLogService.java index 85561e7..7ff2700 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysJobLogService.java +++ b/src/main/java/com/delivery/project/monitor/service/ISysJobLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.service; +package com.delivery.project.monitor.service; import java.util.List; -import com.ruoyi.project.monitor.domain.SysJobLog; +import com.delivery.project.monitor.domain.SysJobLog; /** * 定时任务调度日志信息信息 服务层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java b/src/main/java/com/delivery/project/monitor/service/ISysJobService.java similarity index 93% rename from src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java rename to src/main/java/com/delivery/project/monitor/service/ISysJobService.java index d834f67..b809bb8 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysJobService.java +++ b/src/main/java/com/delivery/project/monitor/service/ISysJobService.java @@ -1,9 +1,9 @@ -package com.ruoyi.project.monitor.service; +package com.delivery.project.monitor.service; import java.util.List; import org.quartz.SchedulerException; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.project.monitor.domain.SysJob; +import com.delivery.common.exception.job.TaskException; +import com.delivery.project.monitor.domain.SysJob; /** * 定时任务调度信息信息 服务层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java b/src/main/java/com/delivery/project/monitor/service/ISysLogininforService.java similarity index 88% rename from src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java rename to src/main/java/com/delivery/project/monitor/service/ISysLogininforService.java index ac51166..f81e4d4 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysLogininforService.java +++ b/src/main/java/com/delivery/project/monitor/service/ISysLogininforService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.service; +package com.delivery.project.monitor.service; import java.util.List; -import com.ruoyi.project.monitor.domain.SysLogininfor; +import com.delivery.project.monitor.domain.SysLogininfor; /** * 系统访问日志情况信息 服务层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java b/src/main/java/com/delivery/project/monitor/service/ISysOperLogService.java similarity index 89% rename from src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java rename to src/main/java/com/delivery/project/monitor/service/ISysOperLogService.java index 0e63d8d..49adcc0 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/ISysOperLogService.java +++ b/src/main/java/com/delivery/project/monitor/service/ISysOperLogService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.monitor.service; +package com.delivery.project.monitor.service; import java.util.List; -import com.ruoyi.project.monitor.domain.SysOperLog; +import com.delivery.project.monitor.domain.SysOperLog; /** * 操作日志 服务层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java b/src/main/java/com/delivery/project/monitor/service/impl/SysJobLogServiceImpl.java similarity index 88% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java rename to src/main/java/com/delivery/project/monitor/service/impl/SysJobLogServiceImpl.java index 991cf81..6af5f04 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobLogServiceImpl.java +++ b/src/main/java/com/delivery/project/monitor/service/impl/SysJobLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.monitor.service.impl; +package com.delivery.project.monitor.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.project.monitor.domain.SysJobLog; -import com.ruoyi.project.monitor.mapper.SysJobLogMapper; -import com.ruoyi.project.monitor.service.ISysJobLogService; +import com.delivery.project.monitor.domain.SysJobLog; +import com.delivery.project.monitor.mapper.SysJobLogMapper; +import com.delivery.project.monitor.service.ISysJobLogService; /** * 定时任务调度日志信息 服务层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java b/src/main/java/com/delivery/project/monitor/service/impl/SysJobServiceImpl.java similarity index 94% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java rename to src/main/java/com/delivery/project/monitor/service/impl/SysJobServiceImpl.java index 4f2bec5..62506f8 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysJobServiceImpl.java +++ b/src/main/java/com/delivery/project/monitor/service/impl/SysJobServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.monitor.service.impl; +package com.delivery.project.monitor.service.impl; import java.util.List; import javax.annotation.PostConstruct; @@ -9,13 +9,13 @@ import org.quartz.SchedulerException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.ScheduleConstants; -import com.ruoyi.common.exception.job.TaskException; -import com.ruoyi.common.utils.job.CronUtils; -import com.ruoyi.common.utils.job.ScheduleUtils; -import com.ruoyi.project.monitor.domain.SysJob; -import com.ruoyi.project.monitor.mapper.SysJobMapper; -import com.ruoyi.project.monitor.service.ISysJobService; +import com.delivery.common.constant.ScheduleConstants; +import com.delivery.common.exception.job.TaskException; +import com.delivery.common.utils.job.CronUtils; +import com.delivery.common.utils.job.ScheduleUtils; +import com.delivery.project.monitor.domain.SysJob; +import com.delivery.project.monitor.mapper.SysJobMapper; +import com.delivery.project.monitor.service.ISysJobService; /** * 定时任务调度信息 服务层 diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java b/src/main/java/com/delivery/project/monitor/service/impl/SysLogininforServiceImpl.java similarity index 84% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java rename to src/main/java/com/delivery/project/monitor/service/impl/SysLogininforServiceImpl.java index e9b099f..eb6bfe1 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysLogininforServiceImpl.java +++ b/src/main/java/com/delivery/project/monitor/service/impl/SysLogininforServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.monitor.service.impl; +package com.delivery.project.monitor.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.project.monitor.domain.SysLogininfor; -import com.ruoyi.project.monitor.mapper.SysLogininforMapper; -import com.ruoyi.project.monitor.service.ISysLogininforService; +import com.delivery.project.monitor.domain.SysLogininfor; +import com.delivery.project.monitor.mapper.SysLogininforMapper; +import com.delivery.project.monitor.service.ISysLogininforService; /** * 系统访问日志情况信息 服务层处理 diff --git a/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java b/src/main/java/com/delivery/project/monitor/service/impl/SysOperLogServiceImpl.java similarity index 86% rename from src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java rename to src/main/java/com/delivery/project/monitor/service/impl/SysOperLogServiceImpl.java index bed9d8d..51d6241 100644 --- a/src/main/java/com/ruoyi/project/monitor/service/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/delivery/project/monitor/service/impl/SysOperLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.monitor.service.impl; +package com.delivery.project.monitor.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.project.monitor.domain.SysOperLog; -import com.ruoyi.project.monitor.mapper.SysOperLogMapper; -import com.ruoyi.project.monitor.service.ISysOperLogService; +import com.delivery.project.monitor.domain.SysOperLog; +import com.delivery.project.monitor.mapper.SysOperLogMapper; +import com.delivery.project.monitor.service.ISysOperLogService; /** * 操作日志 服务层处理 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/src/main/java/com/delivery/project/system/controller/SysConfigController.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/controller/SysConfigController.java rename to src/main/java/com/delivery/project/system/controller/SysConfigController.java index a4df558..b40b9ec 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java +++ b/src/main/java/com/delivery/project/system/controller/SysConfigController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysConfig; -import com.ruoyi.project.system.service.ISysConfigService; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysConfig; +import com.delivery.project.system.service.ISysConfigService; /** * 参数配置 信息操作处理 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/delivery/project/system/controller/SysDeptController.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/controller/SysDeptController.java rename to src/main/java/com/delivery/project/system/controller/SysDeptController.java index 30eee7d..b02f5ed 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java +++ b/src/main/java/com/delivery/project/system/controller/SysDeptController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import org.apache.commons.lang3.ArrayUtils; @@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.service.ISysDeptService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.system.domain.SysDept; +import com.delivery.project.system.service.ISysDeptService; /** * 部门信息 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java b/src/main/java/com/delivery/project/system/controller/SysDictDataController.java similarity index 85% rename from src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java rename to src/main/java/com/delivery/project/system/controller/SysDictDataController.java index c76a214..c067eaa 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java +++ b/src/main/java/com/delivery/project/system/controller/SysDictDataController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.ArrayList; import java.util.List; @@ -14,16 +14,16 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysDictData; -import com.ruoyi.project.system.service.ISysDictDataService; -import com.ruoyi.project.system.service.ISysDictTypeService; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysDictData; +import com.delivery.project.system.service.ISysDictDataService; +import com.delivery.project.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java b/src/main/java/com/delivery/project/system/controller/SysDictTypeController.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java rename to src/main/java/com/delivery/project/system/controller/SysDictTypeController.java index c3a4d0c..ab2dc9e 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java +++ b/src/main/java/com/delivery/project/system/controller/SysDictTypeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysDictType; -import com.ruoyi.project.system.service.ISysDictTypeService; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysDictType; +import com.delivery.project.system.service.ISysDictTypeService; /** * 数据字典信息 diff --git a/src/main/java/com/delivery/project/system/controller/SysIndexController.java b/src/main/java/com/delivery/project/system/controller/SysIndexController.java new file mode 100644 index 0000000..ffddfd3 --- /dev/null +++ b/src/main/java/com/delivery/project/system/controller/SysIndexController.java @@ -0,0 +1,33 @@ +package com.delivery.project.system.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.config.DeliveryConfig; + +/** + * 首页 + * + * @author delivery + */ +@RestController +public class SysIndexController { + + /** 系统基础配置 */ + private final DeliveryConfig deliveryConfig; + + public SysIndexController(DeliveryConfig deliveryConfig) { + this.deliveryConfig = deliveryConfig; + } + + /** + * 访问首页，提示语 + */ + @GetMapping("/") + public String index() { + return StringUtils.format( + "欢迎使用{}后台管理系统，当前版本：v{}，请通过前端地址访问。", + deliveryConfig.getName(), deliveryConfig.getVersion() + ); + } +} diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/delivery/project/system/controller/SysLoginController.java similarity index 80% rename from src/main/java/com/ruoyi/project/system/controller/SysLoginController.java rename to src/main/java/com/delivery/project/system/controller/SysLoginController.java index 6feed09..1352340 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java +++ b/src/main/java/com/delivery/project/system/controller/SysLoginController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.Date; import java.util.List; @@ -8,21 +8,21 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.LoginBody; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.service.SysLoginService; -import com.ruoyi.framework.security.service.SysPermissionService; -import com.ruoyi.framework.security.service.TokenService; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.domain.SysMenu; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysConfigService; -import com.ruoyi.project.system.service.ISysMenuService; +import com.delivery.common.constant.Constants; +import com.delivery.common.core.text.Convert; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.security.LoginBody; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.service.SysLoginService; +import com.delivery.framework.security.service.SysPermissionService; +import com.delivery.framework.security.service.TokenService; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.system.domain.SysMenu; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.service.ISysConfigService; +import com.delivery.project.system.service.ISysMenuService; /** * 登录验证 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/src/main/java/com/delivery/project/system/controller/SysMenuController.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/controller/SysMenuController.java rename to src/main/java/com/delivery/project/system/controller/SysMenuController.java index 1e2ccf0..f568169 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java +++ b/src/main/java/com/delivery/project/system/controller/SysMenuController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,14 +12,14 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.domain.SysMenu; -import com.ruoyi.project.system.service.ISysMenuService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.system.domain.SysMenu; +import com.delivery.project.system.service.ISysMenuService; /** * 菜单信息 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/delivery/project/system/controller/SysNoticeController.java similarity index 85% rename from src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java rename to src/main/java/com/delivery/project/system/controller/SysNoticeController.java index 6519ae3..597038e 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java +++ b/src/main/java/com/delivery/project/system/controller/SysNoticeController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysNotice; -import com.ruoyi.project.system.service.ISysNoticeService; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysNotice; +import com.delivery.project.system.service.ISysNoticeService; /** * 公告 信息操作处理 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/delivery/project/system/controller/SysPostController.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/controller/SysPostController.java rename to src/main/java/com/delivery/project/system/controller/SysPostController.java index 6bf46a1..deeea9c 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java +++ b/src/main/java/com/delivery/project/system/controller/SysPostController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysPost; -import com.ruoyi.project.system.service.ISysPostService; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysPost; +import com.delivery.project.system.service.ISysPostService; /** * 岗位信息操作处理 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/src/main/java/com/delivery/project/system/controller/SysProfileController.java similarity index 81% rename from src/main/java/com/ruoyi/project/system/controller/SysProfileController.java rename to src/main/java/com/delivery/project/system/controller/SysProfileController.java index cf2b413..66bcee6 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java +++ b/src/main/java/com/delivery/project/system/controller/SysProfileController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; @@ -10,21 +10,21 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.common.utils.file.MimeTypeUtils; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.config.RuoYiConfig; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.service.TokenService; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.file.FileUploadUtils; +import com.delivery.common.utils.file.FileUtils; +import com.delivery.common.utils.file.MimeTypeUtils; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.config.DeliveryConfig; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.service.TokenService; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.service.ISysUserService; /** * 个人信息 业务处理 @@ -127,13 +127,13 @@ public class SysProfileController extends BaseController if (!file.isEmpty()) { LoginUser loginUser = getLoginUser(); - String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); + String avatar = FileUploadUtils.upload(DeliveryConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION, true); if (userService.updateUserAvatar(loginUser.getUserId(), avatar)) { String oldAvatar = loginUser.getUser().getAvatar(); if (StringUtils.isNotEmpty(oldAvatar)) { - FileUtils.deleteFile(RuoYiConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); + FileUtils.deleteFile(DeliveryConfig.getProfile() + FileUtils.stripPrefix(oldAvatar)); } AjaxResult ajax = AjaxResult.success(); ajax.put("imgUrl", avatar); diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java b/src/main/java/com/delivery/project/system/controller/SysRegisterController.java similarity index 69% rename from src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java rename to src/main/java/com/delivery/project/system/controller/SysRegisterController.java index d8f570a..2b7d807 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java +++ b/src/main/java/com/delivery/project/system/controller/SysRegisterController.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.RegisterBody; -import com.ruoyi.framework.security.service.SysRegisterService; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.project.system.service.ISysConfigService; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.security.RegisterBody; +import com.delivery.framework.security.service.SysRegisterService; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.project.system.service.ISysConfigService; /** * 注册验证 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/delivery/project/system/controller/SysRoleController.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/controller/SysRoleController.java rename to src/main/java/com/delivery/project/system/controller/SysRoleController.java index 48cb3c3..be0f73c 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java +++ b/src/main/java/com/delivery/project/system/controller/SysRoleController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; @@ -13,23 +13,23 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.framework.security.service.SysPermissionService; -import com.ruoyi.framework.security.service.TokenService; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.domain.SysUserRole; -import com.ruoyi.project.system.service.ISysDeptService; -import com.ruoyi.project.system.service.ISysRoleService; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.security.LoginUser; +import com.delivery.framework.security.service.SysPermissionService; +import com.delivery.framework.security.service.TokenService; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysDept; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.domain.SysUserRole; +import com.delivery.project.system.service.ISysDeptService; +import com.delivery.project.system.service.ISysRoleService; +import com.delivery.project.system.service.ISysUserService; /** * 角色信息 diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/delivery/project/system/controller/SysUserController.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/controller/SysUserController.java rename to src/main/java/com/delivery/project/system/controller/SysUserController.java index 9872c45..f9ed558 100644 --- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java +++ b/src/main/java/com/delivery/project/system/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.controller; +package com.delivery.project.system.controller; import java.util.List; import java.util.stream.Collectors; @@ -16,21 +16,21 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.service.ISysDeptService; -import com.ruoyi.project.system.service.ISysPostService; -import com.ruoyi.project.system.service.ISysRoleService; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.poi.ExcelUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.system.domain.SysDept; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.service.ISysDeptService; +import com.delivery.project.system.service.ISysPostService; +import com.delivery.project.system.service.ISysRoleService; +import com.delivery.project.system.service.ISysUserService; /** * 用户信息 diff --git a/src/main/java/com/ruoyi/project/system/domain/SysConfig.java b/src/main/java/com/delivery/project/system/domain/SysConfig.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/domain/SysConfig.java rename to src/main/java/com/delivery/project/system/domain/SysConfig.java index f9b290b..deb82b8 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysConfig.java +++ b/src/main/java/com/delivery/project/system/domain/SysConfig.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 参数配置表 sys_config diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/src/main/java/com/delivery/project/system/domain/SysDept.java similarity index 97% rename from src/main/java/com/ruoyi/project/system/domain/SysDept.java rename to src/main/java/com/delivery/project/system/domain/SysDept.java index e97e9e8..ebdf1f0 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysDept.java +++ b/src/main/java/com/delivery/project/system/domain/SysDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.web.domain.BaseEntity; /** * 部门表 sys_dept diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDictData.java b/src/main/java/com/delivery/project/system/domain/SysDictData.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/domain/SysDictData.java rename to src/main/java/com/delivery/project/system/domain/SysDictData.java index b0a9a44..64182db 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysDictData.java +++ b/src/main/java/com/delivery/project/system/domain/SysDictData.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.common.constant.UserConstants; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 字典数据表 sys_dict_data diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDictType.java b/src/main/java/com/delivery/project/system/domain/SysDictType.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/domain/SysDictType.java rename to src/main/java/com/delivery/project/system/domain/SysDictType.java index 745296f..898fad9 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysDictType.java +++ b/src/main/java/com/delivery/project/system/domain/SysDictType.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Pattern; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 字典类型表 sys_dict_type diff --git a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java b/src/main/java/com/delivery/project/system/domain/SysMenu.java similarity index 98% rename from src/main/java/com/ruoyi/project/system/domain/SysMenu.java rename to src/main/java/com/delivery/project/system/domain/SysMenu.java index fc2b68f..7023e59 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysMenu.java +++ b/src/main/java/com/delivery/project/system/domain/SysMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.web.domain.BaseEntity; /** * 菜单权限表 sys_menu diff --git a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java b/src/main/java/com/delivery/project/system/domain/SysNotice.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysNotice.java rename to src/main/java/com/delivery/project/system/domain/SysNotice.java index 8b315a0..18c09e1 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java +++ b/src/main/java/com/delivery/project/system/domain/SysNotice.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.xss.Xss; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.common.xss.Xss; +import com.delivery.framework.web.domain.BaseEntity; /** * 通知公告表 sys_notice diff --git a/src/main/java/com/ruoyi/project/system/domain/SysPost.java b/src/main/java/com/delivery/project/system/domain/SysPost.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/domain/SysPost.java rename to src/main/java/com/delivery/project/system/domain/SysPost.java index eb403ff..4aee32e 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysPost.java +++ b/src/main/java/com/delivery/project/system/domain/SysPost.java @@ -1,13 +1,13 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 岗位表 sys_post diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/src/main/java/com/delivery/project/system/domain/SysRole.java similarity index 96% rename from src/main/java/com/ruoyi/project/system/domain/SysRole.java rename to src/main/java/com/delivery/project/system/domain/SysRole.java index 71e817c..5e11186 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysRole.java +++ b/src/main/java/com/delivery/project/system/domain/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import java.util.Set; import javax.validation.constraints.NotBlank; @@ -6,9 +6,9 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.web.domain.BaseEntity; /** * 角色表 sys_role diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java b/src/main/java/com/delivery/project/system/domain/SysRoleDept.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java rename to src/main/java/com/delivery/project/system/domain/SysRoleDept.java index 5cbeed4..d330912 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysRoleDept.java +++ b/src/main/java/com/delivery/project/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java b/src/main/java/com/delivery/project/system/domain/SysRoleMenu.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java rename to src/main/java/com/delivery/project/system/domain/SysRoleMenu.java index 2772cbb..21d5f35 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysRoleMenu.java +++ b/src/main/java/com/delivery/project/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUser.java b/src/main/java/com/delivery/project/system/domain/SysUser.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysUser.java rename to src/main/java/com/delivery/project/system/domain/SysUser.java index cf8e5a0..cc91e89 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysUser.java +++ b/src/main/java/com/delivery/project/system/domain/SysUser.java @@ -1,16 +1,16 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import java.util.Date; import java.util.List; import javax.validation.constraints.*; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.common.xss.Xss; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType; -import com.ruoyi.framework.aspectj.lang.annotation.Excel.Type; -import com.ruoyi.framework.aspectj.lang.annotation.Excels; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.common.xss.Xss; +import com.delivery.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel.ColumnType; +import com.delivery.framework.aspectj.lang.annotation.Excel.Type; +import com.delivery.framework.aspectj.lang.annotation.Excels; +import com.delivery.framework.web.domain.BaseEntity; /** * 用户对象 sys_user diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java b/src/main/java/com/delivery/project/system/domain/SysUserPost.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysUserPost.java rename to src/main/java/com/delivery/project/system/domain/SysUserPost.java index 2633a2f..50e7628 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysUserPost.java +++ b/src/main/java/com/delivery/project/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java b/src/main/java/com/delivery/project/system/domain/SysUserRole.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/domain/SysUserRole.java rename to src/main/java/com/delivery/project/system/domain/SysUserRole.java index 3be4829..3136fd5 100644 --- a/src/main/java/com/ruoyi/project/system/domain/SysUserRole.java +++ b/src/main/java/com/delivery/project/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain; +package com.delivery.project.system.domain; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java b/src/main/java/com/delivery/project/system/domain/vo/MetaVo.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java rename to src/main/java/com/delivery/project/system/domain/vo/MetaVo.java index 68a51d9..a0ce51b 100644 --- a/src/main/java/com/ruoyi/project/system/domain/vo/MetaVo.java +++ b/src/main/java/com/delivery/project/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.project.system.domain.vo; +package com.delivery.project.system.domain.vo; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; /** * 路由显示信息 diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java b/src/main/java/com/delivery/project/system/domain/vo/RouterVo.java similarity index 98% rename from src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java rename to src/main/java/com/delivery/project/system/domain/vo/RouterVo.java index fc98c71..b4d49c7 100644 --- a/src/main/java/com/ruoyi/project/system/domain/vo/RouterVo.java +++ b/src/main/java/com/delivery/project/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.domain.vo; +package com.delivery.project.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java b/src/main/java/com/delivery/project/system/mapper/SysConfigMapper.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysConfigMapper.java index 1569594..114aeec 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysConfigMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysConfig; +import com.delivery.project.system.domain.SysConfig; /** * 参数配置 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java b/src/main/java/com/delivery/project/system/mapper/SysDeptMapper.java similarity index 96% rename from src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysDeptMapper.java index e5a5265..1212e3e 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysDeptMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysDept; +import com.delivery.project.system.domain.SysDept; /** * 部门管理 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java b/src/main/java/com/delivery/project/system/mapper/SysDictDataMapper.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysDictDataMapper.java index 4977bb4..1dd37a6 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysDictDataMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysDictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysDictData; +import com.delivery.project.system.domain.SysDictData; /** * 字典表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java b/src/main/java/com/delivery/project/system/mapper/SysDictTypeMapper.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysDictTypeMapper.java index 9eeb4d3..42a44bb 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysDictTypeMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysDictTypeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysDictType; +import com.delivery.project.system.domain.SysDictType; /** * 字典表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java b/src/main/java/com/delivery/project/system/mapper/SysMenuMapper.java similarity index 96% rename from src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysMenuMapper.java index 8b6dcf5..4e72538 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysMenuMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysMenuMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysMenu; +import com.delivery.project.system.domain.SysMenu; /** * 菜单表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java b/src/main/java/com/delivery/project/system/mapper/SysNoticeMapper.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysNoticeMapper.java index b80c50b..ae3af1d 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysNoticeMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysNoticeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysNotice; +import com.delivery.project.system.domain.SysNotice; /** * 通知公告表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java b/src/main/java/com/delivery/project/system/mapper/SysPostMapper.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysPostMapper.java index ba468bb..5a08122 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysPostMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysPost; +import com.delivery.project.system.domain.SysPost; /** * 岗位信息 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java b/src/main/java/com/delivery/project/system/mapper/SysRoleDeptMapper.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysRoleDeptMapper.java index 77ead08..2616de1 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysRoleDeptMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysRoleDept; +import com.delivery.project.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java b/src/main/java/com/delivery/project/system/mapper/SysRoleMapper.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysRoleMapper.java index 0f65731..0afd624 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysRoleMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysRole; /** * 角色表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java b/src/main/java/com/delivery/project/system/mapper/SysRoleMenuMapper.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysRoleMenuMapper.java index 92247c3..ada7a8c 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysRoleMenuMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysRoleMenu; +import com.delivery.project.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java b/src/main/java/com/delivery/project/system/mapper/SysUserMapper.java similarity index 97% rename from src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysUserMapper.java index b1f689b..02986ba 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysUserMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysUserMapper.java @@ -1,9 +1,9 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysUser; +import com.delivery.project.system.domain.SysUser; /** * 用户表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java b/src/main/java/com/delivery/project/system/mapper/SysUserPostMapper.java similarity index 89% rename from src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysUserPostMapper.java index 5653e1d..9adea29 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysUserPostMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; -import com.ruoyi.project.system.domain.SysUserPost; +import com.delivery.project.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java b/src/main/java/com/delivery/project/system/mapper/SysUserRoleMapper.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java rename to src/main/java/com/delivery/project/system/mapper/SysUserRoleMapper.java index e535905..bb8c0df 100644 --- a/src/main/java/com/ruoyi/project/system/mapper/SysUserRoleMapper.java +++ b/src/main/java/com/delivery/project/system/mapper/SysUserRoleMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.mapper; +package com.delivery.project.system.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.ruoyi.project.system.domain.SysUserRole; +import com.delivery.project.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java b/src/main/java/com/delivery/project/system/service/ISysConfigService.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/service/ISysConfigService.java rename to src/main/java/com/delivery/project/system/service/ISysConfigService.java index 70e5fa5..79bcde8 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysConfigService.java +++ b/src/main/java/com/delivery/project/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysConfig; +import com.delivery.project.system.domain.SysConfig; /** * 参数配置 服务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java b/src/main/java/com/delivery/project/system/service/ISysDeptService.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/service/ISysDeptService.java rename to src/main/java/com/delivery/project/system/service/ISysDeptService.java index ca27753..d7bab4f 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java +++ b/src/main/java/com/delivery/project/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; -import com.ruoyi.framework.web.domain.TreeSelect; -import com.ruoyi.project.system.domain.SysDept; +import com.delivery.framework.web.domain.TreeSelect; +import com.delivery.project.system.domain.SysDept; /** * 部门管理 服务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java b/src/main/java/com/delivery/project/system/service/ISysDictDataService.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java rename to src/main/java/com/delivery/project/system/service/ISysDictDataService.java index e3be8bb..04235e5 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysDictDataService.java +++ b/src/main/java/com/delivery/project/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysDictData; +import com.delivery.project.system.domain.SysDictData; /** * 字典 业务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java b/src/main/java/com/delivery/project/system/service/ISysDictTypeService.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java rename to src/main/java/com/delivery/project/system/service/ISysDictTypeService.java index 0a834d5..35f01de 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysDictTypeService.java +++ b/src/main/java/com/delivery/project/system/service/ISysDictTypeService.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysDictData; -import com.ruoyi.project.system.domain.SysDictType; +import com.delivery.project.system.domain.SysDictData; +import com.delivery.project.system.domain.SysDictType; /** * 字典 业务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java b/src/main/java/com/delivery/project/system/service/ISysMenuService.java similarity index 93% rename from src/main/java/com/ruoyi/project/system/service/ISysMenuService.java rename to src/main/java/com/delivery/project/system/service/ISysMenuService.java index 405ef70..45883fc 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysMenuService.java +++ b/src/main/java/com/delivery/project/system/service/ISysMenuService.java @@ -1,10 +1,10 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.framework.web.domain.TreeSelect; -import com.ruoyi.project.system.domain.SysMenu; -import com.ruoyi.project.system.domain.vo.RouterVo; +import com.delivery.framework.web.domain.TreeSelect; +import com.delivery.project.system.domain.SysMenu; +import com.delivery.project.system.domain.vo.RouterVo; /** * 菜单 业务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java b/src/main/java/com/delivery/project/system/service/ISysNoticeService.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java rename to src/main/java/com/delivery/project/system/service/ISysNoticeService.java index 3f74551..54d42d0 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysNoticeService.java +++ b/src/main/java/com/delivery/project/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysNotice; +import com.delivery.project.system.domain.SysNotice; /** * 公告 服务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysPostService.java b/src/main/java/com/delivery/project/system/service/ISysPostService.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/service/ISysPostService.java rename to src/main/java/com/delivery/project/system/service/ISysPostService.java index 95b9373..dad4957 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysPostService.java +++ b/src/main/java/com/delivery/project/system/service/ISysPostService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; -import com.ruoyi.project.system.domain.SysPost; +import com.delivery.project.system.domain.SysPost; /** * 岗位信息 服务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java b/src/main/java/com/delivery/project/system/service/ISysRoleService.java similarity index 95% rename from src/main/java/com/ruoyi/project/system/service/ISysRoleService.java rename to src/main/java/com/delivery/project/system/service/ISysRoleService.java index 0d6c47a..2c7df4f 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysRoleService.java +++ b/src/main/java/com/delivery/project/system/service/ISysRoleService.java @@ -1,9 +1,9 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.List; import java.util.Set; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUserRole; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUserRole; /** * 角色业务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java b/src/main/java/com/delivery/project/system/service/ISysUserOnlineService.java similarity index 87% rename from src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java rename to src/main/java/com/delivery/project/system/service/ISysUserOnlineService.java index 7974ae7..d6ef203 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysUserOnlineService.java +++ b/src/main/java/com/delivery/project/system/service/ISysUserOnlineService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.monitor.domain.SysUserOnline; +import com.delivery.framework.security.LoginUser; +import com.delivery.project.monitor.domain.SysUserOnline; /** * 在线用户 服务层 diff --git a/src/main/java/com/ruoyi/project/system/service/ISysUserService.java b/src/main/java/com/delivery/project/system/service/ISysUserService.java similarity index 97% rename from src/main/java/com/ruoyi/project/system/service/ISysUserService.java rename to src/main/java/com/delivery/project/system/service/ISysUserService.java index 932690c..479c407 100644 --- a/src/main/java/com/ruoyi/project/system/service/ISysUserService.java +++ b/src/main/java/com/delivery/project/system/service/ISysUserService.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.system.service; +package com.delivery.project.system.service; import java.util.Date; import java.util.List; -import com.ruoyi.project.system.domain.SysUser; +import com.delivery.project.system.domain.SysUser; /** * 用户 业务层 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysConfigServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysConfigServiceImpl.java index a8fa2bc..56f5d6f 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysConfigServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysConfigServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.Collection; import java.util.List; import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.CacheConstants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.redis.RedisCache; -import com.ruoyi.project.system.domain.SysConfig; -import com.ruoyi.project.system.mapper.SysConfigMapper; -import com.ruoyi.project.system.service.ISysConfigService; +import com.delivery.common.constant.CacheConstants; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.core.text.Convert; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.redis.RedisCache; +import com.delivery.project.system.domain.SysConfig; +import com.delivery.project.system.mapper.SysConfigMapper; +import com.delivery.project.system.service.ISysConfigService; /** * 参数配置 服务层实现 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysDeptServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysDeptServiceImpl.java index 2cca629..aefce76 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysDeptServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.ArrayList; import java.util.Iterator; @@ -6,20 +6,20 @@ import java.util.List; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataScope; -import com.ruoyi.framework.web.domain.TreeSelect; -import com.ruoyi.project.system.domain.SysDept; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.mapper.SysDeptMapper; -import com.ruoyi.project.system.mapper.SysRoleMapper; -import com.ruoyi.project.system.service.ISysDeptService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.core.text.Convert; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.framework.aspectj.lang.annotation.DataScope; +import com.delivery.framework.web.domain.TreeSelect; +import com.delivery.project.system.domain.SysDept; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.mapper.SysDeptMapper; +import com.delivery.project.system.mapper.SysRoleMapper; +import com.delivery.project.system.service.ISysDeptService; /** * 部门管理 服务实现 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysDictDataServiceImpl.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysDictDataServiceImpl.java index 111df9e..8549a0d 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysDictDataServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.project.system.domain.SysDictData; -import com.ruoyi.project.system.mapper.SysDictDataMapper; -import com.ruoyi.project.system.service.ISysDictDataService; +import com.delivery.common.utils.DictUtils; +import com.delivery.project.system.domain.SysDictData; +import com.delivery.project.system.mapper.SysDictDataMapper; +import com.delivery.project.system.service.ISysDictDataService; /** * 字典 业务层处理 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysDictTypeServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysDictTypeServiceImpl.java index fe6380f..cda72e5 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysDictTypeServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.Comparator; import java.util.List; @@ -8,15 +8,15 @@ import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.DictUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.system.domain.SysDictData; -import com.ruoyi.project.system.domain.SysDictType; -import com.ruoyi.project.system.mapper.SysDictDataMapper; -import com.ruoyi.project.system.mapper.SysDictTypeMapper; -import com.ruoyi.project.system.service.ISysDictTypeService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.DictUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.project.system.domain.SysDictData; +import com.delivery.project.system.domain.SysDictType; +import com.delivery.project.system.mapper.SysDictDataMapper; +import com.delivery.project.system.mapper.SysDictTypeMapper; +import com.delivery.project.system.service.ISysDictTypeService; /** * 字典 业务层处理 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysMenuServiceImpl.java index 086eccd..f0db547 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysMenuServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysMenuServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -10,20 +10,20 @@ import java.util.Set; import java.util.stream.Collectors; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.TreeSelect; -import com.ruoyi.project.system.domain.SysMenu; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.domain.vo.MetaVo; -import com.ruoyi.project.system.domain.vo.RouterVo; -import com.ruoyi.project.system.mapper.SysMenuMapper; -import com.ruoyi.project.system.mapper.SysRoleMapper; -import com.ruoyi.project.system.mapper.SysRoleMenuMapper; -import com.ruoyi.project.system.service.ISysMenuService; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.web.domain.TreeSelect; +import com.delivery.project.system.domain.SysMenu; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.domain.vo.MetaVo; +import com.delivery.project.system.domain.vo.RouterVo; +import com.delivery.project.system.mapper.SysMenuMapper; +import com.delivery.project.system.mapper.SysRoleMapper; +import com.delivery.project.system.mapper.SysRoleMenuMapper; +import com.delivery.project.system.service.ISysMenuService; /** * 菜单 业务层处理 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysNoticeServiceImpl.java similarity index 88% rename from src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysNoticeServiceImpl.java index 2e9bf00..96eb818 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysNoticeServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysNoticeServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.project.system.domain.SysNotice; -import com.ruoyi.project.system.mapper.SysNoticeMapper; -import com.ruoyi.project.system.service.ISysNoticeService; +import com.delivery.project.system.domain.SysNotice; +import com.delivery.project.system.mapper.SysNoticeMapper; +import com.delivery.project.system.service.ISysNoticeService; /** * 公告 服务层实现 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysPostServiceImpl.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysPostServiceImpl.java index 49640c8..8679315 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysPostServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.system.domain.SysPost; -import com.ruoyi.project.system.mapper.SysPostMapper; -import com.ruoyi.project.system.mapper.SysUserPostMapper; -import com.ruoyi.project.system.service.ISysPostService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.StringUtils; +import com.delivery.project.system.domain.SysPost; +import com.delivery.project.system.mapper.SysPostMapper; +import com.delivery.project.system.mapper.SysUserPostMapper; +import com.delivery.project.system.service.ISysPostService; /** * 岗位信息 服务层处理 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysRoleServiceImpl.java similarity index 91% rename from src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysRoleServiceImpl.java index ee093f5..9e6d081 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysRoleServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.ArrayList; import java.util.Arrays; @@ -8,22 +8,22 @@ import java.util.Set; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataScope; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysRoleDept; -import com.ruoyi.project.system.domain.SysRoleMenu; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.domain.SysUserRole; -import com.ruoyi.project.system.mapper.SysRoleDeptMapper; -import com.ruoyi.project.system.mapper.SysRoleMapper; -import com.ruoyi.project.system.mapper.SysRoleMenuMapper; -import com.ruoyi.project.system.mapper.SysUserRoleMapper; -import com.ruoyi.project.system.service.ISysRoleService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.framework.aspectj.lang.annotation.DataScope; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysRoleDept; +import com.delivery.project.system.domain.SysRoleMenu; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.domain.SysUserRole; +import com.delivery.project.system.mapper.SysRoleDeptMapper; +import com.delivery.project.system.mapper.SysRoleMapper; +import com.delivery.project.system.mapper.SysRoleMenuMapper; +import com.delivery.project.system.mapper.SysUserRoleMapper; +import com.delivery.project.system.service.ISysRoleService; /** * 角色 业务层处理 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysUserOnlineServiceImpl.java similarity index 90% rename from src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysUserOnlineServiceImpl.java index de38b5f..8b5ffb6 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserOnlineServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import org.springframework.stereotype.Service; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.security.LoginUser; -import com.ruoyi.project.monitor.domain.SysUserOnline; -import com.ruoyi.project.system.service.ISysUserOnlineService; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.security.LoginUser; +import com.delivery.project.monitor.domain.SysUserOnline; +import com.delivery.project.system.service.ISysUserOnlineService; /** * 在线用户 服务层处理 diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java b/src/main/java/com/delivery/project/system/service/impl/SysUserServiceImpl.java similarity index 92% rename from src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java rename to src/main/java/com/delivery/project/system/service/impl/SysUserServiceImpl.java index fdbab93..4beb01d 100644 --- a/src/main/java/com/ruoyi/project/system/service/impl/SysUserServiceImpl.java +++ b/src/main/java/com/delivery/project/system/service/impl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.system.service.impl; +package com.delivery.project.system.service.impl; import java.util.ArrayList; import java.util.Date; @@ -11,26 +11,26 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.bean.BeanValidators; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.aspectj.lang.annotation.DataScope; -import com.ruoyi.project.system.domain.SysPost; -import com.ruoyi.project.system.domain.SysRole; -import com.ruoyi.project.system.domain.SysUser; -import com.ruoyi.project.system.domain.SysUserPost; -import com.ruoyi.project.system.domain.SysUserRole; -import com.ruoyi.project.system.mapper.SysPostMapper; -import com.ruoyi.project.system.mapper.SysRoleMapper; -import com.ruoyi.project.system.mapper.SysUserMapper; -import com.ruoyi.project.system.mapper.SysUserPostMapper; -import com.ruoyi.project.system.mapper.SysUserRoleMapper; -import com.ruoyi.project.system.service.ISysConfigService; -import com.ruoyi.project.system.service.ISysDeptService; -import com.ruoyi.project.system.service.ISysUserService; +import com.delivery.common.constant.UserConstants; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.common.utils.bean.BeanValidators; +import com.delivery.common.utils.spring.SpringUtils; +import com.delivery.framework.aspectj.lang.annotation.DataScope; +import com.delivery.project.system.domain.SysPost; +import com.delivery.project.system.domain.SysRole; +import com.delivery.project.system.domain.SysUser; +import com.delivery.project.system.domain.SysUserPost; +import com.delivery.project.system.domain.SysUserRole; +import com.delivery.project.system.mapper.SysPostMapper; +import com.delivery.project.system.mapper.SysRoleMapper; +import com.delivery.project.system.mapper.SysUserMapper; +import com.delivery.project.system.mapper.SysUserPostMapper; +import com.delivery.project.system.mapper.SysUserRoleMapper; +import com.delivery.project.system.service.ISysConfigService; +import com.delivery.project.system.service.ISysDeptService; +import com.delivery.project.system.service.ISysUserService; /** * 用户 业务层处理 diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/delivery/project/tool/gen/controller/GenController.java similarity index 91% rename from src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java rename to src/main/java/com/delivery/project/tool/gen/controller/GenController.java index 8ffd7cb..2764c9e 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java +++ b/src/main/java/com/delivery/project/tool/gen/controller/GenController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.gen.controller; +package com.delivery.project.tool.gen.controller; import java.io.IOException; import java.util.ArrayList; @@ -22,19 +22,19 @@ import com.alibaba.druid.DbType; import com.alibaba.druid.sql.SQLUtils; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.sql.SqlUtil; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; -import com.ruoyi.framework.config.GenConfig; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.page.TableDataInfo; -import com.ruoyi.project.tool.gen.domain.GenTable; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; -import com.ruoyi.project.tool.gen.service.IGenTableColumnService; -import com.ruoyi.project.tool.gen.service.IGenTableService; +import com.delivery.common.core.text.Convert; +import com.delivery.common.utils.SecurityUtils; +import com.delivery.common.utils.sql.SqlUtil; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.config.GenConfig; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.framework.web.page.TableDataInfo; +import com.delivery.project.tool.gen.domain.GenTable; +import com.delivery.project.tool.gen.domain.GenTableColumn; +import com.delivery.project.tool.gen.service.IGenTableColumnService; +import com.delivery.project.tool.gen.service.IGenTableService; /** * 代码生成 操作处理 diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java b/src/main/java/com/delivery/project/tool/gen/domain/GenTable.java similarity index 97% rename from src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java rename to src/main/java/com/delivery/project/tool/gen/domain/GenTable.java index 8905ab9..87fd545 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java +++ b/src/main/java/com/delivery/project/tool/gen/domain/GenTable.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.tool.gen.domain; +package com.delivery.project.tool.gen.domain; import java.util.List; import javax.validation.Valid; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.ArrayUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.common.constant.GenConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.web.domain.BaseEntity; /** * 业务表 gen_table diff --git a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java b/src/main/java/com/delivery/project/tool/gen/domain/GenTableColumn.java similarity index 98% rename from src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java rename to src/main/java/com/delivery/project/tool/gen/domain/GenTableColumn.java index cf275fe..61c723c 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/domain/GenTableColumn.java +++ b/src/main/java/com/delivery/project/tool/gen/domain/GenTableColumn.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.tool.gen.domain; +package com.delivery.project.tool.gen.domain; import javax.validation.constraints.NotBlank; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.web.domain.BaseEntity; /** * 代码生成业务字段表 gen_table_column diff --git a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java b/src/main/java/com/delivery/project/tool/gen/mapper/GenTableColumnMapper.java similarity index 92% rename from src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java rename to src/main/java/com/delivery/project/tool/gen/mapper/GenTableColumnMapper.java index 0124c7b..19f3bd1 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableColumnMapper.java +++ b/src/main/java/com/delivery/project/tool/gen/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.tool.gen.mapper; +package com.delivery.project.tool.gen.mapper; import java.util.List; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; +import com.delivery.project.tool.gen.domain.GenTableColumn; /** * 业务字段 数据层 diff --git a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java b/src/main/java/com/delivery/project/tool/gen/mapper/GenTableMapper.java similarity index 94% rename from src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java rename to src/main/java/com/delivery/project/tool/gen/mapper/GenTableMapper.java index b574de9..771903c 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/mapper/GenTableMapper.java +++ b/src/main/java/com/delivery/project/tool/gen/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.tool.gen.mapper; +package com.delivery.project.tool.gen.mapper; import java.util.List; -import com.ruoyi.project.tool.gen.domain.GenTable; +import com.delivery.project.tool.gen.domain.GenTable; /** * 业务 数据层 diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java b/src/main/java/com/delivery/project/tool/gen/service/GenTableColumnServiceImpl.java similarity index 86% rename from src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java rename to src/main/java/com/delivery/project/tool/gen/service/GenTableColumnServiceImpl.java index 446a0df..35e6cc4 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableColumnServiceImpl.java +++ b/src/main/java/com/delivery/project/tool/gen/service/GenTableColumnServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.project.tool.gen.service; +package com.delivery.project.tool.gen.service; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.ruoyi.common.core.text.Convert; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; -import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper; +import com.delivery.common.core.text.Convert; +import com.delivery.project.tool.gen.domain.GenTableColumn; +import com.delivery.project.tool.gen.mapper.GenTableColumnMapper; /** * 业务字段 服务层实现 diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java b/src/main/java/com/delivery/project/tool/gen/service/GenTableServiceImpl.java similarity index 95% rename from src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java rename to src/main/java/com/delivery/project/tool/gen/service/GenTableServiceImpl.java index f03537f..639cb1e 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/GenTableServiceImpl.java +++ b/src/main/java/com/delivery/project/tool/gen/service/GenTableServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.gen.service; +package com.delivery.project.tool.gen.service; import java.io.ByteArrayOutputStream; import java.io.File; @@ -23,18 +23,18 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.text.CharsetKit; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.tool.gen.domain.GenTable; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; -import com.ruoyi.project.tool.gen.mapper.GenTableColumnMapper; -import com.ruoyi.project.tool.gen.mapper.GenTableMapper; -import com.ruoyi.project.tool.gen.util.GenUtils; -import com.ruoyi.project.tool.gen.util.VelocityInitializer; -import com.ruoyi.project.tool.gen.util.VelocityUtils; +import com.delivery.common.constant.Constants; +import com.delivery.common.constant.GenConstants; +import com.delivery.common.core.text.CharsetKit; +import com.delivery.common.exception.ServiceException; +import com.delivery.common.utils.StringUtils; +import com.delivery.project.tool.gen.domain.GenTable; +import com.delivery.project.tool.gen.domain.GenTableColumn; +import com.delivery.project.tool.gen.mapper.GenTableColumnMapper; +import com.delivery.project.tool.gen.mapper.GenTableMapper; +import com.delivery.project.tool.gen.util.GenUtils; +import com.delivery.project.tool.gen.util.VelocityInitializer; +import com.delivery.project.tool.gen.util.VelocityUtils; /** * 业务 服务层实现 diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java b/src/main/java/com/delivery/project/tool/gen/service/IGenTableColumnService.java similarity index 89% rename from src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java rename to src/main/java/com/delivery/project/tool/gen/service/IGenTableColumnService.java index d87b023..a33a123 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableColumnService.java +++ b/src/main/java/com/delivery/project/tool/gen/service/IGenTableColumnService.java @@ -1,7 +1,7 @@ -package com.ruoyi.project.tool.gen.service; +package com.delivery.project.tool.gen.service; import java.util.List; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; +import com.delivery.project.tool.gen.domain.GenTableColumn; /** * 业务字段 服务层 diff --git a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java b/src/main/java/com/delivery/project/tool/gen/service/IGenTableService.java similarity index 96% rename from src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java rename to src/main/java/com/delivery/project/tool/gen/service/IGenTableService.java index 845e49e..d993a6d 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/service/IGenTableService.java +++ b/src/main/java/com/delivery/project/tool/gen/service/IGenTableService.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.tool.gen.service; +package com.delivery.project.tool.gen.service; import java.util.List; import java.util.Map; -import com.ruoyi.project.tool.gen.domain.GenTable; +import com.delivery.project.tool.gen.domain.GenTable; /** * 业务 服务层 diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java b/src/main/java/com/delivery/project/tool/gen/util/GenUtils.java similarity index 96% rename from src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java rename to src/main/java/com/delivery/project/tool/gen/util/GenUtils.java index e107a9b..73675e8 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/GenUtils.java +++ b/src/main/java/com/delivery/project/tool/gen/util/GenUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.project.tool.gen.util; +package com.delivery.project.tool.gen.util; import java.util.Arrays; import org.apache.commons.lang3.RegExUtils; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.GenConfig; -import com.ruoyi.project.tool.gen.domain.GenTable; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; +import com.delivery.common.constant.GenConstants; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.config.GenConfig; +import com.delivery.project.tool.gen.domain.GenTable; +import com.delivery.project.tool.gen.domain.GenTableColumn; /** * 代码生成器 工具类 diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java b/src/main/java/com/delivery/project/tool/gen/util/VelocityInitializer.java similarity index 89% rename from src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java rename to src/main/java/com/delivery/project/tool/gen/util/VelocityInitializer.java index 578b4fa..26a410d 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityInitializer.java +++ b/src/main/java/com/delivery/project/tool/gen/util/VelocityInitializer.java @@ -1,8 +1,8 @@ -package com.ruoyi.project.tool.gen.util; +package com.delivery.project.tool.gen.util; import java.util.Properties; import org.apache.velocity.app.Velocity; -import com.ruoyi.common.constant.Constants; +import com.delivery.common.constant.Constants; /** * VelocityEngine工厂 diff --git a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java b/src/main/java/com/delivery/project/tool/gen/util/VelocityUtils.java similarity index 97% rename from src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java rename to src/main/java/com/delivery/project/tool/gen/util/VelocityUtils.java index 9a632d7..236b1c1 100644 --- a/src/main/java/com/ruoyi/project/tool/gen/util/VelocityUtils.java +++ b/src/main/java/com/delivery/project/tool/gen/util/VelocityUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.gen.util; +package com.delivery.project.tool.gen.util; import java.util.ArrayList; import java.util.HashSet; @@ -7,11 +7,11 @@ import java.util.Set; import org.apache.velocity.VelocityContext; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.tool.gen.domain.GenTable; -import com.ruoyi.project.tool.gen.domain.GenTableColumn; +import com.delivery.common.constant.GenConstants; +import com.delivery.common.utils.DateUtils; +import com.delivery.common.utils.StringUtils; +import com.delivery.project.tool.gen.domain.GenTable; +import com.delivery.project.tool.gen.domain.GenTableColumn; /** * 模板处理工具类 diff --git a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java b/src/main/java/com/delivery/project/tool/swagger/TestController.java similarity index 96% rename from src/main/java/com/ruoyi/project/tool/swagger/TestController.java rename to src/main/java/com/delivery/project/tool/swagger/TestController.java index 3bd01cf..1ed2ae7 100644 --- a/src/main/java/com/ruoyi/project/tool/swagger/TestController.java +++ b/src/main/java/com/delivery/project/tool/swagger/TestController.java @@ -1,4 +1,4 @@ -package com.ruoyi.project.tool.swagger; +package com.delivery.project.tool.swagger; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.R; +import com.delivery.common.utils.StringUtils; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.R; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java deleted file mode 100644 index b05ffce..0000000 --- a/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.ruoyi.framework.config; - -import java.util.ArrayList; -import java.util.List; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.ApiKey; -import springfox.documentation.service.AuthorizationScope; -import springfox.documentation.service.Contact; -import springfox.documentation.service.SecurityReference; -import springfox.documentation.service.SecurityScheme; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; - -/** - * Swagger2的接口配置 - * - * @author ruoyi - */ -@Configuration -public class SwaggerConfig -{ - /** 系统基础配置 */ - @Autowired - private RuoYiConfig ruoyiConfig; - - /** 是否开启swagger */ - @Value("${swagger.enabled}") - private boolean enabled; - - /** 设置请求的统一前缀 */ - @Value("${swagger.pathMapping}") - private String pathMapping; - - /** - * 创建API - */ - @Bean - public Docket createRestApi() - { - return new Docket(DocumentationType.OAS_30) - // 是否启用Swagger - .enable(enabled) - // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） - .apiInfo(apiInfo()) - // 设置哪些接口暴露给Swagger展示 - .select() - // 扫描所有有注解的api，用这种方式更灵活 - .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) - // 扫描指定包中的swagger注解 - // .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger")) - // 扫描所有 .apis(RequestHandlerSelectors.any()) - .paths(PathSelectors.any()) - .build() - /* 设置安全模式，swagger可以设置访问token */ - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()) - .pathMapping(pathMapping); - } - - /** - * 安全模式，这里指定token通过Authorization头请求头传递 - */ - private List securitySchemes() - { - List apiKeyList = new ArrayList(); - apiKeyList.add(new ApiKey("Authorization", "Authorization", In.HEADER.toValue())); - return apiKeyList; - } - - /** - * 安全上下文 - */ - private List securityContexts() - { - List securityContexts = new ArrayList<>(); - securityContexts.add( - SecurityContext.builder() - .securityReferences(defaultAuth()) - .operationSelector(o -> o.requestMappingPattern().matches("/.*")) - .build()); - return securityContexts; - } - - /** - * 默认的安全上引用 - */ - private List defaultAuth() - { - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - List securityReferences = new ArrayList<>(); - securityReferences.add(new SecurityReference("Authorization", authorizationScopes)); - return securityReferences; - } - - /** - * 添加摘要信息 - */ - private ApiInfo apiInfo() - { - // 用ApiInfoBuilder进行定制 - return new ApiInfoBuilder() - // 设置标题 - .title("标题：若依管理系统_接口文档") - // 描述 - .description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") - // 作者信息 - .contact(new Contact(ruoyiConfig.getName(), null, null)) - // 版本 - .version("版本号:" + ruoyiConfig.getVersion()) - .build(); - } -} diff --git a/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java b/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java deleted file mode 100644 index 5b587e2..0000000 --- a/src/main/java/com/ruoyi/project/system/controller/SysIndexController.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.project.system.controller; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.RuoYiConfig; - -/** - * 首页 - * - * @author ruoyi - */ -@RestController -public class SysIndexController -{ - /** 系统基础配置 */ - @Autowired - private RuoYiConfig ruoyiConfig; - - /** - * 访问首页，提示语 - */ - @RequestMapping("/") - public String index() - { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); - } -} diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml index 1fa1583..fd4ac1a 100644 --- a/src/main/resources/application-druid.yml +++ b/src/main/resources/application-druid.yml @@ -6,7 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.1.20:3306/delivery?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://192.168.1.28:3306/delivery?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai +# url: jdbc:mysql://192.168.1.28:3306/delivery?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: shzg # 从库数据源 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 61d83bc..29bcd8c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,13 +1,13 @@ # 项目相关配置 -ruoyi: +delivery: # 名称 - name: RuoYi + name: Delivery # 版本 version: 3.9.0 # 版权年份 copyrightYear: 2025 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + # 文件路径 示例（ Windows配置D:/delivery/uploadPath，Linux配置 /home/delivery/uploadPath） + profile: D:/delivery/uploadPath # 获取ip地址开关 addressEnabled: false # 验证码类型 math 数字计算 char 字符验证 @@ -15,95 +15,65 @@ ruoyi: # 开发环境配置 server: - # 服务器的HTTP端口，默认为8080 port: 8080 servlet: - # 应用的访问路径 context-path: / tomcat: - # tomcat的URI编码 uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 accept-count: 1000 threads: - # tomcat最大线程数，默认为200 max: 800 - # Tomcat启动初始化的线程数，默认值10 min-spare: 100 # 日志配置 logging: level: - com.ruoyi: debug + com.delivery: debug org.springframework: warn # 用户配置 user: password: - # 密码最大错误次数 maxRetryCount: 5 - # 密码锁定时间（默认10分钟） lockTime: 10 # Spring配置 spring: - # 资源信息 messages: - # 国际化资源文件路径 basename: i18n/messages profiles: active: druid - # 文件上传 servlet: multipart: - # 单个文件大小 max-file-size: 10MB - # 设置总上传的文件大小 max-request-size: 20MB - # 服务模块 devtools: restart: - # 热部署开关 enabled: true - # redis 配置 redis: - # 地址 - host: localhost - # 端口，默认为6379 + host: 192.168.1.28 port: 6379 - # 数据库索引 database: 0 - # 密码 password: - # 连接超时时间 timeout: 10s lettuce: pool: - # 连接池中的最小空闲连接 min-idle: 0 - # 连接池中的最大空闲连接 max-idle: 8 - # 连接池的最大数据库连接数 max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） max-wait: -1ms # token配置 token: - # 令牌自定义标识 header: Authorization - # 令牌密钥 secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） expireTime: 30 - + # MyBatis配置 mybatis: # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.project.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 + typeAliasesPackage: com.delivery.project.**.domain mapperLocations: classpath*:mybatis/**/*Mapper.xml - # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml # PageHelper分页插件 @@ -114,36 +84,26 @@ pagehelper: # Swagger配置 swagger: - # 是否开启swagger enabled: true - # 请求前缀 pathMapping: /dev-api # 防盗链配置 referer: - # 防盗链开关 enabled: false - # 允许的域名列表 - allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip + # 建议替换为你自己的域名白名单 + allowed-domains: localhost,127.0.0.1,delivery.vip,www.delivery.vip # 防止XSS攻击 xss: - # 过滤开关 enabled: true - # 排除链接（多个用逗号分隔） excludes: /system/notice - # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* # 代码生成 gen: - # 作者 - author: ruoyi - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.project.system - # 自动去除表前缀，默认是true + author: delivery + # 默认生成包路径（包名已改） + packageName: com.delivery.project.system autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） tablePrefix: sys_ - # 是否允许生成文件覆盖到本地（自定义路径），默认不允许 - allowOverwrite: false \ No newline at end of file + allowOverwrite: false diff --git a/src/main/resources/banner.txt b/src/main/resources/banner.txt index 0931cb8..1238fa6 100644 --- a/src/main/resources/banner.txt +++ b/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi.version} +Application Version: ${delivery.version} Spring Boot Version: ${spring-boot.version} //////////////////////////////////////////////////////////////////// // _ooOoo_ // diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index a360583..5fb3b68 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -72,7 +72,7 @@ - + diff --git a/src/main/resources/mybatis/monitor/SysLogininforMapper.xml b/src/main/resources/mybatis/monitor/SysLogininforMapper.xml index 9e92f59..9637215 100644 --- a/src/main/resources/mybatis/monitor/SysLogininforMapper.xml +++ b/src/main/resources/mybatis/monitor/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/monitor/SysOperLogMapper.xml b/src/main/resources/mybatis/monitor/SysOperLogMapper.xml index dd5a44a..8cf28ca 100644 --- a/src/main/resources/mybatis/monitor/SysOperLogMapper.xml +++ b/src/main/resources/mybatis/monitor/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysConfigMapper.xml b/src/main/resources/mybatis/system/SysConfigMapper.xml index 4b6ec73..c0b2f3b 100644 --- a/src/main/resources/mybatis/system/SysConfigMapper.xml +++ b/src/main/resources/mybatis/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysDeptMapper.xml b/src/main/resources/mybatis/system/SysDeptMapper.xml index d361cdc..b75d6c0 100644 --- a/src/main/resources/mybatis/system/SysDeptMapper.xml +++ b/src/main/resources/mybatis/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysDictDataMapper.xml b/src/main/resources/mybatis/system/SysDictDataMapper.xml index 3e94965..d028173 100644 --- a/src/main/resources/mybatis/system/SysDictDataMapper.xml +++ b/src/main/resources/mybatis/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysDictTypeMapper.xml b/src/main/resources/mybatis/system/SysDictTypeMapper.xml index 6763467..c6cd5e3 100644 --- a/src/main/resources/mybatis/system/SysDictTypeMapper.xml +++ b/src/main/resources/mybatis/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysJobLogMapper.xml b/src/main/resources/mybatis/system/SysJobLogMapper.xml index 11d9a73..4ec2fe2 100644 --- a/src/main/resources/mybatis/system/SysJobLogMapper.xml +++ b/src/main/resources/mybatis/system/SysJobLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysJobMapper.xml b/src/main/resources/mybatis/system/SysJobMapper.xml index 47f61c9..65abcd7 100644 --- a/src/main/resources/mybatis/system/SysJobMapper.xml +++ b/src/main/resources/mybatis/system/SysJobMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysMenuMapper.xml b/src/main/resources/mybatis/system/SysMenuMapper.xml index a41eda1..2d3eb3c 100644 --- a/src/main/resources/mybatis/system/SysMenuMapper.xml +++ b/src/main/resources/mybatis/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysNoticeMapper.xml b/src/main/resources/mybatis/system/SysNoticeMapper.xml index 33c37a7..3f53cf2 100644 --- a/src/main/resources/mybatis/system/SysNoticeMapper.xml +++ b/src/main/resources/mybatis/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysPostMapper.xml b/src/main/resources/mybatis/system/SysPostMapper.xml index 23e7c14..25461cf 100644 --- a/src/main/resources/mybatis/system/SysPostMapper.xml +++ b/src/main/resources/mybatis/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysRoleDeptMapper.xml b/src/main/resources/mybatis/system/SysRoleDeptMapper.xml index 23d2cb5..68fc224 100644 --- a/src/main/resources/mybatis/system/SysRoleDeptMapper.xml +++ b/src/main/resources/mybatis/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysRoleMapper.xml b/src/main/resources/mybatis/system/SysRoleMapper.xml index 7d661aa..eb9a347 100644 --- a/src/main/resources/mybatis/system/SysRoleMapper.xml +++ b/src/main/resources/mybatis/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysRoleMenuMapper.xml b/src/main/resources/mybatis/system/SysRoleMenuMapper.xml index bf32088..ec82f59 100644 --- a/src/main/resources/mybatis/system/SysRoleMenuMapper.xml +++ b/src/main/resources/mybatis/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysUserMapper.xml b/src/main/resources/mybatis/system/SysUserMapper.xml index 0f3b2b0..7aa5514 100644 --- a/src/main/resources/mybatis/system/SysUserMapper.xml +++ b/src/main/resources/mybatis/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysUserPostMapper.xml b/src/main/resources/mybatis/system/SysUserPostMapper.xml index d048078..b0e77b2 100644 --- a/src/main/resources/mybatis/system/SysUserPostMapper.xml +++ b/src/main/resources/mybatis/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/system/SysUserRoleMapper.xml b/src/main/resources/mybatis/system/SysUserRoleMapper.xml index d7324eb..753eb70 100644 --- a/src/main/resources/mybatis/system/SysUserRoleMapper.xml +++ b/src/main/resources/mybatis/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/tool/GenTableColumnMapper.xml b/src/main/resources/mybatis/tool/GenTableColumnMapper.xml index 450f89c..fbc79f9 100644 --- a/src/main/resources/mybatis/tool/GenTableColumnMapper.xml +++ b/src/main/resources/mybatis/tool/GenTableColumnMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/mybatis/tool/GenTableMapper.xml b/src/main/resources/mybatis/tool/GenTableMapper.xml index c84400d..4e78ada 100644 --- a/src/main/resources/mybatis/tool/GenTableMapper.xml +++ b/src/main/resources/mybatis/tool/GenTableMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm index f72e991..36b0811 100644 --- a/src/main/resources/vm/java/controller.java.vm +++ b/src/main/resources/vm/java/controller.java.vm @@ -12,15 +12,15 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.ruoyi.framework.aspectj.lang.annotation.Log; -import com.ruoyi.framework.aspectj.lang.enums.BusinessType; +import com.delivery.framework.aspectj.lang.annotation.Log; +import com.delivery.framework.aspectj.lang.enums.BusinessType; import ${packageName}.domain.${ClassName}; import ${packageName}.service.I${ClassName}Service; -import com.ruoyi.framework.web.controller.BaseController; -import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.delivery.framework.web.controller.BaseController; +import com.delivery.framework.web.domain.AjaxResult; +import com.delivery.common.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.ruoyi.framework.web.page.TableDataInfo; +import com.delivery.framework.web.page.TableDataInfo; #elseif($table.tree) #end diff --git a/src/main/resources/vm/java/domain.java.vm b/src/main/resources/vm/java/domain.java.vm index 389c877..955aca6 100644 --- a/src/main/resources/vm/java/domain.java.vm +++ b/src/main/resources/vm/java/domain.java.vm @@ -3,13 +3,9 @@ package ${packageName}.domain; #foreach ($import in $importList) import ${import}; #end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; +import com.delivery.framework.aspectj.lang.annotation.Excel; #if($table.crud || $table.sub) -import com.ruoyi.framework.web.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.framework.web.domain.TreeEntity; #end /** diff --git a/src/main/resources/vm/java/serviceImpl.java.vm b/src/main/resources/vm/java/serviceImpl.java.vm index 14746e1..08906bc 100644 --- a/src/main/resources/vm/java/serviceImpl.java.vm +++ b/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import java.util.List; #foreach ($column in $columns) #if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.ruoyi.common.utils.DateUtils; +import com.delivery.common.utils.DateUtils; #break #end #end @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; #if($table.sub) import java.util.ArrayList; -import com.ruoyi.common.utils.StringUtils; +import com.delivery.common.utils.StringUtils; import org.springframework.transaction.annotation.Transactional; import ${packageName}.domain.${subClassName}; #end diff --git a/src/main/resources/vm/java/sub-domain.java.vm b/src/main/resources/vm/java/sub-domain.java.vm index 86e7568..41a6c04 100644 --- a/src/main/resources/vm/java/sub-domain.java.vm +++ b/src/main/resources/vm/java/sub-domain.java.vm @@ -3,10 +3,7 @@ package ${packageName}.domain; #foreach ($import in $subImportList) import ${import}; #end -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.ruoyi.framework.aspectj.lang.annotation.Excel; -import com.ruoyi.framework.web.domain.BaseEntity; +import com.delivery.framework.aspectj.lang.annotation.Excel; /** * ${subTable.functionName}对象 ${subTableName}