From 9edab3dc55da0fc50f7cb16669abe5047aa705e0 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 24 六月 2021 09:36:00 +0800
Subject: [PATCH] !58 同步dev分支 Merge pull request !58 from 疯狂的狮子Li/dev
---
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java | 38 +++++++++++++++++++
ruoyi-ui/package.json | 2
ruoyi-ui/src/views/index.vue | 32 ++++++++++++++++
pom.xml | 2
README.md | 13 +++++-
5 files changed, 82 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 9c5dbd7..cd4863d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
## 骞冲彴绠�浠�
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[](https://github.com/JavaLionLi/RuoYi-Vue-Plus)
[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE)
[
-[]()
+<br>
+[](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus)
+[]()
+[]()
[]()
鍩轰簬 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/)
diff --git a/pom.xml b/pom.xml
index 5fe335a..2a8521c 100644
--- a/pom.xml
+++ b/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>
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 0000000..a8efb64
--- /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<String> upload(@RequestPart("file") MultipartFile file) {
+ return AjaxResult.success("鎿嶄綔鎴愬姛", file.getOriginalFilename());
+ }
+
+}
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 48009be..af8db7e 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 d16cf12..dba6dfe 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/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 澶氭暟鎹簮鏇挎崲鎴恉ynamic-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>
--
Gitblit v1.9.3