From 4545beab51feb988f5ad9628dd4f5c8cb4b187b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 23 Jun 2021 15:30:26 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=20=E5=A2=9E=E5=8A=A0=20GitHub=20=E5=9C=B0=E5=9D=80=20?= =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E5=B0=8F=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c5dbd78..ac06048d 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,12 @@ ## 平台简介 [![码云Gitee](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/badge/star.svg?theme=blue)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![GitHub](https://img.shields.io/github/stars/JavaLionLi/RuoYi-Vue-Plus.svg?style=social&label=Stars)](https://github.com/JavaLionLi/RuoYi-Vue-Plus) [![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) -[![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]() +
+[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-2.3.2-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.4-blue.svg)]() +[![JDK-8+](https://img.shields.io/badge/JDK-8+-green.svg)]() [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() 基于 RuoYi-Vue 集成 Mybatis-Plus Lombok Hutool 等便捷开发工具 适配重写相关业务 便于开发 定期与 RuoYi-Vue 同步 @@ -57,13 +61,13 @@ * 项目修改为 maven多环境配置 * 项目配置修改为 application.yml 统一管理 * 数据权限修改为 适配支持单表、多表 -* 使用 redisson 实现分布式锁注解与工具类 * 使用 redisson 实现 spring-cache 整合 * 增加 mybatis-plus 二级缓存 redis 存储 ### 其他 * 同步升级 RuoYi-Vue 3.5.0 +* 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/) * Oracle 模块 oracle 分支 [RuoYi-Vue-Plus-oracle](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/tree/oracle/) From 152a386ac1d64e42838b893190d773d8874a6406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 23 Jun 2021 17:01:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0=20Swagger3=20?= =?UTF-8?q?=E7=94=A8=E6=B3=95=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/Swagger3DemoController.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java new file mode 100644 index 00000000..a8efb64e --- /dev/null +++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java @@ -0,0 +1,38 @@ +package com.ruoyi.demo.controller; + +import com.ruoyi.common.core.domain.AjaxResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +/** + * swagger3 用法示例 + * + * @author Lion Li + */ +@Api(value = "演示swagger3控制器", tags = {"演示swagger3接口"}) +@RestController +@RequestMapping("/swagger/demo") +public class Swagger3DemoController { + + /** + * 上传请求 + * 必须使用 @RequestPart 注解标注为文件 + * dataType 必须为 "java.io.File" + */ + @ApiOperation(value = "通用上传请求") + @ApiImplicitParams({ + @ApiImplicitParam(name = "file", value = "文件", dataType = "java.io.File", required = true), + }) + @PostMapping(value = "/upload") + public AjaxResult upload(@RequestPart("file") MultipartFile file) { + return AjaxResult.success("操作成功", file.getOriginalFilename()); + } + +} From ae43edeb4fe322916ddbcc9e37ecbbb3d9847518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 23 Jun 2021 21:24:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=20=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E9=A1=B9=E7=9B=AE=20=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ac06048d..cd4863db 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,10 @@ ## 参考文档 -使用框架前请仔细阅读文档重点注意事项 +使用框架前请仔细阅读文档重点注意事项 +
+[初始化项目 必看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于初始化项目?sort_id=4164117) +
[参考文档 Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages) ## 修改RuoYi功能 From 8195e948a16acf33cb8101ef74f2299e50580ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 24 Jun 2021 09:34:06 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=20v2.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5fe335a1..2a8521c4 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ RuoYi-Vue-Plus后台管理系统 - 2.3.2 + 2.4.0 2.4.7 UTF-8 UTF-8 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 48009bed..af8db7e8 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "2.3.2", + "version": "2.4.0", "description": "RuoYi-Vue-Plus后台管理系统", "author": "LionLi", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index d16cf124..dba6dfe8 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -19,6 +19,9 @@ * 校验框架 validation 增强接口安全性 严谨性
* 文档框架 knife4j 美化接口文档
* 代码生成器 一键生成前后端代码
+ * 多数据源框架 dynamic-datasource 支持主从与多种类数据库异构
+ * Redis客户端 采用 Redisson 性能更强
+ * 分布式锁 Lock4j 注解锁、工具锁 多种多样

当前版本: v{{ version }} @@ -35,6 +38,14 @@ @click="goTarget('https://gitee.com/JavaLionLi/RuoYi-Vue-Plus')" >访问码云 + 访问GitHub

@@ -80,6 +91,27 @@ 更新日志 + +
    +
  1. update springboot 2.3.11 => 2.4.7
    2. +
  2. update springboot-admin 2.3.1 => 2.4.1
    3. +
  3. update feign 2.2.6 => 3.0.3
    4. +
  4. update hutool 5.6.7 => 5.7.2
    5. +
  5. update 多数据源替换成dynamic-datasource
    6. +
  6. update 适配 jdk11
    7. +
  7. update 集成 Lock4j 分布式锁
    8. +
  8. update 移除 fastjson 增加 jackson 工具类 重写相关业务
    9. +
  9. update 优化 异步工厂重写 使用 spring 异步处理
    10. +
  10. update 全局挂载字典标签组件
    11. +
  11. update 日志列表支持排序操作
    12. +
  12. update 更新 feign demo 更清晰的用法
    13. +
  13. update 更新多数据源演示案例
    14. +
  14. add 增加 ServicePlusImpl 自动以实现类 重写移除事务注解方法 防止多数据源失效
    15. +
  15. add 增加 自定义 批量insert方法
    16. +
  16. add 增加 Swagger3 用法示例
    17. +
  17. fix 修复地址ip地址特殊回环问题
    18. +
+
  1. add redis锁工具类编写