Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more enhancement

Browse Source
This commit is contained in:
rongqian.xu
2021-10-11 18:40:15 +08:00
parent f47bea66ff
commit 1ca0840994
45 changed files with 637 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
ruoyi-admin/pom.xml
View File

@ -61,6 +61,12 @@
<artifactId>ruoyi-generator</artifactId>
</dependency>
<!-- 前端代码 -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-ui</artifactId>
</dependency>
</dependencies>
<build>
@ -88,7 +94,47 @@
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
</plugin>
<plugin>
<artifactId>maven-clean-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<filesets>
<fileset>
<directory>src/main/resources/public</directory>
</fileset>
</filesets>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.0.2</version>
<executions>
<execution>
<id>copy Vue.js frontend content</id>
<phase>generate-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>src/main/resources/public</outputDirectory>
<overwrite>true</overwrite>
<resources>
<resource>
<directory>${project.parent.basedir}/ruoyi-ui/dist</directory>
<includes>
<include>static/</include>
<include>html/</include>
<include>index.html</include>
<include>favicon.ico</include>
<include>robots.txt</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
View File

@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.Constants;
@ -25,6 +26,7 @@ import com.ruoyi.system.service.ISysConfigService;
* @author ruoyi
*/
@RestController
@RequestMapping("/api")
public class CaptchaController
{
@Resource(name = "captchaProducer")

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
View File

@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.config.RuoYiConfig;
@ -24,6 +25,7 @@ import com.ruoyi.framework.config.ServerConfig;
* @author ruoyi
*/
@RestController
@RequestMapping("/api")
public class CommonController
{
private static final Logger log = LoggerFactory.getLogger(CommonController.class);

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java
View File

@ -21,7 +21,7 @@ import com.ruoyi.common.utils.StringUtils;
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/cache")
@RequestMapping("/api/monitor/cache")
public class CacheController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java
View File

@ -13,7 +13,7 @@ import com.ruoyi.framework.web.domain.Server;
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/server")
@RequestMapping("/api/monitor/server")
public class ServerController
{
@PreAuthorize("@ss.hasPermi('monitor:server:list')")

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
View File

@ -23,7 +23,7 @@ import com.ruoyi.system.service.ISysLogininforService;
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/logininfor")
@RequestMapping("/api/monitor/logininfor")
public class SysLogininforController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
View File

@ -23,7 +23,7 @@ import com.ruoyi.system.service.ISysOperLogService;
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/operlog")
@RequestMapping("/api/monitor/operlog")
public class SysOperlogController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
View File

@ -29,7 +29,7 @@ import com.ruoyi.system.service.ISysUserOnlineService;
* @author ruoyi
*/
@RestController
@RequestMapping("/monitor/online")
@RequestMapping("/api/monitor/online")
public class SysUserOnlineController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
View File

@ -29,7 +29,7 @@ import com.ruoyi.system.service.ISysConfigService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/config")
@RequestMapping("/api/system/config")
public class SysConfigController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
View File

@ -29,7 +29,7 @@ import com.ruoyi.system.service.ISysDeptService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/dept")
@RequestMapping("/api/system/dept")
public class SysDeptController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
View File

@ -30,7 +30,7 @@ import com.ruoyi.system.service.ISysDictTypeService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/dict/data")
@RequestMapping("/api/system/dict/data")
public class SysDictDataController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
View File

@ -28,7 +28,7 @@ import com.ruoyi.system.service.ISysDictTypeService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/dict/type")
@RequestMapping("/api/system/dict/type")
public class SysDictTypeController extends BaseController
{
@Autowired

3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@ -12,6 +12,7 @@ import com.ruoyi.common.utils.StringUtils;
* @author ruoyi
*/
@RestController
@RequestMapping("/api")
public class SysIndexController
{
/** 系统基础配置 */
@ -21,7 +22,7 @@ public class SysIndexController
/**
* 访问首页，提示语
*/
@RequestMapping("/")
@RequestMapping("/info")
public String index()
{
return StringUtils.format("欢迎使用{}后台管理框架，当前版本：v{}，请通过前端地址访问。", ruoyiConfig.getName(), ruoyiConfig.getVersion());

6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
View File

@ -3,10 +3,7 @@ package com.ruoyi.web.controller.system;
import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysMenu;
@ -23,6 +20,7 @@ import com.ruoyi.system.service.ISysMenuService;
* @author ruoyi
*/
@RestController
@RequestMapping("/api")
public class SysLoginController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View File

@ -27,7 +27,7 @@ import com.ruoyi.system.service.ISysMenuService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/menu")
@RequestMapping("/api/system/menu")
public class SysMenuController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
View File

@ -26,7 +26,7 @@ import com.ruoyi.system.service.ISysNoticeService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/notice")
@RequestMapping("/api/system/notice")
public class SysNoticeController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
View File

@ -28,7 +28,7 @@ import com.ruoyi.system.service.ISysPostService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/post")
@RequestMapping("/api/system/post")
public class SysPostController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -30,7 +30,7 @@ import com.ruoyi.system.service.ISysUserService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/user/profile")
@RequestMapping("/api/system/user/profile")
public class SysProfileController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java
View File

@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@ -17,6 +18,7 @@ import com.ruoyi.system.service.ISysConfigService;
* @author ruoyi
*/
@RestController
@RequestMapping("/api")
public class SysRegisterController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
View File

@ -35,7 +35,7 @@ import com.ruoyi.system.service.ISysUserService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/role")
@RequestMapping("/api/system/role")
public class SysRoleController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -36,7 +36,7 @@ import com.ruoyi.system.service.ISysUserService;
* @author ruoyi
*/
@RestController
@RequestMapping("/system/user")
@RequestMapping("/api/system/user")
public class SysUserController extends BaseController
{
@Autowired

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/SwaggerController.java
View File

@ -12,7 +12,7 @@ import com.ruoyi.common.core.controller.BaseController;
* @author ruoyi
*/
@Controller
@RequestMapping("/tool/swagger")
@RequestMapping("/api/tool/swagger")
public class SwaggerController extends BaseController
{
@PreAuthorize("@ss.hasPermi('tool:swagger:view')")

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
View File

@ -29,7 +29,7 @@ import io.swagger.annotations.ApiOperation;
*/
@Api("用户信息管理")
@RestController
@RequestMapping("/test/user")
@RequestMapping("/api/test/user")
public class TestController extends BaseController
{
private final static Map<Integer, UserEntity> users = new LinkedHashMap<Integer, UserEntity>();

4
ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java
View File

@ -56,10 +56,10 @@ public class SwaggerConfig
// 设置哪些接口暴露给Swagger展示
.select()
// 扫描所有有注解的api，用这种方式更灵活
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
//.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
// 扫描指定包中的swagger注解
// .apis(RequestHandlerSelectors.basePackage("com.ruoyi.project.tool.swagger"))
// 扫描所有 .apis(RequestHandlerSelectors.any())
.apis(RequestHandlerSelectors.any()) //扫描所有
.paths(PathSelectors.any())
.build()
/* 设置安全模式，swagger可以设置访问token */

6
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://localhost:3306/ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: password
password: root
# 从库数据源
slave:
# 从数据源开关/默认关闭
@ -41,7 +41,7 @@ spring:
enabled: true
# 设置白名单，不填则允许所有访问
allow:
url-pattern: /druid/*
url-pattern: /api/druid/*
# 控制台管理用户名和密码
login-username: ruoyi
login-password: 123456

12
ruoyi-admin/src/main/resources/application.yml
View File

@ -33,8 +33,8 @@ server:
# 日志配置
logging:
level:
com.ruoyi: debug
org.springframework: warn
com.ruoyi: info
org.springframework: info
# Spring配置
spring:
@ -59,7 +59,7 @@ spring:
# redis 配置
redis:
# 地址
host: localhost
host: 192.168.56.101
# 端口，默认为6379
port: 6379
# 数据库索引
@ -108,13 +108,13 @@ swagger:
# 是否开启swagger
enabled: true
# 请求前缀
pathMapping: /dev-api
pathMapping: /
# 防止XSS攻击
xss:
# 过滤开关
enabled: true
# 排除链接（多个用逗号分隔）
excludes: /system/notice
excludes: /api/system/notice
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
urlPatterns: /api/system/*,/api/monitor/*,/api/tool/*

4
ruoyi-admin/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- 日志存放路径 -->
<property name="log.path" value="/home/ruoyi/logs" />
<property name="log.path" value="${log.dir}" />
<!-- 日志输出格式 -->
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@ -74,7 +74,7 @@
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
<logger name="org.springframework" level="info" />
<root level="info">
<appender-ref ref="console" />