This commit is contained in:
yaoyu 2021-12-10 09:25:05 +08:00
parent 255b5f2f07
commit c56459bc07
822 changed files with 6347 additions and 6354 deletions

View File

@ -1,6 +1,6 @@
The MIT License (MIT) 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 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 this software and associated documentation files (the "Software"), to deal in

View File

@ -4,22 +4,22 @@
[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE) [![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) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
<br> <br>
[![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)]() [![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-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
[![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
[![JDK-17](https://img.shields.io/badge/JDK-17-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) > 系统演示: [传送门](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重构权限鉴权(公测 可尝试上生产) | | 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-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) | | | 前端开发框架 | Vue、Element UI | [Element UI官网](https://element.eleme.cn/#/zh-CN) | |
| 后端开发框架 | SpringBoot | [SpringBoot官网](https://spring.io/projects/spring-boot/#learn) | | | 后端开发框架 | SpringBoot | [SpringBoot官网](https://spring.io/projects/spring-boot/#learn) | |
| 容器框架 | Undertow | [Undertow官网](https://undertow.io/) | 基于 Netty 的高性能容器 | | 容器框架 | 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) * 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/) * 单模块 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/) * satoken 分支 [RuoYi-Vue-Plus-satoken](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/satoken/)

74
pom.xml
View File

@ -4,16 +4,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-vue-plus</artifactId> <artifactId>wild-vue-plus</artifactId>
<version>3.4.0</version> <version>3.4.0</version>
<name>RuoYi-Vue-Plus</name> <name>wild-vue-plus</name>
<url>https://gitee.com/JavaLionLi/RuoYi-Vue-Plus</url> <url>https://gitee.com/JavaLionLi/wild-vue-plus</url>
<description>RuoYi-Vue-Plus后台管理系统</description> <description>wild-vue-plus后台管理系统</description>
<properties> <properties>
<ruoyi-vue-plus.version>3.4.0</ruoyi-vue-plus.version> <wild-vue-plus.version>3.4.0</wild-vue-plus.version>
<spring-boot.version>2.5.7</spring-boot.version> <spring-boot.version>2.5.7</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@ -49,7 +49,7 @@
<!-- docker 配置 --> <!-- docker 配置 -->
<docker.registry.url>localhost</docker.registry.url> <docker.registry.url>localhost</docker.registry.url>
<docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host> <docker.registry.host>http://${docker.registry.url}:2375</docker.registry.host>
<docker.namespace>ruoyi</docker.namespace> <docker.namespace>wild</docker.namespace>
<docker.plugin.version>1.2.2</docker.plugin.version> <docker.plugin.version>1.2.2</docker.plugin.version>
</properties> </properties>
@ -232,66 +232,66 @@
<!-- 定时任务 --> <!-- 定时任务 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-job</artifactId> <artifactId>wild-job</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>wild-generator</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-framework</artifactId> <artifactId>wild-framework</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
<!-- 系统模块--> <!-- 系统模块-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-system</artifactId> <artifactId>wild-system</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
<!-- 通用工具--> <!-- 通用工具-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-common</artifactId> <artifactId>wild-common</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
<!-- OSS对象存储模块 --> <!-- OSS对象存储模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-oss</artifactId> <artifactId>wild-oss</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
<!-- demo模块 --> <!-- demo模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-demo</artifactId> <artifactId>wild-demo</artifactId>
<version>${ruoyi-vue-plus.version}</version> <version>${wild-vue-plus.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
<modules> <modules>
<module>ruoyi-admin</module> <module>wild-admin</module>
<module>ruoyi-framework</module> <module>wild-framework</module>
<module>ruoyi-system</module> <module>wild-system</module>
<module>ruoyi-job</module> <module>wild-job</module>
<module>ruoyi-generator</module> <module>wild-generator</module>
<module>ruoyi-common</module> <module>wild-common</module>
<module>ruoyi-demo</module> <module>wild-demo</module>
<module>ruoyi-extend</module> <module>wild-extend</module>
<module>ruoyi-oss</module> <module>wild-oss</module>
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>

View File

@ -1 +0,0 @@
package com.ruoyi.demo.controller;

View File

@ -1 +0,0 @@
package com.ruoyi.demo.domain;

View File

@ -1 +0,0 @@
package com.ruoyi.demo.mapper;

View File

@ -1 +0,0 @@
package com.ruoyi.demo.service.impl;

View File

@ -1 +0,0 @@
package com.ruoyi.demo.service;

View File

@ -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<SysConfig> {
}

View File

@ -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<SysDictType> {
}

View File

@ -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<SysNotice> {
}

View File

@ -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<SysOperLog> {
}

View File

@ -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<SysOss> {
}

View File

@ -1,21 +1,21 @@
@echo off @echo off
rem jar平级目录 rem jar平级目录
set AppName=ruoyi-admin.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" 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.
ECHO. [1] 启动%AppName% ECHO. [1] 启动%AppName%
ECHO. [2] 关闭%AppName% ECHO. [2] 关闭%AppName%
ECHO. [3] 重启%AppName% ECHO. [3] 重启%AppName%
ECHO. [4] 启动状态 %AppName% ECHO. [4] 启动状态 %AppName%
ECHO. [5] 退 出 ECHO. [5] 退 出
ECHO. ECHO.
ECHO.请输入选择项目的序号: ECHO.请输入选择项目的序号:
set /p ID= set /p ID=
IF "%id%"=="1" GOTO start IF "%id%"=="1" GOTO start
IF "%id%"=="2" GOTO stop IF "%id%"=="2" GOTO stop
@ -35,11 +35,11 @@ PAUSE
start javaw %JAVA_OPTS% -jar %AppName% start javaw %JAVA_OPTS% -jar %AppName%
echo starting…… echo starting……
echo Start %AppName% success... echo Start %AppName% success...
goto:eof goto:eof
rem 函数stop通过jps命令查找pid并结束进程 rem 函数stop通过jps命令查找pid并结束进程
:stop :stop
for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do ( for /f "usebackq tokens=1-2" %%a in (`jps -l ^| findstr %AppName%`) do (
set pid=%%a set pid=%%a
@ -48,7 +48,7 @@ rem
if not defined pid (echo process %AppName% does not exists) else ( if not defined pid (echo process %AppName% does not exists) else (
echo prepare to kill %image_name% echo prepare to kill %image_name%
echo start kill %pid% ... echo start kill %pid% ...
rem 根据进程IDkill进程 rem 根据进程IDkill进程
taskkill /f /pid %pid% taskkill /f /pid %pid%
) )
goto:eof goto:eof

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# ./ry.sh start 启动 stop 停止 restart 重启 status 状态 # ./ry.sh start 启动 stop 停止 restart 重启 status 状态
AppName=ruoyi-admin.jar AppName=wild-admin.jar
# JVM参数 # 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" 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"

View File

@ -45,17 +45,17 @@ base(){
#启动监控模块 #启动监控模块
monitor(){ monitor(){
docker-compose up -d ruoyi-monitor-admin docker-compose up -d wild-monitor-admin
} }
#启动程序模块 #启动程序模块
start(){ 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(){ stop(){
docker-compose stop ruoyi-xxl-job-admin ruoyi-server1 ruoyi-server2 docker-compose stop wild-xxl-job-admin wild-server1 wild-server2
} }
#关闭所有模块 #关闭所有模块

View File

@ -28,7 +28,7 @@ services:
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.36 ipv4_address: 172.30.0.36
nginx-web: nginx-web:
@ -52,7 +52,7 @@ services:
privileged: true privileged: true
restart: always restart: always
networks: networks:
- ruoyi_net - wild_net
redis: redis:
image: redis:6.2.6 image: redis:6.2.6
@ -71,7 +71,7 @@ services:
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.48 ipv4_address: 172.30.0.48
minio: minio:
@ -86,9 +86,9 @@ services:
# 时区上海 # 时区上海
TZ: Asia/Shanghai TZ: Asia/Shanghai
# 管理后台用户名 # 管理后台用户名
MINIO_ACCESS_KEY: ruoyi MINIO_ACCESS_KEY: wild
# 管理后台密码最小8个字符 # 管理后台密码最小8个字符
MINIO_SECRET_KEY: ruoyi123 MINIO_SECRET_KEY: wild123
volumes: volumes:
# 映射当前目录下的data目录至容器内/data目录 # 映射当前目录下的data目录至容器内/data目录
- /docker/minio/data:/data - /docker/minio/data:/data
@ -98,71 +98,71 @@ services:
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.54 ipv4_address: 172.30.0.54
ruoyi-server1: wild-server1:
image: "ruoyi/ruoyi-server:3.4.0" image: "wild/wild-server:3.4.0"
container_name: ruoyi-server1 container_name: wild-server1
environment: environment:
# 时区上海 # 时区上海
TZ: Asia/Shanghai TZ: Asia/Shanghai
volumes: volumes:
# 配置文件 # 配置文件
- /docker/server1/logs/:/ruoyi/server/logs/ - /docker/server1/logs/:/wild/server/logs/
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.60 ipv4_address: 172.30.0.60
ruoyi-server2: wild-server2:
image: "ruoyi/ruoyi-server:3.4.0" image: "wild/wild-server:3.4.0"
container_name: ruoyi-server2 container_name: wild-server2
environment: environment:
# 时区上海 # 时区上海
TZ: Asia/Shanghai TZ: Asia/Shanghai
volumes: volumes:
# 配置文件 # 配置文件
- /docker/server2/logs/:/ruoyi/server/logs/ - /docker/server2/logs/:/wild/server/logs/
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.61 ipv4_address: 172.30.0.61
ruoyi-monitor-admin: wild-monitor-admin:
image: "ruoyi/ruoyi-monitor-admin:3.4.0" image: "wild/wild-monitor-admin:3.4.0"
container_name: ruoyi-monitor-admin container_name: wild-monitor-admin
environment: environment:
# 时区上海 # 时区上海
TZ: Asia/Shanghai TZ: Asia/Shanghai
volumes: volumes:
# 配置文件 # 配置文件
- /docker/monitor/logs/:/ruoyi/monitor/logs - /docker/monitor/logs/:/wild/monitor/logs
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.90 ipv4_address: 172.30.0.90
ruoyi-xxl-job-admin: wild-xxl-job-admin:
image: "ruoyi/ruoyi-xxl-job-admin:3.4.0" image: "wild/wild-xxl-job-admin:3.4.0"
container_name: ruoyi-xxl-job-admin container_name: wild-xxl-job-admin
environment: environment:
# 时区上海 # 时区上海
TZ: Asia/Shanghai TZ: Asia/Shanghai
volumes: volumes:
# 配置文件 # 配置文件
- /docker/xxljob/logs/:/ruoyi/xxljob/logs - /docker/xxljob/logs/:/wild/xxljob/logs
privileged: true privileged: true
restart: always restart: always
networks: networks:
ruoyi_net: wild_net:
ipv4_address: 172.30.0.92 ipv4_address: 172.30.0.92
networks: networks:
ruoyi_net: wild_net:
driver: bridge driver: bridge
ipam: ipam:
config: config:

View File

@ -1,5 +1,5 @@
# redis 密码 # redis 密码
# requirepass ruoyi123 # requirepass wild123
# 配置持久化文件存储路径 # 配置持久化文件存储路径
dir /redis/data dir /redis/data

View File

@ -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('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('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('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('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, '角色管理菜单'); 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) primary key (oss_config_id)
) engine=innodb comment='对象存储配置表'; ) 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 (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', 'ruoyi', '', 'http://XXX.XXXX.com', 'N', 'z0', '1', '', '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', 'ruoyi', '', 'http://oss-cn-beijing.aliyuncs.com', 'N', '', '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', 'ruoyi-1250000000', '', 'http://cos.ap-beijing.myqcloud.com', 'N', 'ap-beijing', '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);

View File

@ -2,14 +2,14 @@ FROM anapsix/alpine-java:8_server-jre_unlimited
MAINTAINER Lion Li MAINTAINER Lion Li
RUN mkdir -p /ruoyi/server RUN mkdir -p /wild/server
RUN mkdir -p /ruoyi/server/logs RUN mkdir -p /wild/server/logs
RUN mkdir -p /ruoyi/server/temp RUN mkdir -p /wild/server/temp
WORKDIR /ruoyi/server WORKDIR /wild/server
EXPOSE 8080 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"] ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]

View File

@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi-vue-plus</artifactId> <artifactId>wild-vue-plus</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<version>3.4.0</version> <version>3.4.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging> <packaging>jar</packaging>
<artifactId>ruoyi-admin</artifactId> <artifactId>wild-admin</artifactId>
<description> <description>
web服务入口 web服务入口
@ -32,35 +32,35 @@
<!-- 核心模块--> <!-- 核心模块-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-framework</artifactId> <artifactId>wild-framework</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-system</artifactId> <artifactId>wild-system</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-job</artifactId> <artifactId>wild-job</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-oss</artifactId> <artifactId>wild-oss</artifactId>
</dependency> </dependency>
<!-- 代码生成--> <!-- 代码生成-->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-generator</artifactId> <artifactId>wild-generator</artifactId>
</dependency> </dependency>
<!-- demo模块 --> <!-- demo模块 -->
<dependency> <dependency>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<artifactId>ruoyi-demo</artifactId> <artifactId>wild-demo</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
@ -97,7 +97,7 @@
<artifactId>docker-maven-plugin</artifactId> <artifactId>docker-maven-plugin</artifactId>
<version>${docker.plugin.version}</version> <version>${docker.plugin.version}</version>
<configuration> <configuration>
<imageName>${docker.namespace}/ruoyi-server:${project.version}</imageName> <imageName>${docker.namespace}/wild-server:${project.version}</imageName>
<dockerDirectory>${project.basedir}</dockerDirectory> <dockerDirectory>${project.basedir}</dockerDirectory>
<dockerHost>${docker.registry.host}</dockerHost> <dockerHost>${docker.registry.host}</dockerHost>
<registryUrl>${docker.registry.url}</registryUrl> <registryUrl>${docker.registry.url}</registryUrl>

View File

@ -1,4 +1,4 @@
package com.ruoyi; package com.wild;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -7,18 +7,18 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt
/** /**
* 启动程序 * 启动程序
* *
* @author ruoyi * @author wild
*/ */
@SpringBootApplication @SpringBootApplication
public class RuoYiApplication { public class WildApplication {
public static void main(String[] args) { public static void main(String[] args) {
System.setProperty("spring.devtools.restart.enabled", "false"); 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.setApplicationStartup(new BufferingApplicationStartup(2048));
application.run(args); application.run(args);
System.out.println("(♥◠‿◠)ノ゙ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)゙"); System.out.println("(♥◠‿◠)ノ゙ wild-vue-plus启动成功 ლ(´ڡ`ლ)゙");
} }
} }

View File

@ -1,4 +1,4 @@
package com.ruoyi; package com.wild;
import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@ -6,13 +6,13 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
/** /**
* web容器中进行部署 * web容器中进行部署
* *
* @author ruoyi * @author wild
*/ */
public class RuoYiServletInitializer extends SpringBootServletInitializer { public class WildServletInitializer extends SpringBootServletInitializer {
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(RuoYiApplication.class); return application.sources(WildApplication.class);
} }
} }

View File

@ -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.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import com.ruoyi.common.constant.Constants; import com.wild.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.CaptchaType; import com.wild.common.enums.CaptchaType;
import com.ruoyi.common.utils.RedisUtils; import com.wild.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils; import com.wild.common.utils.reflect.ReflectUtils;
import com.ruoyi.common.utils.spring.SpringUtils; import com.wild.common.utils.spring.SpringUtils;
import com.ruoyi.framework.config.properties.CaptchaProperties; import com.wild.framework.config.properties.CaptchaProperties;
import com.ruoyi.system.service.ISysConfigService; import com.wild.system.service.ISysConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -30,7 +29,7 @@ import java.util.concurrent.TimeUnit;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "验证码操作处理", tags = {"验证码管理"}) @Api(value = "验证码操作处理", tags = {"验证码管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class CaptchaController { public class CaptchaController {

View File

@ -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.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -22,7 +22,7 @@ import java.util.*;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "缓存监控", tags = {"缓存监控管理"}) @Api(value = "缓存监控", tags = {"缓存监控管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/cache") @RequestMapping("/monitor/cache")
public class CacheController { public class CacheController {

View File

@ -1,13 +1,13 @@
package com.ruoyi.web.controller.monitor; package com.wild.web.controller.monitor;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor; import com.wild.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService; import com.wild.system.service.ISysLogininforService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -26,7 +26,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "系统访问记录", tags = {"系统访问记录管理"}) @Api(value = "系统访问记录", tags = {"系统访问记录管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/logininfor") @RequestMapping("/monitor/logininfor")
public class SysLogininforController extends BaseController { public class SysLogininforController extends BaseController {

View File

@ -1,13 +1,13 @@
package com.ruoyi.web.controller.monitor; package com.wild.web.controller.monitor;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog; import com.wild.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService; import com.wild.system.service.ISysOperLogService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -26,7 +26,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "操作日志记录", tags = {"操作日志记录管理"}) @Api(value = "操作日志记录", tags = {"操作日志记录管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/operlog") @RequestMapping("/monitor/operlog")
public class SysOperlogController extends BaseController { public class SysOperlogController extends BaseController {

View File

@ -1,17 +1,17 @@
package com.ruoyi.web.controller.monitor; package com.wild.web.controller.monitor;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.Constants; import com.wild.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser; import com.wild.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils; import com.wild.common.utils.PageUtils;
import com.ruoyi.common.utils.RedisUtils; import com.wild.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline; import com.wild.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService; import com.wild.system.service.ISysUserOnlineService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -30,7 +30,7 @@ import java.util.List;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "在线用户监控", tags = {"在线用户监控管理"}) @Api(value = "在线用户监控", tags = {"在线用户监控管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/monitor/online") @RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController { public class SysUserOnlineController extends BaseController {

View File

@ -1,19 +1,18 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig; import com.wild.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService; import com.wild.system.service.ISysConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -28,7 +27,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "参数配置控制器", tags = {"参数配置管理"}) @Api(value = "参数配置控制器", tags = {"参数配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/config") @RequestMapping("/system/config")
public class SysConfigController extends BaseController { public class SysConfigController extends BaseController {

View File

@ -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.lang.tree.Tree;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept; import com.wild.common.core.domain.entity.SysDept;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService; import com.wild.system.service.ISysDeptService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -30,7 +29,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "部门控制器", tags = {"部门管理"}) @Api(value = "部门控制器", tags = {"部门管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/dept") @RequestMapping("/system/dept")
public class SysDeptController extends BaseController { public class SysDeptController extends BaseController {

View File

@ -1,20 +1,19 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.wild.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService; import com.wild.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService; import com.wild.system.service.ISysDictTypeService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -30,7 +29,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"}) @Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/dict/data") @RequestMapping("/system/dict/data")
public class SysDictDataController extends BaseController { public class SysDictDataController extends BaseController {

View File

@ -1,19 +1,18 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictType; import com.wild.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictTypeService; import com.wild.system.service.ISysDictTypeService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -28,7 +27,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"}) @Api(value = "数据字典信息控制器", tags = {"数据字典信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/dict/type") @RequestMapping("/system/dict/type")
public class SysDictTypeController extends BaseController { public class SysDictTypeController extends BaseController {

View File

@ -1,11 +1,10 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.config.RuoYiConfig; import com.wild.common.config.WildConfig;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -15,14 +14,14 @@ import org.springframework.web.bind.annotation.RestController;
* @author Lion Li * @author Lion Li
*/ */
@Api(value = "首页控制器", tags = {"首页管理"}) @Api(value = "首页控制器", tags = {"首页管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class SysIndexController { public class SysIndexController {
/** /**
* 系统基础配置 * 系统基础配置
*/ */
private final RuoYiConfig ruoyiConfig; private final WildConfig WildConfig;
/** /**
* 访问首页提示语 * 访问首页提示语
@ -30,6 +29,6 @@ public class SysIndexController {
@ApiOperation("访问首页,提示语") @ApiOperation("访问首页,提示语")
@GetMapping("/") @GetMapping("/")
public String index() { public String index() {
return StringUtils.format("欢迎使用{}后台管理框架当前版本v{},请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion()); return StringUtils.format("欢迎使用{}后台管理框架当前版本v{},请通过前端地址访问。", WildConfig.getName(), WildConfig.getVersion());
} }
} }

View File

@ -1,16 +1,16 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.constant.Constants; import com.wild.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.wild.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser; import com.wild.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody; import com.wild.common.core.domain.model.LoginBody;
import com.ruoyi.common.utils.SecurityUtils; import com.wild.common.utils.SecurityUtils;
import com.ruoyi.system.domain.vo.RouterVo; import com.wild.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService; import com.wild.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysUserService; import com.wild.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService; import com.wild.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService; import com.wild.system.service.SysPermissionService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -33,7 +33,7 @@ import java.util.Set;
*/ */
@Validated @Validated
@Api(value = "登录验证控制器", tags = {"登录验证管理"}) @Api(value = "登录验证控制器", tags = {"登录验证管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class SysLoginController { public class SysLoginController {

View File

@ -1,14 +1,14 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.Tree;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu; import com.wild.common.core.domain.entity.SysMenu;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.system.service.ISysMenuService; import com.wild.system.service.ISysMenuService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -29,7 +29,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "菜单信息控制器", tags = {"菜单信息管理"}) @Api(value = "菜单信息控制器", tags = {"菜单信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/menu") @RequestMapping("/system/menu")
public class SysMenuController extends BaseController { public class SysMenuController extends BaseController {

View File

@ -1,12 +1,12 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice; import com.wild.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService; import com.wild.system.service.ISysNoticeService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
*/ */
@Validated @Validated
@Api(value = "公告信息控制器", tags = {"公告信息管理"}) @Api(value = "公告信息控制器", tags = {"公告信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/notice") @RequestMapping("/system/notice")
public class SysNoticeController extends BaseController { public class SysNoticeController extends BaseController {

View File

@ -1,17 +1,17 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.wild.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.AddGroup; import com.wild.common.core.validate.AddGroup;
import com.ruoyi.common.core.validate.EditGroup; import com.wild.common.core.validate.EditGroup;
import com.ruoyi.common.core.validate.QueryGroup; import com.wild.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.system.domain.bo.SysOssConfigBo; import com.wild.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo; import com.wild.system.domain.vo.SysOssConfigVo;
import com.ruoyi.system.service.ISysOssConfigService; import com.wild.system.service.ISysOssConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -34,7 +34,7 @@ import java.util.Arrays;
*/ */
@Validated @Validated
@Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"}) @Api(value = "对象存储配置控制器", tags = {"对象存储配置管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/oss/config") @RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController { public class SysOssConfigController extends BaseController {

View File

@ -1,4 +1,4 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import cn.hutool.core.convert.Convert; 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.HttpException;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit; import com.wild.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.QueryGroup; import com.wild.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.wild.common.exception.ServiceException;
import com.ruoyi.common.utils.JsonUtils; import com.wild.common.utils.JsonUtils;
import com.ruoyi.common.utils.file.FileUtils; import com.wild.common.utils.file.FileUtils;
import com.ruoyi.oss.constant.OssConstant; import com.wild.oss.constant.OssConstant;
import com.ruoyi.system.domain.SysConfig; import com.wild.system.domain.SysConfig;
import com.ruoyi.system.domain.SysOss; import com.wild.system.domain.SysOss;
import com.ruoyi.system.domain.bo.SysOssBo; import com.wild.system.domain.bo.SysOssBo;
import com.ruoyi.system.domain.vo.SysOssVo; import com.wild.system.domain.vo.SysOssVo;
import com.ruoyi.system.service.ISysConfigService; import com.wild.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysOssService; import com.wild.system.service.ISysOssService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -47,7 +47,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"}) @Api(value = "OSS对象存储控制器", tags = {"OSS对象存储管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/oss") @RequestMapping("/system/oss")
public class SysOssController extends BaseController { public class SysOssController extends BaseController {

View File

@ -1,14 +1,14 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysPost; import com.wild.system.domain.SysPost;
import com.ruoyi.system.service.ISysPostService; import com.wild.system.service.ISysPostService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
@ -28,7 +28,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "岗位信息控制器", tags = {"岗位信息管理"}) @Api(value = "岗位信息控制器", tags = {"岗位信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/post") @RequestMapping("/system/post")
public class SysPostController extends BaseController { public class SysPostController extends BaseController {

View File

@ -1,18 +1,18 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser; import com.wild.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.wild.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.TokenService; import com.wild.common.core.service.TokenService;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.SecurityUtils; import com.wild.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.system.domain.SysOss; import com.wild.system.domain.SysOss;
import com.ruoyi.system.service.ISysOssService; import com.wild.system.service.ISysOssService;
import com.ruoyi.system.service.ISysUserService; import com.wild.system.service.ISysUserService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -31,7 +31,7 @@ import java.util.Map;
*/ */
@Validated @Validated
@Api(value = "个人信息控制器", tags = {"个人信息管理"}) @Api(value = "个人信息控制器", tags = {"个人信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/user/profile") @RequestMapping("/system/user/profile")
public class SysProfileController extends BaseController { public class SysProfileController extends BaseController {

View File

@ -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.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.RegisterBody; import com.wild.common.core.domain.model.RegisterBody;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.system.service.ISysConfigService; import com.wild.system.service.ISysConfigService;
import com.ruoyi.system.service.SysRegisterService; import com.wild.system.service.SysRegisterService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
*/ */
@Validated @Validated
@Api(value = "注册验证控制器", tags = {"注册验证管理"}) @Api(value = "注册验证控制器", tags = {"注册验证管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
public class SysRegisterController extends BaseController { public class SysRegisterController extends BaseController {

View File

@ -1,21 +1,21 @@
package com.ruoyi.web.controller.system; package com.wild.web.controller.system;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysRole; import com.wild.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.wild.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser; import com.wild.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.TokenService; import com.wild.common.core.service.TokenService;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysUserRole; import com.wild.system.domain.SysUserRole;
import com.ruoyi.system.service.ISysRoleService; import com.wild.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.wild.system.service.ISysUserService;
import com.ruoyi.system.service.SysPermissionService; import com.wild.system.service.SysPermissionService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -33,7 +33,7 @@ import java.util.List;
*/ */
@Validated @Validated
@Api(value = "角色信息控制器", tags = {"角色信息管理"}) @Api(value = "角色信息控制器", tags = {"角色信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/role") @RequestMapping("/system/role")
public class SysRoleController extends BaseController { public class SysRoleController extends BaseController {

View File

@ -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.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log; import com.wild.common.annotation.Log;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController; import com.wild.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDept; import com.wild.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysRole; import com.wild.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser; import com.wild.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.page.TableDataInfo; import com.wild.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.excel.ExcelResult; import com.wild.common.excel.ExcelResult;
import com.ruoyi.common.utils.SecurityUtils; import com.wild.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.vo.SysUserExportVo; import com.wild.system.domain.vo.SysUserExportVo;
import com.ruoyi.system.domain.vo.SysUserImportVo; import com.wild.system.domain.vo.SysUserImportVo;
import com.ruoyi.system.listener.SysUserImportListener; import com.wild.system.listener.SysUserImportListener;
import com.ruoyi.system.service.ISysPostService; import com.wild.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService; import com.wild.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService; import com.wild.system.service.ISysUserService;
import io.swagger.annotations.*; import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -44,7 +44,7 @@ import java.util.stream.Collectors;
*/ */
@Validated @Validated
@Api(value = "用户信息控制器", tags = {"用户信息管理"}) @Api(value = "用户信息控制器", tags = {"用户信息管理"})
@RequiredArgsConstructor(onConstructor_ = @Autowired) @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/system/user") @RequestMapping("/system/user")
public class SysUserController extends BaseController { public class SysUserController extends BaseController {

View File

@ -10,7 +10,7 @@ spring:
url: http://localhost:9090/admin url: http://localhost:9090/admin
instance: instance:
prefer-ip: true # 注册实例时,优先使用 IP prefer-ip: true # 注册实例时,优先使用 IP
username: ruoyi username: wild
password: 123456 password: 123456
--- # xxl-job 配置 --- # xxl-job 配置
@ -96,7 +96,7 @@ spring:
allow: allow:
url-pattern: /druid/* url-pattern: /druid/*
# 控制台管理用户名和密码 # 控制台管理用户名和密码
login-username: ruoyi login-username: wild
login-password: 123456 login-password: 123456
filter: filter:
stat: stat:
@ -135,7 +135,7 @@ redisson:
# 单节点配置 # 单节点配置
singleServerConfig: singleServerConfig:
# 客户端名称 # 客户端名称
clientName: ${ruoyi.name} clientName: ${wild.name}
# 最小空闲连接数 # 最小空闲连接数
connectionMinimumIdleSize: 32 connectionMinimumIdleSize: 32
# 连接池大小 # 连接池大小

View File

@ -3,7 +3,7 @@ spring:
servlet: servlet:
multipart: multipart:
# 临时文件存储位置 避免临时文件被系统清理报错 # 临时文件存储位置 避免临时文件被系统清理报错
location: /ruoyi/server/temp location: /wild/server/temp
--- # 监控配置 --- # 监控配置
spring: spring:
@ -17,7 +17,7 @@ spring:
url: http://172.30.0.90:9090/admin url: http://172.30.0.90:9090/admin
instance: instance:
prefer-ip: true # 注册实例时,优先使用 IP prefer-ip: true # 注册实例时,优先使用 IP
username: ruoyi username: wild
password: 123456 password: 123456
--- # xxl-job 配置 --- # xxl-job 配置
@ -103,7 +103,7 @@ spring:
allow: allow:
url-pattern: /druid/* url-pattern: /druid/*
# 控制台管理用户名和密码 # 控制台管理用户名和密码
login-username: ruoyi login-username: wild
login-password: 123456 login-password: 123456
filter: filter:
stat: stat:
@ -142,7 +142,7 @@ redisson:
# 单节点配置 # 单节点配置
singleServerConfig: singleServerConfig:
# 客户端名称 # 客户端名称
clientName: ${ruoyi.name} clientName: ${wild.name}
# 最小空闲连接数 # 最小空闲连接数
connectionMinimumIdleSize: 32 connectionMinimumIdleSize: 32
# 连接池大小 # 连接池大小

View File

@ -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 copyrightYear: 2021
# 实例演示开关 # 实例演示开关
@ -49,7 +49,7 @@ server:
# 日志配置 # 日志配置
logging: logging:
level: level:
com.ruoyi: @logging.level@ com.wild: @logging.level@
org.springframework: warn org.springframework: warn
config: classpath:logback.xml config: classpath:logback.xml
@ -60,7 +60,7 @@ tlog:
# Spring配置 # Spring配置
spring: spring:
application: application:
name: ${ruoyi.name} name: ${wild.name}
# 资源信息 # 资源信息
messages: messages:
# 国际化资源文件路径 # 国际化资源文件路径
@ -136,11 +136,11 @@ repeat-submit:
mybatis-plus: mybatis-plus:
# 不支持多包, 如有需要可在注解配置 或 提升扫包等级 # 不支持多包, 如有需要可在注解配置 或 提升扫包等级
# 例如 com.**.**.mapper # 例如 com.**.**.mapper
mapperPackage: com.ruoyi.**.mapper mapperPackage: com.wild.**.mapper
# 对应的 XML 文件位置 # 对应的 XML 文件位置
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml
# 实体扫描多个package用逗号或者分号分隔 # 实体扫描多个package用逗号或者分号分隔
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.wild.**.domain
# 启动时是否检查 MyBatis XML 文件的存在,默认不检查 # 启动时是否检查 MyBatis XML 文件的存在,默认不检查
checkConfigLocation: false checkConfigLocation: false
# 通过该属性可指定 MyBatis 的执行器MyBatis 的执行器总共有三种: # 通过该属性可指定 MyBatis 的执行器MyBatis 的执行器总共有三种:
@ -198,23 +198,23 @@ swagger:
# 请求前缀 # 请求前缀
pathMapping: /dev-api pathMapping: /dev-api
# 标题 # 标题
title: '标题:${ruoyi.name}后台管理系统_接口文档' title: '标题:${wild.name}后台管理系统_接口文档'
# 描述 # 描述
description: '描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...' description: '描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...'
# 版本 # 版本
version: '版本号: ${ruoyi-vue-plus.version}' version: '版本号: ${wild-vue-plus.version}'
# 作者信息 # 作者信息
contact: contact:
name: Lion Li name: Lion Li
email: crazylionli@163.com email: crazylionli@163.com
url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus url: https://gitee.com/JavaLionLi/wild-vue-plus
groups: groups:
- name: 1.演示案例 - name: 1.演示案例
basePackage: com.ruoyi.demo basePackage: com.wild.demo
- name: 2.系统模块 - name: 2.系统模块
basePackage: com.ruoyi.web basePackage: com.wild.web
- name: 3.代码生成模块 - name: 3.代码生成模块
basePackage: com.ruoyi.generator basePackage: com.wild.generator
knife4j: knife4j:
# 是否开启Knife4j增强模式 # 是否开启Knife4j增强模式

View File

@ -1,4 +1,4 @@
Application Version: ${ruoyi-vue-plus.version} Application Version: ${wild-vue-plus.version}
Spring Boot Version: ${spring-boot.version} Spring Boot Version: ${spring-boot.version}
__________ _____.___.__ ____ ____ __________.__ __________ _____.___.__ ____ ____ __________.__
\______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______ \______ \__ __ ____\__ | |__| \ \ / /_ __ ____ \______ \ | __ __ ______

View File

@ -78,7 +78,7 @@
</appender> </appender>
<!-- 系统模块日志级别控制 --> <!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" /> <logger name="com.wild" level="info" />
<!-- Spring日志级别控制 --> <!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" /> <logger name="org.springframework" level="warn" />

View File

@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>ruoyi-vue-plus</artifactId> <artifactId>wild-vue-plus</artifactId>
<groupId>com.ruoyi</groupId> <groupId>com.wild</groupId>
<version>3.4.0</version> <version>3.4.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common</artifactId> <artifactId>wild-common</artifactId>
<description> <description>
common通用工具 common通用工具

View File

@ -1,11 +1,11 @@
package com.ruoyi.common.annotation; package com.wild.common.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* 数据权限过滤注解 * 数据权限过滤注解
* *
* @author ruoyi * @author wild
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

View File

@ -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.*; import java.lang.annotation.*;
@ -9,7 +9,7 @@ import java.lang.annotation.*;
* <p> * <p>
* 优先级先方法后类如果方法覆盖了类上的数据源类型以方法的为准否则以类上的为准 * 优先级先方法后类如果方法覆盖了类上的数据源类型以方法的为准否则以类上的为准
* *
* @author ruoyi * @author wild
*/ */
@Target({ElementType.METHOD, ElementType.TYPE}) @Target({ElementType.METHOD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation; package com.wild.common.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;

View File

@ -1,14 +1,14 @@
package com.ruoyi.common.annotation; package com.wild.common.annotation;
import com.ruoyi.common.enums.BusinessType; import com.wild.common.enums.BusinessType;
import com.ruoyi.common.enums.OperatorType; import com.wild.common.enums.OperatorType;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* 自定义操作日志记录注解 * 自定义操作日志记录注解
* *
* @author ruoyi * @author wild
*/ */
@Target({ElementType.PARAMETER, ElementType.METHOD}) @Target({ElementType.PARAMETER, ElementType.METHOD})
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)

View File

@ -1,36 +1,36 @@
package com.ruoyi.common.annotation; package com.wild.common.annotation;
import com.ruoyi.common.constant.Constants; import com.wild.common.constant.Constants;
import com.ruoyi.common.enums.LimitType; import com.wild.common.enums.LimitType;
import java.lang.annotation.*; import java.lang.annotation.*;
/** /**
* 限流注解 * 限流注解
* *
* @author Lion Li * @author Lion Li
*/ */
@Target(ElementType.METHOD) @Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Documented @Documented
public @interface RateLimiter { public @interface RateLimiter {
/** /**
* 限流key * 限流key
*/ */
String key() default Constants.RATE_LIMIT_KEY; String key() default Constants.RATE_LIMIT_KEY;
/** /**
* 限流时间,单位秒 * 限流时间,单位秒
*/ */
int time() default 60; int time() default 60;
/** /**
* 限流次数 * 限流次数
*/ */
int count() default 100; int count() default 100;
/** /**
* 限流类型 * 限流类型
*/ */
LimitType limitType() default LimitType.DEFAULT; LimitType limitType() default LimitType.DEFAULT;
} }

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.annotation; package com.wild.common.annotation;
import java.lang.annotation.*; import java.lang.annotation.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;

View File

@ -1,10 +1,10 @@
package com.ruoyi.common.captcha; package com.wild.common.captcha;
import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.math.Calculator; import cn.hutool.core.math.Calculator;
import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
/** /**
* 无符号计算生成器 * 无符号计算生成器

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.config; package com.wild.common.config;
import lombok.Data; import lombok.Data;
import lombok.Getter; import lombok.Getter;
@ -15,8 +15,8 @@ import org.springframework.stereotype.Component;
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@Component @Component
@ConfigurationProperties(prefix = "ruoyi") @ConfigurationProperties(prefix = "wild")
public class RuoYiConfig { public class WildConfig {
/** /**
* 项目名称 * 项目名称
@ -50,7 +50,7 @@ public class RuoYiConfig {
private static boolean addressEnabled; private static boolean addressEnabled;
public void setAddressEnabled(boolean addressEnabled) { public void setAddressEnabled(boolean addressEnabled) {
RuoYiConfig.addressEnabled = addressEnabled; WildConfig.addressEnabled = addressEnabled;
} }
} }

View File

@ -1,11 +1,11 @@
package com.ruoyi.common.constant; package com.wild.common.constant;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
/** /**
* 通用常量信息 * 通用常量信息
* *
* @author ruoyi * @author wild
*/ */
public class Constants { public class Constants {
/** /**

View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant; package com.wild.common.constant;
/** /**
* 代码生成通用常量 * 代码生成通用常量
* *
* @author ruoyi * @author wild
*/ */
public class GenConstants { public class GenConstants {
/** /**

View File

@ -1,9 +1,9 @@
package com.ruoyi.common.constant; package com.wild.common.constant;
/** /**
* 用户常量信息 * 用户常量信息
* *
* @author ruoyi * @author wild
*/ */
public class UserConstants { public class UserConstants {

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.convert; package com.wild.common.convert;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.convert; package com.wild.common.convert;
import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.convert.Convert; 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.CellData;
import com.alibaba.excel.metadata.GlobalConfiguration; import com.alibaba.excel.metadata.GlobalConfiguration;
import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.metadata.property.ExcelContentProperty;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.wild.common.annotation.ExcelDictFormat;
import com.ruoyi.common.core.service.DictService; import com.wild.common.core.service.DictService;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.wild.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.spring.SpringUtils; import com.wild.common.utils.spring.SpringUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import java.lang.reflect.Field; import java.lang.reflect.Field;

View File

@ -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.wild.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.model.LoginUser; import com.wild.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.SecurityUtils; import com.wild.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.wild.common.utils.StringUtils;
/** /**
* web层通用数据处理 * web层通用数据处理
* *
* @author ruoyi * @author wild
*/ */
public class BaseController { public class BaseController {

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain; package com.wild.common.core.domain;
import cn.hutool.http.HttpStatus; import cn.hutool.http.HttpStatus;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -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.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain; package com.wild.common.core.domain;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.domain.dto; package com.wild.common.core.domain.dto;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;

View File

@ -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.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

View File

@ -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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.wild.common.annotation.ExcelDictFormat;
import com.ruoyi.common.constant.UserConstants; import com.wild.common.constant.UserConstants;
import com.ruoyi.common.convert.ExcelDictConvert; import com.wild.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity; import com.wild.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

View File

@ -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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.wild.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert; import com.wild.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity; import com.wild.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

View File

@ -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.TableId;
import com.baomidou.mybatisplus.annotation.TableName; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

View File

@ -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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.ExcelDictFormat; import com.wild.common.annotation.ExcelDictFormat;
import com.ruoyi.common.convert.ExcelDictConvert; import com.wild.common.convert.ExcelDictConvert;
import com.ruoyi.common.core.domain.BaseEntity; import com.wild.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;

View File

@ -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.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; 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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

View File

@ -1,43 +1,43 @@
package com.ruoyi.common.core.domain.model; package com.wild.common.core.domain.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
/** /**
* 用户登录对象 * 用户登录对象
* *
* @author Lion Li * @author Lion Li
*/ */
@Data @Data
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel("用户登录对象") @ApiModel("用户登录对象")
public class LoginBody { public class LoginBody {
/** /**
* 用户名 * 用户名
*/ */
@ApiModelProperty(value = "用户名") @ApiModelProperty(value = "用户名")
private String username; private String username;
/** /**
* 用户密码 * 用户密码
*/ */
@ApiModelProperty(value = "用户密码") @ApiModelProperty(value = "用户密码")
private String password; private String password;
/** /**
* 验证码 * 验证码
*/ */
@ApiModelProperty(value = "验证码") @ApiModelProperty(value = "验证码")
private String code; private String code;
/** /**
* 唯一标识 * 唯一标识
*/ */
@ApiModelProperty(value = "唯一标识") @ApiModelProperty(value = "唯一标识")
private String uuid = ""; private String uuid = "";
} }

View File

@ -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 com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data; import lombok.Data;

View File

@ -1,13 +1,13 @@
package com.ruoyi.common.core.domain.model; package com.wild.common.core.domain.model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
/** /**
* 用户注册对象 * 用户注册对象
* *
* @author Lion Li * @author Lion Li
*/ */
@ApiModel("用户注册对象") @ApiModel("用户注册对象")
public class RegisterBody extends LoginBody { public class RegisterBody extends LoginBody {
} }

View File

@ -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 com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

View File

@ -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 cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService; 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.io.Serializable;
import java.util.Collection; import java.util.Collection;

View File

@ -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.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollUtil; 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.Assert;
import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.core.toolkit.ReflectionKit;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.page.PagePlus; import com.wild.common.core.page.PagePlus;
import com.ruoyi.common.utils.BeanCopyUtils; import com.wild.common.utils.BeanCopyUtils;
import com.ruoyi.common.utils.reflect.ReflectUtils; import com.wild.common.utils.reflect.ReflectUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -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.annotation.IdType;
import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.AbstractMethod;
import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo;
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; 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.Jdbc3KeyGenerator;
import org.apache.ibatis.executor.keygen.KeyGenerator; import org.apache.ibatis.executor.keygen.KeyGenerator;
import org.apache.ibatis.executor.keygen.NoKeyGenerator; import org.apache.ibatis.executor.keygen.NoKeyGenerator;

View File

@ -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.IPage;
import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.core.metadata.OrderItem;

View File

@ -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.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.service; package com.wild.common.core.service;
/** /**
* 通用 参数配置服务 * 通用 参数配置服务

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.service; package com.wild.common.core.service;
/** /**
* 通用 字典服务 * 通用 字典服务

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.service; package com.wild.common.core.service;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;

View File

@ -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; import org.springframework.scheduling.annotation.Async;
/** /**

View File

@ -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; import javax.servlet.http.HttpServletRequest;

View File

@ -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;
/** /**
* 通用 用户业务 * 通用 用户业务

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.validate; package com.wild.common.core.validate;
/** /**
* 校验分组 add * 校验分组 add

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.validate; package com.wild.common.core.validate;
/** /**
* 校验分组 edit * 校验分组 edit

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.validate; package com.wild.common.core.validate;
/** /**
* 校验分组 query * 校验分组 query

View File

@ -1,9 +1,9 @@
package com.ruoyi.common.enums; package com.wild.common.enums;
/** /**
* 操作状态 * 操作状态
* *
* @author ruoyi * @author wild
*/ */
public enum BusinessStatus { public enum BusinessStatus {
/** /**

View File

@ -1,9 +1,9 @@
package com.ruoyi.common.enums; package com.wild.common.enums;
/** /**
* 业务操作类型 * 业务操作类型
* *
* @author ruoyi * @author wild
*/ */
public enum BusinessType { public enum BusinessType {
/** /**

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.wild.common.enums;
import cn.hutool.captcha.AbstractCaptcha; import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.CircleCaptcha; import cn.hutool.captcha.CircleCaptcha;

View File

@ -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.CodeGenerator;
import cn.hutool.captcha.generator.RandomGenerator; import cn.hutool.captcha.generator.RandomGenerator;
import com.ruoyi.common.captcha.UnsignedMathGenerator; import com.wild.common.captcha.UnsignedMathGenerator;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package com.ruoyi.common.enums; package com.wild.common.enums;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

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