diff --git a/LICENSE b/LICENSE index 32b307112..4019c3a4e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2019 RuoYi-Vue-Plus +Copyright (c) 2019 wild-vue-plus Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/README.md b/README.md index 7004f0e50..e48cec701 100644 --- a/README.md +++ b/README.md @@ -4,22 +4,22 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-3.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/ruoyi_Vue_Plus-3.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.5-blue.svg)]() [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]() [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]() -> RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 `分布式集群` 场景升级(不兼容原框架) +> RuoYi-Vue-Plus 是基于 ruoyi-Vue 针对 `分布式集群` 场景升级(不兼容原框架) > 系统演示: [传送门](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/系统演示?sort_id=4836388) | 功能介绍 | 使用技术 | 文档地址 | 特性注意事项 | |---|---|---|---| -| 当前框架 | RuoYi-Vue-Plus | [RuoYi-Vue-Plus文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) | 重写RuoYi-Vue全方位升级(不兼容原框架) | +| 当前框架 | RuoYi-Vue-Plus | [RuoYi-Vue-Plus文档](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) | 重写ruoyi-Vue全方位升级(不兼容原框架) | | satoken分支 | RuoYi-Vue-Plus-satoken | [satoken分支地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/) | 使用satoken重构权限鉴权(公测 可尝试上生产) | | 单体分支 | RuoYi-Vue-Plus-fast | [fast分支地址](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/) | 单体应用结构 | -| 原框架 | RuoYi-Vue | [RuoYi-Vue官网](http://ruoyi.vip/) | 定期同步需要的功能 | +| 原框架 | ruoyi-Vue | [ruoyi-Vue官网](http://ruoyi.vip/) | 定期同步需要的功能 | | 前端开发框架 | Vue、Element UI | [Element UI官网](https://element.eleme.cn/#/zh-CN) | | | 后端开发框架 | SpringBoot | [SpringBoot官网](https://spring.io/projects/spring-boot/#learn) | | | 容器框架 | Undertow | [Undertow官网](https://undertow.io/) | 基于 Netty 的高性能容器 | @@ -71,7 +71,7 @@ ### 其他 -* 同步升级 RuoYi-Vue +* 同步升级 ruoyi-Vue * GitHub 地址 [RuoYi-Vue-Plus-github](https://github.com/JavaLionLi/RuoYi-Vue-Plus) * 单模块 fast 分支 [RuoYi-Vue-Plus-fast](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/fast/) * satoken 分支 [RuoYi-Vue-Plus-satoken](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/) diff --git a/pom.xml b/pom.xml index 4dd51662f..79b1dae0a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,16 +4,16 @@ 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-vue-plus + com.wild + wild-vue-plus 3.4.0 - RuoYi-Vue-Plus - https://gitee.com/JavaLionLi/RuoYi-Vue-Plus - RuoYi-Vue-Plus后台管理系统 + wild-vue-plus + https://gitee.com/JavaLionLi/wild-vue-plus + wild-vue-plus后台管理系统 - 3.4.0 + 3.4.0 2.5.7 UTF-8 UTF-8 @@ -49,7 +49,7 @@ localhost http://${docker.registry.url}:2375 - ruoyi + wild 1.2.2 @@ -232,66 +232,66 @@ - com.ruoyi - ruoyi-job - ${ruoyi-vue-plus.version} + com.wild + wild-job + ${wild-vue-plus.version} - com.ruoyi - ruoyi-generator - ${ruoyi-vue-plus.version} + com.wild + wild-generator + ${wild-vue-plus.version} - com.ruoyi - ruoyi-framework - ${ruoyi-vue-plus.version} + com.wild + wild-framework + ${wild-vue-plus.version} - com.ruoyi - ruoyi-system - ${ruoyi-vue-plus.version} + com.wild + wild-system + ${wild-vue-plus.version} - com.ruoyi - ruoyi-common - ${ruoyi-vue-plus.version} + com.wild + wild-common + ${wild-vue-plus.version} - com.ruoyi - ruoyi-oss - ${ruoyi-vue-plus.version} + com.wild + wild-oss + ${wild-vue-plus.version} - com.ruoyi - ruoyi-demo - ${ruoyi-vue-plus.version} + com.wild + wild-demo + ${wild-vue-plus.version} - ruoyi-admin - ruoyi-framework - ruoyi-system - ruoyi-job - ruoyi-generator - ruoyi-common - ruoyi-demo - ruoyi-extend - ruoyi-oss + wild-admin + wild-framework + wild-system + wild-job + wild-generator + wild-common + wild-demo + wild-extend + wild-oss pom diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java deleted file mode 100644 index 4239668a6..000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.controller; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java deleted file mode 100644 index e2da76563..000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.domain; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java deleted file mode 100644 index 7243da910..000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.mapper; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java deleted file mode 100644 index 6060849c9..000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.service.impl; \ No newline at end of file diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java deleted file mode 100644 index d6a44c989..000000000 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package com.ruoyi.demo.service; \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java deleted file mode 100644 index 9431389e2..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysConfig; - -/** - * 参数配置 数据层 - * - * @author Lion Li - */ -public interface SysConfigMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java deleted file mode 100644 index 7e03a2504..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; - -/** - * 字典表 数据层 - * - * @author Lion Li - */ -public interface SysDictTypeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java deleted file mode 100644 index de972ff1f..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysNotice; - -/** - * 通知公告表 数据层 - * - * @author Lion Li - */ -public interface SysNoticeMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java deleted file mode 100644 index c1c3b5411..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysOperLog; - -/** - * 操作日志 数据层 - * - * @author Lion Li - */ -public interface SysOperLogMapper extends BaseMapperPlus { - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java deleted file mode 100644 index 8eee53b63..000000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.ruoyi.system.mapper; - -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysOss; - -/** - * 文件上传 数据层 - * - * @author Lion Li - */ -public interface SysOssMapper extends BaseMapperPlus { -} diff --git a/script/bin/ry.bat b/script/bin/ry.bat index ae2494044..b3a016b67 100644 --- a/script/bin/ry.bat +++ b/script/bin/ry.bat @@ -1,21 +1,21 @@ @echo off -rem jarƽĿ¼ -set AppName=ruoyi-admin.jar +rem jar平级目录 +set AppName=wild-admin.jar -rem JVM +rem JVM参数 set JVM_OPTS="-Dname=%AppName% -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" ECHO. - ECHO. [1] %AppName% - ECHO. [2] ر%AppName% - ECHO. [3] %AppName% - ECHO. [4] ״̬ %AppName% - ECHO. [5] + ECHO. [1] 启动%AppName% + ECHO. [2] 关闭%AppName% + ECHO. [3] 重启%AppName% + ECHO. [4] 启动状态 %AppName% + ECHO. [5] 退 出 ECHO. -ECHO.ѡĿ: +ECHO.请输入选择项目的序号: set /p ID= IF "%id%"=="1" GOTO start IF "%id%"=="2" GOTO stop @@ -35,11 +35,11 @@ PAUSE start javaw %JAVA_OPTS% -jar %AppName% -echo starting +echo starting…… echo Start %AppName% success... goto:eof -rem stopͨjpspid +rem 函数stop通过jps命令查找pid并结束进程 :stop for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( set pid=%%a @@ -48,7 +48,7 @@ rem if not defined pid (echo process %AppName% does not exists) else ( echo prepare to kill %image_name% echo start kill %pid% ... - rem ݽIDkill + rem 根据进程ID，kill进程 taskkill /f /pid %pid% ) goto:eof diff --git a/script/bin/ry.sh b/script/bin/ry.sh index d6a9cf33a..b4e817273 100644 --- a/script/bin/ry.sh +++ b/script/bin/ry.sh @@ -1,6 +1,6 @@ #!/bin/sh # ./ry.sh start 启动 stop 停止 restart 重启 status 状态 -AppName=ruoyi-admin.jar +AppName=wild-admin.jar # JVM参数 JVM_OPTS="-Dname=$AppName -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:NewRatio=1 -XX:SurvivorRatio=30 -XX:+UseParallelGC -XX:+UseParallelOldGC" diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh index 1564002d1..cc6188807 100644 --- a/script/docker/deploy.sh +++ b/script/docker/deploy.sh @@ -45,17 +45,17 @@ base(){ #启动监控模块 monitor(){ - docker-compose up -d ruoyi-monitor-admin + docker-compose up -d wild-monitor-admin } #启动程序模块 start(){ - docker-compose up -d ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2 + docker-compose up -d wild-xxl-job-admin wild-server1 wild-server2 } #停止程序模块 stop(){ - docker-compose stop ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2 + docker-compose stop wild-xxl-job-admin wild-server1 wild-server2 } #关闭所有模块 diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 34c44b8d8..f78cb9b8c 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -28,7 +28,7 @@ services: privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.36 nginx-web: @@ -52,7 +52,7 @@ services: privileged: true restart: always networks: - - ruoyi_net + - wild_net redis: image: redis:6.2.6 @@ -71,7 +71,7 @@ services: privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.48 minio: @@ -86,9 +86,9 @@ services: # 时区上海 TZ: Asia/Shanghai # 管理后台用户名 - MINIO_ACCESS_KEY: ruoyi + MINIO_ACCESS_KEY: wild # 管理后台密码，最小8个字符 - MINIO_SECRET_KEY: ruoyi123 + MINIO_SECRET_KEY: wild123 volumes: # 映射当前目录下的data目录至容器内/data目录 - /docker/minio/data:/data @@ -98,71 +98,71 @@ services: privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.54 - ruoyi-server1: - image: "ruoyi/ruoyi-server:3.4.0" - container_name: ruoyi-server1 + wild-server1: + image: "wild/wild-server:3.4.0" + container_name: wild-server1 environment: # 时区上海 TZ: Asia/Shanghai volumes: # 配置文件 - - /docker/server1/logs/:/ruoyi/server/logs/ + - /docker/server1/logs/:/wild/server/logs/ privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.60 - ruoyi-server2: - image: "ruoyi/ruoyi-server:3.4.0" - container_name: ruoyi-server2 + wild-server2: + image: "wild/wild-server:3.4.0" + container_name: wild-server2 environment: # 时区上海 TZ: Asia/Shanghai volumes: # 配置文件 - - /docker/server2/logs/:/ruoyi/server/logs/ + - /docker/server2/logs/:/wild/server/logs/ privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.61 - ruoyi-monitor-admin: - image: "ruoyi/ruoyi-monitor-admin:3.4.0" - container_name: ruoyi-monitor-admin + wild-monitor-admin: + image: "wild/wild-monitor-admin:3.4.0" + container_name: wild-monitor-admin environment: # 时区上海 TZ: Asia/Shanghai volumes: # 配置文件 - - /docker/monitor/logs/:/ruoyi/monitor/logs + - /docker/monitor/logs/:/wild/monitor/logs privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.90 - ruoyi-xxl-job-admin: - image: "ruoyi/ruoyi-xxl-job-admin:3.4.0" - container_name: ruoyi-xxl-job-admin + wild-xxl-job-admin: + image: "wild/wild-xxl-job-admin:3.4.0" + container_name: wild-xxl-job-admin environment: # 时区上海 TZ: Asia/Shanghai volumes: # 配置文件 - - /docker/xxljob/logs/:/ruoyi/xxljob/logs + - /docker/xxljob/logs/:/wild/xxljob/logs privileged: true restart: always networks: - ruoyi_net: + wild_net: ipv4_address: 172.30.0.92 networks: - ruoyi_net: + wild_net: driver: bridge ipam: config: diff --git a/script/docker/redis/redis.conf b/script/docker/redis/redis.conf index 7d550e149..bc955eedd 100644 --- a/script/docker/redis/redis.conf +++ b/script/docker/redis/redis.conf @@ -1,5 +1,5 @@ # redis 密码 -# requirepass ruoyi123 +# requirepass wild123 # 配置持久化文件存储路径 dir /redis/data diff --git a/script/sql/ry_20210908.sql b/script/sql/ry_20210908.sql index 428c24a03..a66abdf82 100644 --- a/script/sql/ry_20210908.sql +++ b/script/sql/ry_20210908.sql @@ -160,7 +160,7 @@ create table sys_menu ( insert into sys_menu values('1', '系统管理', '0', '1', 'system', null, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', sysdate(), '', null, '系统管理目录'); insert into sys_menu values('2', '系统监控', '0', '2', 'monitor', null, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', sysdate(), '', null, '系统监控目录'); insert into sys_menu values('3', '系统工具', '0', '3', 'tool', null, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', sysdate(), '', null, '系统工具目录'); -insert into sys_menu values('4', 'PLUS官网', '0', '4', 'https://gitee.com/JavaLionLi/RuoYi-Vue-Plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, 'RuoYi-Vue-Plus官网地址'); +insert into sys_menu values('4', 'PLUS官网', '0', '4', 'https://gitee.com/JavaLionLi/wild-vue-plus', null, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', sysdate(), '', null, 'wild-vue-plus官网地址'); -- 二级菜单 insert into sys_menu values('100', '用户管理', '1', '1', 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', sysdate(), '', null, '用户管理菜单'); insert into sys_menu values('101', '角色管理', '1', '2', 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', sysdate(), '', null, '角色管理菜单'); @@ -680,7 +680,7 @@ create table sys_oss_config ( primary key (oss_config_id) ) engine=innodb comment='对象存储配置表'; -insert into sys_oss_config values (1, 'minio', 'ruoyi', 'ruoyi123', 'ruoyi', '', 'http://localhost:9000', 'N', '', '0', '', 'admin', sysdate(), 'admin', sysdate(), NULL); -insert into sys_oss_config values (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://XXX.XXXX.com', 'N', 'z0', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL); -insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL); -insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'ruoyi-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL); +insert into sys_oss_config values (1, 'minio', 'wild', 'wild123', 'wild', '', 'http://localhost:9000', 'N', '', '0', '', 'admin', sysdate(), 'admin', sysdate(), NULL); +insert into sys_oss_config values (2, 'qiniu', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'wild', '', 'http://XXX.XXXX.com', 'N', 'z0', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL); +insert into sys_oss_config values (3, 'aliyun', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'wild', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL); +insert into sys_oss_config values (4, 'qcloud', 'XXXXXXXXXXXXXXX', 'XXXXXXXXXXXXXXX', 'wild-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '1', '', 'admin', sysdate(), 'admin', sysdate(), NULL); diff --git a/ruoyi-admin/Dockerfile b/wild-admin/Dockerfile similarity index 52% rename from ruoyi-admin/Dockerfile rename to wild-admin/Dockerfile index 1bbd2ccf6..aa6adfd3b 100644 --- a/ruoyi-admin/Dockerfile +++ b/wild-admin/Dockerfile @@ -2,14 +2,14 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/server -RUN mkdir -p /ruoyi/server/logs -RUN mkdir -p /ruoyi/server/temp +RUN mkdir -p /wild/server +RUN mkdir -p /wild/server/logs +RUN mkdir -p /wild/server/temp -WORKDIR /ruoyi/server +WORKDIR /wild/server EXPOSE 8080 -ADD ./target/ruoyi-admin.jar ./app.jar +ADD ./target/wild-admin.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/ruoyi-admin/pom.xml b/wild-admin/pom.xml similarity index 81% rename from ruoyi-admin/pom.xml rename to wild-admin/pom.xml index 91aa0133f..82bb29dcc 100644 --- a/ruoyi-admin/pom.xml +++ b/wild-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 jar - ruoyi-admin + wild-admin web服务入口 @@ -32,35 +32,35 @@ - com.ruoyi - ruoyi-framework + com.wild + wild-framework - com.ruoyi - ruoyi-system + com.wild + wild-system - com.ruoyi - ruoyi-job + com.wild + wild-job - com.ruoyi - ruoyi-oss + com.wild + wild-oss - com.ruoyi - ruoyi-generator + com.wild + wild-generator - com.ruoyi - ruoyi-demo + com.wild + wild-demo @@ -97,7 +97,7 @@ docker-maven-plugin ${docker.plugin.version} - ${docker.namespace}/ruoyi-server:${project.version} + ${docker.namespace}/wild-server:${project.version} ${project.basedir} ${docker.registry.host} ${docker.registry.url} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/wild-admin/src/main/java/com/wild/WildApplication.java similarity index 66% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java rename to wild-admin/src/main/java/com/wild/WildApplication.java index b52d32d6e..d15cccd06 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/wild-admin/src/main/java/com/wild/WildApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.wild; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -7,18 +7,18 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt /** * 启动程序 * - * @author ruoyi + * @author wild */ @SpringBootApplication -public class RuoYiApplication { +public class WildApplication { public static void main(String[] args) { System.setProperty("spring.devtools.restart.enabled", "false"); - SpringApplication application = new SpringApplication(RuoYiApplication.class); + SpringApplication application = new SpringApplication(WildApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ wild-vue-plus启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/wild-admin/src/main/java/com/wild/WildServletInitializer.java similarity index 63% rename from ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java rename to wild-admin/src/main/java/com/wild/WildServletInitializer.java index dd0562684..8bfdff94f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ b/wild-admin/src/main/java/com/wild/WildServletInitializer.java @@ -1,4 +1,4 @@ -package com.ruoyi; +package com.wild; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; @@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer /** * web容器中进行部署 * - * @author ruoyi + * @author wild */ -public class RuoYiServletInitializer extends SpringBootServletInitializer { +public class WildServletInitializer extends SpringBootServletInitializer { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(RuoYiApplication.class); + return application.sources(WildApplication.class); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/wild-admin/src/main/java/com/wild/web/controller/common/CaptchaController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java rename to wild-admin/src/main/java/com/wild/web/controller/common/CaptchaController.java index 4a2bf30d7..6f89183af 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/common/CaptchaController.java @@ -1,22 +1,21 @@ -package com.ruoyi.web.controller.common; +package com.wild.web.controller.common; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.IdUtil; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.CaptchaType; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.CaptchaProperties; -import com.ruoyi.system.service.ISysConfigService; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.enums.CaptchaType; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.reflect.ReflectUtils; +import com.wild.common.utils.spring.SpringUtils; +import com.wild.framework.config.properties.CaptchaProperties; +import com.wild.system.service.ISysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -30,7 +29,7 @@ import java.util.concurrent.TimeUnit; * @author Lion Li */ @Api(value = "验证码操作处理", tags = {"验证码管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController public class CaptchaController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java b/wild-admin/src/main/java/com/wild/web/controller/monitor/CacheController.java similarity index 92% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java rename to wild-admin/src/main/java/com/wild/web/controller/monitor/CacheController.java index ef81c99a3..1a3d6d6e1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/monitor/CacheController.java @@ -1,7 +1,7 @@ -package com.ruoyi.web.controller.monitor; +package com.wild.web.controller.monitor; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -22,7 +22,7 @@ import java.util.*; * @author Lion Li */ @Api(value = "缓存监控", tags = {"缓存监控管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/monitor/cache") public class CacheController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/wild-admin/src/main/java/com/wild/web/controller/monitor/SysLogininforController.java similarity index 82% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java rename to wild-admin/src/main/java/com/wild/web/controller/monitor/SysLogininforController.java index 17df95cee..4249414b3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/monitor/SysLogininforController.java @@ -1,13 +1,13 @@ -package com.ruoyi.web.controller.monitor; +package com.wild.web.controller.monitor; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.service.ISysLogininforService; +import com.wild.common.annotation.Log; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.domain.SysLogininfor; +import com.wild.system.service.ISysLogininforService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -26,7 +26,7 @@ import java.util.List; */ @Validated @Api(value = "系统访问记录", tags = {"系统访问记录管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/monitor/logininfor") public class SysLogininforController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/wild-admin/src/main/java/com/wild/web/controller/monitor/SysOperlogController.java similarity index 81% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java rename to wild-admin/src/main/java/com/wild/web/controller/monitor/SysOperlogController.java index 0b6ee7f91..940623e8e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/monitor/SysOperlogController.java @@ -1,13 +1,13 @@ -package com.ruoyi.web.controller.monitor; +package com.wild.web.controller.monitor; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.service.ISysOperLogService; +import com.wild.common.annotation.Log; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.domain.SysOperLog; +import com.wild.system.service.ISysOperLogService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -26,7 +26,7 @@ import java.util.List; */ @Validated @Api(value = "操作日志记录", tags = {"操作日志记录管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/monitor/operlog") public class SysOperlogController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/wild-admin/src/main/java/com/wild/web/controller/monitor/SysUserOnlineController.java similarity index 80% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java rename to wild-admin/src/main/java/com/wild/web/controller/monitor/SysUserOnlineController.java index 013748376..38dcae070 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/monitor/SysUserOnlineController.java @@ -1,17 +1,17 @@ -package com.ruoyi.web.controller.monitor; +package com.wild.web.controller.monitor; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.Constants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.domain.SysUserOnline; +import com.wild.system.service.ISysUserOnlineService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -30,7 +30,7 @@ import java.util.List; * @author Lion Li */ @Api(value = "在线用户监控", tags = {"在线用户监控管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/monitor/online") public class SysUserOnlineController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysConfigController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysConfigController.java index e2b397d0e..9b3edf302 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysConfigController.java @@ -1,19 +1,18 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.service.ISysConfigService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.domain.SysConfig; +import com.wild.system.service.ISysConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,7 +27,7 @@ import java.util.List; */ @Validated @Api(value = "参数配置控制器", tags = {"参数配置管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/config") public class SysConfigController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysDeptController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysDeptController.java index e47b1e885..39fabcdf7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysDeptController.java @@ -1,20 +1,19 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysDeptService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysDept; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.StringUtils; +import com.wild.system.service.ISysDeptService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,7 +29,7 @@ import java.util.Map; */ @Validated @Api(value = "部门控制器", tags = {"部门管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/dept") public class SysDeptController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysDictDataController.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysDictDataController.java index 0a54db315..c249ac255 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysDictDataController.java @@ -1,20 +1,19 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictDataService; -import com.ruoyi.system.service.ISysDictTypeService; +import com.wild.common.annotation.Log; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysDictData; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.service.ISysDictDataService; +import com.wild.system.service.ISysDictTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,7 +29,7 @@ import java.util.List; */ @Validated @Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/dict/data") public class SysDictDataController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysDictTypeController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysDictTypeController.java index 37e9d8c63..03b0cc96d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysDictTypeController.java @@ -1,19 +1,18 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.ISysDictTypeService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysDictType; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.service.ISysDictTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,7 +27,7 @@ import java.util.List; */ @Validated @Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/dict/type") public class SysDictTypeController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysIndexController.java similarity index 61% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysIndexController.java index 541333698..b063d6b2b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysIndexController.java @@ -1,11 +1,10 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.config.WildConfig; +import com.wild.common.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -15,14 +14,14 @@ import org.springframework.web.bind.annotation.RestController; * @author Lion Li */ @Api(value = "首页控制器", tags = {"首页管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController public class SysIndexController { /** * 系统基础配置 */ - private final RuoYiConfig ruoyiConfig; + private final WildConfig WildConfig; /** * 访问首页，提示语 @@ -30,6 +29,6 @@ public class SysIndexController { @ApiOperation("访问首页，提示语") @GetMapping("/") public String index() { - return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); + return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", WildConfig.getName(), WildConfig.getVersion()); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysLoginController.java similarity index 80% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysLoginController.java index 9e518234d..fde14ec9d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysLoginController.java @@ -1,16 +1,16 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginBody; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.service.ISysMenuService; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysLoginService; -import com.ruoyi.system.service.SysPermissionService; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysMenu; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginBody; +import com.wild.common.utils.SecurityUtils; +import com.wild.system.domain.vo.RouterVo; +import com.wild.system.service.ISysMenuService; +import com.wild.system.service.ISysUserService; +import com.wild.system.service.SysLoginService; +import com.wild.system.service.SysPermissionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -33,7 +33,7 @@ import java.util.Set; */ @Validated @Api(value = "登录验证控制器", tags = {"登录验证管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController public class SysLoginController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysMenuController.java similarity index 91% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysMenuController.java index a525ac422..cf62bcaee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysMenuController.java @@ -1,14 +1,14 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; import cn.hutool.core.lang.tree.Tree; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysMenuService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysMenu; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.StringUtils; +import com.wild.system.service.ISysMenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -29,7 +29,7 @@ import java.util.Map; */ @Validated @Api(value = "菜单信息控制器", tags = {"菜单信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/menu") public class SysMenuController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysNoticeController.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysNoticeController.java index bafb720b5..5a2d1b59b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysNoticeController.java @@ -1,12 +1,12 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.service.ISysNoticeService; +import com.wild.common.annotation.Log; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.system.domain.SysNotice; +import com.wild.system.service.ISysNoticeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; */ @Validated @Api(value = "公告信息控制器", tags = {"公告信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/notice") public class SysNoticeController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysOssConfigController.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysOssConfigController.java index db6ce7e33..b1479b9da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysOssConfigController.java @@ -1,17 +1,17 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.system.domain.bo.SysOssConfigBo; -import com.ruoyi.system.domain.vo.SysOssConfigVo; -import com.ruoyi.system.service.ISysOssConfigService; +import com.wild.common.annotation.Log; +import com.wild.common.annotation.RepeatSubmit; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; +import com.wild.common.core.validate.QueryGroup; +import com.wild.common.enums.BusinessType; +import com.wild.system.domain.bo.SysOssConfigBo; +import com.wild.system.domain.vo.SysOssConfigVo; +import com.wild.system.service.ISysOssConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -34,7 +34,7 @@ import java.util.Arrays; */ @Validated @Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/oss/config") public class SysOssConfigController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysOssController.java similarity index 84% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysOssController.java index 013f319f0..edcd7c7ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysOssController.java @@ -1,4 +1,4 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; import cn.hutool.core.convert.Convert; @@ -6,23 +6,23 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpException; import cn.hutool.http.HttpUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.domain.SysOss; -import com.ruoyi.system.domain.bo.SysOssBo; -import com.ruoyi.system.domain.vo.SysOssVo; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysOssService; +import com.wild.common.annotation.Log; +import com.wild.common.annotation.RepeatSubmit; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.validate.QueryGroup; +import com.wild.common.enums.BusinessType; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.file.FileUtils; +import com.wild.oss.constant.OssConstant; +import com.wild.system.domain.SysConfig; +import com.wild.system.domain.SysOss; +import com.wild.system.domain.bo.SysOssBo; +import com.wild.system.domain.vo.SysOssVo; +import com.wild.system.service.ISysConfigService; +import com.wild.system.service.ISysOssService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -47,7 +47,7 @@ import java.util.Map; */ @Validated @Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/oss") public class SysOssController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysPostController.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysPostController.java index d115619fa..f7b2f0934 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysPostController.java @@ -1,14 +1,14 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.service.ISysPostService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.domain.SysPost; +import com.wild.system.service.ISysPostService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -28,7 +28,7 @@ import java.util.List; */ @Validated @Api(value = "岗位信息控制器", tags = {"岗位信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/post") public class SysPostController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysProfileController.java similarity index 87% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysProfileController.java index 4261f17e4..ff09b23bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysProfileController.java @@ -1,18 +1,18 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.TokenService; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysOss; -import com.ruoyi.system.service.ISysOssService; -import com.ruoyi.system.service.ISysUserService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.TokenService; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.domain.SysOss; +import com.wild.system.service.ISysOssService; +import com.wild.system.service.ISysUserService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -31,7 +31,7 @@ import java.util.Map; */ @Validated @Api(value = "个人信息控制器", tags = {"个人信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/user/profile") public class SysProfileController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysRegisterController.java similarity index 74% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysRegisterController.java index 11dc6ebc4..be72664ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysRegisterController.java @@ -1,11 +1,11 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.SysRegisterService; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.model.RegisterBody; +import com.wild.common.utils.StringUtils; +import com.wild.system.service.ISysConfigService; +import com.wild.system.service.SysRegisterService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Validated @Api(value = "注册验证控制器", tags = {"注册验证管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController public class SysRegisterController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysRoleController.java similarity index 90% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysRoleController.java index 19cda5e45..ba561c7cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysRoleController.java @@ -1,21 +1,21 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.TokenService; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysPermissionService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.TokenService; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.domain.SysUserRole; +import com.wild.system.service.ISysRoleService; +import com.wild.system.service.ISysUserService; +import com.wild.system.service.SysPermissionService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,7 @@ import java.util.List; */ @Validated @Api(value = "角色信息控制器", tags = {"角色信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/role") public class SysRoleController extends BaseController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/wild-admin/src/main/java/com/wild/web/controller/system/SysUserController.java similarity index 89% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java rename to wild-admin/src/main/java/com/wild/web/controller/system/SysUserController.java index 194c99362..0cb593e9b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/wild-admin/src/main/java/com/wild/web/controller/system/SysUserController.java @@ -1,27 +1,27 @@ -package com.ruoyi.web.controller.system; +package com.wild.web.controller.system; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.domain.vo.SysUserExportVo; -import com.ruoyi.system.domain.vo.SysUserImportVo; -import com.ruoyi.system.listener.SysUserImportListener; -import com.ruoyi.system.service.ISysPostService; -import com.ruoyi.system.service.ISysRoleService; -import com.ruoyi.system.service.ISysUserService; +import com.wild.common.annotation.Log; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.entity.SysDept; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.common.excel.ExcelResult; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.system.domain.vo.SysUserExportVo; +import com.wild.system.domain.vo.SysUserImportVo; +import com.wild.system.listener.SysUserImportListener; +import com.wild.system.service.ISysPostService; +import com.wild.system.service.ISysRoleService; +import com.wild.system.service.ISysUserService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +44,7 @@ import java.util.stream.Collectors; */ @Validated @Api(value = "用户信息控制器", tags = {"用户信息管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/system/user") public class SysUserController extends BaseController { diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/wild-admin/src/main/resources/application-dev.yml similarity index 98% rename from ruoyi-admin/src/main/resources/application-dev.yml rename to wild-admin/src/main/resources/application-dev.yml index 015b3028e..1b3649f8e 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/wild-admin/src/main/resources/application-dev.yml @@ -10,7 +10,7 @@ spring: url: http://localhost:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP - username: ruoyi + username: wild password: 123456 --- # xxl-job 配置 @@ -96,7 +96,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: wild login-password: 123456 filter: stat: @@ -135,7 +135,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: ${wild.name} # 最小空闲连接数 connectionMinimumIdleSize: 32 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/wild-admin/src/main/resources/application-prod.yml similarity index 97% rename from ruoyi-admin/src/main/resources/application-prod.yml rename to wild-admin/src/main/resources/application-prod.yml index 1d680d7de..d788da7f8 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/wild-admin/src/main/resources/application-prod.yml @@ -3,7 +3,7 @@ spring: servlet: multipart: # 临时文件存储位置 避免临时文件被系统清理报错 - location: /ruoyi/server/temp + location: /wild/server/temp --- # 监控配置 spring: @@ -17,7 +17,7 @@ spring: url: http://172.30.0.90:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP - username: ruoyi + username: wild password: 123456 --- # xxl-job 配置 @@ -103,7 +103,7 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi + login-username: wild login-password: 123456 filter: stat: @@ -142,7 +142,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 - clientName: ${ruoyi.name} + clientName: ${wild.name} # 最小空闲连接数 connectionMinimumIdleSize: 32 # 连接池大小 diff --git a/ruoyi-admin/src/main/resources/application.yml b/wild-admin/src/main/resources/application.yml similarity index 94% rename from ruoyi-admin/src/main/resources/application.yml rename to wild-admin/src/main/resources/application.yml index f7ef6339d..e7c0d269d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/wild-admin/src/main/resources/application.yml @@ -1,9 +1,9 @@ # 项目相关配置 -ruoyi: +wild: # 名称 - name: RuoYi-Vue-Plus + name: wild-vue-plus # 版本 - version: ${ruoyi-vue-plus.version} + version: ${wild-vue-plus.version} # 版权年份 copyrightYear: 2021 # 实例演示开关 @@ -49,7 +49,7 @@ server: # 日志配置 logging: level: - com.ruoyi: @logging.level@ + com.wild: @logging.level@ org.springframework: warn config: classpath:logback.xml @@ -60,7 +60,7 @@ tlog: # Spring配置 spring: application: - name: ${ruoyi.name} + name: ${wild.name} # 资源信息 messages: # 国际化资源文件路径 @@ -136,11 +136,11 @@ repeat-submit: mybatis-plus: # 不支持多包, 如有需要可在注解配置 或 提升扫包等级 # 例如 com.**.**.mapper - mapperPackage: com.ruoyi.**.mapper + mapperPackage: com.wild.**.mapper # 对应的 XML 文件位置 mapperLocations: classpath*:mapper/**/*Mapper.xml # 实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.ruoyi.**.domain + typeAliasesPackage: com.wild.**.domain # 启动时是否检查 MyBatis XML 文件的存在，默认不检查 checkConfigLocation: false # 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种： @@ -198,23 +198,23 @@ swagger: # 请求前缀 pathMapping: /dev-api # 标题 - title: '标题：${ruoyi.name}后台管理系统_接口文档' + title: '标题：${wild.name}后台管理系统_接口文档' # 描述 description: '描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' # 版本 - version: '版本号: ${ruoyi-vue-plus.version}' + version: '版本号: ${wild-vue-plus.version}' # 作者信息 contact: name: Lion Li email: crazylionli@163.com - url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus + url: https://gitee.com/JavaLionLi/wild-vue-plus groups: - name: 1.演示案例 - basePackage: com.ruoyi.demo + basePackage: com.wild.demo - name: 2.系统模块 - basePackage: com.ruoyi.web + basePackage: com.wild.web - name: 3.代码生成模块 - basePackage: com.ruoyi.generator + basePackage: com.wild.generator knife4j: # 是否开启Knife4j增强模式 diff --git a/ruoyi-admin/src/main/resources/banner.txt b/wild-admin/src/main/resources/banner.txt similarity index 93% rename from ruoyi-admin/src/main/resources/banner.txt rename to wild-admin/src/main/resources/banner.txt index f592dbe14..812a2f9ab 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/wild-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi-vue-plus.version} +Application Version: ${wild-vue-plus.version} Spring Boot Version: ${spring-boot.version} __________ _____.___.__ ____ ____ __________.__ \______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ diff --git a/ruoyi-admin/src/main/resources/i18n/messages.properties b/wild-admin/src/main/resources/i18n/messages.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages.properties rename to wild-admin/src/main/resources/i18n/messages.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_en_US.properties b/wild-admin/src/main/resources/i18n/messages_en_US.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_en_US.properties rename to wild-admin/src/main/resources/i18n/messages_en_US.properties diff --git a/ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties b/wild-admin/src/main/resources/i18n/messages_zh_CN.properties similarity index 100% rename from ruoyi-admin/src/main/resources/i18n/messages_zh_CN.properties rename to wild-admin/src/main/resources/i18n/messages_zh_CN.properties diff --git a/ruoyi-admin/src/main/resources/logback.xml b/wild-admin/src/main/resources/logback.xml similarity index 98% rename from ruoyi-admin/src/main/resources/logback.xml rename to wild-admin/src/main/resources/logback.xml index 6e3280fb3..df4622a41 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/wild-admin/src/main/resources/logback.xml @@ -78,7 +78,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/spy.properties b/wild-admin/src/main/resources/spy.properties similarity index 100% rename from ruoyi-admin/src/main/resources/spy.properties rename to wild-admin/src/main/resources/spy.properties diff --git a/ruoyi-common/pom.xml b/wild-common/pom.xml similarity index 97% rename from ruoyi-common/pom.xml rename to wild-common/pom.xml index 4a0e1a863..086dec544 100644 --- a/ruoyi-common/pom.xml +++ b/wild-common/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-common + wild-common common通用工具 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java b/wild-common/src/main/java/com/wild/common/annotation/DataScope.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java rename to wild-common/src/main/java/com/wild/common/annotation/DataScope.java index feaa3f42c..2db21a019 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataScope.java +++ b/wild-common/src/main/java/com/wild/common/annotation/DataScope.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.annotation; +package com.wild.common.annotation; import java.lang.annotation.*; /** * 数据权限过滤注解 * - * @author ruoyi + * @author wild */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java b/wild-common/src/main/java/com/wild/common/annotation/DataSource.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java rename to wild-common/src/main/java/com/wild/common/annotation/DataSource.java index e7d2250a6..7d0d21d8d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/DataSource.java +++ b/wild-common/src/main/java/com/wild/common/annotation/DataSource.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.annotation; +package com.wild.common.annotation; -import com.ruoyi.common.enums.DataSourceType; +import com.wild.common.enums.DataSourceType; import java.lang.annotation.*; @@ -9,7 +9,7 @@ import java.lang.annotation.*; *

* 优先级：先方法，后类，如果方法覆盖了类上的数据源类型，以方法的为准，否则以类上的为准 * - * @author ruoyi + * @author wild */ @Target({ElementType.METHOD, ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java b/wild-common/src/main/java/com/wild/common/annotation/ExcelDictFormat.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java rename to wild-common/src/main/java/com/wild/common/annotation/ExcelDictFormat.java index 400080ea7..c39aef960 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/ExcelDictFormat.java +++ b/wild-common/src/main/java/com/wild/common/annotation/ExcelDictFormat.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.wild.common.annotation; import java.lang.annotation.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/wild-common/src/main/java/com/wild/common/annotation/Log.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java rename to wild-common/src/main/java/com/wild/common/annotation/Log.java index 32c39a3b0..74158ee1e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/wild-common/src/main/java/com/wild/common/annotation/Log.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.annotation; +package com.wild.common.annotation; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.enums.OperatorType; +import com.wild.common.enums.BusinessType; +import com.wild.common.enums.OperatorType; import java.lang.annotation.*; /** * 自定义操作日志记录注解 * - * @author ruoyi + * @author wild */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java b/wild-common/src/main/java/com/wild/common/annotation/RateLimiter.java similarity index 76% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java rename to wild-common/src/main/java/com/wild/common/annotation/RateLimiter.java index 90db9d776..6f01d6cd9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RateLimiter.java +++ b/wild-common/src/main/java/com/wild/common/annotation/RateLimiter.java @@ -1,36 +1,36 @@ -package com.ruoyi.common.annotation; - -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.enums.LimitType; - -import java.lang.annotation.*; - -/** - * 限流注解 - * - * @author Lion Li - */ -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@Documented -public @interface RateLimiter { - /** - * 限流key - */ - String key() default Constants.RATE_LIMIT_KEY; - - /** - * 限流时间,单位秒 - */ - int time() default 60; - - /** - * 限流次数 - */ - int count() default 100; - - /** - * 限流类型 - */ - LimitType limitType() default LimitType.DEFAULT; -} +package com.wild.common.annotation; + +import com.wild.common.constant.Constants; +import com.wild.common.enums.LimitType; + +import java.lang.annotation.*; + +/** + * 限流注解 + * + * @author Lion Li + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RateLimiter { + /** + * 限流key + */ + String key() default Constants.RATE_LIMIT_KEY; + + /** + * 限流时间,单位秒 + */ + int time() default 60; + + /** + * 限流次数 + */ + int count() default 100; + + /** + * 限流类型 + */ + LimitType limitType() default LimitType.DEFAULT; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java b/wild-common/src/main/java/com/wild/common/annotation/RepeatSubmit.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java rename to wild-common/src/main/java/com/wild/common/annotation/RepeatSubmit.java index a87466768..f6a4d2ec5 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java +++ b/wild-common/src/main/java/com/wild/common/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.annotation; +package com.wild.common.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java b/wild-common/src/main/java/com/wild/common/captcha/UnsignedMathGenerator.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java rename to wild-common/src/main/java/com/wild/common/captcha/UnsignedMathGenerator.java index 9c0f26f5b..09c427a98 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java +++ b/wild-common/src/main/java/com/wild/common/captcha/UnsignedMathGenerator.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.captcha; +package com.wild.common.captcha; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.core.math.Calculator; import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.RandomUtil; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; /** * 无符号计算生成器 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/wild-common/src/main/java/com/wild/common/config/WildConfig.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java rename to wild-common/src/main/java/com/wild/common/config/WildConfig.java index bcfc677bd..bc09d781a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java +++ b/wild-common/src/main/java/com/wild/common/config/WildConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.config; +package com.wild.common.config; import lombok.Data; import lombok.Getter; @@ -15,8 +15,8 @@ import org.springframework.stereotype.Component; @Data @Accessors(chain = true) @Component -@ConfigurationProperties(prefix = "ruoyi") -public class RuoYiConfig { +@ConfigurationProperties(prefix = "wild") +public class WildConfig { /** * 项目名称 @@ -50,7 +50,7 @@ public class RuoYiConfig { private static boolean addressEnabled; public void setAddressEnabled(boolean addressEnabled) { - RuoYiConfig.addressEnabled = addressEnabled; + WildConfig.addressEnabled = addressEnabled; } } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/wild-common/src/main/java/com/wild/common/constant/Constants.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java rename to wild-common/src/main/java/com/wild/common/constant/Constants.java index 9c91a1a15..80704d176 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java +++ b/wild-common/src/main/java/com/wild/common/constant/Constants.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.constant; +package com.wild.common.constant; import io.jsonwebtoken.Claims; /** * 通用常量信息 * - * @author ruoyi + * @author wild */ public class Constants { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/wild-common/src/main/java/com/wild/common/constant/GenConstants.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java rename to wild-common/src/main/java/com/wild/common/constant/GenConstants.java index 4d0a4e8a7..c652e1fbb 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java +++ b/wild-common/src/main/java/com/wild/common/constant/GenConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.wild.common.constant; /** * 代码生成通用常量 * - * @author ruoyi + * @author wild */ public class GenConstants { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/wild-common/src/main/java/com/wild/common/constant/UserConstants.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java rename to wild-common/src/main/java/com/wild/common/constant/UserConstants.java index fa88e7c17..dac9d6f02 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/wild-common/src/main/java/com/wild/common/constant/UserConstants.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.constant; +package com.wild.common.constant; /** * 用户常量信息 * - * @author ruoyi + * @author wild */ public class UserConstants { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java b/wild-common/src/main/java/com/wild/common/convert/ExcelBigNumberConvert.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java rename to wild-common/src/main/java/com/wild/common/convert/ExcelBigNumberConvert.java index df1f95a0f..f5ee785df 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java +++ b/wild-common/src/main/java/com/wild/common/convert/ExcelBigNumberConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.wild.common.convert; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.ObjectUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java b/wild-common/src/main/java/com/wild/common/convert/ExcelDictConvert.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java rename to wild-common/src/main/java/com/wild/common/convert/ExcelDictConvert.java index 7c4d63124..a1898be31 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelDictConvert.java +++ b/wild-common/src/main/java/com/wild/common/convert/ExcelDictConvert.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.convert; +package com.wild.common.convert; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.convert.Convert; @@ -7,11 +7,11 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.CellData; import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.property.ExcelContentProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.core.service.DictService; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import java.lang.reflect.Field; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java b/wild-common/src/main/java/com/wild/common/core/controller/BaseController.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java rename to wild-common/src/main/java/com/wild/common/core/controller/BaseController.java index bad8f77a5..94071f437 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java +++ b/wild-common/src/main/java/com/wild/common/core/controller/BaseController.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.core.controller; +package com.wild.common.core.controller; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; /** * web层通用数据处理 * - * @author ruoyi + * @author wild */ public class BaseController { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java b/wild-common/src/main/java/com/wild/common/core/domain/AjaxResult.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java rename to wild-common/src/main/java/com/wild/common/core/domain/AjaxResult.java index 7c388c5ef..2aa019e2a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/AjaxResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.wild.common.core.domain; import cn.hutool.http.HttpStatus; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/wild-common/src/main/java/com/wild/common/core/domain/BaseEntity.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java rename to wild-common/src/main/java/com/wild/common/core/domain/BaseEntity.java index b21807033..603ac01ce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/BaseEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.wild.common.core.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/wild-common/src/main/java/com/wild/common/core/domain/TreeEntity.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java rename to wild-common/src/main/java/com/wild/common/core/domain/TreeEntity.java index c0e62c710..cda716838 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/TreeEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain; +package com.wild.common.core.domain; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java b/wild-common/src/main/java/com/wild/common/core/domain/dto/OperLogDTO.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java rename to wild-common/src/main/java/com/wild/common/core/domain/dto/OperLogDTO.java index 773858f64..4d42c68d8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/dto/OperLogDTO.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/dto/OperLogDTO.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.dto; +package com.wild.common.core.domain.dto; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysDept.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java rename to wild-common/src/main/java/com/wild/common/core/domain/entity/SysDept.java index 17ff6606e..8770db8ea 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysDept.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.entity; +package com.wild.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.TreeEntity; +import com.wild.common.core.domain.TreeEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysDictData.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java rename to wild-common/src/main/java/com/wild/common/core/domain/entity/SysDictData.java index 3c572bd27..79b2d09a7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysDictData.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.entity; +package com.wild.common.core.domain.entity; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.constant.UserConstants; +import com.wild.common.convert.ExcelDictConvert; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysDictType.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java rename to wild-common/src/main/java/com/wild/common/core/domain/entity/SysDictType.java index c6c9b1a29..d69d7ecd1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysDictType.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.core.domain.entity; +package com.wild.common.core.domain.entity; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysMenu.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java rename to wild-common/src/main/java/com/wild/common/core/domain/entity/SysMenu.java index 30d074b75..0ab16463a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysMenu.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.core.domain.entity; +package com.wild.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.TreeEntity; +import com.wild.common.core.domain.TreeEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysRole.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java rename to wild-common/src/main/java/com/wild/common/core/domain/entity/SysRole.java index 1d186db52..a6ff873ca 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.entity; +package com.wild.common.core.domain.entity; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysUser.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java rename to wild-common/src/main/java/com/wild/common/core/domain/entity/SysUser.java index 2fa57f5ca..bd0586ed1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/entity/SysUser.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.core.domain.entity; +package com.wild.common.core.domain.entity; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/wild-common/src/main/java/com/wild/common/core/domain/model/LoginBody.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java rename to wild-common/src/main/java/com/wild/common/core/domain/model/LoginBody.java index d47053694..890b38dfd 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/model/LoginBody.java @@ -1,43 +1,43 @@ -package com.ruoyi.common.core.domain.model; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 用户登录对象 - * - * @author Lion Li - */ - -@Data -@Accessors(chain = true) -@ApiModel("用户登录对象") -public class LoginBody { - - /** - * 用户名 - */ - @ApiModelProperty(value = "用户名") - private String username; - - /** - * 用户密码 - */ - @ApiModelProperty(value = "用户密码") - private String password; - - /** - * 验证码 - */ - @ApiModelProperty(value = "验证码") - private String code; - - /** - * 唯一标识 - */ - @ApiModelProperty(value = "唯一标识") - private String uuid = ""; - -} +package com.wild.common.core.domain.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +/** + * 用户登录对象 + * + * @author Lion Li + */ + +@Data +@Accessors(chain = true) +@ApiModel("用户登录对象") +public class LoginBody { + + /** + * 用户名 + */ + @ApiModelProperty(value = "用户名") + private String username; + + /** + * 用户密码 + */ + @ApiModelProperty(value = "用户密码") + private String password; + + /** + * 验证码 + */ + @ApiModelProperty(value = "验证码") + private String code; + + /** + * 唯一标识 + */ + @ApiModelProperty(value = "唯一标识") + private String uuid = ""; + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java b/wild-common/src/main/java/com/wild/common/core/domain/model/LoginUser.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java rename to wild-common/src/main/java/com/wild/common/core/domain/model/LoginUser.java index b138c529a..bf09bba5f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/model/LoginUser.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.domain.model; +package com.wild.common.core.domain.model; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java b/wild-common/src/main/java/com/wild/common/core/domain/model/RegisterBody.java similarity index 75% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java rename to wild-common/src/main/java/com/wild/common/core/domain/model/RegisterBody.java index ce6c385ae..5e36cecf1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/RegisterBody.java +++ b/wild-common/src/main/java/com/wild/common/core/domain/model/RegisterBody.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.core.domain.model; - -import io.swagger.annotations.ApiModel; - -/** - * 用户注册对象 - * - * @author Lion Li - */ -@ApiModel("用户注册对象") -public class RegisterBody extends LoginBody { - -} +package com.wild.common.core.domain.model; + +import io.swagger.annotations.ApiModel; + +/** + * 用户注册对象 + * + * @author Lion Li + */ +@ApiModel("用户注册对象") +public class RegisterBody extends LoginBody { + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java b/wild-common/src/main/java/com/wild/common/core/mybatisplus/core/BaseMapperPlus.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java rename to wild-common/src/main/java/com/wild/common/core/mybatisplus/core/BaseMapperPlus.java index ee20abd81..32d04636a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/BaseMapperPlus.java +++ b/wild-common/src/main/java/com/wild/common/core/mybatisplus/core/BaseMapperPlus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.mybatisplus.core; +package com.wild.common.core.mybatisplus.core; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java b/wild-common/src/main/java/com/wild/common/core/mybatisplus/core/IServicePlus.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java rename to wild-common/src/main/java/com/wild/common/core/mybatisplus/core/IServicePlus.java index 815791bf0..9d8a91640 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/IServicePlus.java +++ b/wild-common/src/main/java/com/wild/common/core/mybatisplus/core/IServicePlus.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.core.mybatisplus.core; +package com.wild.common.core.mybatisplus.core; import cn.hutool.core.bean.copier.CopyOptions; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.PagePlus; +import com.wild.common.core.page.PagePlus; import java.io.Serializable; import java.util.Collection; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java b/wild-common/src/main/java/com/wild/common/core/mybatisplus/core/ServicePlusImpl.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java rename to wild-common/src/main/java/com/wild/common/core/mybatisplus/core/ServicePlusImpl.java index e9c1f191e..5ac7eeb2a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/core/ServicePlusImpl.java +++ b/wild-common/src/main/java/com/wild/common/core/mybatisplus/core/ServicePlusImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.mybatisplus.core; +package com.wild.common.core.mybatisplus.core; import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.collection.CollUtil; @@ -9,9 +9,9 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.utils.BeanCopyUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; +import com.wild.common.core.page.PagePlus; +import com.wild.common.utils.BeanCopyUtils; +import com.wild.common.utils.reflect.ReflectUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java b/wild-common/src/main/java/com/wild/common/core/mybatisplus/methods/InsertAll.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java rename to wild-common/src/main/java/com/wild/common/core/mybatisplus/methods/InsertAll.java index 403ea539b..44f83b313 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/mybatisplus/methods/InsertAll.java +++ b/wild-common/src/main/java/com/wild/common/core/mybatisplus/methods/InsertAll.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.core.mybatisplus.methods; +package com.wild.common.core.mybatisplus.methods; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; import org.apache.ibatis.executor.keygen.KeyGenerator; import org.apache.ibatis.executor.keygen.NoKeyGenerator; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java b/wild-common/src/main/java/com/wild/common/core/page/PagePlus.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java rename to wild-common/src/main/java/com/wild/common/core/page/PagePlus.java index 79d889cf0..5dda9990d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java +++ b/wild-common/src/main/java/com/wild/common/core/page/PagePlus.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.wild.common.core.page; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java b/wild-common/src/main/java/com/wild/common/core/page/TableDataInfo.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java rename to wild-common/src/main/java/com/wild/common/core/page/TableDataInfo.java index 81c596b4f..3a2633510 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableDataInfo.java +++ b/wild-common/src/main/java/com/wild/common/core/page/TableDataInfo.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.page; +package com.wild.common.core.page; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java b/wild-common/src/main/java/com/wild/common/core/service/ConfigService.java similarity index 87% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java rename to wild-common/src/main/java/com/wild/common/core/service/ConfigService.java index c6badf65c..48011efa4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/ConfigService.java +++ b/wild-common/src/main/java/com/wild/common/core/service/ConfigService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.wild.common.core.service; /** * 通用 参数配置服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java b/wild-common/src/main/java/com/wild/common/core/service/DictService.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java rename to wild-common/src/main/java/com/wild/common/core/service/DictService.java index b334c82af..dc817cb81 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/DictService.java +++ b/wild-common/src/main/java/com/wild/common/core/service/DictService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.wild.common.core.service; /** * 通用 字典服务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/LogininforService.java b/wild-common/src/main/java/com/wild/common/core/service/LogininforService.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/LogininforService.java rename to wild-common/src/main/java/com/wild/common/core/service/LogininforService.java index 91aee4369..f634e09e8 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/LogininforService.java +++ b/wild-common/src/main/java/com/wild/common/core/service/LogininforService.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.service; +package com.wild.common.core.service; import javax.servlet.http.HttpServletRequest; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OperLogService.java b/wild-common/src/main/java/com/wild/common/core/service/OperLogService.java similarity index 69% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/OperLogService.java rename to wild-common/src/main/java/com/wild/common/core/service/OperLogService.java index a3b27e6a7..93edb36b6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/OperLogService.java +++ b/wild-common/src/main/java/com/wild/common/core/service/OperLogService.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.service; +package com.wild.common.core.service; -import com.ruoyi.common.core.domain.dto.OperLogDTO; +import com.wild.common.core.domain.dto.OperLogDTO; import org.springframework.scheduling.annotation.Async; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java b/wild-common/src/main/java/com/wild/common/core/service/TokenService.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java rename to wild-common/src/main/java/com/wild/common/core/service/TokenService.java index d9a9f0acf..9fe3f95a7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/TokenService.java +++ b/wild-common/src/main/java/com/wild/common/core/service/TokenService.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.service; +package com.wild.common.core.service; -import com.ruoyi.common.core.domain.model.LoginUser; +import com.wild.common.core.domain.model.LoginUser; import javax.servlet.http.HttpServletRequest; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java b/wild-common/src/main/java/com/wild/common/core/service/UserService.java similarity index 82% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java rename to wild-common/src/main/java/com/wild/common/core/service/UserService.java index e637f4731..7ee757fe7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/service/UserService.java +++ b/wild-common/src/main/java/com/wild/common/core/service/UserService.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.core.service; +package com.wild.common.core.service; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.entity.SysUser; /** * 通用 用户业务 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java b/wild-common/src/main/java/com/wild/common/core/validate/AddGroup.java similarity index 66% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java rename to wild-common/src/main/java/com/wild/common/core/validate/AddGroup.java index e1934e1ed..27ece5954 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/AddGroup.java +++ b/wild-common/src/main/java/com/wild/common/core/validate/AddGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.wild.common.core.validate; /** * 校验分组 add diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java b/wild-common/src/main/java/com/wild/common/core/validate/EditGroup.java similarity index 67% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java rename to wild-common/src/main/java/com/wild/common/core/validate/EditGroup.java index 3c6ca7f83..a96d4c993 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/EditGroup.java +++ b/wild-common/src/main/java/com/wild/common/core/validate/EditGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.wild.common.core.validate; /** * 校验分组 edit diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java b/wild-common/src/main/java/com/wild/common/core/validate/QueryGroup.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java rename to wild-common/src/main/java/com/wild/common/core/validate/QueryGroup.java index bbbfe0388..da89c9fc0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/validate/QueryGroup.java +++ b/wild-common/src/main/java/com/wild/common/core/validate/QueryGroup.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.core.validate; +package com.wild.common.core.validate; /** * 校验分组 query diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java b/wild-common/src/main/java/com/wild/common/enums/BusinessStatus.java similarity index 74% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java rename to wild-common/src/main/java/com/wild/common/enums/BusinessStatus.java index ce32cb41c..059646bce 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessStatus.java +++ b/wild-common/src/main/java/com/wild/common/enums/BusinessStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; /** * 操作状态 * - * @author ruoyi + * @author wild */ public enum BusinessStatus { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java b/wild-common/src/main/java/com/wild/common/enums/BusinessType.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java rename to wild-common/src/main/java/com/wild/common/enums/BusinessType.java index 2d2f2e463..4f461bcc1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/BusinessType.java +++ b/wild-common/src/main/java/com/wild/common/enums/BusinessType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; /** * 业务操作类型 * - * @author ruoyi + * @author wild */ public enum BusinessType { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java b/wild-common/src/main/java/com/wild/common/enums/CaptchaCategory.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java rename to wild-common/src/main/java/com/wild/common/enums/CaptchaCategory.java index 35d3ea3cf..157183b2a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaCategory.java +++ b/wild-common/src/main/java/com/wild/common/enums/CaptchaCategory.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java b/wild-common/src/main/java/com/wild/common/enums/CaptchaType.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java rename to wild-common/src/main/java/com/wild/common/enums/CaptchaType.java index b1c50ca75..7d831fc93 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/CaptchaType.java +++ b/wild-common/src/main/java/com/wild/common/enums/CaptchaType.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.RandomGenerator; -import com.ruoyi.common.captcha.UnsignedMathGenerator; +import com.wild.common.captcha.UnsignedMathGenerator; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java b/wild-common/src/main/java/com/wild/common/enums/DataSourceType.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java rename to wild-common/src/main/java/com/wild/common/enums/DataSourceType.java index d6fe72864..f9cb3c315 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/DataSourceType.java +++ b/wild-common/src/main/java/com/wild/common/enums/DataSourceType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java b/wild-common/src/main/java/com/wild/common/enums/HttpMethod.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java rename to wild-common/src/main/java/com/wild/common/enums/HttpMethod.java index bd1bfcc46..6b4118853 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/HttpMethod.java +++ b/wild-common/src/main/java/com/wild/common/enums/HttpMethod.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; import org.springframework.lang.Nullable; @@ -8,7 +8,7 @@ import java.util.Map; /** * 请求方式 * - * @author ruoyi + * @author wild */ public enum HttpMethod { GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java b/wild-common/src/main/java/com/wild/common/enums/LimitType.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java rename to wild-common/src/main/java/com/wild/common/enums/LimitType.java index 897f7068f..628a79141 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/LimitType.java +++ b/wild-common/src/main/java/com/wild/common/enums/LimitType.java @@ -1,24 +1,24 @@ -package com.ruoyi.common.enums; - -/** - * 限流类型 - * - * @author ruoyi - */ - -public enum LimitType { - /** - * 默认策略全局限流 - */ - DEFAULT, - - /** - * 根据请求者IP进行限流 - */ - IP, - - /** - * 实例限流(集群多后端实例) - */ - CLUSTER -} +package com.wild.common.enums; + +/** + * 限流类型 + * + * @author wild + */ + +public enum LimitType { + /** + * 默认策略全局限流 + */ + DEFAULT, + + /** + * 根据请求者IP进行限流 + */ + IP, + + /** + * 实例限流(集群多后端实例) + */ + CLUSTER +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java b/wild-common/src/main/java/com/wild/common/enums/OperatorType.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java rename to wild-common/src/main/java/com/wild/common/enums/OperatorType.java index 3c4127d98..dbe5570ea 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/OperatorType.java +++ b/wild-common/src/main/java/com/wild/common/enums/OperatorType.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; /** * 操作人类别 * - * @author ruoyi + * @author wild */ public enum OperatorType { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java b/wild-common/src/main/java/com/wild/common/enums/ThreadPoolRejectedPolicy.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java rename to wild-common/src/main/java/com/wild/common/enums/ThreadPoolRejectedPolicy.java index 5529bb336..91f34fb62 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ThreadPoolRejectedPolicy.java +++ b/wild-common/src/main/java/com/wild/common/enums/ThreadPoolRejectedPolicy.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java b/wild-common/src/main/java/com/wild/common/enums/UserStatus.java similarity index 89% rename from ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java rename to wild-common/src/main/java/com/wild/common/enums/UserStatus.java index 673ddebd2..035d65f8d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/UserStatus.java +++ b/wild-common/src/main/java/com/wild/common/enums/UserStatus.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.enums; +package com.wild.common.enums; /** * 用户状态 * - * @author ruoyi + * @author wild */ public enum UserStatus { OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java b/wild-common/src/main/java/com/wild/common/excel/DefaultExcelListener.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java rename to wild-common/src/main/java/com/wild/common/excel/DefaultExcelListener.java index f626a5e11..8896196e6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefaultExcelListener.java +++ b/wild-common/src/main/java/com/wild/common/excel/DefaultExcelListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.wild.common.excel; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.context.AnalysisContext; @@ -6,7 +6,7 @@ import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelAnalysisException; import com.alibaba.excel.exception.ExcelDataConvertException; import com.alibaba.fastjson.JSON; -import com.ruoyi.common.utils.ValidatorUtils; +import com.wild.common.utils.ValidatorUtils; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java b/wild-common/src/main/java/com/wild/common/excel/DefautExcelResult.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java rename to wild-common/src/main/java/com/wild/common/excel/DefautExcelResult.java index c852ce65f..5e554de51 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/DefautExcelResult.java +++ b/wild-common/src/main/java/com/wild/common/excel/DefautExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.wild.common.excel; import cn.hutool.core.util.StrUtil; import lombok.Setter; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java b/wild-common/src/main/java/com/wild/common/excel/ExcelListener.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java rename to wild-common/src/main/java/com/wild/common/excel/ExcelListener.java index 2064cad36..c971936ba 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelListener.java +++ b/wild-common/src/main/java/com/wild/common/excel/ExcelListener.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.wild.common.excel; import com.alibaba.excel.read.listener.ReadListener; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java b/wild-common/src/main/java/com/wild/common/excel/ExcelResult.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java rename to wild-common/src/main/java/com/wild/common/excel/ExcelResult.java index 63f8b8ac6..5d6f648f0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/excel/ExcelResult.java +++ b/wild-common/src/main/java/com/wild/common/excel/ExcelResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.excel; +package com.wild.common.excel; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java b/wild-common/src/main/java/com/wild/common/exception/DemoModeException.java similarity index 77% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java rename to wild-common/src/main/java/com/wild/common/exception/DemoModeException.java index 9178131d7..d02fe2c5f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/DemoModeException.java +++ b/wild-common/src/main/java/com/wild/common/exception/DemoModeException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.wild.common.exception; /** * 演示模式异常 * - * @author ruoyi + * @author wild */ public class DemoModeException extends RuntimeException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java b/wild-common/src/main/java/com/wild/common/exception/GlobalException.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java rename to wild-common/src/main/java/com/wild/common/exception/GlobalException.java index 5584cbce3..8cfebce61 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java +++ b/wild-common/src/main/java/com/wild/common/exception/GlobalException.java @@ -1,52 +1,52 @@ -package com.ruoyi.common.exception; - -/** - * 全局异常 - * - * @author ruoyi - */ -public class GlobalException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - /** - * 错误提示 - */ - private String message; - - /** - * 错误明细，内部调试错误 - *

- * 和 {@link CommonResult#getDetailMessage()} 一致的设计 - */ - private String detailMessage; - - /** - * 空构造方法，避免反序列化问题 - */ - public GlobalException() { - } - - public GlobalException(String message) { - this.message = message; - } - - public String getDetailMessage() { - return detailMessage; - } - - public GlobalException setDetailMessage(String detailMessage) { - this.detailMessage = detailMessage; - return this; - } - - @Override - public String getMessage() { - return message; - } - - public GlobalException setMessage(String message) { - this.message = message; - return this; - } -} \ No newline at end of file +package com.wild.common.exception; + +/** + * 全局异常 + * + * @author wild + */ +public class GlobalException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细，内部调试错误 + *

+ * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法，避免反序列化问题 + */ + public GlobalException() { + } + + public GlobalException(String message) { + this.message = message; + } + + public String getDetailMessage() { + return detailMessage; + } + + public GlobalException setDetailMessage(String detailMessage) { + this.detailMessage = detailMessage; + return this; + } + + @Override + public String getMessage() { + return message; + } + + public GlobalException setMessage(String message) { + this.message = message; + return this; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java b/wild-common/src/main/java/com/wild/common/exception/ServiceException.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java rename to wild-common/src/main/java/com/wild/common/exception/ServiceException.java index 95ce6d84c..258b42436 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/ServiceException.java +++ b/wild-common/src/main/java/com/wild/common/exception/ServiceException.java @@ -1,65 +1,65 @@ -package com.ruoyi.common.exception; - -/** - * 业务异常 - * - * @author ruoyi - */ -public final class ServiceException extends RuntimeException { - private static final long serialVersionUID = 1L; - - /** - * 错误码 - */ - private Integer code; - - /** - * 错误提示 - */ - private String message; - - /** - * 错误明细，内部调试错误 - *

- * 和 {@link CommonResult#getDetailMessage()} 一致的设计 - */ - private String detailMessage; - - /** - * 空构造方法，避免反序列化问题 - */ - public ServiceException() { - } - - public ServiceException(String message) { - this.message = message; - } - - public ServiceException(String message, Integer code) { - this.message = message; - this.code = code; - } - - public String getDetailMessage() { - return detailMessage; - } - - @Override - public String getMessage() { - return message; - } - - public Integer getCode() { - return code; - } - - public ServiceException setMessage(String message) { - this.message = message; - return this; - } - - public ServiceException setDetailMessage(String detailMessage) { - this.detailMessage = detailMessage; - return this; - } -} \ No newline at end of file +package com.wild.common.exception; + +/** + * 业务异常 + * + * @author wild + */ +public final class ServiceException extends RuntimeException { + private static final long serialVersionUID = 1L; + + /** + * 错误码 + */ + private Integer code; + + /** + * 错误提示 + */ + private String message; + + /** + * 错误明细，内部调试错误 + *

+ * 和 {@link CommonResult#getDetailMessage()} 一致的设计 + */ + private String detailMessage; + + /** + * 空构造方法，避免反序列化问题 + */ + public ServiceException() { + } + + public ServiceException(String message) { + this.message = message; + } + + public ServiceException(String message, Integer code) { + this.message = message; + this.code = code; + } + + public String getDetailMessage() { + return detailMessage; + } + + @Override + public String getMessage() { + return message; + } + + public Integer getCode() { + return code; + } + + public ServiceException setMessage(String message) { + this.message = message; + return this; + } + + public ServiceException setDetailMessage(String detailMessage) { + this.detailMessage = detailMessage; + return this; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java b/wild-common/src/main/java/com/wild/common/exception/UtilException.java similarity index 88% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java rename to wild-common/src/main/java/com/wild/common/exception/UtilException.java index 01cc8782b..83da0efc1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/UtilException.java +++ b/wild-common/src/main/java/com/wild/common/exception/UtilException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception; +package com.wild.common.exception; /** * 工具类异常 * - * @author ruoyi + * @author wild */ public class UtilException extends RuntimeException { private static final long serialVersionUID = 8247610319171014183L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java b/wild-common/src/main/java/com/wild/common/exception/base/BaseException.java similarity index 90% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java rename to wild-common/src/main/java/com/wild/common/exception/base/BaseException.java index 13c0d2fef..d27a6fa93 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java +++ b/wild-common/src/main/java/com/wild/common/exception/base/BaseException.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.exception.base; +package com.wild.common.exception.base; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.MessageUtils; +import com.wild.common.utils.StringUtils; import lombok.*; /** * 基础异常 * - * @author ruoyi + * @author wild */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java b/wild-common/src/main/java/com/wild/common/exception/file/FileException.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java rename to wild-common/src/main/java/com/wild/common/exception/file/FileException.java index 794f4e1a7..e37e2a7bc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java +++ b/wild-common/src/main/java/com/wild/common/exception/file/FileException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.file; +package com.wild.common.exception.file; -import com.ruoyi.common.exception.base.BaseException; +import com.wild.common.exception.base.BaseException; /** * 文件信息异常类 * - * @author ruoyi + * @author wild */ public class FileException extends BaseException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java b/wild-common/src/main/java/com/wild/common/exception/file/FileNameLengthLimitExceededException.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java rename to wild-common/src/main/java/com/wild/common/exception/file/FileNameLengthLimitExceededException.java index 64a5020d0..220a2d4a3 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileNameLengthLimitExceededException.java +++ b/wild-common/src/main/java/com/wild/common/exception/file/FileNameLengthLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.wild.common.exception.file; /** * 文件名称超长限制异常类 * - * @author ruoyi + * @author wild */ public class FileNameLengthLimitExceededException extends FileException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java b/wild-common/src/main/java/com/wild/common/exception/file/FileSizeLimitExceededException.java similarity index 84% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java rename to wild-common/src/main/java/com/wild/common/exception/file/FileSizeLimitExceededException.java index 93e9e1c60..f6018708d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileSizeLimitExceededException.java +++ b/wild-common/src/main/java/com/wild/common/exception/file/FileSizeLimitExceededException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.file; +package com.wild.common.exception.file; /** * 文件名大小限制异常类 * - * @author ruoyi + * @author wild */ public class FileSizeLimitExceededException extends FileException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java b/wild-common/src/main/java/com/wild/common/exception/user/CaptchaException.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java rename to wild-common/src/main/java/com/wild/common/exception/user/CaptchaException.java index 90404854c..3f9f83b79 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaException.java +++ b/wild-common/src/main/java/com/wild/common/exception/user/CaptchaException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.wild.common.exception.user; /** * 验证码错误异常类 * - * @author ruoyi + * @author wild */ public class CaptchaException extends UserException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java b/wild-common/src/main/java/com/wild/common/exception/user/CaptchaExpireException.java similarity index 80% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java rename to wild-common/src/main/java/com/wild/common/exception/user/CaptchaExpireException.java index ae5f759f0..52ae83c03 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/CaptchaExpireException.java +++ b/wild-common/src/main/java/com/wild/common/exception/user/CaptchaExpireException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.wild.common.exception.user; /** * 验证码失效异常类 * - * @author ruoyi + * @author wild */ public class CaptchaExpireException extends UserException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java b/wild-common/src/main/java/com/wild/common/exception/user/UserException.java similarity index 68% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java rename to wild-common/src/main/java/com/wild/common/exception/user/UserException.java index 94dbcdd52..7ce6a77b6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java +++ b/wild-common/src/main/java/com/wild/common/exception/user/UserException.java @@ -1,11 +1,11 @@ -package com.ruoyi.common.exception.user; +package com.wild.common.exception.user; -import com.ruoyi.common.exception.base.BaseException; +import com.wild.common.exception.base.BaseException; /** * 用户信息异常类 * - * @author ruoyi + * @author wild */ public class UserException extends BaseException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java b/wild-common/src/main/java/com/wild/common/exception/user/UserPasswordNotMatchException.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java rename to wild-common/src/main/java/com/wild/common/exception/user/UserPasswordNotMatchException.java index 0fab11678..482e74b30 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserPasswordNotMatchException.java +++ b/wild-common/src/main/java/com/wild/common/exception/user/UserPasswordNotMatchException.java @@ -1,9 +1,9 @@ -package com.ruoyi.common.exception.user; +package com.wild.common.exception.user; /** * 用户密码不正确或不符合规范异常类 * - * @author ruoyi + * @author wild */ public class UserPasswordNotMatchException extends UserException { private static final long serialVersionUID = 1L; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java b/wild-common/src/main/java/com/wild/common/filter/RepeatableFilter.java similarity index 91% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java rename to wild-common/src/main/java/com/wild/common/filter/RepeatableFilter.java index 0e4b2658b..b1d696eac 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatableFilter.java +++ b/wild-common/src/main/java/com/wild/common/filter/RepeatableFilter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.filter; +package com.wild.common.filter; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import org.springframework.http.MediaType; import javax.servlet.*; @@ -10,7 +10,7 @@ import java.io.IOException; /** * Repeatable 过滤器 * - * @author ruoyi + * @author wild */ public class RepeatableFilter implements Filter { @Override diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java b/wild-common/src/main/java/com/wild/common/filter/RepeatedlyRequestWrapper.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java rename to wild-common/src/main/java/com/wild/common/filter/RepeatedlyRequestWrapper.java index b6fd0b65a..bc202725a 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/RepeatedlyRequestWrapper.java +++ b/wild-common/src/main/java/com/wild/common/filter/RepeatedlyRequestWrapper.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.filter; +package com.wild.common.filter; import cn.hutool.core.io.IoUtil; @@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets; /** * 构建可重复读取inputStream的request * - * @author ruoyi + * @author wild */ public class RepeatedlyRequestWrapper extends HttpServletRequestWrapper { private final byte[] body; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java b/wild-common/src/main/java/com/wild/common/filter/XssFilter.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java rename to wild-common/src/main/java/com/wild/common/filter/XssFilter.java index f397de1ec..d019e4965 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java +++ b/wild-common/src/main/java/com/wild/common/filter/XssFilter.java @@ -1,6 +1,6 @@ -package com.ruoyi.common.filter; +package com.wild.common.filter; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; @@ -12,7 +12,7 @@ import java.util.List; /** * 防止XSS攻击的过滤器 * - * @author ruoyi + * @author wild */ public class XssFilter implements Filter { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java b/wild-common/src/main/java/com/wild/common/filter/XssHttpServletRequestWrapper.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java rename to wild-common/src/main/java/com/wild/common/filter/XssHttpServletRequestWrapper.java index a8ffd66cc..e9c8bf334 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/filter/XssHttpServletRequestWrapper.java +++ b/wild-common/src/main/java/com/wild/common/filter/XssHttpServletRequestWrapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.filter; +package com.wild.common.filter; import cn.hutool.core.io.IoUtil; import cn.hutool.http.HtmlUtil; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets; /** * XSS过滤处理 * - * @author ruoyi + * @author wild */ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { /** @@ -95,4 +95,4 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper { String header = super.getHeader(HttpHeaders.CONTENT_TYPE); return StringUtils.startsWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE); } -} \ No newline at end of file +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java b/wild-common/src/main/java/com/wild/common/properties/TokenProperties.java similarity index 93% rename from ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java rename to wild-common/src/main/java/com/wild/common/properties/TokenProperties.java index 927a9413d..1cbd26afc 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/properties/TokenProperties.java +++ b/wild-common/src/main/java/com/wild/common/properties/TokenProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.properties; +package com.wild.common.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/wild-common/src/main/java/com/wild/common/utils/BeanCopyUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java rename to wild-common/src/main/java/com/wild/common/utils/BeanCopyUtils.java index 8bf40d16a..64b7a2029 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/BeanCopyUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.bean.copier.BeanCopier; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/wild-common/src/main/java/com/wild/common/utils/DateUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java rename to wild-common/src/main/java/com/wild/common/utils/DateUtils.java index 1e27f2494..4cd09f88e 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/DateUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import org.apache.commons.lang3.time.DateFormatUtils; @@ -10,7 +10,7 @@ import java.util.Date; /** * 时间工具类 * - * @author ruoyi + * @author wild */ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java b/wild-common/src/main/java/com/wild/common/utils/DictUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java rename to wild-common/src/main/java/com/wild/common/utils/DictUtils.java index 3309da14e..98fe33214 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/DictUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.collection.CollUtil; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysDictData; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.entity.SysDictData; import java.util.Collection; import java.util.List; @@ -10,8 +10,8 @@ import java.util.List; /** * 字典工具类 * - * @author ruoyi - * @deprecated 3.5.0 版本删除 迁移至 {@link com.ruoyi.common.core.service.DictService} + * @author wild + * @deprecated 3.5.0 版本删除 迁移至 {@link com.wild.common.core.service.DictService} */ @Deprecated public class DictUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java b/wild-common/src/main/java/com/wild/common/utils/JsonUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java rename to wild-common/src/main/java/com/wild/common/utils/JsonUtils.java index b65c23dc8..5f7754fd9 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/JsonUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/JsonUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.util.ArrayUtil; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java b/wild-common/src/main/java/com/wild/common/utils/MessageUtils.java similarity index 86% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java rename to wild-common/src/main/java/com/wild/common/utils/MessageUtils.java index 039eb2435..967401cb4 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/MessageUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/MessageUtils.java @@ -1,13 +1,13 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.utils.spring.SpringUtils; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; /** * 获取i18n资源文件 * - * @author ruoyi + * @author wild */ public class MessageUtils { /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java b/wild-common/src/main/java/com/wild/common/utils/PageUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java rename to wild-common/src/main/java/com/wild/common/utils/PageUtils.java index abc42ddd2..a4cc12e9d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/PageUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.sql.SqlUtil; +import com.wild.common.core.page.PagePlus; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.utils.sql.SqlUtil; import java.util.List; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java b/wild-common/src/main/java/com/wild/common/utils/RedisUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java rename to wild-common/src/main/java/com/wild/common/utils/RedisUtils.java index 7f4d2cace..762bd0982 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/RedisUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/RedisUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import com.google.common.collect.Lists; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.utils.spring.SpringUtils; import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.redisson.api.*; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/wild-common/src/main/java/com/wild/common/utils/SecurityUtils.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java rename to wild-common/src/main/java/com/wild/common/utils/SecurityUtils.java index 91a40ec12..bc5d92f1b 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/SecurityUtils.java @@ -1,8 +1,8 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.exception.ServiceException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; @@ -10,7 +10,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; /** * 安全服务工具类 * - * @author ruoyi + * @author wild */ public class SecurityUtils { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java b/wild-common/src/main/java/com/wild/common/utils/ServletUtils.java similarity index 98% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java rename to wild-common/src/main/java/com/wild/common/utils/ServletUtils.java index 1e1db3749..decd3e402 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/ServletUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.convert.Convert; import cn.hutool.extra.servlet.ServletUtil; @@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets; /** * 客户端工具类 * - * @author ruoyi + * @author wild */ public class ServletUtils extends ServletUtil { diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/wild-common/src/main/java/com/wild/common/utils/StringUtils.java similarity index 99% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java rename to wild-common/src/main/java/com/wild/common/utils/StringUtils.java index 12fc4db9b..18713b480 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/StringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Validator; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java b/wild-common/src/main/java/com/wild/common/utils/Threads.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java rename to wild-common/src/main/java/com/wild/common/utils/Threads.java index 5be9582ad..25bbb7329 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java +++ b/wild-common/src/main/java/com/wild/common/utils/Threads.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -8,7 +8,7 @@ import java.util.concurrent.*; /** * 线程相关工具类. * - * @author ruoyi + * @author wild */ public class Threads { private static final Logger logger = LoggerFactory.getLogger(Threads.class); diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java b/wild-common/src/main/java/com/wild/common/utils/TreeBuildUtils.java similarity index 96% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java rename to wild-common/src/main/java/com/wild/common/utils/TreeBuildUtils.java index a8380a287..7677d3a48 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TreeBuildUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/TreeBuildUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java b/wild-common/src/main/java/com/wild/common/utils/ValidatorUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java rename to wild-common/src/main/java/com/wild/common/utils/ValidatorUtils.java index c28cf80fa..ecf2f9f25 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ValidatorUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/ValidatorUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils; +package com.wild.common.utils; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java b/wild-common/src/main/java/com/wild/common/utils/file/FileUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java rename to wild-common/src/main/java/com/wild/common/utils/file/FileUtils.java index ff56a2a70..a6b29a709 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/file/FileUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.file; +package com.wild.common.utils.file; import cn.hutool.core.io.FileUtil; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java b/wild-common/src/main/java/com/wild/common/utils/ip/AddressUtils.java similarity index 85% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java rename to wild-common/src/main/java/com/wild/common/utils/ip/AddressUtils.java index 808cc8d5c..b55ba27d1 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/ip/AddressUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.ip; +package com.wild.common.utils.ip; import cn.hutool.core.net.NetUtil; import cn.hutool.http.HtmlUtil; import cn.hutool.http.HttpUtil; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.config.WildConfig; +import com.wild.common.constant.Constants; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import java.util.Map; @@ -35,7 +35,7 @@ public class AddressUtils { if (NetUtil.isInnerIP(ip)) { return "内网IP"; } - if (RuoYiConfig.isAddressEnabled()) { + if (WildConfig.isAddressEnabled()) { try { String rspStr = HttpUtil.createGet(IP_URL) .body("ip=" + ip + "&json=true", Constants.GBK) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/wild-common/src/main/java/com/wild/common/utils/poi/ExcelUtil.java similarity index 94% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java rename to wild-common/src/main/java/com/wild/common/utils/poi/ExcelUtil.java index 6c5dc5fc8..ff4ea660c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java +++ b/wild-common/src/main/java/com/wild/common/utils/poi/ExcelUtil.java @@ -1,14 +1,14 @@ -package com.ruoyi.common.utils.poi; +package com.wild.common.utils.poi; import cn.hutool.core.util.IdUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; -import com.ruoyi.common.convert.ExcelBigNumberConvert; -import com.ruoyi.common.excel.DefaultExcelListener; -import com.ruoyi.common.excel.ExcelListener; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; +import com.wild.common.convert.ExcelBigNumberConvert; +import com.wild.common.excel.DefaultExcelListener; +import com.wild.common.excel.ExcelListener; +import com.wild.common.excel.ExcelResult; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.file.FileUtils; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/wild-common/src/main/java/com/wild/common/utils/reflect/ReflectUtils.java similarity index 95% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java rename to wild-common/src/main/java/com/wild/common/utils/reflect/ReflectUtils.java index 07ac943c3..3cac2db9c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/reflect/ReflectUtils.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.utils.reflect; +package com.wild.common.utils.reflect; import cn.hutool.core.util.ReflectUtil; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import java.lang.reflect.Method; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java b/wild-common/src/main/java/com/wild/common/utils/spring/SpringUtils.java similarity index 97% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java rename to wild-common/src/main/java/com/wild/common/utils/spring/SpringUtils.java index ebc6d27f4..82d147c16 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/spring/SpringUtils.java +++ b/wild-common/src/main/java/com/wild/common/utils/spring/SpringUtils.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.utils.spring; +package com.wild.common.utils.spring; import cn.hutool.extra.spring.SpringUtil; import org.springframework.aop.framework.AopContext; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java b/wild-common/src/main/java/com/wild/common/utils/sql/SqlUtil.java similarity index 83% rename from ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java rename to wild-common/src/main/java/com/wild/common/utils/sql/SqlUtil.java index 8121e0253..921082c86 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java +++ b/wild-common/src/main/java/com/wild/common/utils/sql/SqlUtil.java @@ -1,12 +1,12 @@ -package com.ruoyi.common.utils.sql; +package com.wild.common.utils.sql; -import com.ruoyi.common.exception.UtilException; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.exception.UtilException; +import com.wild.common.utils.StringUtils; /** * sql操作工具类 * - * @author ruoyi + * @author wild */ public class SqlUtil { /** diff --git a/ruoyi-demo/pom.xml b/wild-demo/pom.xml similarity index 71% rename from ruoyi-demo/pom.xml rename to wild-demo/pom.xml index 1ca6d92b6..cadb6096a 100644 --- a/ruoyi-demo/pom.xml +++ b/wild-demo/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-demo + wild-demo demo模块 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.wild + wild-common diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/wild-demo/src/main/java/com/wild/demo/controller/RedisCacheController.java similarity index 95% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java rename to wild-demo/src/main/java/com/wild/demo/controller/RedisCacheController.java index e01b542e0..d5da676ce 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/RedisCacheController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.RedisUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.utils.RedisUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ import java.util.concurrent.TimeUnit; // 类级别 缓存统一配置 //@CacheConfig(cacheNames = "redissonCacheMap") @Api(value = "spring-cache 演示案例", tags = {"spring-cache 演示案例"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/demo/cache") public class RedisCacheController { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/wild-demo/src/main/java/com/wild/demo/controller/RedisLockController.java similarity index 96% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java rename to wild-demo/src/main/java/com/wild/demo/controller/RedisLockController.java index 94ad3c3a3..3fb5489a2 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/RedisLockController.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; import com.baomidou.lock.LockInfo; import com.baomidou.lock.LockTemplate; import com.baomidou.lock.annotation.Lock4j; import com.baomidou.lock.executor.RedissonLockExecutor; -import com.ruoyi.common.core.domain.AjaxResult; +import com.wild.common.core.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/wild-demo/src/main/java/com/wild/demo/controller/RedisPubSubController.java similarity index 88% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java rename to wild-demo/src/main/java/com/wild/demo/controller/RedisPubSubController.java index 619a69028..43f0ac9cd 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/RedisPubSubController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.RedisUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.utils.RedisUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * @author Lion Li */ @Api(value = "Redis发布订阅 演示案例", tags = {"Redis发布订阅"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/demo/redis/pubsub") public class RedisPubSubController { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/wild-demo/src/main/java/com/wild/demo/controller/RedisRateLimiterController.java similarity index 89% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java rename to wild-demo/src/main/java/com/wild/demo/controller/RedisRateLimiterController.java index 1eeab6114..c87a2c24a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.enums.LimitType; +import com.wild.common.annotation.RateLimiter; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.enums.LimitType; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/wild-demo/src/main/java/com/wild/demo/controller/Swagger3DemoController.java similarity index 93% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java rename to wild-demo/src/main/java/com/wild/demo/controller/Swagger3DemoController.java index 6b73d64a8..18bf9ff6a 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/Swagger3DemoController.java @@ -1,6 +1,6 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; -import com.ruoyi.common.core.domain.AjaxResult; +import com.wild.common.core.domain.AjaxResult; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/wild-demo/src/main/java/com/wild/demo/controller/TestBatchController.java similarity index 90% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java rename to wild-demo/src/main/java/com/wild/demo/controller/TestBatchController.java index d6e691dbb..ca3e11cec 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/TestBatchController.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.service.ITestDemoService; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.demo.domain.TestDemo; +import com.wild.demo.service.ITestDemoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -24,7 +24,7 @@ import java.util.List; * @date 2021-05-30 */ @Api(value = "测试批量方法", tags = {"测试批量方法"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/demo/batch") public class TestBatchController extends BaseController { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/wild-demo/src/main/java/com/wild/demo/controller/TestDemoController.java similarity index 85% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java rename to wild-demo/src/main/java/com/wild/demo/controller/TestDemoController.java index a3b1c7ffa..16111682e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/TestDemoController.java @@ -1,23 +1,23 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.ValidatorUtils; -import com.ruoyi.common.excel.ExcelResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.bo.TestDemoBo; -import com.ruoyi.demo.domain.bo.TestDemoImportVo; -import com.ruoyi.demo.domain.vo.TestDemoVo; -import com.ruoyi.demo.service.ITestDemoService; +import com.wild.common.annotation.Log; +import com.wild.common.annotation.RepeatSubmit; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; +import com.wild.common.core.validate.QueryGroup; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.ValidatorUtils; +import com.wild.common.excel.ExcelResult; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.demo.domain.TestDemo; +import com.wild.demo.domain.bo.TestDemoBo; +import com.wild.demo.domain.bo.TestDemoImportVo; +import com.wild.demo.domain.vo.TestDemoVo; +import com.wild.demo.service.ITestDemoService; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit; */ @Validated @Api(value = "测试单表控制器", tags = {"测试单表管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/demo/demo") public class TestDemoController extends BaseController { diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/wild-demo/src/main/java/com/wild/demo/controller/TestI18nController.java similarity index 93% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java rename to wild-demo/src/main/java/com/wild/demo/controller/TestI18nController.java index 40b031b51..7335aa9b4 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/TestI18nController.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.MessageUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.utils.MessageUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/wild-demo/src/main/java/com/wild/demo/controller/TestTreeController.java similarity index 84% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java rename to wild-demo/src/main/java/com/wild/demo/controller/TestTreeController.java index 463ea3bf6..7d6b88085 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java +++ b/wild-demo/src/main/java/com/wild/demo/controller/TestTreeController.java @@ -1,17 +1,17 @@ -package com.ruoyi.demo.controller; +package com.wild.demo.controller; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.demo.domain.bo.TestTreeBo; -import com.ruoyi.demo.domain.vo.TestTreeVo; -import com.ruoyi.demo.service.ITestTreeService; +import com.wild.common.annotation.Log; +import com.wild.common.annotation.RepeatSubmit; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; +import com.wild.common.core.validate.QueryGroup; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; +import com.wild.demo.domain.bo.TestTreeBo; +import com.wild.demo.domain.vo.TestTreeVo; +import com.wild.demo.service.ITestTreeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; @@ -35,7 +35,7 @@ import java.util.List; */ @Validated @Api(value = "测试树表控制器", tags = {"测试树表管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/demo/tree") public class TestTreeController extends BaseController { diff --git a/wild-demo/src/main/java/com/wild/demo/controller/package-info.java b/wild-demo/src/main/java/com/wild/demo/controller/package-info.java new file mode 100644 index 000000000..dc3db8b7e --- /dev/null +++ b/wild-demo/src/main/java/com/wild/demo/controller/package-info.java @@ -0,0 +1 @@ +package com.wild.demo.controller; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/wild-demo/src/main/java/com/wild/demo/domain/TestDemo.java similarity index 92% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java rename to wild-demo/src/main/java/com/wild/demo/domain/TestDemo.java index 74b57d991..7ff006c32 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/TestDemo.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.domain; +package com.wild.demo.domain; import com.baomidou.mybatisplus.annotation.*; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/wild-demo/src/main/java/com/wild/demo/domain/TestTree.java similarity index 92% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java rename to wild-demo/src/main/java/com/wild/demo/domain/TestTree.java index 92e005b85..795362288 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/TestTree.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.domain; +package com.wild.demo.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import com.ruoyi.common.core.domain.TreeEntity; +import com.wild.common.core.domain.TreeEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/wild-demo/src/main/java/com/wild/demo/domain/bo/TestDemoBo.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java rename to wild-demo/src/main/java/com/wild/demo/domain/bo/TestDemoBo.java index 46018b108..5058ee0ed 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/bo/TestDemoBo.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.domain.bo; +package com.wild.demo.domain.bo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +10,7 @@ import javax.validation.constraints.*; import java.util.Date; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; /** * 测试单表业务对象 test_demo diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java b/wild-demo/src/main/java/com/wild/demo/domain/bo/TestDemoImportVo.java similarity index 97% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java rename to wild-demo/src/main/java/com/wild/demo/domain/bo/TestDemoImportVo.java index 7185514fd..1ce05fe51 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/bo/TestDemoImportVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.domain.bo; +package com.wild.demo.domain.bo; import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/wild-demo/src/main/java/com/wild/demo/domain/bo/TestTreeBo.java similarity index 90% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java rename to wild-demo/src/main/java/com/wild/demo/domain/bo/TestTreeBo.java index 2dfe1ff09..b63749bed 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/bo/TestTreeBo.java @@ -1,8 +1,8 @@ -package com.ruoyi.demo.domain.bo; +package com.wild.demo.domain.bo; -import com.ruoyi.common.core.domain.TreeEntity; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.wild.common.core.domain.TreeEntity; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/wild-demo/src/main/java/com/wild/demo/domain/package-info.java b/wild-demo/src/main/java/com/wild/demo/domain/package-info.java new file mode 100644 index 000000000..bb8b95615 --- /dev/null +++ b/wild-demo/src/main/java/com/wild/demo/domain/package-info.java @@ -0,0 +1 @@ +package com.wild.demo.domain; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/wild-demo/src/main/java/com/wild/demo/domain/vo/TestDemoVo.java similarity index 98% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java rename to wild-demo/src/main/java/com/wild/demo/domain/vo/TestDemoVo.java index 4919bbde2..40fb08d27 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/vo/TestDemoVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.domain.vo; +package com.wild.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/wild-demo/src/main/java/com/wild/demo/domain/vo/TestTreeVo.java similarity index 97% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java rename to wild-demo/src/main/java/com/wild/demo/domain/vo/TestTreeVo.java index dab816243..9eb85315e 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java +++ b/wild-demo/src/main/java/com/wild/demo/domain/vo/TestTreeVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.demo.domain.vo; +package com.wild.demo.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/wild-demo/src/main/java/com/wild/demo/mapper/TestDemoMapper.java similarity index 71% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java rename to wild-demo/src/main/java/com/wild/demo/mapper/TestDemoMapper.java index dccea6154..65eab19ab 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java +++ b/wild-demo/src/main/java/com/wild/demo/mapper/TestDemoMapper.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.mapper; +package com.wild.demo.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.vo.TestDemoVo; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.demo.domain.TestDemo; +import com.wild.demo.domain.vo.TestDemoVo; import org.apache.ibatis.annotations.Param; /** diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java b/wild-demo/src/main/java/com/wild/demo/mapper/TestTreeMapper.java similarity index 53% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java rename to wild-demo/src/main/java/com/wild/demo/mapper/TestTreeMapper.java index 05b0153b8..48e73c17d 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java +++ b/wild-demo/src/main/java/com/wild/demo/mapper/TestTreeMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.demo.mapper; +package com.wild.demo.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.demo.domain.TestTree; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.demo.domain.TestTree; /** * 测试树表Mapper接口 diff --git a/wild-demo/src/main/java/com/wild/demo/mapper/package-info.java b/wild-demo/src/main/java/com/wild/demo/mapper/package-info.java new file mode 100644 index 000000000..09ca73f88 --- /dev/null +++ b/wild-demo/src/main/java/com/wild/demo/mapper/package-info.java @@ -0,0 +1 @@ +package com.wild.demo.mapper; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/wild-demo/src/main/java/com/wild/demo/service/ITestDemoService.java similarity index 79% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java rename to wild-demo/src/main/java/com/wild/demo/service/ITestDemoService.java index eb4f21be8..8b7b90c43 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java +++ b/wild-demo/src/main/java/com/wild/demo/service/ITestDemoService.java @@ -1,10 +1,10 @@ -package com.ruoyi.demo.service; +package com.wild.demo.service; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.vo.TestDemoVo; -import com.ruoyi.demo.domain.bo.TestDemoBo; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; -import com.ruoyi.common.core.page.TableDataInfo; +import com.wild.demo.domain.TestDemo; +import com.wild.demo.domain.vo.TestDemoVo; +import com.wild.demo.domain.bo.TestDemoBo; +import com.wild.common.core.mybatisplus.core.IServicePlus; +import com.wild.common.core.page.TableDataInfo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java b/wild-demo/src/main/java/com/wild/demo/service/ITestTreeService.java similarity index 80% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java rename to wild-demo/src/main/java/com/wild/demo/service/ITestTreeService.java index 9b8acb9c6..478c3f2ec 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java +++ b/wild-demo/src/main/java/com/wild/demo/service/ITestTreeService.java @@ -1,9 +1,9 @@ -package com.ruoyi.demo.service; +package com.wild.demo.service; -import com.ruoyi.demo.domain.TestTree; -import com.ruoyi.demo.domain.vo.TestTreeVo; -import com.ruoyi.demo.domain.bo.TestTreeBo; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.wild.demo.domain.TestTree; +import com.wild.demo.domain.vo.TestTreeVo; +import com.wild.demo.domain.bo.TestTreeBo; +import com.wild.common.core.mybatisplus.core.IServicePlus; import java.util.Collection; import java.util.List; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/wild-demo/src/main/java/com/wild/demo/service/impl/TestDemoServiceImpl.java similarity index 84% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java rename to wild-demo/src/main/java/com/wild/demo/service/impl/TestDemoServiceImpl.java index 4280d509d..353857b3c 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java +++ b/wild-demo/src/main/java/com/wild/demo/service/impl/TestDemoServiceImpl.java @@ -1,20 +1,20 @@ -package com.ruoyi.demo.service.impl; +package com.wild.demo.service.impl; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.demo.domain.TestDemo; -import com.ruoyi.demo.domain.bo.TestDemoBo; -import com.ruoyi.demo.domain.vo.TestDemoVo; -import com.ruoyi.demo.mapper.TestDemoMapper; -import com.ruoyi.demo.service.ITestDemoService; +import com.wild.common.annotation.DataScope; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.PagePlus; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.utils.PageUtils; +import com.wild.demo.domain.TestDemo; +import com.wild.demo.domain.bo.TestDemoBo; +import com.wild.demo.domain.vo.TestDemoVo; +import com.wild.demo.mapper.TestDemoMapper; +import com.wild.demo.service.ITestDemoService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/wild-demo/src/main/java/com/wild/demo/service/impl/TestTreeServiceImpl.java similarity index 84% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java rename to wild-demo/src/main/java/com/wild/demo/service/impl/TestTreeServiceImpl.java index e793a86fe..e80426e91 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java +++ b/wild-demo/src/main/java/com/wild/demo/service/impl/TestTreeServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.demo.service.impl; +package com.wild.demo.service.impl; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.demo.domain.TestTree; -import com.ruoyi.demo.domain.bo.TestTreeBo; -import com.ruoyi.demo.domain.vo.TestTreeVo; -import com.ruoyi.demo.mapper.TestTreeMapper; -import com.ruoyi.demo.service.ITestTreeService; +import com.wild.common.annotation.DataScope; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.utils.StringUtils; +import com.wild.demo.domain.TestTree; +import com.wild.demo.domain.bo.TestTreeBo; +import com.wild.demo.domain.vo.TestTreeVo; +import com.wild.demo.mapper.TestTreeMapper; +import com.wild.demo.service.ITestTreeService; import org.springframework.stereotype.Service; import java.util.Collection; diff --git a/wild-demo/src/main/java/com/wild/demo/service/impl/package-info.java b/wild-demo/src/main/java/com/wild/demo/service/impl/package-info.java new file mode 100644 index 000000000..f7d8ad977 --- /dev/null +++ b/wild-demo/src/main/java/com/wild/demo/service/impl/package-info.java @@ -0,0 +1 @@ +package com.wild.demo.service.impl; diff --git a/wild-demo/src/main/java/com/wild/demo/service/package-info.java b/wild-demo/src/main/java/com/wild/demo/service/package-info.java new file mode 100644 index 000000000..380a38eed --- /dev/null +++ b/wild-demo/src/main/java/com/wild/demo/service/package-info.java @@ -0,0 +1 @@ +package com.wild.demo.service; diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/wild-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 80% rename from ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to wild-demo/src/main/resources/mapper/demo/TestDemoMapper.xml index 3caf98a71..5b62afc8e 100644 --- a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml +++ b/wild-demo/src/main/resources/mapper/demo/TestDemoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - SELECT * FROM test_demo ${ew.customSqlSegment} diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/wild-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 84% rename from ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to wild-demo/src/main/resources/mapper/demo/TestTreeMapper.xml index 0943d5b14..230a7b48c 100644 --- a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml +++ b/wild-demo/src/main/resources/mapper/demo/TestTreeMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -19,4 +19,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - \ No newline at end of file + diff --git a/ruoyi-demo/src/main/resources/mapper/package-info.md b/wild-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-demo/src/main/resources/mapper/package-info.md rename to wild-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-extend/pom.xml b/wild-extend/pom.xml similarity index 66% rename from ruoyi-extend/pom.xml rename to wild-extend/pom.xml index ccd525cec..97bb14e96 100644 --- a/ruoyi-extend/pom.xml +++ b/wild-extend/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-extend + wild-extend pom - ruoyi-monitor-admin - ruoyi-xxl-job-admin + wild-monitor-admin + wild-xxl-job-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile b/wild-extend/wild-monitor-admin/Dockerfile similarity index 56% rename from ruoyi-extend/ruoyi-monitor-admin/Dockerfile rename to wild-extend/wild-monitor-admin/Dockerfile index b506a2ddd..bd6d6ec7f 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/Dockerfile +++ b/wild-extend/wild-monitor-admin/Dockerfile @@ -2,13 +2,13 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/monitor -RUN mkdir -p /ruoyi/monitor/logs +RUN mkdir -p /wild/monitor +RUN mkdir -p /wild/monitor/logs -WORKDIR /ruoyi/monitor +WORKDIR /wild/monitor EXPOSE 9090 -ADD ./target/ruoyi-monitor-admin.jar ./app.jar +ADD ./target/wild-monitor-admin.jar ./app.jar ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/wild-extend/wild-monitor-admin/pom.xml similarity index 95% rename from ruoyi-extend/ruoyi-monitor-admin/pom.xml rename to wild-extend/wild-monitor-admin/pom.xml index 177c9af3e..0f713bfc2 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/wild-extend/wild-monitor-admin/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-extend - com.ruoyi + wild-extend + com.wild 3.4.0 4.0.0 jar - ruoyi-monitor-admin + wild-monitor-admin diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java b/wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/MonitorAdminApplication.java similarity index 92% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java rename to wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/MonitorAdminApplication.java index 1d1cbca58..8d0d8de27 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/MonitorAdminApplication.java +++ b/wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/MonitorAdminApplication.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin; +package com.wild.monitor.admin; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/AdminServerConfig.java b/wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/config/AdminServerConfig.java similarity index 96% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/AdminServerConfig.java rename to wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/config/AdminServerConfig.java index e2a9c51de..53f327e7b 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/AdminServerConfig.java +++ b/wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/config/AdminServerConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin.config; +package com.wild.monitor.admin.config; import de.codecentric.boot.admin.server.config.EnableAdminServer; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java b/wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/config/SecurityConfig.java similarity index 98% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java rename to wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/config/SecurityConfig.java index 7335e2f25..b22a80e95 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/java/com/ruoyi/monitor/admin/config/SecurityConfig.java +++ b/wild-extend/wild-monitor-admin/src/main/java/com/wild/monitor/admin/config/SecurityConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.monitor.admin.config; +package com.wild.monitor.admin.config; import de.codecentric.boot.admin.server.config.AdminServerProperties; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml b/wild-extend/wild-monitor-admin/src/main/resources/application-dev.yml similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml rename to wild-extend/wild-monitor-admin/src/main/resources/application-dev.yml index 829314b41..0ce36f627 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml +++ b/wild-extend/wild-monitor-admin/src/main/resources/application-dev.yml @@ -10,5 +10,5 @@ spring: url: http://localhost:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP - username: ruoyi + username: wild password: 123456 diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml b/wild-extend/wild-monitor-admin/src/main/resources/application-prod.yml similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml rename to wild-extend/wild-monitor-admin/src/main/resources/application-prod.yml index e8cac1369..574b526b5 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml +++ b/wild-extend/wild-monitor-admin/src/main/resources/application-prod.yml @@ -10,5 +10,5 @@ spring: url: http://172.30.0.90:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP - username: ruoyi + username: wild password: 123456 diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/wild-extend/wild-monitor-admin/src/main/resources/application.yml similarity index 87% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml rename to wild-extend/wild-monitor-admin/src/main/resources/application.yml index bf0db5620..93bb87d87 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/wild-extend/wild-monitor-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 9090 spring: application: - name: ruoyi-monitor-admin + name: wild-monitor-admin profiles: active: @profiles.active@ @@ -10,7 +10,7 @@ spring: spring: security: user: - name: ruoyi + name: wild password: 123456 boot: admin: @@ -28,4 +28,4 @@ management: include: @endpoints.include@ endpoint: logfile: - external-file: ./logs/ruoyi-monitor-admin.log + external-file: ./logs/wild-monitor-admin.log diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt b/wild-extend/wild-monitor-admin/src/main/resources/banner.txt similarity index 90% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt rename to wild-extend/wild-monitor-admin/src/main/resources/banner.txt index abb124d8c..d050e2eff 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/banner.txt +++ b/wild-extend/wild-monitor-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi-vue-plus.version} +Application Version: ${wild-vue-plus.version} Spring Boot Version: ${spring-boot.version} __ __ _ _ _ _ | \/ | (_) | /\ | | (_) diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml b/wild-extend/wild-monitor-admin/src/main/resources/logback.xml similarity index 93% rename from ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml rename to wild-extend/wild-monitor-admin/src/main/resources/logback.xml index 16bb9376b..00bea343e 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/logback.xml +++ b/wild-extend/wild-monitor-admin/src/main/resources/logback.xml @@ -2,7 +2,7 @@ logback - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile b/wild-extend/wild-xxl-job-admin/Dockerfile similarity index 62% rename from ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile rename to wild-extend/wild-xxl-job-admin/Dockerfile index f7221bdf0..80eb1b717 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/Dockerfile +++ b/wild-extend/wild-xxl-job-admin/Dockerfile @@ -2,16 +2,16 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li -RUN mkdir -p /ruoyi/xxljob -RUN mkdir -p /ruoyi/xxljob/logs +RUN mkdir -p /wild/xxljob +RUN mkdir -p /wild/xxljob/logs -WORKDIR /ruoyi/xxljob +WORKDIR /wild/xxljob ENV TZ=PRC RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone EXPOSE 9100 -ADD ./target/ruoyi-xxl-job-admin.jar ./app.jar +ADD ./target/wild-xxl-job-admin.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"] diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/wild-extend/wild-xxl-job-admin/pom.xml similarity index 97% rename from ruoyi-extend/ruoyi-xxl-job-admin/pom.xml rename to wild-extend/wild-xxl-job-admin/pom.xml index 29786ee06..b73c8b496 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/wild-extend/wild-xxl-job-admin/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - ruoyi-extend - com.ruoyi + wild-extend + com.wild 3.4.0 - ruoyi-xxl-job-admin + wild-xxl-job-admin jar diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/XxlJobAdminApplication.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/annotation/PermissionLimit.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarm.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/JobAlarmer.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/alarm/impl/EmailJobAlarm.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/complete/XxlJobCompleter.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/conf/XxlJobAdminConfig.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/cron/CronExpression.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/exception/XxlJobException.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobGroup.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLog.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogGlue.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobLogReport.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobUser.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/RemoteHttpJobBean.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobDynamicScheduler.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/old/XxlJobThreadPool.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouteStrategyEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteBusyover.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteConsistentHash.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFailover.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteFirst.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLast.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRandom.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteRound.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/MisfireStrategyEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/ScheduleTypeEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/scheduler/XxlJobScheduler.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobCompleteHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobLogReportHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/TriggerTypeEnum.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/CookieUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/FtlUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/I18nUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/JacksonUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/LocalCacheUtil.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobGroupDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobInfoDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogGlueDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobLogReportDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobRegistryDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/dao/XxlJobUserDao.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/LoginService.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/XxlJobService.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/AdminBizImpl.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java b/wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java rename to wild-extend/wild-xxl-job-admin/src/main/java/com/xxl/job/admin/service/impl/XxlJobServiceImpl.java diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml b/wild-extend/wild-xxl-job-admin/src/main/resources/application-dev.yml similarity index 98% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml rename to wild-extend/wild-xxl-job-admin/src/main/resources/application-dev.yml index 540a3237a..ce0d29dfc 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml +++ b/wild-extend/wild-xxl-job-admin/src/main/resources/application-dev.yml @@ -10,7 +10,7 @@ spring: url: http://localhost:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP - username: ruoyi + username: wild password: 123456 --- # 数据库配置 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml b/wild-extend/wild-xxl-job-admin/src/main/resources/application-prod.yml similarity index 98% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml rename to wild-extend/wild-xxl-job-admin/src/main/resources/application-prod.yml index bcec9d82e..cad67e530 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml +++ b/wild-extend/wild-xxl-job-admin/src/main/resources/application-prod.yml @@ -10,7 +10,7 @@ spring: url: http://172.30.0.90:9090/admin instance: prefer-ip: true # 注册实例时，优先使用 IP - username: ruoyi + username: wild password: 123456 --- # 数据库配置 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml b/wild-extend/wild-xxl-job-admin/src/main/resources/application.yml similarity index 94% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml rename to wild-extend/wild-xxl-job-admin/src/main/resources/application.yml index 202272087..64969ab76 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml +++ b/wild-extend/wild-xxl-job-admin/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: context-path: /xxl-job-admin spring: application: - name: ruoyi-xxl-job-admin + name: wild-xxl-job-admin profiles: active: @profiles.active@ mvc: @@ -45,7 +45,7 @@ management: include: @endpoints.include@ endpoint: logfile: - external-file: ./logs/ruoyi-xxl-job-admin.log + external-file: ./logs/wild-xxl-job-admin.log --- # xxljob系统配置 xxl: diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt b/wild-extend/wild-xxl-job-admin/src/main/resources/banner.txt similarity index 91% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt rename to wild-extend/wild-xxl-job-admin/src/main/resources/banner.txt index a9179c6a4..2d9aa93f6 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/banner.txt +++ b/wild-extend/wild-xxl-job-admin/src/main/resources/banner.txt @@ -1,4 +1,4 @@ -Application Version: ${ruoyi-vue-plus.version} +Application Version: ${wild-vue-plus.version} Spring Boot Version: ${spring-boot.version} __ __ _ _ _ _ _ \ \ / / | | | | | | /\ | | (_) diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_en.properties b/wild-extend/wild-xxl-job-admin/src/main/resources/i18n/message_en.properties similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_en.properties rename to wild-extend/wild-xxl-job-admin/src/main/resources/i18n/message_en.properties diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties b/wild-extend/wild-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties rename to wild-extend/wild-xxl-job-admin/src/main/resources/i18n/message_zh_CN.properties diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties b/wild-extend/wild-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties rename to wild-extend/wild-xxl-job-admin/src/main/resources/i18n/message_zh_TC.properties diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/logback.xml similarity index 93% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/logback.xml index 9c2e77233..2616e5eed 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/logback.xml +++ b/wild-extend/wild-xxl-job-admin/src/main/resources/logback.xml @@ -2,7 +2,7 @@ logback - + @@ -31,4 +31,4 @@ - \ No newline at end of file + diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobGroupMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogGlueMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobLogReportMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml b/wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml rename to wild-extend/wild-xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobUserMapper.xml diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/css/ionicons.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.eot diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.svg diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.ttf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/Ionicons/fonts/ionicons.woff diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/pace.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/PACE/themes/blue/pace-theme-flash.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap-daterangepicker/daterangepicker.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/css/bootstrap.min.css.map diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.eot diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.svg diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.ttf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/fonts/glyphicons-halflings-regular.woff2 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/bootstrap/js/bootstrap.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/datatables.net/js/jquery.dataTables.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/fastclick/fastclick.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.css.map diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/css/font-awesome.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/FontAwesome.otf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.eot diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.svg diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.ttf diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/font-awesome/fonts/fontawesome-webfont.woff2 diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery-slimscroll/jquery.slimscroll.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/jquery/jquery.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/bower_components/moment/moment.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/dist/css/AdminLTE.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/dist/css/skins/_all-skins.min.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/dist/js/adminlte.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/icheck.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png b/wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/adminlte/plugins/iCheck/square/blue@2x.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/favicon.ico b/wild-extend/wild-xxl-job-admin/src/main/resources/static/favicon.ico similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/favicon.ico rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/favicon.ico diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/common.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/common.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/common.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/common.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/index.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/index.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/index.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/index.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/jobcode.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/jobgroup.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/jobinfo.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/joblog.detail.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/joblog.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/login.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/login.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/login.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/login.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/js/user.index.1.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/js/user.index.1.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/js/user.index.1.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/anyword-hint.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/addon/hint/show-hint.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/lib/codemirror.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/clike/clike.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/javascript/javascript.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/php/php.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/powershell/powershell.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/python/python.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/codemirror/mode/shell/shell.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/cronGen/cronGen_en.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/echarts/echarts.common.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.cookie.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/jquery/jquery.validate.min.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/layer.js diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon-ext.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/icon.png diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/layer.css diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-0.gif diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-1.gif diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif b/wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif rename to wild-extend/wild-xxl-job-admin/src/main/resources/static/plugins/layer/theme/default/loading-2.gif diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/common/common.exception.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/common/common.macro.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/help.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/help.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/help.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/help.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/index.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/index.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/jobcode/jobcode.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/jobgroup/jobgroup.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/jobinfo/jobinfo.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/joblog/joblog.detail.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/joblog/joblog.index.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/login.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/login.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/login.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/login.ftl diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/user/user.index.ftl b/wild-extend/wild-xxl-job-admin/src/main/resources/templates/user/user.index.ftl similarity index 100% rename from ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/templates/user/user.index.ftl rename to wild-extend/wild-xxl-job-admin/src/main/resources/templates/user/user.index.ftl diff --git a/ruoyi-framework/pom.xml b/wild-framework/pom.xml similarity index 90% rename from ruoyi-framework/pom.xml rename to wild-framework/pom.xml index d5466af29..71684c570 100644 --- a/ruoyi-framework/pom.xml +++ b/wild-framework/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-framework + wild-framework framework框架核心 @@ -59,8 +59,8 @@ - com.ruoyi - ruoyi-common + com.wild + wild-common diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/Interceptor/PlusWebInvokeTimeInterceptor.java b/wild-framework/src/main/java/com/wild/framework/Interceptor/PlusWebInvokeTimeInterceptor.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/Interceptor/PlusWebInvokeTimeInterceptor.java rename to wild-framework/src/main/java/com/wild/framework/Interceptor/PlusWebInvokeTimeInterceptor.java index e2120bf00..26c875118 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/Interceptor/PlusWebInvokeTimeInterceptor.java +++ b/wild-framework/src/main/java/com/wild/framework/Interceptor/PlusWebInvokeTimeInterceptor.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.Interceptor; +package com.wild.framework.Interceptor; import cn.hutool.core.map.MapUtil; import com.alibaba.ttl.TransmittableThreadLocal; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.StringUtils; import com.yomahub.tlog.context.TLogContext; import com.yomahub.tlog.web.interceptor.AbsTLogWebHandlerMethodInterceptor; import com.yomahub.tlog.web.wrapper.RequestWrapper; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/wild-framework/src/main/java/com/wild/framework/aspectj/DataScopeAspect.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java rename to wild-framework/src/main/java/com/wild/framework/aspectj/DataScopeAspect.java index 40cedcaff..fa109d28f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +++ b/wild-framework/src/main/java/com/wild/framework/aspectj/DataScopeAspect.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.aspectj; +package com.wild.framework.aspectj; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.UserService; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.annotation.DataScope; +import com.wild.common.core.domain.BaseEntity; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.UserService; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.reflect.ReflectUtils; +import com.wild.common.utils.spring.SpringUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java b/wild-framework/src/main/java/com/wild/framework/aspectj/DataSourceAspect.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java rename to wild-framework/src/main/java/com/wild/framework/aspectj/DataSourceAspect.java index 45ffe3bca..90f01897c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java +++ b/wild-framework/src/main/java/com/wild/framework/aspectj/DataSourceAspect.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.aspectj; +package com.wild.framework.aspectj; import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.annotation.DataSource; +import com.wild.common.utils.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -24,8 +24,8 @@ import java.util.Objects; @Component public class DataSourceAspect { - @Pointcut("@annotation(com.ruoyi.common.annotation.DataSource)" - + "|| @within(com.ruoyi.common.annotation.DataSource)") + @Pointcut("@annotation(com.wild.common.annotation.DataSource)" + + "|| @within(com.wild.common.annotation.DataSource)") public void dsPointCut() { } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/wild-framework/src/main/java/com/wild/framework/aspectj/LogAspect.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java rename to wild-framework/src/main/java/com/wild/framework/aspectj/LogAspect.java index 642076d9e..32fc154c6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/wild-framework/src/main/java/com/wild/framework/aspectj/LogAspect.java @@ -1,16 +1,16 @@ -package com.ruoyi.framework.aspectj; +package com.wild.framework.aspectj; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.domain.dto.OperLogDTO; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.OperLogService; -import com.ruoyi.common.enums.BusinessStatus; -import com.ruoyi.common.enums.HttpMethod; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.annotation.Log; +import com.wild.common.core.domain.dto.OperLogDTO; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.OperLogService; +import com.wild.common.enums.BusinessStatus; +import com.wild.common.enums.HttpMethod; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.ServletUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.spring.SpringUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.AfterReturning; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java b/wild-framework/src/main/java/com/wild/framework/aspectj/RateLimiterAspect.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java rename to wild-framework/src/main/java/com/wild/framework/aspectj/RateLimiterAspect.java index df4d9c877..b74b28d32 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java +++ b/wild-framework/src/main/java/com/wild/framework/aspectj/RateLimiterAspect.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.aspectj; +package com.wild.framework.aspectj; -import com.ruoyi.common.annotation.RateLimiter; -import com.ruoyi.common.enums.LimitType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.ServletUtils; +import com.wild.common.annotation.RateLimiter; +import com.wild.common.enums.LimitType; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.ServletUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/wild-framework/src/main/java/com/wild/framework/aspectj/RepeatSubmitAspect.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java rename to wild-framework/src/main/java/com/wild/framework/aspectj/RepeatSubmitAspect.java index f8f5c370b..e9d2eabc8 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java +++ b/wild-framework/src/main/java/com/wild/framework/aspectj/RepeatSubmitAspect.java @@ -1,15 +1,15 @@ -package com.ruoyi.framework.aspectj; +package com.wild.framework.aspectj; import cn.hutool.crypto.SecureUtil; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.properties.TokenProperties; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.RepeatSubmitProperties; +import com.wild.common.annotation.RepeatSubmit; +import com.wild.common.constant.Constants; +import com.wild.common.exception.ServiceException; +import com.wild.common.properties.TokenProperties; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.ServletUtils; +import com.wild.common.utils.StringUtils; +import com.wild.framework.config.properties.RepeatSubmitProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; * @author Lion Li */ @Slf4j -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @Aspect @Component public class RepeatSubmitAspect { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/wild-framework/src/main/java/com/wild/framework/config/ApplicationConfig.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/ApplicationConfig.java index 072eef96a..34d1d047f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java b/wild-framework/src/main/java/com/wild/framework/config/AsyncConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/AsyncConfig.java index 95f3c9b73..3547113f1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/AsyncConfig.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import cn.hutool.core.util.ArrayUtil; -import com.ruoyi.common.exception.ServiceException; +import com.wild.common.exception.ServiceException; import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java b/wild-framework/src/main/java/com/wild/framework/config/CaptchaConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/CaptchaConfig.java index 3d4bc9e8b..367029e96 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/CaptchaConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/CaptchaConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import cn.hutool.captcha.CaptchaUtil; import cn.hutool.captcha.CircleCaptcha; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java b/wild-framework/src/main/java/com/wild/framework/config/DruidConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/DruidConfig.java index 735f7e35e..4770aaafd 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/DruidConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/DruidConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties; import com.alibaba.druid.util.Utils; @@ -13,7 +13,7 @@ import java.io.IOException; /** * druid 配置多数据源 * - * @author ruoyi + * @author wild */ @Configuration public class DruidConfig { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java b/wild-framework/src/main/java/com/wild/framework/config/FilterConfig.java similarity index 88% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/FilterConfig.java index 6f3b099ab..2d1b5972c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/FilterConfig.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; -import com.ruoyi.common.filter.RepeatableFilter; -import com.ruoyi.common.filter.XssFilter; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.XssProperties; +import com.wild.common.filter.RepeatableFilter; +import com.wild.common.filter.XssFilter; +import com.wild.common.utils.StringUtils; +import com.wild.framework.config.properties.XssProperties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.web.servlet.FilterRegistrationBean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java b/wild-framework/src/main/java/com/wild/framework/config/I18nConfig.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/I18nConfig.java index 20b52a8e2..d7cb264e0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/I18nConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/I18nConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import cn.hutool.core.util.StrUtil; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java b/wild-framework/src/main/java/com/wild/framework/config/JacksonConfig.java similarity index 95% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/JacksonConfig.java index 55756d49b..8a5684d6f 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/JacksonConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/JacksonConfig.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; -import com.ruoyi.framework.jackson.BigNumberSerializer; +import com.wild.framework.jackson.BigNumberSerializer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.jackson.JacksonProperties; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java b/wild-framework/src/main/java/com/wild/framework/config/MybatisPlusConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/MybatisPlusConfig.java index db81b7437..9ed3ac388 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.injector.AbstractMethod; @@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; -import com.ruoyi.common.core.mybatisplus.methods.InsertAll; -import com.ruoyi.framework.handler.CreateAndUpdateMetaObjectHandler; +import com.wild.common.core.mybatisplus.methods.InsertAll; +import com.wild.framework.handler.CreateAndUpdateMetaObjectHandler; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,7 +24,7 @@ import java.util.List; */ @EnableTransactionManagement(proxyTargetClass = true) @Configuration -@MapperScan("${mybatis-plus.mapperPackage}") +@MapperScan("com.wild.**.mapper") public class MybatisPlusConfig { @Bean diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java b/wild-framework/src/main/java/com/wild/framework/config/RedisConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/RedisConfig.java index d7ae1cdce..990b5dbb3 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/RedisConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import cn.hutool.core.util.ObjectUtil; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.config.properties.RedissonProperties; +import com.wild.common.utils.StringUtils; +import com.wild.framework.config.properties.RedissonProperties; import lombok.extern.slf4j.Slf4j; import org.redisson.Redisson; import org.redisson.api.RedissonClient; @@ -151,7 +151,7 @@ public class RedisConfig extends CachingConfigurerSupport { * # 集群配置 * clusterServersConfig: * # 客户端名称 - * clientName: ${ruoyi.name} + * clientName: ${wild.name} * # master最小空闲连接数 * masterConnectionMinimumIdleSize: 32 * # master连接池大小 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java b/wild-framework/src/main/java/com/wild/framework/config/ResourcesConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/ResourcesConfig.java index f4e2b5fab..05416d6a9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/ResourcesConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; -import com.ruoyi.framework.Interceptor.PlusWebInvokeTimeInterceptor; +import com.wild.framework.Interceptor.PlusWebInvokeTimeInterceptor; import com.yomahub.tlog.web.interceptor.TLogWebInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,4 +52,4 @@ public class ResourcesConfig implements WebMvcConfigurer { // 返回新的CorsFilter return new CorsFilter(source); } -} \ No newline at end of file +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/wild-framework/src/main/java/com/wild/framework/config/SecurityConfig.java similarity index 93% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/SecurityConfig.java index 450eccd45..de70f5d22 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/SecurityConfig.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; -import com.ruoyi.framework.config.properties.SecurityProperties; -import com.ruoyi.framework.security.filter.JwtAuthenticationTokenFilter; -import com.ruoyi.framework.security.handle.AuthenticationEntryPointImpl; -import com.ruoyi.framework.security.handle.LogoutSuccessHandlerImpl; +import com.wild.framework.config.properties.SecurityProperties; +import com.wild.framework.security.filter.JwtAuthenticationTokenFilter; +import com.wild.framework.security.handle.AuthenticationEntryPointImpl; +import com.wild.framework.security.handle.LogoutSuccessHandlerImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpMethod; @@ -22,7 +22,7 @@ import org.springframework.web.filter.CorsFilter; /** * spring security配置 * - * @author ruoyi + * @author wild */ @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) public class SecurityConfig extends WebSecurityConfigurerAdapter { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java b/wild-framework/src/main/java/com/wild/framework/config/SwaggerConfig.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/SwaggerConfig.java index bf6bc8f9f..676ae3b54 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/SwaggerConfig.java @@ -1,11 +1,11 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; -import com.ruoyi.common.properties.TokenProperties; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.framework.config.properties.SwaggerProperties; +import com.wild.common.properties.TokenProperties; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.spring.SpringUtils; +import com.wild.framework.config.properties.SwaggerProperties; import io.swagger.models.auth.In; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java b/wild-framework/src/main/java/com/wild/framework/config/TLogConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/TLogConfig.java index c1665d9b0..7fa82ee5b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/TLogConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/TLogConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import com.yomahub.tlog.core.aop.AspectLogAop; import com.yomahub.tlog.spring.TLogPropertyInit; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java b/wild-framework/src/main/java/com/wild/framework/config/ThreadPoolConfig.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/ThreadPoolConfig.java index 5dd2b5f64..27461bfcb 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ThreadPoolConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/ThreadPoolConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; -import com.ruoyi.common.utils.Threads; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.framework.config.properties.ThreadPoolProperties; +import com.wild.common.utils.Threads; +import com.wild.common.utils.reflect.ReflectUtils; +import com.wild.framework.config.properties.ThreadPoolProperties; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java b/wild-framework/src/main/java/com/wild/framework/config/ValidatorConfig.java similarity index 97% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java rename to wild-framework/src/main/java/com/wild/framework/config/ValidatorConfig.java index 0a2007c81..1a6fbd20c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ValidatorConfig.java +++ b/wild-framework/src/main/java/com/wild/framework/config/ValidatorConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config; +package com.wild.framework.config; import org.hibernate.validator.HibernateValidator; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/CaptchaProperties.java similarity index 80% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/CaptchaProperties.java index 354d8c304..a12fff515 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/CaptchaProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/CaptchaProperties.java @@ -1,7 +1,7 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; -import com.ruoyi.common.enums.CaptchaCategory; -import com.ruoyi.common.enums.CaptchaType; +import com.wild.common.enums.CaptchaCategory; +import com.wild.common.enums.CaptchaType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/RedissonProperties.java similarity index 98% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/RedissonProperties.java index 4516da269..f1d926ab1 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RedissonProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/RedissonProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/RepeatSubmitProperties.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/RepeatSubmitProperties.java index fa65b28c3..3e3aae7ce 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/RepeatSubmitProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/SecurityProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/SecurityProperties.java index c83ffccbe..13b23d221 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SecurityProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/SecurityProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/SwaggerProperties.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/SwaggerProperties.java index 9c4cd238c..71c241088 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/SwaggerProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/SwaggerProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/ThreadPoolProperties.java similarity index 89% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/ThreadPoolProperties.java index fbffc0f45..92080c23a 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/ThreadPoolProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/ThreadPoolProperties.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; -import com.ruoyi.common.enums.ThreadPoolRejectedPolicy; +import com.wild.common.enums.ThreadPoolRejectedPolicy; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java b/wild-framework/src/main/java/com/wild/framework/config/properties/XssProperties.java similarity index 91% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java rename to wild-framework/src/main/java/com/wild/framework/config/properties/XssProperties.java index d8a68a86a..7f9114017 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/XssProperties.java +++ b/wild-framework/src/main/java/com/wild/framework/config/properties/XssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.config.properties; +package com.wild.framework.config.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java b/wild-framework/src/main/java/com/wild/framework/handler/CreateAndUpdateMetaObjectHandler.java similarity index 90% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java rename to wild-framework/src/main/java/com/wild/framework/handler/CreateAndUpdateMetaObjectHandler.java index 7cf64c46b..4f7f06bcf 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java +++ b/wild-framework/src/main/java/com/wild/framework/handler/CreateAndUpdateMetaObjectHandler.java @@ -1,13 +1,13 @@ -package com.ruoyi.framework.handler; +package com.wild.framework.handler; import cn.hutool.core.util.ObjectUtil; import cn.hutool.http.HttpStatus; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.BaseEntity; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.reflection.MetaObject; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java b/wild-framework/src/main/java/com/wild/framework/jackson/BigNumberSerializer.java similarity index 96% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java rename to wild-framework/src/main/java/com/wild/framework/jackson/BigNumberSerializer.java index 1781b94be..a7680b76b 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/jackson/BigNumberSerializer.java +++ b/wild-framework/src/main/java/com/wild/framework/jackson/BigNumberSerializer.java @@ -1,4 +1,4 @@ -package com.ruoyi.framework.jackson; +package com.wild.framework.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java b/wild-framework/src/main/java/com/wild/framework/manager/ShutdownManager.java similarity index 92% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java rename to wild-framework/src/main/java/com/wild/framework/manager/ShutdownManager.java index ef77a219a..d81236d12 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/manager/ShutdownManager.java +++ b/wild-framework/src/main/java/com/wild/framework/manager/ShutdownManager.java @@ -1,6 +1,6 @@ -package com.ruoyi.framework.manager; +package com.wild.framework.manager; -import com.ruoyi.common.utils.Threads; +import com.wild.common.utils.Threads; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java b/wild-framework/src/main/java/com/wild/framework/security/filter/JwtAuthenticationTokenFilter.java similarity index 86% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java rename to wild-framework/src/main/java/com/wild/framework/security/filter/JwtAuthenticationTokenFilter.java index 4ebb4aaea..f1ba13ec9 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java +++ b/wild-framework/src/main/java/com/wild/framework/security/filter/JwtAuthenticationTokenFilter.java @@ -1,9 +1,9 @@ -package com.ruoyi.framework.security.filter; +package com.wild.framework.security.filter; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.TokenService; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.TokenService; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; @@ -20,7 +20,7 @@ import java.io.IOException; /** * token过滤器 验证token有效性 * - * @author ruoyi + * @author wild */ @Component public class JwtAuthenticationTokenFilter extends OncePerRequestFilter { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java b/wild-framework/src/main/java/com/wild/framework/security/handle/AuthenticationEntryPointImpl.java similarity index 81% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java rename to wild-framework/src/main/java/com/wild/framework/security/handle/AuthenticationEntryPointImpl.java index 35b0f921c..c288fc18d 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java +++ b/wild-framework/src/main/java/com/wild/framework/security/handle/AuthenticationEntryPointImpl.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.security.handle; +package com.wild.framework.security.handle; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.ServletUtils; +import com.wild.common.utils.StringUtils; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; @@ -17,7 +17,7 @@ import java.io.Serializable; /** * 认证失败处理类 返回未授权 * - * @author ruoyi + * @author wild */ @Component public class AuthenticationEntryPointImpl implements AuthenticationEntryPoint, Serializable { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java b/wild-framework/src/main/java/com/wild/framework/security/handle/LogoutSuccessHandlerImpl.java similarity index 75% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java rename to wild-framework/src/main/java/com/wild/framework/security/handle/LogoutSuccessHandlerImpl.java index 857cbe376..3d5fc08f6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java +++ b/wild-framework/src/main/java/com/wild/framework/security/handle/LogoutSuccessHandlerImpl.java @@ -1,14 +1,14 @@ -package com.ruoyi.framework.security.handle; +package com.wild.framework.security.handle; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.LogininforService; -import com.ruoyi.common.core.service.TokenService; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.LogininforService; +import com.wild.common.core.service.TokenService; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.ServletUtils; +import com.wild.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.security.core.Authentication; @@ -22,7 +22,7 @@ import java.io.IOException; /** * 自定义退出处理类 返回成功 * - * @author ruoyi + * @author wild */ @Configuration public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler { diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java b/wild-framework/src/main/java/com/wild/framework/web/exception/GlobalExceptionHandler.java similarity index 94% rename from ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java rename to wild-framework/src/main/java/com/wild/framework/web/exception/GlobalExceptionHandler.java index 4c642c2d7..0d8a40d12 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java +++ b/wild-framework/src/main/java/com/wild/framework/web/exception/GlobalExceptionHandler.java @@ -1,10 +1,10 @@ -package com.ruoyi.framework.web.exception; +package com.wild.framework.web.exception; import cn.hutool.http.HttpStatus; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.exception.DemoModeException; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.exception.DemoModeException; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.StringUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.security.access.AccessDeniedException; diff --git a/ruoyi-generator/pom.xml b/wild-generator/pom.xml similarity index 77% rename from ruoyi-generator/pom.xml rename to wild-generator/pom.xml index 4b61ea612..30b103723 100644 --- a/ruoyi-generator/pom.xml +++ b/wild-generator/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-generator + wild-generator generator代码生成 @@ -25,8 +25,8 @@ - com.ruoyi - ruoyi-common + com.wild + wild-common diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/wild-generator/src/main/java/com/wild/generator/config/GenConfig.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to wild-generator/src/main/java/com/wild/generator/config/GenConfig.java index 92c522f0b..a8ddd86a8 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java +++ b/wild-generator/src/main/java/com/wild/generator/config/GenConfig.java @@ -1,4 +1,4 @@ -package com.ruoyi.generator.config; +package com.wild.generator.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -8,7 +8,7 @@ import org.springframework.stereotype.Component; /** * 读取代码生成相关配置 * - * @author ruoyi + * @author wild */ @Component @ConfigurationProperties(prefix = "gen") diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/wild-generator/src/main/java/com/wild/generator/controller/GenController.java similarity index 92% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to wild-generator/src/main/java/com/wild/generator/controller/GenController.java index b90addf71..0422fc1ce 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java +++ b/wild-generator/src/main/java/com/wild/generator/controller/GenController.java @@ -1,16 +1,16 @@ -package com.ruoyi.generator.controller; +package com.wild.generator.controller; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.service.IGenTableColumnService; -import com.ruoyi.generator.service.IGenTableService; +import com.wild.common.annotation.Log; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.enums.BusinessType; +import com.wild.generator.domain.GenTable; +import com.wild.generator.domain.GenTableColumn; +import com.wild.generator.service.IGenTableColumnService; +import com.wild.generator.service.IGenTableService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -32,7 +32,7 @@ import java.util.Map; */ @Validated @Api(value = "代码生成", tags = {"代码生成管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/tool/gen") public class GenController extends BaseController { @@ -198,7 +198,7 @@ public class GenController extends BaseController { response.reset(); response.addHeader("Access-Control-Allow-Origin", "*"); response.addHeader("Access-Control-Expose-Headers", "Content-Disposition"); - response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\""); + response.setHeader("Content-Disposition", "attachment; filename=\"wild.zip\""); response.addHeader("Content-Length", "" + data.length); response.setContentType("application/octet-stream; charset=UTF-8"); IoUtil.write(response.getOutputStream(), false, data); diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/wild-generator/src/main/java/com/wild/generator/domain/GenTable.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to wild-generator/src/main/java/com/wild/generator/domain/GenTable.java index 252f32cb6..b1b9a2b4a 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java +++ b/wild-generator/src/main/java/com/wild/generator/domain/GenTable.java @@ -1,11 +1,11 @@ -package com.ruoyi.generator.domain; +package com.wild.generator.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.constant.GenConstants; +import com.wild.common.core.domain.BaseEntity; +import com.wild.common.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/wild-generator/src/main/java/com/wild/generator/domain/GenTableColumn.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to wild-generator/src/main/java/com/wild/generator/domain/GenTableColumn.java index 8c08d543c..b7b2f256f 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java +++ b/wild-generator/src/main/java/com/wild/generator/domain/GenTableColumn.java @@ -1,11 +1,11 @@ -package com.ruoyi.generator.domain; +package com.wild.generator.domain; import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.core.domain.BaseEntity; +import com.wild.common.utils.StringUtils; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/wild-generator/src/main/java/com/wild/generator/mapper/GenTableColumnMapper.java similarity index 70% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to wild-generator/src/main/java/com/wild/generator/mapper/GenTableColumnMapper.java index 1f7e20ce9..e278af351 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java +++ b/wild-generator/src/main/java/com/wild/generator/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.generator.mapper; +package com.wild.generator.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.generator.domain.GenTableColumn; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.generator.domain.GenTableColumn; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/wild-generator/src/main/java/com/wild/generator/mapper/GenTableMapper.java similarity index 91% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to wild-generator/src/main/java/com/wild/generator/mapper/GenTableMapper.java index c55a9a28e..8021a016c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java +++ b/wild-generator/src/main/java/com/wild/generator/mapper/GenTableMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.mapper; +package com.wild.generator.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.generator.domain.GenTable; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.generator.domain.GenTable; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/wild-generator/src/main/java/com/wild/generator/service/GenTableColumnServiceImpl.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to wild-generator/src/main/java/com/wild/generator/service/GenTableColumnServiceImpl.java index cd4d87547..4538eb41c 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java +++ b/wild-generator/src/main/java/com/wild/generator/service/GenTableColumnServiceImpl.java @@ -1,9 +1,9 @@ -package com.ruoyi.generator.service; +package com.wild.generator.service; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.generator.domain.GenTableColumn; +import com.wild.generator.mapper.GenTableColumnMapper; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/wild-generator/src/main/java/com/wild/generator/service/GenTableServiceImpl.java similarity index 94% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to wild-generator/src/main/java/com/wild/generator/service/GenTableServiceImpl.java index b53393f0c..2212faa72 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java +++ b/wild-generator/src/main/java/com/wild/generator/service/GenTableServiceImpl.java @@ -1,26 +1,26 @@ -package com.ruoyi.generator.service; +package com.wild.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.file.FileUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; -import com.ruoyi.generator.mapper.GenTableColumnMapper; -import com.ruoyi.generator.mapper.GenTableMapper; -import com.ruoyi.generator.util.GenUtils; -import com.ruoyi.generator.util.VelocityInitializer; -import com.ruoyi.generator.util.VelocityUtils; +import com.wild.common.constant.Constants; +import com.wild.common.constant.GenConstants; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.file.FileUtils; +import com.wild.generator.domain.GenTable; +import com.wild.generator.domain.GenTableColumn; +import com.wild.generator.mapper.GenTableColumnMapper; +import com.wild.generator.mapper.GenTableMapper; +import com.wild.generator.util.GenUtils; +import com.wild.generator.util.VelocityInitializer; +import com.wild.generator.util.VelocityUtils; import lombok.extern.slf4j.Slf4j; import org.apache.poi.util.IOUtils; import org.apache.velocity.Template; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/wild-generator/src/main/java/com/wild/generator/service/IGenTableColumnService.java similarity index 91% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to wild-generator/src/main/java/com/wild/generator/service/IGenTableColumnService.java index d1b5bae5e..5f867d286 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java +++ b/wild-generator/src/main/java/com/wild/generator/service/IGenTableColumnService.java @@ -1,7 +1,7 @@ -package com.ruoyi.generator.service; +package com.wild.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.generator.domain.GenTableColumn; +import com.wild.generator.domain.GenTableColumn; import java.util.List; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/wild-generator/src/main/java/com/wild/generator/service/IGenTableService.java similarity index 95% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to wild-generator/src/main/java/com/wild/generator/service/IGenTableService.java index 1bf0c27e5..8140dbb32 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java +++ b/wild-generator/src/main/java/com/wild/generator/service/IGenTableService.java @@ -1,8 +1,8 @@ -package com.ruoyi.generator.service; +package com.wild.generator.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.generator.domain.GenTable; +import com.wild.common.core.page.TableDataInfo; +import com.wild.generator.domain.GenTable; import java.util.List; import java.util.Map; diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/wild-generator/src/main/java/com/wild/generator/util/GenUtils.java similarity index 96% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to wild-generator/src/main/java/com/wild/generator/util/GenUtils.java index c434ca88d..03b8e5d70 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java +++ b/wild-generator/src/main/java/com/wild/generator/util/GenUtils.java @@ -1,10 +1,10 @@ -package com.ruoyi.generator.util; +package com.wild.generator.util; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.config.GenConfig; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.wild.common.constant.GenConstants; +import com.wild.common.utils.StringUtils; +import com.wild.generator.config.GenConfig; +import com.wild.generator.domain.GenTable; +import com.wild.generator.domain.GenTableColumn; import org.apache.commons.lang3.RegExUtils; import java.util.Arrays; @@ -12,7 +12,7 @@ import java.util.Arrays; /** * 代码生成器 工具类 * - * @author ruoyi + * @author wild */ public class GenUtils { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/wild-generator/src/main/java/com/wild/generator/util/VelocityInitializer.java similarity index 88% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to wild-generator/src/main/java/com/wild/generator/util/VelocityInitializer.java index a81bd51df..a25b949f4 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java +++ b/wild-generator/src/main/java/com/wild/generator/util/VelocityInitializer.java @@ -1,6 +1,6 @@ -package com.ruoyi.generator.util; +package com.wild.generator.util; -import com.ruoyi.common.constant.Constants; +import com.wild.common.constant.Constants; import org.apache.velocity.app.Velocity; import java.util.Properties; @@ -8,7 +8,7 @@ import java.util.Properties; /** * VelocityEngine工厂 * - * @author ruoyi + * @author wild */ public class VelocityInitializer { diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/wild-generator/src/main/java/com/wild/generator/util/VelocityUtils.java similarity index 97% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to wild-generator/src/main/java/com/wild/generator/util/VelocityUtils.java index d2e0e3a65..206f75e50 100644 --- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java +++ b/wild-generator/src/main/java/com/wild/generator/util/VelocityUtils.java @@ -1,12 +1,12 @@ -package com.ruoyi.generator.util; +package com.wild.generator.util; import cn.hutool.core.convert.Convert; -import com.ruoyi.common.constant.GenConstants; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.generator.domain.GenTable; -import com.ruoyi.generator.domain.GenTableColumn; +import com.wild.common.constant.GenConstants; +import com.wild.common.utils.DateUtils; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.StringUtils; +import com.wild.generator.domain.GenTable; +import com.wild.generator.domain.GenTableColumn; import org.apache.velocity.VelocityContext; import java.util.ArrayList; @@ -17,7 +17,7 @@ import java.util.Map; /** * 模板处理工具类 * - * @author ruoyi + * @author wild */ public class VelocityUtils { diff --git a/ruoyi-generator/src/main/resources/generator.yml b/wild-generator/src/main/resources/generator.yml similarity index 75% rename from ruoyi-generator/src/main/resources/generator.yml rename to wild-generator/src/main/resources/generator.yml index 4544c8c24..f1420f0bc 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/wild-generator/src/main/resources/generator.yml @@ -1,10 +1,10 @@ -# 代码生成 -gen: - # 作者 - author: ruoyi - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ \ No newline at end of file +# 代码生成 +gen: + # 作者 + author: wild + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.wild.system + # 自动去除表前缀，默认是false + autoRemovePre: false + # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） + tablePrefix: sys_ diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/wild-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 96% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to wild-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml index be07a9cb4..425a345fd 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ b/wild-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -28,11 +28,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - \ No newline at end of file + diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/wild-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 98% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to wild-generator/src/main/resources/mapper/generator/GenTableMapper.xml index 768b9fdb0..2dbc75437 100644 --- a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml +++ b/wild-generator/src/main/resources/mapper/generator/GenTableMapper.xml @@ -2,7 +2,7 @@ - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + @@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table @@ -133,22 +133,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by create_time desc - + - + - + - + - + - \ No newline at end of file + diff --git a/ruoyi-generator/src/main/resources/mapper/package-info.md b/wild-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/package-info.md rename to wild-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/wild-generator/src/main/resources/vm/java/bo.java.vm similarity index 91% rename from ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to wild-generator/src/main/resources/vm/java/bo.java.vm index 8831d0c2c..6832cc913 100644 --- a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm +++ b/wild-generator/src/main/resources/vm/java/bo.java.vm @@ -1,7 +1,7 @@ package ${packageName}.domain.bo; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -14,9 +14,9 @@ import java.util.Date; import ${import}; #end #if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.wild.common.core.domain.TreeEntity; #end /** diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/wild-generator/src/main/resources/vm/java/controller.java.vm similarity index 89% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to wild-generator/src/main/resources/vm/java/controller.java.vm index ae6f81876..445601c8a 100644 --- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/wild-generator/src/main/resources/vm/java/controller.java.vm @@ -11,20 +11,20 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.validation.annotation.Validated; -import com.ruoyi.common.annotation.RepeatSubmit; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.core.validate.QueryGroup; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.poi.ExcelUtil; +import com.wild.common.annotation.RepeatSubmit; +import com.wild.common.annotation.Log; +import com.wild.common.core.controller.BaseController; +import com.wild.common.core.domain.AjaxResult; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; +import com.wild.common.core.validate.QueryGroup; +import com.wild.common.enums.BusinessType; +import com.wild.common.utils.poi.ExcelUtil; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud || $table.sub) -import com.ruoyi.common.core.page.TableDataInfo; +import com.wild.common.core.page.TableDataInfo; #elseif($table.tree) #end import io.swagger.annotations.Api; @@ -39,7 +39,7 @@ import io.swagger.annotations.ApiOperation; */ @Validated @Api(value = "${functionName}控制器", tags = {"${functionName}管理"}) -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @RestController @RequestMapping("/${moduleName}/${businessName}") public class ${ClassName}Controller extends BaseController { diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/wild-generator/src/main/resources/vm/java/domain.java.vm similarity index 91% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to wild-generator/src/main/resources/vm/java/domain.java.vm index dfd1465f6..50d5c2e63 100644 --- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm +++ b/wild-generator/src/main/resources/vm/java/domain.java.vm @@ -12,9 +12,9 @@ import java.math.BigDecimal; import ${import}; #end #if($table.crud || $table.sub) -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; #elseif($table.tree) -import com.ruoyi.common.core.domain.TreeEntity; +import com.wild.common.core.domain.TreeEntity; #end /** diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/wild-generator/src/main/resources/vm/java/mapper.java.vm similarity index 79% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to wild-generator/src/main/resources/vm/java/mapper.java.vm index af2edb670..fa062a672 100644 --- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm +++ b/wild-generator/src/main/resources/vm/java/mapper.java.vm @@ -1,7 +1,7 @@ package ${packageName}.mapper; import ${packageName}.domain.${ClassName}; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; /** * ${functionName}Mapper接口 diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/wild-generator/src/main/resources/vm/java/service.java.vm similarity index 92% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to wild-generator/src/main/resources/vm/java/service.java.vm index 0041c398c..cf8a1f3c1 100644 --- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/wild-generator/src/main/resources/vm/java/service.java.vm @@ -3,9 +3,9 @@ package ${packageName}.service; import ${packageName}.domain.${ClassName}; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; +import com.wild.common.core.mybatisplus.core.IServicePlus; #if($table.crud || $table.sub) -import com.ruoyi.common.core.page.TableDataInfo; +import com.wild.common.core.page.TableDataInfo; #end import java.util.Collection; diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/wild-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 93% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to wild-generator/src/main/resources/vm/java/serviceImpl.java.vm index b9a45c675..a4ba597bc 100644 --- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/wild-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -1,14 +1,14 @@ package ${packageName}.service.impl; import cn.hutool.core.bean.BeanUtil; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; #if($table.crud || $table.sub) -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.core.page.TableDataInfo; +import com.wild.common.utils.PageUtils; +import com.wild.common.core.page.PagePlus; +import com.wild.common.core.page.TableDataInfo; #end import org.springframework.stereotype.Service; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import ${packageName}.domain.bo.${ClassName}Bo; diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/wild-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 90% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to wild-generator/src/main/resources/vm/java/sub-domain.java.vm index b5e308cf7..445dd4776 100644 --- a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm +++ b/wild-generator/src/main/resources/vm/java/sub-domain.java.vm @@ -1,76 +1,76 @@ -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.common.annotation.Excel; -import com.ruoyi.common.core.domain.BaseEntity; - -/** - * ${subTable.functionName}对象 ${subTableName} - * - * @author ${author} - * @date ${datetime} - */ -public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} +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.wild.common.annotation.Excel; +import com.wild.common.core.domain.BaseEntity; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("（")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm b/wild-generator/src/main/resources/vm/java/vo.java.vm similarity index 93% rename from ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to wild-generator/src/main/resources/vm/java/vo.java.vm index 489723ef3..405a2267a 100644 --- a/ruoyi-generator/src/main/resources/vm/java/vo.java.vm +++ b/wild-generator/src/main/resources/vm/java/vo.java.vm @@ -5,8 +5,8 @@ import ${import}; #end import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/wild-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to wild-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/wild-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to wild-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/wild-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to wild-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/wild-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to wild-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/wild-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to wild-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-job/pom.xml b/wild-job/pom.xml similarity index 80% rename from ruoyi-job/pom.xml rename to wild-job/pom.xml index a87b3efe9..be65b699a 100644 --- a/ruoyi-job/pom.xml +++ b/wild-job/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 jar - ruoyi-job + wild-job 任务调度 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.wild + wild-common diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java b/wild-job/src/main/java/com/wild/job/config/XxlJobConfig.java similarity index 95% rename from ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java rename to wild-job/src/main/java/com/wild/job/config/XxlJobConfig.java index 2df063e36..c2be07a95 100644 --- a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java +++ b/wild-job/src/main/java/com/wild/job/config/XxlJobConfig.java @@ -1,6 +1,6 @@ -package com.ruoyi.job.config; +package com.wild.job.config; -import com.ruoyi.job.config.properties.XxlJobProperties; +import com.wild.job.config.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import com.yomahub.tlog.springboot.lifecircle.TLogXxljobEnhanceInit; import lombok.AllArgsConstructor; @@ -45,4 +45,4 @@ public class XxlJobConfig { return new TLogXxljobEnhanceInit(); } -} \ No newline at end of file +} diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java b/wild-job/src/main/java/com/wild/job/config/properties/XxlJobProperties.java similarity index 94% rename from ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java rename to wild-job/src/main/java/com/wild/job/config/properties/XxlJobProperties.java index f2c755a15..c25ce2670 100644 --- a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java +++ b/wild-job/src/main/java/com/wild/job/config/properties/XxlJobProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.config.properties; +package com.wild.job.config.properties; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java b/wild-job/src/main/java/com/wild/job/service/SampleService.java similarity index 99% rename from ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java rename to wild-job/src/main/java/com/wild/job/service/SampleService.java index 20afa2e64..d86195c3e 100644 --- a/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java +++ b/wild-job/src/main/java/com/wild/job/service/SampleService.java @@ -1,4 +1,4 @@ -package com.ruoyi.job.service; +package com.wild.job.service; import com.xxl.job.core.context.XxlJobHelper; import com.xxl.job.core.handler.annotation.XxlJob; diff --git a/ruoyi-oss/pom.xml b/wild-oss/pom.xml similarity index 87% rename from ruoyi-oss/pom.xml rename to wild-oss/pom.xml index 8aaf3e444..e8e208302 100644 --- a/ruoyi-oss/pom.xml +++ b/wild-oss/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-oss + wild-oss OSS对象存储模块 @@ -19,8 +19,8 @@ - com.ruoyi - ruoyi-common + com.wild + wild-common diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java b/wild-oss/src/main/java/com/wild/oss/constant/OssConstant.java similarity index 95% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java rename to wild-oss/src/main/java/com/wild/oss/constant/OssConstant.java index b5236bfe7..0fce89f6d 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/constant/OssConstant.java +++ b/wild-oss/src/main/java/com/wild/oss/constant/OssConstant.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.constant; +package com.wild.oss.constant; import java.util.Arrays; import java.util.List; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java b/wild-oss/src/main/java/com/wild/oss/entity/UploadResult.java similarity index 91% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java rename to wild-oss/src/main/java/com/wild/oss/entity/UploadResult.java index cb4f62054..2b6a5ff3f 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/entity/UploadResult.java +++ b/wild-oss/src/main/java/com/wild/oss/entity/UploadResult.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.entity; +package com.wild.oss.entity; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java b/wild-oss/src/main/java/com/wild/oss/enumd/OssEnumd.java similarity index 76% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java rename to wild-oss/src/main/java/com/wild/oss/enumd/OssEnumd.java index 4defca40e..1c747957b 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/OssEnumd.java +++ b/wild-oss/src/main/java/com/wild/oss/enumd/OssEnumd.java @@ -1,10 +1,10 @@ -package com.ruoyi.oss.enumd; +package com.wild.oss.enumd; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.service.impl.AliyunOssStrategy; -import com.ruoyi.oss.service.impl.MinioOssStrategy; -import com.ruoyi.oss.service.impl.QcloudOssStrategy; -import com.ruoyi.oss.service.impl.QiniuOssStrategy; +import com.wild.common.utils.StringUtils; +import com.wild.oss.service.impl.AliyunOssStrategy; +import com.wild.oss.service.impl.MinioOssStrategy; +import com.wild.oss.service.impl.QcloudOssStrategy; +import com.wild.oss.service.impl.QiniuOssStrategy; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java b/wild-oss/src/main/java/com/wild/oss/enumd/PolicyType.java similarity index 97% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java rename to wild-oss/src/main/java/com/wild/oss/enumd/PolicyType.java index c10dceb06..4a73d2242 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/enumd/PolicyType.java +++ b/wild-oss/src/main/java/com/wild/oss/enumd/PolicyType.java @@ -14,7 +14,7 @@ * this software without specific prior written permission. * Author: Chill 庄骞 (smallchill@163.com) */ -package com.ruoyi.oss.enumd; +package com.wild.oss.enumd; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java b/wild-oss/src/main/java/com/wild/oss/exception/OssException.java similarity index 86% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java rename to wild-oss/src/main/java/com/wild/oss/exception/OssException.java index 48ab618ae..f259443af 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/exception/OssException.java +++ b/wild-oss/src/main/java/com/wild/oss/exception/OssException.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.exception; +package com.wild.oss.exception; /** * OSS异常类 diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java b/wild-oss/src/main/java/com/wild/oss/factory/OssFactory.java similarity index 79% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java rename to wild-oss/src/main/java/com/wild/oss/factory/OssFactory.java index 169159602..dec12a151 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/factory/OssFactory.java +++ b/wild-oss/src/main/java/com/wild/oss/factory/OssFactory.java @@ -1,15 +1,15 @@ -package com.ruoyi.oss.factory; +package com.wild.oss.factory; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.reflect.ReflectUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.oss.enumd.OssEnumd; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; -import com.ruoyi.oss.service.IOssStrategy; -import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.reflect.ReflectUtils; +import com.wild.oss.constant.OssConstant; +import com.wild.oss.enumd.OssEnumd; +import com.wild.oss.exception.OssException; +import com.wild.oss.properties.OssProperties; +import com.wild.oss.service.IOssStrategy; +import com.wild.oss.service.abstractd.AbstractOssStrategy; import lombok.extern.slf4j.Slf4j; import java.util.Map; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java b/wild-oss/src/main/java/com/wild/oss/properties/OssProperties.java similarity index 93% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java rename to wild-oss/src/main/java/com/wild/oss/properties/OssProperties.java index 48a478b7a..d42bb378d 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/properties/OssProperties.java +++ b/wild-oss/src/main/java/com/wild/oss/properties/OssProperties.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.properties; +package com.wild.oss.properties; import lombok.Data; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java b/wild-oss/src/main/java/com/wild/oss/service/IOssStrategy.java similarity index 94% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java rename to wild-oss/src/main/java/com/wild/oss/service/IOssStrategy.java index 34d25e477..f7deb63f0 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/IOssStrategy.java +++ b/wild-oss/src/main/java/com/wild/oss/service/IOssStrategy.java @@ -1,6 +1,6 @@ -package com.ruoyi.oss.service; +package com.wild.oss.service; -import com.ruoyi.oss.entity.UploadResult; +import com.wild.oss.entity.UploadResult; import java.io.InputStream; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java b/wild-oss/src/main/java/com/wild/oss/service/abstractd/AbstractOssStrategy.java similarity index 84% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java rename to wild-oss/src/main/java/com/wild/oss/service/abstractd/AbstractOssStrategy.java index 9fa52acb4..7a4b48307 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/abstractd/AbstractOssStrategy.java +++ b/wild-oss/src/main/java/com/wild/oss/service/abstractd/AbstractOssStrategy.java @@ -1,12 +1,12 @@ -package com.ruoyi.oss.service.abstractd; +package com.wild.oss.service.abstractd; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.IdUtil; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.properties.OssProperties; -import com.ruoyi.oss.service.IOssStrategy; +import com.wild.common.utils.DateUtils; +import com.wild.common.utils.StringUtils; +import com.wild.oss.entity.UploadResult; +import com.wild.oss.properties.OssProperties; +import com.wild.oss.service.IOssStrategy; import java.io.InputStream; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java b/wild-oss/src/main/java/com/wild/oss/service/impl/AliyunOssStrategy.java similarity index 91% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java rename to wild-oss/src/main/java/com/wild/oss/service/impl/AliyunOssStrategy.java index db9ad910e..4b74eb400 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/AliyunOssStrategy.java +++ b/wild-oss/src/main/java/com/wild/oss/service/impl/AliyunOssStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.service.impl; +package com.wild.oss.service.impl; import com.aliyun.oss.ClientConfiguration; import com.aliyun.oss.OSSClient; @@ -7,12 +7,12 @@ import com.aliyun.oss.model.CannedAccessControlList; import com.aliyun.oss.model.CreateBucketRequest; import com.aliyun.oss.model.ObjectMetadata; import com.aliyun.oss.model.PutObjectRequest; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.OssEnumd; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; -import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; +import com.wild.common.utils.StringUtils; +import com.wild.oss.entity.UploadResult; +import com.wild.oss.enumd.OssEnumd; +import com.wild.oss.exception.OssException; +import com.wild.oss.properties.OssProperties; +import com.wild.oss.service.abstractd.AbstractOssStrategy; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java b/wild-oss/src/main/java/com/wild/oss/service/impl/MinioOssStrategy.java similarity index 94% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java rename to wild-oss/src/main/java/com/wild/oss/service/impl/MinioOssStrategy.java index 0423dcc8a..fb634a3e7 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/MinioOssStrategy.java +++ b/wild-oss/src/main/java/com/wild/oss/service/impl/MinioOssStrategy.java @@ -1,12 +1,12 @@ -package com.ruoyi.oss.service.impl; +package com.wild.oss.service.impl; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.OssEnumd; -import com.ruoyi.oss.enumd.PolicyType; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; -import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; +import com.wild.common.utils.StringUtils; +import com.wild.oss.entity.UploadResult; +import com.wild.oss.enumd.OssEnumd; +import com.wild.oss.enumd.PolicyType; +import com.wild.oss.exception.OssException; +import com.wild.oss.properties.OssProperties; +import com.wild.oss.service.abstractd.AbstractOssStrategy; import io.minio.*; import org.springframework.http.MediaType; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java b/wild-oss/src/main/java/com/wild/oss/service/impl/QcloudOssStrategy.java similarity index 92% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java rename to wild-oss/src/main/java/com/wild/oss/service/impl/QcloudOssStrategy.java index 156eb24c5..b0f8d2fd9 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QcloudOssStrategy.java +++ b/wild-oss/src/main/java/com/wild/oss/service/impl/QcloudOssStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.service.impl; +package com.wild.oss.service.impl; import com.qcloud.cos.COSClient; import com.qcloud.cos.ClientConfig; @@ -7,12 +7,12 @@ import com.qcloud.cos.auth.COSCredentials; import com.qcloud.cos.http.HttpProtocol; import com.qcloud.cos.model.*; import com.qcloud.cos.region.Region; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.OssEnumd; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; -import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; +import com.wild.common.utils.StringUtils; +import com.wild.oss.entity.UploadResult; +import com.wild.oss.enumd.OssEnumd; +import com.wild.oss.exception.OssException; +import com.wild.oss.properties.OssProperties; +import com.wild.oss.service.abstractd.AbstractOssStrategy; import java.io.ByteArrayInputStream; import java.io.InputStream; diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java b/wild-oss/src/main/java/com/wild/oss/service/impl/QiniuOssStrategy.java similarity index 92% rename from ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java rename to wild-oss/src/main/java/com/wild/oss/service/impl/QiniuOssStrategy.java index bf90aa824..9bdc16614 100644 --- a/ruoyi-oss/src/main/java/com/ruoyi/oss/service/impl/QiniuOssStrategy.java +++ b/wild-oss/src/main/java/com/wild/oss/service/impl/QiniuOssStrategy.java @@ -1,4 +1,4 @@ -package com.ruoyi.oss.service.impl; +package com.wild.oss.service.impl; import cn.hutool.core.util.ArrayUtil; import com.qiniu.http.Response; @@ -7,11 +7,11 @@ import com.qiniu.storage.Configuration; import com.qiniu.storage.Region; import com.qiniu.storage.UploadManager; import com.qiniu.util.Auth; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.enumd.OssEnumd; -import com.ruoyi.oss.exception.OssException; -import com.ruoyi.oss.properties.OssProperties; -import com.ruoyi.oss.service.abstractd.AbstractOssStrategy; +import com.wild.oss.entity.UploadResult; +import com.wild.oss.enumd.OssEnumd; +import com.wild.oss.exception.OssException; +import com.wild.oss.properties.OssProperties; +import com.wild.oss.service.abstractd.AbstractOssStrategy; import java.io.InputStream; diff --git a/ruoyi-system/pom.xml b/wild-system/pom.xml similarity index 67% rename from ruoyi-system/pom.xml rename to wild-system/pom.xml index a436dfcdd..2c5fab10e 100644 --- a/ruoyi-system/pom.xml +++ b/wild-system/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-vue-plus - com.ruoyi + wild-vue-plus + com.wild 3.4.0 4.0.0 - ruoyi-system + wild-system system系统模块 @@ -19,14 +19,14 @@ - com.ruoyi - ruoyi-common + com.wild + wild-common - com.ruoyi - ruoyi-oss + com.wild + wild-oss diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/wild-system/src/main/java/com/wild/system/domain/SysConfig.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to wild-system/src/main/java/com/wild/system/domain/SysConfig.java index 3b9fce0b5..f04bc8502 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysConfig.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/wild-system/src/main/java/com/wild/system/domain/SysLogininfor.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to wild-system/src/main/java/com/wild/system/domain/SysLogininfor.java index a1575378d..db29c90f0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysLogininfor.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/wild-system/src/main/java/com/wild/system/domain/SysNotice.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to wild-system/src/main/java/com/wild/system/domain/SysNotice.java index 2b230bf6a..892ec207a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysNotice.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/wild-system/src/main/java/com/wild/system/domain/SysOperLog.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to wild-system/src/main/java/com/wild/system/domain/SysOperLog.java index 84ab555ec..6e03b7a6b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysOperLog.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java b/wild-system/src/main/java/com/wild/system/domain/SysOss.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java rename to wild-system/src/main/java/com/wild/system/domain/SysOss.java index 0793d04fe..7be842732 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysOss.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/wild-system/src/main/java/com/wild/system/domain/SysOssConfig.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java rename to wild-system/src/main/java/com/wild/system/domain/SysOssConfig.java index ff081ce90..a9cc32e66 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysOssConfig.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/wild-system/src/main/java/com/wild/system/domain/SysPost.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to wild-system/src/main/java/com/wild/system/domain/SysPost.java index b0b8a11e5..1ff9b1463 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysPost.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/wild-system/src/main/java/com/wild/system/domain/SysRoleDept.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to wild-system/src/main/java/com/wild/system/domain/SysRoleDept.java index 8c93badab..edd12d752 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysRoleDept.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/wild-system/src/main/java/com/wild/system/domain/SysRoleMenu.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to wild-system/src/main/java/com/wild/system/domain/SysRoleMenu.java index aa819c706..f3f00f22b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysRoleMenu.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/wild-system/src/main/java/com/wild/system/domain/SysUserOnline.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to wild-system/src/main/java/com/wild/system/domain/SysUserOnline.java index f81508c8c..e156126e9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysUserOnline.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/wild-system/src/main/java/com/wild/system/domain/SysUserPost.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to wild-system/src/main/java/com/wild/system/domain/SysUserPost.java index f6694e37d..0e06ab77c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysUserPost.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/wild-system/src/main/java/com/wild/system/domain/SysUserRole.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to wild-system/src/main/java/com/wild/system/domain/SysUserRole.java index fd4e2e5b0..ca75c9ee1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java +++ b/wild-system/src/main/java/com/wild/system/domain/SysUserRole.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain; +package com.wild.system.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java b/wild-system/src/main/java/com/wild/system/domain/bo/SysOssBo.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java rename to wild-system/src/main/java/com/wild/system/domain/bo/SysOssBo.java index f2770abd3..b8d9ccf51 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java +++ b/wild-system/src/main/java/com/wild/system/domain/bo/SysOssBo.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.domain.bo; +package com.wild.system.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; +import com.wild.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/wild-system/src/main/java/com/wild/system/domain/bo/SysOssConfigBo.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java rename to wild-system/src/main/java/com/wild/system/domain/bo/SysOssConfigBo.java index 9b8b3784c..9e1c107c2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/wild-system/src/main/java/com/wild/system/domain/bo/SysOssConfigBo.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain.bo; +package com.wild.system.domain.bo; -import com.ruoyi.common.core.domain.BaseEntity; -import com.ruoyi.common.core.validate.AddGroup; -import com.ruoyi.common.core.validate.EditGroup; +import com.wild.common.core.domain.BaseEntity; +import com.wild.common.core.validate.AddGroup; +import com.wild.common.core.validate.EditGroup; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/wild-system/src/main/java/com/wild/system/domain/vo/MetaVo.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to wild-system/src/main/java/com/wild/system/domain/vo/MetaVo.java index 6a3798adb..f296ec4b1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java +++ b/wild-system/src/main/java/com/wild/system/domain/vo/MetaVo.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.domain.vo; +package com.wild.system.domain.vo; -import com.ruoyi.common.utils.StringUtils; +import com.wild.common.utils.StringUtils; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import lombok.experimental.Accessors; /** * 路由显示信息 * - * @author ruoyi + * @author wild */ @Data diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/wild-system/src/main/java/com/wild/system/domain/vo/RouterVo.java similarity index 98% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to wild-system/src/main/java/com/wild/system/domain/vo/RouterVo.java index 05ba451d7..09457968d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java +++ b/wild-system/src/main/java/com/wild/system/domain/vo/RouterVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.wild.system.domain.vo; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java b/wild-system/src/main/java/com/wild/system/domain/vo/SysOssConfigVo.java similarity index 97% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java rename to wild-system/src/main/java/com/wild/system/domain/vo/SysOssConfigVo.java index 0fb08dd00..d94d05971 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java +++ b/wild-system/src/main/java/com/wild/system/domain/vo/SysOssConfigVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.wild.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/wild-system/src/main/java/com/wild/system/domain/vo/SysOssVo.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java rename to wild-system/src/main/java/com/wild/system/domain/vo/SysOssVo.java index eb2299ee6..21a27fde9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java +++ b/wild-system/src/main/java/com/wild/system/domain/vo/SysOssVo.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.domain.vo; +package com.wild.system.domain.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/wild-system/src/main/java/com/wild/system/domain/vo/SysUserExportVo.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java rename to wild-system/src/main/java/com/wild/system/domain/vo/SysUserExportVo.java index c43c8a5c3..9c550649d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java +++ b/wild-system/src/main/java/com/wild/system/domain/vo/SysUserExportVo.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain.vo; +package com.wild.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java b/wild-system/src/main/java/com/wild/system/domain/vo/SysUserImportVo.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java rename to wild-system/src/main/java/com/wild/system/domain/vo/SysUserImportVo.java index d461332f2..c648a7eb3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java +++ b/wild-system/src/main/java/com/wild/system/domain/vo/SysUserImportVo.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.domain.vo; +package com.wild.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; -import com.ruoyi.common.annotation.ExcelDictFormat; -import com.ruoyi.common.convert.ExcelDictConvert; +import com.wild.common.annotation.ExcelDictFormat; +import com.wild.common.convert.ExcelDictConvert; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/wild-system/src/main/java/com/wild/system/listener/SysUserImportListener.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java rename to wild-system/src/main/java/com/wild/system/listener/SysUserImportListener.java index d0fd7d0e6..93f59ea0d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java +++ b/wild-system/src/main/java/com/wild/system/listener/SysUserImportListener.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.listener; +package com.wild.system.listener; import cn.hutool.core.bean.BeanUtil; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.excel.ExcelListener; -import com.ruoyi.common.excel.ExcelResult; -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.system.domain.vo.SysUserImportVo; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.excel.ExcelListener; +import com.wild.common.excel.ExcelResult; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.spring.SpringUtils; +import com.wild.system.domain.vo.SysUserImportVo; +import com.wild.system.service.ISysConfigService; +import com.wild.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import java.util.List; diff --git a/wild-system/src/main/java/com/wild/system/mapper/SysConfigMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysConfigMapper.java new file mode 100644 index 000000000..7310cb609 --- /dev/null +++ b/wild-system/src/main/java/com/wild/system/mapper/SysConfigMapper.java @@ -0,0 +1,13 @@ +package com.wild.system.mapper; + +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysConfig; + +/** + * 参数配置 数据层 + * + * @author Lion Li + */ +public interface SysConfigMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysDeptMapper.java similarity index 85% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysDeptMapper.java index 051085c3e..91df7ab59 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysDeptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.common.core.domain.entity.SysDept; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysDictDataMapper.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysDictDataMapper.java index e45c198d0..47ef18af1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysDictDataMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.common.core.domain.entity.SysDictData; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; import java.util.List; diff --git a/wild-system/src/main/java/com/wild/system/mapper/SysDictTypeMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysDictTypeMapper.java new file mode 100644 index 000000000..849e47bf3 --- /dev/null +++ b/wild-system/src/main/java/com/wild/system/mapper/SysDictTypeMapper.java @@ -0,0 +1,13 @@ +package com.wild.system.mapper; + +import com.wild.common.core.domain.entity.SysDictType; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; + +/** + * 字典表 数据层 + * + * @author Lion Li + */ +public interface SysDictTypeMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysLogininforMapper.java similarity index 52% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysLogininforMapper.java index fe47417f0..e54f6eb45 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysLogininforMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysLogininfor; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysLogininfor; /** * 系统访问日志情况信息 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysMenuMapper.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysMenuMapper.java index f1a018ff6..baf387961 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysMenuMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.common.core.domain.entity.SysMenu; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/wild-system/src/main/java/com/wild/system/mapper/SysNoticeMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysNoticeMapper.java new file mode 100644 index 000000000..8f6156d12 --- /dev/null +++ b/wild-system/src/main/java/com/wild/system/mapper/SysNoticeMapper.java @@ -0,0 +1,13 @@ +package com.wild.system.mapper; + +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysNotice; + +/** + * 通知公告表 数据层 + * + * @author Lion Li + */ +public interface SysNoticeMapper extends BaseMapperPlus { + +} diff --git a/wild-system/src/main/java/com/wild/system/mapper/SysOperLogMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysOperLogMapper.java new file mode 100644 index 000000000..d5c6976d0 --- /dev/null +++ b/wild-system/src/main/java/com/wild/system/mapper/SysOperLogMapper.java @@ -0,0 +1,13 @@ +package com.wild.system.mapper; + +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysOperLog; + +/** + * 操作日志 数据层 + * + * @author Lion Li + */ +public interface SysOperLogMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysOssConfigMapper.java similarity index 57% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysOssConfigMapper.java index db63709ba..7b7e7f321 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysOssConfigMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysOssConfig; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysOssConfig; /** * 对象存储配置Mapper接口 diff --git a/wild-system/src/main/java/com/wild/system/mapper/SysOssMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysOssMapper.java new file mode 100644 index 000000000..874cc734c --- /dev/null +++ b/wild-system/src/main/java/com/wild/system/mapper/SysOssMapper.java @@ -0,0 +1,12 @@ +package com.wild.system.mapper; + +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysOss; + +/** + * 文件上传 数据层 + * + * @author Lion Li + */ +public interface SysOssMapper extends BaseMapperPlus { +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysPostMapper.java similarity index 79% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysPostMapper.java index 50a5c752c..af04377ed 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysPost; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysPost; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysRoleDeptMapper.java similarity index 51% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysRoleDeptMapper.java index bf91a9273..ca4f7f7bb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysRoleDeptMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysRoleDept; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysRoleDept; /** * 角色与部门关联表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysRoleMapper.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysRoleMapper.java index eb440065f..2b38c00a6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysRoleMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysRoleMenuMapper.java similarity index 51% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysRoleMenuMapper.java index f92ebbb0f..89a6a4839 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysRoleMenuMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysRoleMenu; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysRoleMenu; /** * 角色与菜单关联表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysUserMapper.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysUserMapper.java index e930d879a..558132f0d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysUserMapper.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysUserPostMapper.java similarity index 51% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysUserPostMapper.java index e0f1bb049..6ffd76853 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysUserPostMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysUserPost; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysUserPost; /** * 用户与岗位关联表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/wild-system/src/main/java/com/wild/system/mapper/SysUserRoleMapper.java similarity index 51% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to wild-system/src/main/java/com/wild/system/mapper/SysUserRoleMapper.java index 052599cf7..546469830 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java +++ b/wild-system/src/main/java/com/wild/system/mapper/SysUserRoleMapper.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.mapper; +package com.wild.system.mapper; -import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus; -import com.ruoyi.system.domain.SysUserRole; +import com.wild.common.core.mybatisplus.core.BaseMapperPlus; +import com.wild.system.domain.SysUserRole; /** * 用户与角色关联表 数据层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java b/wild-system/src/main/java/com/wild/system/runner/SystemApplicationRunner.java similarity index 68% rename from ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java rename to wild-system/src/main/java/com/wild/system/runner/SystemApplicationRunner.java index 4080a1ac3..8dcd9e8ce 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java +++ b/wild-system/src/main/java/com/wild/system/runner/SystemApplicationRunner.java @@ -1,12 +1,11 @@ -package com.ruoyi.system.runner; +package com.wild.system.runner; -import com.ruoyi.common.config.RuoYiConfig; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysDictTypeService; -import com.ruoyi.system.service.ISysOssConfigService; +import com.wild.common.config.WildConfig; +import com.wild.system.service.ISysConfigService; +import com.wild.system.service.ISysDictTypeService; +import com.wild.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.stereotype.Component; @@ -17,11 +16,11 @@ import org.springframework.stereotype.Component; * @author Lion Li */ @Slf4j -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @Component public class SystemApplicationRunner implements ApplicationRunner { - private final RuoYiConfig ruoyiConfig; + private final WildConfig WildConfig; private final ISysConfigService configService; private final ISysDictTypeService dictTypeService; private final ISysOssConfigService ossConfigService; @@ -30,7 +29,7 @@ public class SystemApplicationRunner implements ApplicationRunner { public void run(ApplicationArguments args) throws Exception { ossConfigService.init(); log.info("初始化OSS配置成功"); - if (ruoyiConfig.isCacheLazy()){ + if (WildConfig.isCacheLazy()){ return; } configService.loadingConfigCache(); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/wild-system/src/main/java/com/wild/system/service/ISysConfigService.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to wild-system/src/main/java/com/wild/system/service/ISysConfigService.java index fe283876f..b5eae8cab 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysConfigService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysConfig; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysConfig; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/wild-system/src/main/java/com/wild/system/service/ISysDeptService.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to wild-system/src/main/java/com/wild/system/service/ISysDeptService.java index bd8c5ffbf..894c6b87a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysDeptService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.wild.common.core.domain.entity.SysDept; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/wild-system/src/main/java/com/wild/system/service/ISysDictDataService.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to wild-system/src/main/java/com/wild/system/service/ISysDictDataService.java index ce6898ecf..ae2fa6914 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysDictDataService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.page.TableDataInfo; +import com.wild.common.core.domain.entity.SysDictData; +import com.wild.common.core.page.TableDataInfo; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/wild-system/src/main/java/com/wild/system/service/ISysDictTypeService.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to wild-system/src/main/java/com/wild/system/service/ISysDictTypeService.java index 9599c4f1a..95020debf 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysDictTypeService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.page.TableDataInfo; +import com.wild.common.core.domain.entity.SysDictData; +import com.wild.common.core.domain.entity.SysDictType; +import com.wild.common.core.page.TableDataInfo; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/wild-system/src/main/java/com/wild/system/service/ISysLogininforService.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to wild-system/src/main/java/com/wild/system/service/ISysLogininforService.java index 5d4a66e24..85eedee2b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysLogininforService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysLogininfor; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysLogininfor; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/wild-system/src/main/java/com/wild/system/service/ISysMenuService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to wild-system/src/main/java/com/wild/system/service/ISysMenuService.java index 9424052d6..3250dc0cd 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysMenuService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.system.domain.vo.RouterVo; +import com.wild.common.core.domain.entity.SysMenu; +import com.wild.system.domain.vo.RouterVo; import java.util.List; import java.util.Set; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/wild-system/src/main/java/com/wild/system/service/ISysNoticeService.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to wild-system/src/main/java/com/wild/system/service/ISysNoticeService.java index 7db68daea..f11ad556b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysNoticeService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysNotice; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysNotice; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/wild-system/src/main/java/com/wild/system/service/ISysOperLogService.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to wild-system/src/main/java/com/wild/system/service/ISysOperLogService.java index 531f6390f..be0356df3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysOperLogService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysOperLog; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysOperLog; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java b/wild-system/src/main/java/com/wild/system/service/ISysOssConfigService.java similarity index 80% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java rename to wild-system/src/main/java/com/wild/system/service/ISysOssConfigService.java index 9d9fd5341..bdd023517 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysOssConfigService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysOssConfig; -import com.ruoyi.system.domain.bo.SysOssConfigBo; -import com.ruoyi.system.domain.vo.SysOssConfigVo; +import com.wild.common.core.mybatisplus.core.IServicePlus; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysOssConfig; +import com.wild.system.domain.bo.SysOssConfigBo; +import com.wild.system.domain.vo.SysOssConfigVo; import java.util.Collection; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java b/wild-system/src/main/java/com/wild/system/service/ISysOssService.java similarity index 59% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java rename to wild-system/src/main/java/com/wild/system/service/ISysOssService.java index 948e8f762..b9374e817 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysOssService.java @@ -1,10 +1,10 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.core.mybatisplus.core.IServicePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysOss; -import com.ruoyi.system.domain.bo.SysOssBo; -import com.ruoyi.system.domain.vo.SysOssVo; +import com.wild.common.core.mybatisplus.core.IServicePlus; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysOss; +import com.wild.system.domain.bo.SysOssBo; +import com.wild.system.domain.vo.SysOssVo; import org.springframework.web.multipart.MultipartFile; import java.util.Collection; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/wild-system/src/main/java/com/wild/system/service/ISysPostService.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to wild-system/src/main/java/com/wild/system/service/ISysPostService.java index a049928ce..eac72ff93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysPostService.java @@ -1,8 +1,8 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysPost; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysPost; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/wild-system/src/main/java/com/wild/system/service/ISysRoleService.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to wild-system/src/main/java/com/wild/system/service/ISysRoleService.java index d5838a846..2d69539ff 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysRoleService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.system.domain.SysUserRole; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.page.TableDataInfo; +import com.wild.system.domain.SysUserRole; import java.util.List; import java.util.Set; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/wild-system/src/main/java/com/wild/system/service/ISysUserOnlineService.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to wild-system/src/main/java/com/wild/system/service/ISysUserOnlineService.java index aefc3c745..59761a15d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysUserOnlineService.java @@ -1,7 +1,7 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.system.domain.SysUserOnline; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.system.domain.SysUserOnline; /** * 在线用户 服务层 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/wild-system/src/main/java/com/wild/system/service/ISysUserService.java similarity index 96% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to wild-system/src/main/java/com/wild/system/service/ISysUserService.java index a901e0abe..457f4272a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/wild-system/src/main/java/com/wild/system/service/ISysUserService.java @@ -1,9 +1,9 @@ -package com.ruoyi.system.service; +package com.wild.system.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.UserService; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.UserService; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java b/wild-system/src/main/java/com/wild/system/service/PermissionService.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java rename to wild-system/src/main/java/com/wild/system/service/PermissionService.java index e41333391..365fdfad7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java +++ b/wild-system/src/main/java/com/wild/system/service/PermissionService.java @@ -1,21 +1,21 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.UserService; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.UserService; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.spring.SpringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Set; /** - * RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母 + * wild首创 自定义权限实现，ss取自SpringSecurity首字母 * - * @author ruoyi + * @author wild */ @Service("ss") public class PermissionService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java b/wild-system/src/main/java/com/wild/system/service/SysLoginService.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java rename to wild-system/src/main/java/com/wild/system/service/SysLoginService.java index 70f66019f..2aca9710e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java +++ b/wild-system/src/main/java/com/wild/system/service/SysLoginService.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.LogininforService; -import com.ruoyi.common.core.service.TokenService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.exception.user.UserPasswordNotMatchException; -import com.ruoyi.common.utils.DateUtils; -import com.ruoyi.common.utils.MessageUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.ServletUtils; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.LogininforService; +import com.wild.common.core.service.TokenService; +import com.wild.common.exception.ServiceException; +import com.wild.common.exception.user.CaptchaException; +import com.wild.common.exception.user.CaptchaExpireException; +import com.wild.common.exception.user.UserPasswordNotMatchException; +import com.wild.common.utils.DateUtils; +import com.wild.common.utils.MessageUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.ServletUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.BadCredentialsException; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java b/wild-system/src/main/java/com/wild/system/service/SysPermissionService.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java rename to wild-system/src/main/java/com/wild/system/service/SysPermissionService.java index 095b3b566..bb46d9dde 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java +++ b/wild-system/src/main/java/com/wild/system/service/SysPermissionService.java @@ -1,6 +1,6 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.entity.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -10,7 +10,7 @@ import java.util.Set; /** * 用户权限处理 * - * @author ruoyi + * @author wild */ @Service public class SysPermissionService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/wild-system/src/main/java/com/wild/system/service/SysRegisterService.java similarity index 86% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java rename to wild-system/src/main/java/com/wild/system/service/SysRegisterService.java index 171224976..35b650ffa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java +++ b/wild-system/src/main/java/com/wild/system/service/SysRegisterService.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service; +package com.wild.system.service; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.RegisterBody; -import com.ruoyi.common.core.service.LogininforService; -import com.ruoyi.common.exception.user.CaptchaException; -import com.ruoyi.common.exception.user.CaptchaExpireException; -import com.ruoyi.common.utils.*; +import com.wild.common.constant.Constants; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.RegisterBody; +import com.wild.common.core.service.LogininforService; +import com.wild.common.exception.user.CaptchaException; +import com.wild.common.exception.user.CaptchaExpireException; +import com.wild.common.utils.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysConfigServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysConfigServiceImpl.java index bbd09a1d7..2a4cb5deb 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysConfigServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.convert.Convert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.annotation.DataSource; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.ConfigService; -import com.ruoyi.common.enums.DataSourceType; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysConfig; -import com.ruoyi.system.mapper.SysConfigMapper; -import com.ruoyi.system.service.ISysConfigService; +import com.wild.common.annotation.DataSource; +import com.wild.common.constant.Constants; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.ConfigService; +import com.wild.common.enums.DataSourceType; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.domain.SysConfig; +import com.wild.system.mapper.SysConfigMapper; +import com.wild.system.service.ISysConfigService; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysDeptServiceImpl.java similarity index 90% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysDeptServiceImpl.java index 995bd2d60..ceecb678d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysDeptServiceImpl.java @@ -1,24 +1,24 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDept; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.TreeBuildUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.mapper.SysDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.system.service.ISysDeptService; +import com.wild.common.annotation.DataScope; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.domain.entity.SysDept; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.TreeBuildUtils; +import com.wild.common.utils.spring.SpringUtils; +import com.wild.system.mapper.SysDeptMapper; +import com.wild.system.mapper.SysRoleMapper; +import com.wild.system.mapper.SysUserMapper; +import com.wild.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysDictDataServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysDictDataServiceImpl.java index d2ac2a02e..17814e673 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysDictDataServiceImpl.java @@ -1,15 +1,15 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.service.ISysDictDataService; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.entity.SysDictData; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.mapper.SysDictDataMapper; +import com.wild.system.service.ISysDictDataService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysDictTypeServiceImpl.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysDictTypeServiceImpl.java index b520d4188..ea41a11ae 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysDictTypeServiceImpl.java @@ -1,22 +1,22 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysDictData; -import com.ruoyi.common.core.domain.entity.SysDictType; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.DictService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.SysDictDataMapper; -import com.ruoyi.system.mapper.SysDictTypeMapper; -import com.ruoyi.system.service.ISysDictTypeService; +import com.wild.common.constant.Constants; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.domain.entity.SysDictData; +import com.wild.common.core.domain.entity.SysDictType; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.DictService; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.mapper.SysDictDataMapper; +import com.wild.system.mapper.SysDictTypeMapper; +import com.wild.system.service.ISysDictTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysLogininforServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysLogininforServiceImpl.java index 0ce33be0f..aea24a2a5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysLogininforServiceImpl.java @@ -1,19 +1,19 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.LogininforService; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.system.domain.SysLogininfor; -import com.ruoyi.system.mapper.SysLogininforMapper; -import com.ruoyi.system.service.ISysLogininforService; +import com.wild.common.constant.Constants; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.LogininforService; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.ServletUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.ip.AddressUtils; +import com.wild.system.domain.SysLogininfor; +import com.wild.system.mapper.SysLogininforMapper; +import com.wild.system.service.ISysLogininforService; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysMenuServiceImpl.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysMenuServiceImpl.java index 9c3bfeb77..97b2b01c0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysMenuServiceImpl.java @@ -1,23 +1,23 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysMenu; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.TreeBuildUtils; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.vo.MetaVo; -import com.ruoyi.system.domain.vo.RouterVo; -import com.ruoyi.system.mapper.SysMenuMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.service.ISysMenuService; +import com.wild.common.constant.Constants; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.domain.entity.SysMenu; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.TreeBuildUtils; +import com.wild.system.domain.SysRoleMenu; +import com.wild.system.domain.vo.MetaVo; +import com.wild.system.domain.vo.RouterVo; +import com.wild.system.mapper.SysMenuMapper; +import com.wild.system.mapper.SysRoleMapper; +import com.wild.system.mapper.SysRoleMenuMapper; +import com.wild.system.service.ISysMenuService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysNoticeServiceImpl.java similarity index 87% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysNoticeServiceImpl.java index b4f70d7c6..6faebaef6 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysNoticeServiceImpl.java @@ -1,13 +1,13 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysNotice; -import com.ruoyi.system.mapper.SysNoticeMapper; -import com.ruoyi.system.service.ISysNoticeService; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.domain.SysNotice; +import com.wild.system.mapper.SysNoticeMapper; +import com.wild.system.service.ISysNoticeService; import org.springframework.stereotype.Service; import java.util.Arrays; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysOperLogServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysOperLogServiceImpl.java index c08b634ad..d26c1df93 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysOperLogServiceImpl.java @@ -1,18 +1,18 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.core.domain.dto.OperLogDTO; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.OperLogService; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; -import com.ruoyi.system.domain.SysOperLog; -import com.ruoyi.system.mapper.SysOperLogMapper; -import com.ruoyi.system.service.ISysOperLogService; +import com.wild.common.core.domain.dto.OperLogDTO; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.OperLogService; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.ip.AddressUtils; +import com.wild.system.domain.SysOperLog; +import com.wild.system.mapper.SysOperLogMapper; +import com.wild.system.service.ISysOperLogService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysOssConfigServiceImpl.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysOssConfigServiceImpl.java index 9940beaeb..b082508c4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysOssConfigServiceImpl.java @@ -1,4 +1,4 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -6,22 +6,22 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.Lists; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.JsonUtils; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.constant.OssConstant; -import com.ruoyi.oss.factory.OssFactory; -import com.ruoyi.system.domain.SysOssConfig; -import com.ruoyi.system.domain.bo.SysOssConfigBo; -import com.ruoyi.system.domain.vo.SysOssConfigVo; -import com.ruoyi.system.mapper.SysOssConfigMapper; -import com.ruoyi.system.service.ISysOssConfigService; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.PagePlus; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.JsonUtils; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.StringUtils; +import com.wild.oss.constant.OssConstant; +import com.wild.oss.factory.OssFactory; +import com.wild.system.domain.SysOssConfig; +import com.wild.system.domain.bo.SysOssConfigBo; +import com.wild.system.domain.vo.SysOssConfigVo; +import com.wild.system.mapper.SysOssConfigMapper; +import com.wild.system.service.ISysOssConfigService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ import java.util.List; * @date 2021-08-13 */ @Slf4j -@RequiredArgsConstructor(onConstructor_ = @Autowired) +@RequiredArgsConstructor @Service public class SysOssConfigServiceImpl extends ServicePlusImpl implements ISysOssConfigService { diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysOssServiceImpl.java similarity index 82% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysOssServiceImpl.java index c20cc4b76..5a6c0a0d3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysOssServiceImpl.java @@ -1,21 +1,21 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.PagePlus; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.oss.entity.UploadResult; -import com.ruoyi.oss.factory.OssFactory; -import com.ruoyi.oss.service.IOssStrategy; -import com.ruoyi.system.domain.SysOss; -import com.ruoyi.system.domain.bo.SysOssBo; -import com.ruoyi.system.domain.vo.SysOssVo; -import com.ruoyi.system.mapper.SysOssMapper; -import com.ruoyi.system.service.ISysOssService; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.PagePlus; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.StringUtils; +import com.wild.oss.entity.UploadResult; +import com.wild.oss.factory.OssFactory; +import com.wild.oss.service.IOssStrategy; +import com.wild.system.domain.SysOss; +import com.wild.system.domain.bo.SysOssBo; +import com.wild.system.domain.vo.SysOssVo; +import com.wild.system.mapper.SysOssMapper; +import com.wild.system.service.ISysOssService; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysPostServiceImpl.java similarity index 89% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysPostServiceImpl.java index 4e04f3a19..e2ca225df 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysPostServiceImpl.java @@ -1,17 +1,17 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.mapper.SysPostMapper; -import com.ruoyi.system.mapper.SysUserPostMapper; -import com.ruoyi.system.service.ISysPostService; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.StringUtils; +import com.wild.system.domain.SysPost; +import com.wild.system.domain.SysUserPost; +import com.wild.system.mapper.SysPostMapper; +import com.wild.system.mapper.SysUserPostMapper; +import com.wild.system.service.ISysPostService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysRoleServiceImpl.java similarity index 92% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysRoleServiceImpl.java index 7bad29746..a8eb43ee2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysRoleServiceImpl.java @@ -1,25 +1,25 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysRoleDept; -import com.ruoyi.system.domain.SysRoleMenu; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.SysRoleDeptMapper; -import com.ruoyi.system.mapper.SysRoleMapper; -import com.ruoyi.system.mapper.SysRoleMenuMapper; -import com.ruoyi.system.mapper.SysUserRoleMapper; -import com.ruoyi.system.service.ISysRoleService; +import com.wild.common.annotation.DataScope; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.spring.SpringUtils; +import com.wild.system.domain.SysRoleDept; +import com.wild.system.domain.SysRoleMenu; +import com.wild.system.domain.SysUserRole; +import com.wild.system.mapper.SysRoleDeptMapper; +import com.wild.system.mapper.SysRoleMapper; +import com.wild.system.mapper.SysRoleMenuMapper; +import com.wild.system.mapper.SysUserRoleMapper; +import com.wild.system.service.ISysRoleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysUserOnlineServiceImpl.java similarity index 88% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysUserOnlineServiceImpl.java index 874f76ccd..806ed4da1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysUserOnlineServiceImpl.java @@ -1,11 +1,11 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.domain.SysUserOnline; -import com.ruoyi.system.service.ISysUserOnlineService; -import com.ruoyi.system.service.ISysUserService; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.utils.StringUtils; +import com.wild.system.domain.SysUserOnline; +import com.wild.system.service.ISysUserOnlineService; +import com.wild.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/SysUserServiceImpl.java similarity index 94% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/SysUserServiceImpl.java index 86f4642ba..77b7503a9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/SysUserServiceImpl.java @@ -1,25 +1,25 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.ruoyi.common.annotation.DataScope; -import com.ruoyi.common.constant.UserConstants; -import com.ruoyi.common.core.domain.entity.SysRole; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl; -import com.ruoyi.common.core.page.TableDataInfo; -import com.ruoyi.common.core.service.UserService; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.PageUtils; -import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.spring.SpringUtils; -import com.ruoyi.system.domain.SysPost; -import com.ruoyi.system.domain.SysUserPost; -import com.ruoyi.system.domain.SysUserRole; -import com.ruoyi.system.mapper.*; -import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.system.service.ISysUserService; +import com.wild.common.annotation.DataScope; +import com.wild.common.constant.UserConstants; +import com.wild.common.core.domain.entity.SysRole; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.mybatisplus.core.ServicePlusImpl; +import com.wild.common.core.page.TableDataInfo; +import com.wild.common.core.service.UserService; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.PageUtils; +import com.wild.common.utils.SecurityUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.spring.SpringUtils; +import com.wild.system.domain.SysPost; +import com.wild.system.domain.SysUserPost; +import com.wild.system.domain.SysUserRole; +import com.wild.system.mapper.*; +import com.wild.system.service.ISysConfigService; +import com.wild.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/TokenServiceImpl.java similarity index 93% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/TokenServiceImpl.java index 15b9759b8..384fd3a03 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/TokenServiceImpl.java @@ -1,16 +1,16 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.ruoyi.common.constant.Constants; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.core.service.TokenService; -import com.ruoyi.common.properties.TokenProperties; -import com.ruoyi.common.utils.RedisUtils; -import com.ruoyi.common.utils.ServletUtils; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.common.utils.ip.AddressUtils; +import com.wild.common.constant.Constants; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.core.service.TokenService; +import com.wild.common.properties.TokenProperties; +import com.wild.common.utils.RedisUtils; +import com.wild.common.utils.ServletUtils; +import com.wild.common.utils.StringUtils; +import com.wild.common.utils.ip.AddressUtils; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.SignatureAlgorithm; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java b/wild-system/src/main/java/com/wild/system/service/impl/UserDetailsServiceImpl.java similarity index 81% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java rename to wild-system/src/main/java/com/wild/system/service/impl/UserDetailsServiceImpl.java index 14801e9dc..985acb3e5 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java +++ b/wild-system/src/main/java/com/wild/system/service/impl/UserDetailsServiceImpl.java @@ -1,12 +1,12 @@ -package com.ruoyi.system.service.impl; +package com.wild.system.service.impl; -import com.ruoyi.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.enums.UserStatus; -import com.ruoyi.common.exception.ServiceException; -import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.SysPermissionService; +import com.wild.common.core.domain.entity.SysUser; +import com.wild.common.core.domain.model.LoginUser; +import com.wild.common.enums.UserStatus; +import com.wild.common.exception.ServiceException; +import com.wild.common.utils.StringUtils; +import com.wild.system.service.ISysUserService; +import com.wild.system.service.SysPermissionService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.userdetails.UserDetails; @@ -17,7 +17,7 @@ import org.springframework.stereotype.Service; /** * 用户验证处理 * - * @author ruoyi + * @author wild */ @Slf4j @Service diff --git a/ruoyi-system/src/main/resources/mapper/package-info.md b/wild-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-system/src/main/resources/mapper/package-info.md rename to wild-system/src/main/resources/mapper/package-info.md diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/wild-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 91% rename from ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to wild-system/src/main/resources/mapper/system/SysConfigMapper.xml index 983125b60..06dc9c0ed 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -2,7 +2,7 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/wild-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to wild-system/src/main/resources/mapper/system/SysDeptMapper.xml index 889982aad..5625b89bd 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/wild-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 93% rename from ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to wild-system/src/main/resources/mapper/system/SysDictDataMapper.xml index f17d59377..27454eef9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -2,7 +2,7 @@ - + @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/wild-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 90% rename from ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to wild-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index 8857f3498..5940453b6 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -2,7 +2,7 @@ - + @@ -15,4 +15,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/wild-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 90% rename from ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to wild-system/src/main/resources/mapper/system/SysLogininforMapper.xml index a2e38bfbf..86cd1790f 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysLogininforMapper.xml @@ -2,7 +2,7 @@ - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/wild-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to wild-system/src/main/resources/mapper/system/SysMenuMapper.xml index bfb543673..77c44758b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/wild-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 92% rename from ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to wild-system/src/main/resources/mapper/system/SysNoticeMapper.xml index be3cd0857..ee1933621 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysNoticeMapper.xml @@ -2,7 +2,7 @@ - + @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/wild-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 94% rename from ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to wild-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 9d40c6d94..868779a34 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -2,7 +2,7 @@ - + @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml b/wild-system/src/main/resources/mapper/system/SysOssConfigMapper.xml similarity index 87% rename from ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to wild-system/src/main/resources/mapper/system/SysOssConfigMapper.xml index 77dc40e20..66d9c1cb0 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysOssConfigMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/wild-system/src/main/resources/mapper/system/SysOssMapper.xml similarity index 84% rename from ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml rename to wild-system/src/main/resources/mapper/system/SysOssMapper.xml index a1e4ca8ad..687bf336a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysOssMapper.xml @@ -1,8 +1,8 @@ - + - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/wild-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 96% rename from ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to wild-system/src/main/resources/mapper/system/SysPostMapper.xml index c009a6cf7..0acd85e1c 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysPostMapper.xml @@ -2,7 +2,7 @@ - + @@ -45,4 +45,4 @@ where u.user_name = #{userName} - \ No newline at end of file + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/wild-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 85% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to wild-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml index e64cb4555..9a9e2b971 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/wild-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to wild-system/src/main/resources/mapper/system/SysRoleMapper.xml index 94b161b3b..d5f198d42 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/wild-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 85% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to wild-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml index efc5a791f..33744978a 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/wild-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 99% rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to wild-system/src/main/resources/mapper/system/SysUserMapper.xml index 5d9a18568..832735291 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/wild-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 85% rename from ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to wild-system/src/main/resources/mapper/system/SysUserPostMapper.xml index 0ff926556..001e3284e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/wild-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 85% rename from ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to wild-system/src/main/resources/mapper/system/SysUserRoleMapper.xml index 3066f478b..bb380b984 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/wild-system/src/main/resources/mapper/system/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-ui/.editorconfig b/wild-ui/.editorconfig similarity index 100% rename from ruoyi-ui/.editorconfig rename to wild-ui/.editorconfig diff --git a/ruoyi-ui/.env.development b/wild-ui/.env.development similarity index 89% rename from ruoyi-ui/.env.development rename to wild-ui/.env.development index 232d9077b..4ad6e77fb 100644 --- a/ruoyi-ui/.env.development +++ b/wild-ui/.env.development @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 +VUE_APP_TITLE = wild-vue-plus后台管理系统 # 开发环境配置 ENV = 'development' diff --git a/ruoyi-ui/.env.production b/wild-ui/.env.production similarity index 86% rename from ruoyi-ui/.env.production rename to wild-ui/.env.production index 928000bda..eb0b58bb4 100644 --- a/ruoyi-ui/.env.production +++ b/wild-ui/.env.production @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 +VUE_APP_TITLE = wild-vue-plus后台管理系统 # 生产环境配置 ENV = 'production' diff --git a/ruoyi-ui/.env.staging b/wild-ui/.env.staging similarity index 87% rename from ruoyi-ui/.env.staging rename to wild-ui/.env.staging index 903abe658..eba0fb566 100644 --- a/ruoyi-ui/.env.staging +++ b/wild-ui/.env.staging @@ -1,5 +1,5 @@ # 页面标题 -VUE_APP_TITLE = RuoYi-Vue-Plus后台管理系统 +VUE_APP_TITLE = wild-vue-plus后台管理系统 NODE_ENV = production diff --git a/ruoyi-ui/.eslintignore b/wild-ui/.eslintignore similarity index 100% rename from ruoyi-ui/.eslintignore rename to wild-ui/.eslintignore diff --git a/ruoyi-ui/.eslintrc.js b/wild-ui/.eslintrc.js similarity index 100% rename from ruoyi-ui/.eslintrc.js rename to wild-ui/.eslintrc.js diff --git a/ruoyi-ui/.gitignore b/wild-ui/.gitignore similarity index 100% rename from ruoyi-ui/.gitignore rename to wild-ui/.gitignore diff --git a/ruoyi-ui/README.md b/wild-ui/README.md similarity index 88% rename from ruoyi-ui/README.md rename to wild-ui/README.md index a857617b6..0470fe9af 100644 --- a/ruoyi-ui/README.md +++ b/wild-ui/README.md @@ -2,10 +2,10 @@ ```bash # 克隆项目 -git clone https://gitee.com/y_project/RuoYi-Vue +git clone https://gitee.com/y_project/wild-Vue # 进入项目目录 -cd ruoyi-ui +cd wild-ui # 安装依赖 npm install diff --git a/ruoyi-ui/babel.config.js b/wild-ui/babel.config.js similarity index 100% rename from ruoyi-ui/babel.config.js rename to wild-ui/babel.config.js diff --git a/ruoyi-ui/bin/build.bat b/wild-ui/bin/build.bat similarity index 100% rename from ruoyi-ui/bin/build.bat rename to wild-ui/bin/build.bat diff --git a/ruoyi-ui/bin/package.bat b/wild-ui/bin/package.bat similarity index 100% rename from ruoyi-ui/bin/package.bat rename to wild-ui/bin/package.bat diff --git a/ruoyi-ui/bin/run-web.bat b/wild-ui/bin/run-web.bat similarity index 100% rename from ruoyi-ui/bin/run-web.bat rename to wild-ui/bin/run-web.bat diff --git a/ruoyi-ui/build/index.js b/wild-ui/build/index.js similarity index 100% rename from ruoyi-ui/build/index.js rename to wild-ui/build/index.js diff --git a/ruoyi-ui/package.json b/wild-ui/package.json similarity index 93% rename from ruoyi-ui/package.json rename to wild-ui/package.json index 2784eccb2..dd51bdb2d 100644 --- a/ruoyi-ui/package.json +++ b/wild-ui/package.json @@ -1,7 +1,7 @@ { - "name": "ruoyi-vue-plus", + "name": "wild-vue-plus", "version": "3.4.0", - "description": "RuoYi-Vue-Plus后台管理系统", + "description": "wild-vue-plus后台管理系统", "author": "LionLi", "license": "MIT", "scripts": { @@ -33,7 +33,7 @@ ], "repository": { "type": "git", - "url": "https://gitee.com/y_project/RuoYi-Vue.git" + "url": "https://gitee.com/y_project/wild-Vue.git" }, "dependencies": { "@riophae/vue-treeselect": "0.4.0", diff --git a/ruoyi-ui/public/favicon.ico b/wild-ui/public/favicon.ico similarity index 100% rename from ruoyi-ui/public/favicon.ico rename to wild-ui/public/favicon.ico diff --git a/ruoyi-ui/public/html/ie.html b/wild-ui/public/html/ie.html similarity index 99% rename from ruoyi-ui/public/html/ie.html rename to wild-ui/public/html/ie.html index 390ce8ab2..052ffcd64 100644 --- a/ruoyi-ui/public/html/ie.html +++ b/wild-ui/public/html/ie.html @@ -1,46 +1,46 @@ - - - - - - 请升级您的浏览器 - - - - - - -

请升级您的浏览器，以便我们更好的为您提供服务！

-

您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。

-
-

请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束

-

自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明 。

-
-

您可以选择更先进的浏览器

-

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。

- -
- + + + + + + 请升级您的浏览器 + + + + + + +

请升级您的浏览器，以便我们更好的为您提供服务！

+

您正在使用 Internet Explorer 的早期版本（IE11以下版本或使用该内核的浏览器）。这意味着在升级浏览器前，您将无法访问此网站。

+
+

请注意：微软公司对Windows XP 及 Internet Explorer 早期版本的支持已经结束

+

自 2016 年 1 月 12 日起，Microsoft 不再为 IE 11 以下版本提供相应支持和更新。没有关键的浏览器安全更新，您的电脑可能易受有害病毒、间谍软件和其他恶意软件的攻击，它们可以窃取或损害您的业务数据和信息。请参阅 微软对 Internet Explorer 早期版本的支持将于 2016 年 1 月 12 日结束的说明 。

+
+

您可以选择更先进的浏览器

+

推荐使用以下浏览器的最新版本。如果您的电脑已有以下浏览器的最新版本则直接使用该浏览器访问即可。

+ +
+ \ No newline at end of file diff --git a/ruoyi-ui/public/index.html b/wild-ui/public/index.html similarity index 100% rename from ruoyi-ui/public/index.html rename to wild-ui/public/index.html diff --git a/ruoyi-ui/public/robots.txt b/wild-ui/public/robots.txt similarity index 96% rename from ruoyi-ui/public/robots.txt rename to wild-ui/public/robots.txt index c2aab7e03..77470cb39 100644 --- a/ruoyi-ui/public/robots.txt +++ b/wild-ui/public/robots.txt @@ -1,2 +1,2 @@ -User-agent: * +User-agent: * Disallow: / \ No newline at end of file diff --git a/ruoyi-ui/src/App.vue b/wild-ui/src/App.vue similarity index 100% rename from ruoyi-ui/src/App.vue rename to wild-ui/src/App.vue diff --git a/ruoyi-ui/src/api/demo/demo.js b/wild-ui/src/api/demo/demo.js similarity index 100% rename from ruoyi-ui/src/api/demo/demo.js rename to wild-ui/src/api/demo/demo.js diff --git a/ruoyi-ui/src/api/demo/tree.js b/wild-ui/src/api/demo/tree.js similarity index 100% rename from ruoyi-ui/src/api/demo/tree.js rename to wild-ui/src/api/demo/tree.js diff --git a/ruoyi-ui/src/api/login.js b/wild-ui/src/api/login.js similarity index 100% rename from ruoyi-ui/src/api/login.js rename to wild-ui/src/api/login.js diff --git a/ruoyi-ui/src/api/menu.js b/wild-ui/src/api/menu.js similarity index 100% rename from ruoyi-ui/src/api/menu.js rename to wild-ui/src/api/menu.js diff --git a/ruoyi-ui/src/api/monitor/cache.js b/wild-ui/src/api/monitor/cache.js similarity index 94% rename from ruoyi-ui/src/api/monitor/cache.js rename to wild-ui/src/api/monitor/cache.js index 2ffaf7a3f..59d3505a4 100644 --- a/ruoyi-ui/src/api/monitor/cache.js +++ b/wild-ui/src/api/monitor/cache.js @@ -1,9 +1,9 @@ -import request from '@/utils/request' - -// 查询缓存详细 -export function getCache() { - return request({ - url: '/monitor/cache', - method: 'get' - }) -} +import request from '@/utils/request' + +// 查询缓存详细 +export function getCache() { + return request({ + url: '/monitor/cache', + method: 'get' + }) +} diff --git a/ruoyi-ui/src/api/monitor/logininfor.js b/wild-ui/src/api/monitor/logininfor.js similarity index 100% rename from ruoyi-ui/src/api/monitor/logininfor.js rename to wild-ui/src/api/monitor/logininfor.js diff --git a/ruoyi-ui/src/api/monitor/online.js b/wild-ui/src/api/monitor/online.js similarity index 100% rename from ruoyi-ui/src/api/monitor/online.js rename to wild-ui/src/api/monitor/online.js diff --git a/ruoyi-ui/src/api/monitor/operlog.js b/wild-ui/src/api/monitor/operlog.js similarity index 100% rename from ruoyi-ui/src/api/monitor/operlog.js rename to wild-ui/src/api/monitor/operlog.js diff --git a/ruoyi-ui/src/api/system/config.js b/wild-ui/src/api/system/config.js similarity index 100% rename from ruoyi-ui/src/api/system/config.js rename to wild-ui/src/api/system/config.js diff --git a/ruoyi-ui/src/api/system/dept.js b/wild-ui/src/api/system/dept.js similarity index 100% rename from ruoyi-ui/src/api/system/dept.js rename to wild-ui/src/api/system/dept.js diff --git a/ruoyi-ui/src/api/system/dict/data.js b/wild-ui/src/api/system/dict/data.js similarity index 100% rename from ruoyi-ui/src/api/system/dict/data.js rename to wild-ui/src/api/system/dict/data.js diff --git a/ruoyi-ui/src/api/system/dict/type.js b/wild-ui/src/api/system/dict/type.js similarity index 100% rename from ruoyi-ui/src/api/system/dict/type.js rename to wild-ui/src/api/system/dict/type.js diff --git a/ruoyi-ui/src/api/system/menu.js b/wild-ui/src/api/system/menu.js similarity index 100% rename from ruoyi-ui/src/api/system/menu.js rename to wild-ui/src/api/system/menu.js diff --git a/ruoyi-ui/src/api/system/notice.js b/wild-ui/src/api/system/notice.js similarity index 100% rename from ruoyi-ui/src/api/system/notice.js rename to wild-ui/src/api/system/notice.js diff --git a/ruoyi-ui/src/api/system/oss.js b/wild-ui/src/api/system/oss.js similarity index 100% rename from ruoyi-ui/src/api/system/oss.js rename to wild-ui/src/api/system/oss.js diff --git a/ruoyi-ui/src/api/system/ossConfig.js b/wild-ui/src/api/system/ossConfig.js similarity index 100% rename from ruoyi-ui/src/api/system/ossConfig.js rename to wild-ui/src/api/system/ossConfig.js diff --git a/ruoyi-ui/src/api/system/post.js b/wild-ui/src/api/system/post.js similarity index 100% rename from ruoyi-ui/src/api/system/post.js rename to wild-ui/src/api/system/post.js diff --git a/ruoyi-ui/src/api/system/role.js b/wild-ui/src/api/system/role.js similarity index 100% rename from ruoyi-ui/src/api/system/role.js rename to wild-ui/src/api/system/role.js diff --git a/ruoyi-ui/src/api/system/user.js b/wild-ui/src/api/system/user.js similarity index 97% rename from ruoyi-ui/src/api/system/user.js rename to wild-ui/src/api/system/user.js index 204c26eb8..82d4b02df 100644 --- a/ruoyi-ui/src/api/system/user.js +++ b/wild-ui/src/api/system/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -import { praseStrEmpty } from "@/utils/ruoyi"; +import { praseStrEmpty } from "@/utils/wild"; // 查询用户列表 export function listUser(query) { diff --git a/ruoyi-ui/src/api/tool/gen.js b/wild-ui/src/api/tool/gen.js similarity index 100% rename from ruoyi-ui/src/api/tool/gen.js rename to wild-ui/src/api/tool/gen.js diff --git a/ruoyi-ui/src/assets/401_images/401.gif b/wild-ui/src/assets/401_images/401.gif similarity index 100% rename from ruoyi-ui/src/assets/401_images/401.gif rename to wild-ui/src/assets/401_images/401.gif diff --git a/ruoyi-ui/src/assets/404_images/404.png b/wild-ui/src/assets/404_images/404.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404.png rename to wild-ui/src/assets/404_images/404.png diff --git a/ruoyi-ui/src/assets/404_images/404_cloud.png b/wild-ui/src/assets/404_images/404_cloud.png similarity index 100% rename from ruoyi-ui/src/assets/404_images/404_cloud.png rename to wild-ui/src/assets/404_images/404_cloud.png diff --git a/ruoyi-ui/src/assets/icons/index.js b/wild-ui/src/assets/icons/index.js similarity index 100% rename from ruoyi-ui/src/assets/icons/index.js rename to wild-ui/src/assets/icons/index.js diff --git a/ruoyi-ui/src/assets/icons/svg/404.svg b/wild-ui/src/assets/icons/svg/404.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/404.svg rename to wild-ui/src/assets/icons/svg/404.svg diff --git a/ruoyi-ui/src/assets/icons/svg/bug.svg b/wild-ui/src/assets/icons/svg/bug.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/bug.svg rename to wild-ui/src/assets/icons/svg/bug.svg diff --git a/ruoyi-ui/src/assets/icons/svg/build.svg b/wild-ui/src/assets/icons/svg/build.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/build.svg rename to wild-ui/src/assets/icons/svg/build.svg diff --git a/ruoyi-ui/src/assets/icons/svg/button.svg b/wild-ui/src/assets/icons/svg/button.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/button.svg rename to wild-ui/src/assets/icons/svg/button.svg diff --git a/ruoyi-ui/src/assets/icons/svg/cascader.svg b/wild-ui/src/assets/icons/svg/cascader.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/cascader.svg rename to wild-ui/src/assets/icons/svg/cascader.svg diff --git a/ruoyi-ui/src/assets/icons/svg/chart.svg b/wild-ui/src/assets/icons/svg/chart.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/chart.svg rename to wild-ui/src/assets/icons/svg/chart.svg diff --git a/ruoyi-ui/src/assets/icons/svg/checkbox.svg b/wild-ui/src/assets/icons/svg/checkbox.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/checkbox.svg rename to wild-ui/src/assets/icons/svg/checkbox.svg diff --git a/ruoyi-ui/src/assets/icons/svg/clipboard.svg b/wild-ui/src/assets/icons/svg/clipboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/clipboard.svg rename to wild-ui/src/assets/icons/svg/clipboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/code.svg b/wild-ui/src/assets/icons/svg/code.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/code.svg rename to wild-ui/src/assets/icons/svg/code.svg diff --git a/ruoyi-ui/src/assets/icons/svg/color.svg b/wild-ui/src/assets/icons/svg/color.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/color.svg rename to wild-ui/src/assets/icons/svg/color.svg diff --git a/ruoyi-ui/src/assets/icons/svg/component.svg b/wild-ui/src/assets/icons/svg/component.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/component.svg rename to wild-ui/src/assets/icons/svg/component.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dashboard.svg b/wild-ui/src/assets/icons/svg/dashboard.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dashboard.svg rename to wild-ui/src/assets/icons/svg/dashboard.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date-range.svg b/wild-ui/src/assets/icons/svg/date-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date-range.svg rename to wild-ui/src/assets/icons/svg/date-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/date.svg b/wild-ui/src/assets/icons/svg/date.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/date.svg rename to wild-ui/src/assets/icons/svg/date.svg diff --git a/ruoyi-ui/src/assets/icons/svg/dict.svg b/wild-ui/src/assets/icons/svg/dict.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/dict.svg rename to wild-ui/src/assets/icons/svg/dict.svg diff --git a/ruoyi-ui/src/assets/icons/svg/documentation.svg b/wild-ui/src/assets/icons/svg/documentation.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/documentation.svg rename to wild-ui/src/assets/icons/svg/documentation.svg diff --git a/ruoyi-ui/src/assets/icons/svg/download.svg b/wild-ui/src/assets/icons/svg/download.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/download.svg rename to wild-ui/src/assets/icons/svg/download.svg diff --git a/ruoyi-ui/src/assets/icons/svg/drag.svg b/wild-ui/src/assets/icons/svg/drag.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/drag.svg rename to wild-ui/src/assets/icons/svg/drag.svg diff --git a/ruoyi-ui/src/assets/icons/svg/druid.svg b/wild-ui/src/assets/icons/svg/druid.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/druid.svg rename to wild-ui/src/assets/icons/svg/druid.svg diff --git a/ruoyi-ui/src/assets/icons/svg/edit.svg b/wild-ui/src/assets/icons/svg/edit.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/edit.svg rename to wild-ui/src/assets/icons/svg/edit.svg diff --git a/ruoyi-ui/src/assets/icons/svg/education.svg b/wild-ui/src/assets/icons/svg/education.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/education.svg rename to wild-ui/src/assets/icons/svg/education.svg diff --git a/ruoyi-ui/src/assets/icons/svg/email.svg b/wild-ui/src/assets/icons/svg/email.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/email.svg rename to wild-ui/src/assets/icons/svg/email.svg diff --git a/ruoyi-ui/src/assets/icons/svg/example.svg b/wild-ui/src/assets/icons/svg/example.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/example.svg rename to wild-ui/src/assets/icons/svg/example.svg diff --git a/ruoyi-ui/src/assets/icons/svg/excel.svg b/wild-ui/src/assets/icons/svg/excel.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/excel.svg rename to wild-ui/src/assets/icons/svg/excel.svg diff --git a/ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg b/wild-ui/src/assets/icons/svg/exit-fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/exit-fullscreen.svg rename to wild-ui/src/assets/icons/svg/exit-fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye-open.svg b/wild-ui/src/assets/icons/svg/eye-open.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye-open.svg rename to wild-ui/src/assets/icons/svg/eye-open.svg diff --git a/ruoyi-ui/src/assets/icons/svg/eye.svg b/wild-ui/src/assets/icons/svg/eye.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/eye.svg rename to wild-ui/src/assets/icons/svg/eye.svg diff --git a/ruoyi-ui/src/assets/icons/svg/form.svg b/wild-ui/src/assets/icons/svg/form.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/form.svg rename to wild-ui/src/assets/icons/svg/form.svg diff --git a/ruoyi-ui/src/assets/icons/svg/fullscreen.svg b/wild-ui/src/assets/icons/svg/fullscreen.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/fullscreen.svg rename to wild-ui/src/assets/icons/svg/fullscreen.svg diff --git a/ruoyi-ui/src/assets/icons/svg/github.svg b/wild-ui/src/assets/icons/svg/github.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/github.svg rename to wild-ui/src/assets/icons/svg/github.svg diff --git a/ruoyi-ui/src/assets/icons/svg/guide.svg b/wild-ui/src/assets/icons/svg/guide.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/guide.svg rename to wild-ui/src/assets/icons/svg/guide.svg diff --git a/ruoyi-ui/src/assets/icons/svg/icon.svg b/wild-ui/src/assets/icons/svg/icon.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/icon.svg rename to wild-ui/src/assets/icons/svg/icon.svg diff --git a/ruoyi-ui/src/assets/icons/svg/input.svg b/wild-ui/src/assets/icons/svg/input.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/input.svg rename to wild-ui/src/assets/icons/svg/input.svg diff --git a/ruoyi-ui/src/assets/icons/svg/international.svg b/wild-ui/src/assets/icons/svg/international.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/international.svg rename to wild-ui/src/assets/icons/svg/international.svg diff --git a/ruoyi-ui/src/assets/icons/svg/job.svg b/wild-ui/src/assets/icons/svg/job.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/job.svg rename to wild-ui/src/assets/icons/svg/job.svg diff --git a/ruoyi-ui/src/assets/icons/svg/language.svg b/wild-ui/src/assets/icons/svg/language.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/language.svg rename to wild-ui/src/assets/icons/svg/language.svg diff --git a/ruoyi-ui/src/assets/icons/svg/link.svg b/wild-ui/src/assets/icons/svg/link.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/link.svg rename to wild-ui/src/assets/icons/svg/link.svg diff --git a/ruoyi-ui/src/assets/icons/svg/list.svg b/wild-ui/src/assets/icons/svg/list.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/list.svg rename to wild-ui/src/assets/icons/svg/list.svg diff --git a/ruoyi-ui/src/assets/icons/svg/lock.svg b/wild-ui/src/assets/icons/svg/lock.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/lock.svg rename to wild-ui/src/assets/icons/svg/lock.svg diff --git a/ruoyi-ui/src/assets/icons/svg/log.svg b/wild-ui/src/assets/icons/svg/log.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/log.svg rename to wild-ui/src/assets/icons/svg/log.svg diff --git a/ruoyi-ui/src/assets/icons/svg/logininfor.svg b/wild-ui/src/assets/icons/svg/logininfor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/logininfor.svg rename to wild-ui/src/assets/icons/svg/logininfor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/message.svg b/wild-ui/src/assets/icons/svg/message.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/message.svg rename to wild-ui/src/assets/icons/svg/message.svg diff --git a/ruoyi-ui/src/assets/icons/svg/money.svg b/wild-ui/src/assets/icons/svg/money.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/money.svg rename to wild-ui/src/assets/icons/svg/money.svg diff --git a/ruoyi-ui/src/assets/icons/svg/monitor.svg b/wild-ui/src/assets/icons/svg/monitor.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/monitor.svg rename to wild-ui/src/assets/icons/svg/monitor.svg diff --git a/ruoyi-ui/src/assets/icons/svg/nested.svg b/wild-ui/src/assets/icons/svg/nested.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/nested.svg rename to wild-ui/src/assets/icons/svg/nested.svg diff --git a/ruoyi-ui/src/assets/icons/svg/number.svg b/wild-ui/src/assets/icons/svg/number.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/number.svg rename to wild-ui/src/assets/icons/svg/number.svg diff --git a/ruoyi-ui/src/assets/icons/svg/online.svg b/wild-ui/src/assets/icons/svg/online.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/online.svg rename to wild-ui/src/assets/icons/svg/online.svg diff --git a/ruoyi-ui/src/assets/icons/svg/password.svg b/wild-ui/src/assets/icons/svg/password.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/password.svg rename to wild-ui/src/assets/icons/svg/password.svg diff --git a/ruoyi-ui/src/assets/icons/svg/pdf.svg b/wild-ui/src/assets/icons/svg/pdf.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/pdf.svg rename to wild-ui/src/assets/icons/svg/pdf.svg diff --git a/ruoyi-ui/src/assets/icons/svg/people.svg b/wild-ui/src/assets/icons/svg/people.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/people.svg rename to wild-ui/src/assets/icons/svg/people.svg diff --git a/ruoyi-ui/src/assets/icons/svg/peoples.svg b/wild-ui/src/assets/icons/svg/peoples.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/peoples.svg rename to wild-ui/src/assets/icons/svg/peoples.svg diff --git a/ruoyi-ui/src/assets/icons/svg/phone.svg b/wild-ui/src/assets/icons/svg/phone.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/phone.svg rename to wild-ui/src/assets/icons/svg/phone.svg diff --git a/ruoyi-ui/src/assets/icons/svg/post.svg b/wild-ui/src/assets/icons/svg/post.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/post.svg rename to wild-ui/src/assets/icons/svg/post.svg diff --git a/ruoyi-ui/src/assets/icons/svg/qq.svg b/wild-ui/src/assets/icons/svg/qq.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/qq.svg rename to wild-ui/src/assets/icons/svg/qq.svg diff --git a/ruoyi-ui/src/assets/icons/svg/question.svg b/wild-ui/src/assets/icons/svg/question.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/question.svg rename to wild-ui/src/assets/icons/svg/question.svg diff --git a/ruoyi-ui/src/assets/icons/svg/radio.svg b/wild-ui/src/assets/icons/svg/radio.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/radio.svg rename to wild-ui/src/assets/icons/svg/radio.svg diff --git a/ruoyi-ui/src/assets/icons/svg/rate.svg b/wild-ui/src/assets/icons/svg/rate.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/rate.svg rename to wild-ui/src/assets/icons/svg/rate.svg diff --git a/ruoyi-ui/src/assets/icons/svg/redis.svg b/wild-ui/src/assets/icons/svg/redis.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/redis.svg rename to wild-ui/src/assets/icons/svg/redis.svg diff --git a/ruoyi-ui/src/assets/icons/svg/row.svg b/wild-ui/src/assets/icons/svg/row.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/row.svg rename to wild-ui/src/assets/icons/svg/row.svg diff --git a/ruoyi-ui/src/assets/icons/svg/search.svg b/wild-ui/src/assets/icons/svg/search.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/search.svg rename to wild-ui/src/assets/icons/svg/search.svg diff --git a/ruoyi-ui/src/assets/icons/svg/select.svg b/wild-ui/src/assets/icons/svg/select.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/select.svg rename to wild-ui/src/assets/icons/svg/select.svg diff --git a/ruoyi-ui/src/assets/icons/svg/server.svg b/wild-ui/src/assets/icons/svg/server.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/server.svg rename to wild-ui/src/assets/icons/svg/server.svg diff --git a/ruoyi-ui/src/assets/icons/svg/shopping.svg b/wild-ui/src/assets/icons/svg/shopping.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/shopping.svg rename to wild-ui/src/assets/icons/svg/shopping.svg diff --git a/ruoyi-ui/src/assets/icons/svg/size.svg b/wild-ui/src/assets/icons/svg/size.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/size.svg rename to wild-ui/src/assets/icons/svg/size.svg diff --git a/ruoyi-ui/src/assets/icons/svg/skill.svg b/wild-ui/src/assets/icons/svg/skill.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/skill.svg rename to wild-ui/src/assets/icons/svg/skill.svg diff --git a/ruoyi-ui/src/assets/icons/svg/slider.svg b/wild-ui/src/assets/icons/svg/slider.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/slider.svg rename to wild-ui/src/assets/icons/svg/slider.svg diff --git a/ruoyi-ui/src/assets/icons/svg/star.svg b/wild-ui/src/assets/icons/svg/star.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/star.svg rename to wild-ui/src/assets/icons/svg/star.svg diff --git a/ruoyi-ui/src/assets/icons/svg/swagger.svg b/wild-ui/src/assets/icons/svg/swagger.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/swagger.svg rename to wild-ui/src/assets/icons/svg/swagger.svg diff --git a/ruoyi-ui/src/assets/icons/svg/switch.svg b/wild-ui/src/assets/icons/svg/switch.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/switch.svg rename to wild-ui/src/assets/icons/svg/switch.svg diff --git a/ruoyi-ui/src/assets/icons/svg/system.svg b/wild-ui/src/assets/icons/svg/system.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/system.svg rename to wild-ui/src/assets/icons/svg/system.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tab.svg b/wild-ui/src/assets/icons/svg/tab.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tab.svg rename to wild-ui/src/assets/icons/svg/tab.svg diff --git a/ruoyi-ui/src/assets/icons/svg/table.svg b/wild-ui/src/assets/icons/svg/table.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/table.svg rename to wild-ui/src/assets/icons/svg/table.svg diff --git a/ruoyi-ui/src/assets/icons/svg/textarea.svg b/wild-ui/src/assets/icons/svg/textarea.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/textarea.svg rename to wild-ui/src/assets/icons/svg/textarea.svg diff --git a/ruoyi-ui/src/assets/icons/svg/theme.svg b/wild-ui/src/assets/icons/svg/theme.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/theme.svg rename to wild-ui/src/assets/icons/svg/theme.svg diff --git a/ruoyi-ui/src/assets/icons/svg/time-range.svg b/wild-ui/src/assets/icons/svg/time-range.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/time-range.svg rename to wild-ui/src/assets/icons/svg/time-range.svg diff --git a/ruoyi-ui/src/assets/icons/svg/time.svg b/wild-ui/src/assets/icons/svg/time.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/time.svg rename to wild-ui/src/assets/icons/svg/time.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tool.svg b/wild-ui/src/assets/icons/svg/tool.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tool.svg rename to wild-ui/src/assets/icons/svg/tool.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tree-table.svg b/wild-ui/src/assets/icons/svg/tree-table.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tree-table.svg rename to wild-ui/src/assets/icons/svg/tree-table.svg diff --git a/ruoyi-ui/src/assets/icons/svg/tree.svg b/wild-ui/src/assets/icons/svg/tree.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/tree.svg rename to wild-ui/src/assets/icons/svg/tree.svg diff --git a/ruoyi-ui/src/assets/icons/svg/upload.svg b/wild-ui/src/assets/icons/svg/upload.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/upload.svg rename to wild-ui/src/assets/icons/svg/upload.svg diff --git a/ruoyi-ui/src/assets/icons/svg/user.svg b/wild-ui/src/assets/icons/svg/user.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/user.svg rename to wild-ui/src/assets/icons/svg/user.svg diff --git a/ruoyi-ui/src/assets/icons/svg/validCode.svg b/wild-ui/src/assets/icons/svg/validCode.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/validCode.svg rename to wild-ui/src/assets/icons/svg/validCode.svg diff --git a/ruoyi-ui/src/assets/icons/svg/wechat.svg b/wild-ui/src/assets/icons/svg/wechat.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/wechat.svg rename to wild-ui/src/assets/icons/svg/wechat.svg diff --git a/ruoyi-ui/src/assets/icons/svg/zip.svg b/wild-ui/src/assets/icons/svg/zip.svg similarity index 100% rename from ruoyi-ui/src/assets/icons/svg/zip.svg rename to wild-ui/src/assets/icons/svg/zip.svg diff --git a/ruoyi-ui/src/assets/icons/svgo.yml b/wild-ui/src/assets/icons/svgo.yml similarity index 100% rename from ruoyi-ui/src/assets/icons/svgo.yml rename to wild-ui/src/assets/icons/svgo.yml diff --git a/ruoyi-ui/src/assets/images/dark.svg b/wild-ui/src/assets/images/dark.svg similarity index 98% rename from ruoyi-ui/src/assets/images/dark.svg rename to wild-ui/src/assets/images/dark.svg index 36b58b5b8..f646bd7ea 100644 --- a/ruoyi-ui/src/assets/images/dark.svg +++ b/wild-ui/src/assets/images/dark.svg @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/light.svg b/wild-ui/src/assets/images/light.svg similarity index 98% rename from ruoyi-ui/src/assets/images/light.svg rename to wild-ui/src/assets/images/light.svg index efd52c67d..ab7cc088f 100644 --- a/ruoyi-ui/src/assets/images/light.svg +++ b/wild-ui/src/assets/images/light.svg @@ -1,39 +1,39 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/assets/images/login-background.jpg b/wild-ui/src/assets/images/login-background.jpg similarity index 100% rename from ruoyi-ui/src/assets/images/login-background.jpg rename to wild-ui/src/assets/images/login-background.jpg diff --git a/ruoyi-ui/src/assets/images/profile.jpg b/wild-ui/src/assets/images/profile.jpg similarity index 100% rename from ruoyi-ui/src/assets/images/profile.jpg rename to wild-ui/src/assets/images/profile.jpg diff --git a/ruoyi-ui/src/assets/logo/logo.png b/wild-ui/src/assets/logo/logo.png similarity index 100% rename from ruoyi-ui/src/assets/logo/logo.png rename to wild-ui/src/assets/logo/logo.png diff --git a/ruoyi-ui/src/assets/styles/btn.scss b/wild-ui/src/assets/styles/btn.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/btn.scss rename to wild-ui/src/assets/styles/btn.scss diff --git a/ruoyi-ui/src/assets/styles/element-ui.scss b/wild-ui/src/assets/styles/element-ui.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/element-ui.scss rename to wild-ui/src/assets/styles/element-ui.scss diff --git a/ruoyi-ui/src/assets/styles/element-variables.scss b/wild-ui/src/assets/styles/element-variables.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/element-variables.scss rename to wild-ui/src/assets/styles/element-variables.scss diff --git a/ruoyi-ui/src/assets/styles/index.scss b/wild-ui/src/assets/styles/index.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/index.scss rename to wild-ui/src/assets/styles/index.scss diff --git a/ruoyi-ui/src/assets/styles/mixin.scss b/wild-ui/src/assets/styles/mixin.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/mixin.scss rename to wild-ui/src/assets/styles/mixin.scss diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/wild-ui/src/assets/styles/sidebar.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/sidebar.scss rename to wild-ui/src/assets/styles/sidebar.scss diff --git a/ruoyi-ui/src/assets/styles/transition.scss b/wild-ui/src/assets/styles/transition.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/transition.scss rename to wild-ui/src/assets/styles/transition.scss diff --git a/ruoyi-ui/src/assets/styles/variables.scss b/wild-ui/src/assets/styles/variables.scss similarity index 100% rename from ruoyi-ui/src/assets/styles/variables.scss rename to wild-ui/src/assets/styles/variables.scss diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/wild-ui/src/assets/styles/wild.scss similarity index 99% rename from ruoyi-ui/src/assets/styles/ruoyi.scss rename to wild-ui/src/assets/styles/wild.scss index 8fe1961b2..052824a1c 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/wild-ui/src/assets/styles/wild.scss @@ -1,6 +1,6 @@ /** * 通用css样式布局处理 - * Copyright (c) 2019 ruoyi + * Copyright (c) 2019 wild */ /** 基础通用 **/ diff --git a/ruoyi-ui/src/components/Breadcrumb/index.vue b/wild-ui/src/components/Breadcrumb/index.vue similarity index 100% rename from ruoyi-ui/src/components/Breadcrumb/index.vue rename to wild-ui/src/components/Breadcrumb/index.vue diff --git a/ruoyi-ui/src/components/Crontab/day.vue b/wild-ui/src/components/Crontab/day.vue similarity index 100% rename from ruoyi-ui/src/components/Crontab/day.vue rename to wild-ui/src/components/Crontab/day.vue diff --git a/ruoyi-ui/src/components/Crontab/hour.vue b/wild-ui/src/components/Crontab/hour.vue similarity index 96% rename from ruoyi-ui/src/components/Crontab/hour.vue rename to wild-ui/src/components/Crontab/hour.vue index 5a1e14678..50833fc19 100644 --- a/ruoyi-ui/src/components/Crontab/hour.vue +++ b/wild-ui/src/components/Crontab/hour.vue @@ -1,122 +1,122 @@ - - -
- - - - - - - - - - - - - - -
- - - + + + diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/wild-ui/src/components/Screenfull/index.vue similarity index 100% rename from ruoyi-ui/src/components/Screenfull/index.vue rename to wild-ui/src/components/Screenfull/index.vue diff --git a/ruoyi-ui/src/components/SizeSelect/index.vue b/wild-ui/src/components/SizeSelect/index.vue similarity index 100% rename from ruoyi-ui/src/components/SizeSelect/index.vue rename to wild-ui/src/components/SizeSelect/index.vue diff --git a/ruoyi-ui/src/components/SvgIcon/index.vue b/wild-ui/src/components/SvgIcon/index.vue similarity index 100% rename from ruoyi-ui/src/components/SvgIcon/index.vue rename to wild-ui/src/components/SvgIcon/index.vue diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/wild-ui/src/components/ThemePicker/index.vue similarity index 100% rename from ruoyi-ui/src/components/ThemePicker/index.vue rename to wild-ui/src/components/ThemePicker/index.vue diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/wild-ui/src/components/TopNav/index.vue similarity index 100% rename from ruoyi-ui/src/components/TopNav/index.vue rename to wild-ui/src/components/TopNav/index.vue diff --git a/ruoyi-ui/src/components/iFrame/index.vue b/wild-ui/src/components/iFrame/index.vue similarity index 95% rename from ruoyi-ui/src/components/iFrame/index.vue rename to wild-ui/src/components/iFrame/index.vue index 4b85f3653..426857fb1 100644 --- a/ruoyi-ui/src/components/iFrame/index.vue +++ b/wild-ui/src/components/iFrame/index.vue @@ -1,36 +1,36 @@ -