🦁 发布 1.2.0 新增 SpringDoc 无注解文档生成与新增 easy-es 集成

3 years ago · e2a5167368
parent 7d402c010d
commit e2a5167368
48 changed files with 58 additions and 58 deletions
--- a/README.md
+++ b/README.md
@ -5,7 +5,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Cloud-Plus)
 <br>
-[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-1.1.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
+[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-1.2.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7-blue.svg)]()
 [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]()
 [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]()
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -101,7 +101,7 @@ services:
    network_mode: "host"

  seata-server:
-    image: ruoyi/ruoyi-seata-server:1.1.0
+    image: ruoyi/ruoyi-seata-server:1.2.0
    container_name: seata-server
    ports:
      - "7091:7091"
@ -138,7 +138,7 @@ services:
    network_mode: "host"

  sentinel:
-    image: ruoyi/ruoyi-sentinel-dashboard:1.1.0
+    image: ruoyi/ruoyi-sentinel-dashboard:1.2.0
    container_name: sentinel
    environment:
      TZ: Asia/Shanghai
@ -151,7 +151,7 @@ services:
    network_mode: "host"

  ruoyi-monitor-admin:
-    image: ruoyi/ruoyi-monitor:1.1.0
+    image: ruoyi/ruoyi-monitor:1.2.0
    container_name: ruoyi-monitor
    environment:
      # 时区上海
@ -165,7 +165,7 @@ services:
    network_mode: "host"

  ruoyi-xxl-job-admin:
-    image: ruoyi/ruoyi-xxl-job-admin:1.1.0
+    image: ruoyi/ruoyi-xxl-job-admin:1.2.0
    container_name: ruoyi-xxl-job-admin
    environment:
      # 时区上海
@ -179,7 +179,7 @@ services:
    network_mode: "host"

  ruoyi-gateway:
-    image: ruoyi/ruoyi-gateway:1.1.0
+    image: ruoyi/ruoyi-gateway:1.2.0
    container_name: ruoyi-gateway
    environment:
      # 时区上海
@ -193,7 +193,7 @@ services:
    network_mode: "host"

  ruoyi-auth:
-    image: ruoyi/ruoyi-auth:1.1.0
+    image: ruoyi/ruoyi-auth:1.2.0
    container_name: ruoyi-auth
    environment:
      # 时区上海
@ -207,7 +207,7 @@ services:
    network_mode: "host"

  ruoyi-system:
-    image: ruoyi/ruoyi-system:1.1.0
+    image: ruoyi/ruoyi-system:1.2.0
    container_name: ruoyi-system
    environment:
      # 时区上海
@ -221,7 +221,7 @@ services:
    network_mode: "host"

  ruoyi-gen:
-    image: ruoyi/ruoyi-gen:1.1.0
+    image: ruoyi/ruoyi-gen:1.2.0
    container_name: ruoyi-gen
    environment:
      # 时区上海
@ -235,7 +235,7 @@ services:
    network_mode: "host"

  ruoyi-job:
-    image: ruoyi/ruoyi-job:1.1.0
+    image: ruoyi/ruoyi-job:1.2.0
    container_name: ruoyi-job
    environment:
      # 时区上海
@ -249,7 +249,7 @@ services:
    network_mode: "host"

  ruoyi-resource:
-    image: ruoyi/ruoyi-resource:1.1.0
+    image: ruoyi/ruoyi-resource:1.2.0
    container_name: ruoyi-resource
    environment:
      # 时区上海
--- a/pom.xml
+++ b/pom.xml
@ -6,14 +6,14 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-cloud-plus</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>

    <name>RuoYi-Cloud-Plus</name>
    <url>https://gitee.com/JavaLionLi/RuoYi-Cloud-Plus</url>
    <description>RuoYi-Cloud-Plus微服务系统</description>

    <properties>
-        <ruoyi.version>1.1.0</ruoyi.version>
+        <ruoyi.version>1.2.0</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-api/ruoyi-api-bom/pom.xml
+++ b/ruoyi-api/ruoyi-api-bom/pom.xml
@ -8,7 +8,7 @@
    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-api-bom</artifactId>
    <packaging>pom</packaging>
-    <version>1.1.0</version>
+    <version>1.2.0</version>

    <description>
        ruoyi-api-bom api依赖项
--- a/ruoyi-api/ruoyi-api-resource/pom.xml
+++ b/ruoyi-api/ruoyi-api-resource/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-api</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-api/ruoyi-api-system/pom.xml
+++ b/ruoyi-api/ruoyi-api-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-api</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@ -6,7 +6,7 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-common-alibaba-bom</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
    <packaging>pom</packaging>

    <description>
--- a/ruoyi-common/ruoyi-common-bom/pom.xml
+++ b/ruoyi-common/ruoyi-common-bom/pom.xml
@ -6,7 +6,7 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-common-bom</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
    <packaging>pom</packaging>

    <description>
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-dict/pom.xml
+++ b/ruoyi-common/ruoyi-common-dict/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-doc/pom.xml
+++ b/ruoyi-common/ruoyi-common-doc/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-dubbo/pom.xml
+++ b/ruoyi-common/ruoyi-common-dubbo/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
+++ b/ruoyi-common/ruoyi-common-elasticsearch/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-excel/pom.xml
+++ b/ruoyi-common/ruoyi-common-excel/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-idempotent/pom.xml
+++ b/ruoyi-common/ruoyi-common-idempotent/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-job/pom.xml
+++ b/ruoyi-common/ruoyi-common-job/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-loadbalancer/pom.xml
+++ b/ruoyi-common/ruoyi-common-loadbalancer/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-log/pom.xml
+++ b/ruoyi-common/ruoyi-common-log/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-logstash/pom.xml
+++ b/ruoyi-common/ruoyi-common-logstash/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-mail/pom.xml
+++ b/ruoyi-common/ruoyi-common-mail/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-mybatis/pom.xml
+++ b/ruoyi-common/ruoyi-common-mybatis/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-oss/pom.xml
+++ b/ruoyi-common/ruoyi-common-oss/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-redis/pom.xml
+++ b/ruoyi-common/ruoyi-common-redis/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-satoken/pom.xml
+++ b/ruoyi-common/ruoyi-common-satoken/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-seata/pom.xml
+++ b/ruoyi-common/ruoyi-common-seata/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-security/pom.xml
+++ b/ruoyi-common/ruoyi-common-security/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-sms/pom.xml
+++ b/ruoyi-common/ruoyi-common-sms/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-web/pom.xml
+++ b/ruoyi-common/ruoyi-common-web/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-example/pom.xml
+++ b/ruoyi-example/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-example/ruoyi-demo/pom.xml
+++ b/ruoyi-example/ruoyi-demo/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-example</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-example/ruoyi-stream-mq/pom.xml
+++ b/ruoyi-example/ruoyi-stream-mq/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-example</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-gen/pom.xml
+++ b/ruoyi-modules/ruoyi-gen/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-resource/pom.xml
+++ b/ruoyi-modules/ruoyi-resource/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-modules/ruoyi-system/pom.xml
+++ b/ruoyi-modules/ruoyi-system/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-modules</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -1,6 +1,6 @@
 {
  "name": "ruoyi-cloud-plus",
-  "version": "1.1.0",
+  "version": "1.2.0",
  "description": "RuoYi-Cloud-Plus后台管理系统",
  "author": "Lion Li",
  "license": "MIT",
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@ -154,7 +154,7 @@ export default {
  data() {
    return {
      // 版本号
-      version: "1.1.0",
+      version: "1.2.0",
    };
  },
  methods: {
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-cloud-plus</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-visual/ruoyi-seata-server/pom.xml
+++ b/ruoyi-visual/ruoyi-seata-server/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>ruoyi-seata-server</artifactId>
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
    </parent>

    <artifactId>ruoyi-sentinel-dashboard</artifactId>
--- a/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json
+++ b/ruoyi-visual/ruoyi-sentinel-dashboard/src/main/webapp/resources/package.json
@ -1,6 +1,6 @@
 {
  "name": "sentinel-dashboard",
-  "version": "1.1.0",
+  "version": "1.0.0",
  "description": "",
  "main": "index.js",
  "scripts": {
--- a/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml
+++ b/ruoyi-visual/ruoyi-xxl-job-admin/pom.xml
@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ruoyi</groupId>
 		<artifactId>ruoyi-visual</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.0</version>
 	</parent>
 	<artifactId>ruoyi-xxl-job-admin</artifactId>
 	<packaging>jar</packaging>