!58 同步dev分支 Merge pull request !58 from 疯狂的狮子Li/dev

疯狂的狮子Li

2021-06-24 9edab3dc55da0fc50f7cb16669abe5047aa705e0

!58 同步dev分支
Merge pull request !58 from 疯狂的狮子Li/dev

 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)]()
<br>
[![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 åŒæ­¥
@@ -26,7 +30,10 @@

## å‚考文档

使用框架前请仔细阅读文档重点注意事项  
使用框架前请仔细阅读文档重点注意事项
<br>
[初始化项目 å¿…看](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/关于初始化项目?sort_id=4164117)
<br>
[参考文档 Wiki](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/wikis/pages)

## ä¿®æ”¹RuoYi功能
@@ -57,13 +64,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/)


 pom.xml

@@ -13,7 +13,7 @@
    <description>RuoYi-Vue-Plus后台管理系统</description>

    <properties>
        <ruoyi-vue-plus.version>2.3.2</ruoyi-vue-plus.version>
        <ruoyi-vue-plus.version>2.4.0</ruoyi-vue-plus.version>
        <spring-boot.version>2.4.7</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

 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<String> upload(@RequestPart("file") MultipartFile file) {
        return AjaxResult.success("操作成功", file.getOriginalFilename());
    }

}

 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",

 ruoyi-ui/src/views/index.vue

@@ -19,6 +19,9 @@
          * æ ¡éªŒæ¡†æž¶ validation å¢žå¼ºæŽ¥å£å®‰å…¨æ€§ ä¸¥è°¨æ€§<br/>
          * æ–‡æ¡£æ¡†æž¶ knife4j ç¾ŽåŒ–接口文档<br/>
          * ä»£ç ç”Ÿæˆå™¨ ä¸€é”®ç”Ÿæˆå‰åŽç«¯ä»£ç <br/>
          * å¤šæ•°æ®æºæ¡†æž¶ dynamic-datasource æ”¯æŒä¸»ä»Žä¸Žå¤šç§ç±»æ•°æ®åº“异构<br/>
          * Redis客户端 é‡‡ç”¨ Redisson æ€§èƒ½æ›´å¼º<br/>
          * åˆ†å¸ƒå¼é” Lock4j æ³¨è§£é”ã€å·¥å…·é” å¤šç§å¤šæ ·<br/>
        </p>
        <p>
          <b>当前版本:</b> <span>v{{ version }}</span>
@@ -34,6 +37,14 @@
            plain
            @click="goTarget('https://gitee.com/JavaLionLi/RuoYi-Vue-Plus')"
            >访问码云</el-button
          >
          <el-button
            type="primary"
            size="mini"
            icon="el-icon-cloudy"
            plain
            @click="goTarget('https://github.com/JavaLionLi/RuoYi-Vue-Plus')"
          >访问GitHub</el-button
          >
        </p>
      </el-col>
@@ -80,6 +91,27 @@
            <span>更新日志</span>
          </div>
          <el-collapse accordion>
            <el-collapse-item title="v2.4.0 - 2021-6-24">
              <ol>
                <li>update springboot 2.3.11 => 2.4.7</li>
                <li>update springboot-admin 2.3.1 => 2.4.1</li>
                <li>update feign 2.2.6 => 3.0.3</li>
                <li>update hutool 5.6.7 => 5.7.2</li>
                <li>update å¤šæ•°æ®æºæ›¿æ¢æˆdynamic-datasource</li>
                <li>update é€‚配 jdk11</li>
                <li>update é›†æˆ Lock4j åˆ†å¸ƒå¼é”</li>
                <li>update ç§»é™¤ fastjson å¢žåŠ  jackson å·¥å…·ç±» é‡å†™ç›¸å…³ä¸šåŠ¡</li>
                <li>update ä¼˜åŒ– å¼‚步工厂重写 ä½¿ç”¨ spring å¼‚步处理</li>
                <li>update å…¨å±€æŒ‚载字典标签组件</li>
                <li>update æ—¥å¿—列表支持排序操作</li>
                <li>update æ›´æ–° feign demo æ›´æ¸…晰的用法</li>
                <li>update æ›´æ–°å¤šæ•°æ®æºæ¼”示案例</li>
                <li>add å¢žåŠ  ServicePlusImpl è‡ªåŠ¨ä»¥å®žçŽ°ç±» é‡å†™ç§»é™¤äº‹åŠ¡æ³¨è§£æ–¹æ³• é˜²æ­¢å¤šæ•°æ®æºå¤±æ•ˆ</li>
                <li>add å¢žåŠ  è‡ªå®šä¹‰ æ‰¹é‡insert方法</li>
                <li>add å¢žåŠ  Swagger3 ç”¨æ³•ç¤ºä¾‹</li>
                <li>fix ä¿®å¤åœ°å€ip地址特殊回环问题</li>
              </ol>
            </el-collapse-item>
            <el-collapse-item title="v2.3.2 - 2021-6-11">
              <ol>
                <li>add redis锁工具类编写</li>