Merge remote-tracking branch 'origin/dev'

# Conflicts: # README.md
⚔ 发布 1.7.0 稳定性版本
2025-09-10 06:09:12 +00:00 · 2023-05-10 09:37:03 +08:00 · 2023-05-10 09:34:34 +08:00 · 2023-05-10 00:01:39 +08:00 · 2023-05-06 15:30:26 +08:00 · 2023-05-04 19:12:36 +08:00
76 changed files with 663 additions and 554 deletions
--- a/.run/ruoyi-auth.run.xml
+++ b/.run/ruoyi-auth.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-auth" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-auth:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-auth:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-auth/Dockerfile" />
      </settings>
--- a/.run/ruoyi-gateway.run.xml
+++ b/.run/ruoyi-gateway.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-gateway" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-gateway:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-gateway:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-gateway/Dockerfile" />
      </settings>
--- a/.run/ruoyi-gen.run.xml
+++ b/.run/ruoyi-gen.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-gen" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-gen:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-gen:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-gen/Dockerfile" />
      </settings>
--- a/.run/ruoyi-job.run.xml
+++ b/.run/ruoyi-job.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-job" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-job:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-job:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-job/Dockerfile" />
      </settings>
--- a/.run/ruoyi-monitor.run.xml
+++ b/.run/ruoyi-monitor.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-monitor" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-monitor:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-monitor/Dockerfile" />
      </settings>
--- a/.run/ruoyi-nacos.run.xml
+++ b/.run/ruoyi-nacos.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-nacos" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-nacos:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-nacos:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-nacos/Dockerfile" />
      </settings>
--- a/.run/ruoyi-resource.run.xml
+++ b/.run/ruoyi-resource.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-resource" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-resource:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-resource:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-resource/Dockerfile" />
      </settings>
--- a/.run/ruoyi-seata-server.run.xml
+++ b/.run/ruoyi-seata-server.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-seata-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-seata-server:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-seata-server:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-seata-server/Dockerfile" />
      </settings>
--- a/.run/ruoyi-sentinel-dashboard.run.xml
+++ b/.run/ruoyi-sentinel-dashboard.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-sentinel-dashboard" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile" />
      </settings>
--- a/.run/ruoyi-system.run.xml
+++ b/.run/ruoyi-system.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-system" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-system:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-system:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-system/Dockerfile" />
      </settings>
--- a/.run/ruoyi-xxl-job-admin.run.xml
+++ b/.run/ruoyi-xxl-job-admin.run.xml
@@ -2,7 +2,7 @@
  <configuration default="false" name="ruoyi-xxl-job-admin" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
    <deployment type="dockerfile">
      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:1.6.0" />
+        <option name="imageTag" value="ruoyi/ruoyi-xxl-job-admin:1.7.0" />
        <option name="buildOnly" value="true" />
        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-xxl-job-admin/Dockerfile" />
      </settings>
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/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.6.0-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus)
+[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-1.7.0-success.svg)](https://gitee.com/dromara/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
@@ -29,7 +29,7 @@ services:
    network_mode: "host"

  nacos:
-    image: ruoyi/ruoyi-nacos:1.6.0
+    image: ruoyi/ruoyi-nacos:1.7.0
    container_name: nacos
    ports:
      - "8848:8848"
@@ -96,7 +96,7 @@ services:
    network_mode: "host"

  seata-server:
-    image: ruoyi/ruoyi-seata-server:1.6.0
+    image: ruoyi/ruoyi-seata-server:1.7.0
    container_name: seata-server
    ports:
      - "7091:7091"
@@ -135,7 +135,7 @@ services:
    network_mode: "host"

  sentinel:
-    image: ruoyi/ruoyi-sentinel-dashboard:1.6.0
+    image: ruoyi/ruoyi-sentinel-dashboard:1.7.0
    container_name: sentinel
    environment:
      TZ: Asia/Shanghai
@@ -150,7 +150,7 @@ services:
    network_mode: "host"

  ruoyi-monitor:
-    image: ruoyi/ruoyi-monitor:1.6.0
+    image: ruoyi/ruoyi-monitor:1.7.0
    container_name: ruoyi-monitor
    environment:
      # 时区上海
@@ -166,7 +166,7 @@ services:
    network_mode: "host"

  ruoyi-xxl-job-admin:
-    image: ruoyi/ruoyi-xxl-job-admin:1.6.0
+    image: ruoyi/ruoyi-xxl-job-admin:1.7.0
    container_name: ruoyi-xxl-job-admin
    environment:
      # 时区上海
@@ -182,7 +182,7 @@ services:
    network_mode: "host"

  ruoyi-gateway:
-    image: ruoyi/ruoyi-gateway:1.6.0
+    image: ruoyi/ruoyi-gateway:1.7.0
    container_name: ruoyi-gateway
    environment:
      # 时区上海
@@ -198,7 +198,7 @@ services:
    network_mode: "host"

  ruoyi-auth:
-    image: ruoyi/ruoyi-auth:1.6.0
+    image: ruoyi/ruoyi-auth:1.7.0
    container_name: ruoyi-auth
    environment:
      # 时区上海
@@ -214,7 +214,7 @@ services:
    network_mode: "host"

  ruoyi-system:
-    image: ruoyi/ruoyi-system:1.6.0
+    image: ruoyi/ruoyi-system:1.7.0
    container_name: ruoyi-system
    environment:
      # 时区上海
@@ -230,7 +230,7 @@ services:
    network_mode: "host"

  ruoyi-gen:
-    image: ruoyi/ruoyi-gen:1.6.0
+    image: ruoyi/ruoyi-gen:1.7.0
    container_name: ruoyi-gen
    environment:
      # 时区上海
@@ -246,7 +246,7 @@ services:
    network_mode: "host"

  ruoyi-job:
-    image: ruoyi/ruoyi-job:1.6.0
+    image: ruoyi/ruoyi-job:1.7.0
    container_name: ruoyi-job
    environment:
      # 时区上海
@@ -262,7 +262,7 @@ services:
    network_mode: "host"

  ruoyi-resource:
-    image: ruoyi/ruoyi-resource:1.6.0
+    image: ruoyi/ruoyi-resource:1.7.0
    container_name: ruoyi-resource
    environment:
      # 时区上海
--- a/pom.xml
+++ b/pom.xml
@@ -6,19 +6,19 @@

    <groupId>com.ruoyi</groupId>
    <artifactId>ruoyi-cloud-plus</artifactId>
-    <version>1.6.0</version>
+    <version>1.7.0</version>

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

    <properties>
-        <ruoyi.version>1.6.0</ruoyi.version>
+        <ruoyi.version>1.7.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>
-        <spring-boot.version>2.7.10</spring-boot.version>
-        <spring-cloud.version>2021.0.6</spring-cloud.version>
+        <spring-boot.version>2.7.11</spring-boot.version>
+        <spring-cloud.version>2021.0.7</spring-cloud.version>
        <spring-boot-admin.version>2.7.10</spring-boot-admin.version>
        <spring-boot.mybatis>2.2.2</spring-boot.mybatis>
        <mybatis.version>3.5.10</mybatis.version>
@@ -30,12 +30,12 @@
        <springdoc.version>1.6.15</springdoc.version>
        <poi.version>5.2.3</poi.version>
        <easyexcel.version>3.2.1</easyexcel.version>
-        <hutool.version>5.8.15</hutool.version>
-        <redisson.version>3.20.0</redisson.version>
+        <hutool.version>5.8.18</hutool.version>
+        <redisson.version>3.20.1</redisson.version>
        <lock4j.version>2.2.3</lock4j.version>
        <xxl-job.version>2.4.0</xxl-job.version>
        <satoken.version>1.34.0</satoken.version>
-        <lombok.version>1.18.24</lombok.version>
+        <lombok.version>1.18.26</lombok.version>
        <logstash.version>7.2</logstash.version>
        <easy-es.version>1.1.1</easy-es.version>
        <elasticsearch.version>7.14.0</elasticsearch.version>
@@ -64,7 +64,7 @@
            <properties>
                <!-- 环境标识，需要与配置文件的名称相对应 -->
                <profiles.active>dev</profiles.active>
-                <nacos.server>127.0.0.1:8848</nacos.server>
+                <nacos.server>101.42.248.151:8848</nacos.server>
                <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
                <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
                <logstash.address>127.0.0.1:4560</logstash.address>
--- 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.6.0</version>
+        <version>1.7.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.6.0</version>
+    <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+    <version>1.7.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.6.0</version>
+    <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.Map;

 /**
- * bean深拷贝工具(基于 cglib 性能优异)
+ * bean拷贝工具(基于 cglib 性能优异)
 *
 * @author Lion Li
 */
--- 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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-encrypt/pom.xml
+++ b/ruoyi-common/ruoyi-common-encrypt/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/utils/EncryptUtils.java
+++ b/ruoyi-common/ruoyi-common-encrypt/src/main/java/com/ruoyi/common/encrypt/utils/EncryptUtils.java
@@ -230,4 +230,14 @@ public class EncryptUtils {
        return SecureUtil.sha256(data);
    }

+    /**
+     * sm3加密
+     *
+     * @param data 待加密数据
+     * @return 加密后字符串, 采用Hex编码
+     */
+    public static String encryptBySm3(String data) {
+        return SmUtil.sm3(data);
+    }
+
 }
--- 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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-prometheus/pom.xml
+++ b/ruoyi-common/ruoyi-common-prometheus/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-sentinel/pom.xml
+++ b/ruoyi-common/ruoyi-common-sentinel/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-skylog/pom.xml
+++ b/ruoyi-common/ruoyi-common-skylog/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-common/ruoyi-common-translation/pom.xml
+++ b/ruoyi-common/ruoyi-common-translation/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-common</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.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.6.0",
+  "version": "1.7.0",
  "description": "RuoYi-Cloud-Plus后台管理系统",
  "author": "Lion Li",
  "license": "MIT",
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -1,7 +1,7 @@
 #app {

  .main-container {
-    min-height: 100%;
+    height: 100%;
    transition: margin-left .28s;
    margin-left: $base-sidebar-width;
    position: relative;
--- a/ruoyi-ui/src/components/DictTag/index.vue
+++ b/ruoyi-ui/src/components/DictTag/index.vue
@@ -7,7 +7,7 @@
          :key="item.value"
          :index="index"
          :class="item.raw.cssClass"
-          >{{ item.label }}</span
+          >{{ item.label + " " }}</span
        >
        <el-tag
          v-else
@@ -17,10 +17,13 @@
          :type="item.raw.listClass == 'primary' ? '' : item.raw.listClass"
          :class="item.raw.cssClass"
        >
-          {{ item.label }}
+          {{ item.label + " " }}
        </el-tag>
      </template>
    </template>
+    <template v-if="unmatch && showValue">
+      {{ unmatchArray | handleArray }}
+    </template>
  </div>
 </template>

@@ -33,6 +36,16 @@ export default {
      default: null,
    },
    value: [Number, String, Array],
+    // 当未找到匹配的数据时，显示value
+    showValue: {
+      type: Boolean,
+      default: true,
+    }
+  },
+  data() {
+    return {
+      unmatchArray: [], // 记录未匹配的项
+    }
  },
  computed: {
    values() {
@@ -42,7 +55,34 @@ export default {
        return [];
      }
    },
+    unmatch() {
+      this.unmatchArray = [];
+      if (this.value !== null && typeof this.value !== "undefined") {
+        // 传入值为非数组
+        if (!Array.isArray(this.value)) {
+          if (this.options.some((v) => v.value == this.value)) return false;
+          this.unmatchArray.push(this.value);
+          return true;
+        }
+        // 传入值为Array
+        this.value.forEach((item) => {
+          if (!this.options.some((v) => v.value == item))
+            this.unmatchArray.push(item);
+        });
+        return true;
+      }
+      // 没有value不显示
+      return false;
    },
+  },
+  filters: {
+    handleArray(array) {
+      if (array.length === 0) return "";
+      return array.reduce((pre, cur) => {
+        return pre + " " + cur;
+      })
+    }
+  }
 };
 </script>
 <style scoped>
--- a/ruoyi-ui/src/components/IconSelect/index.vue
+++ b/ruoyi-ui/src/components/IconSelect/index.vue
@@ -1,22 +1,31 @@
 <!-- @author zhengjie -->
 <template>
  <div class="icon-body">
-    <el-input v-model="name" style="position: relative;" clearable placeholder="请输入图标名称" @clear="filterIcons" @input="filterIcons">
+    <el-input v-model="name" class="icon-search" clearable placeholder="请输入图标名称" @clear="filterIcons" @input="filterIcons">
      <i slot="suffix" class="el-icon-search el-input__icon" />
    </el-input>
    <div class="icon-list">
-      <div v-for="(item, index) in iconList" :key="index" @click="selectedIcon(item)">
-        <svg-icon :icon-class="item" style="height: 30px;width: 16px;" />
+      <div class="list-container">
+        <div v-for="(item, index) in iconList" class="icon-item-wrapper" :key="index" @click="selectedIcon(item)">
+          <div :class="['icon-item', { active: activeIcon === item }]">
+            <svg-icon :icon-class="item" class-name="icon" style="height: 25px;width: 16px;"/>
            <span>{{ item }}</span>
          </div>
        </div>
      </div>
+    </div>
+  </div>
 </template>

 <script>
 import icons from './requireIcons'
 export default {
  name: 'IconSelect',
+  props: {
+    activeIcon: {
+      type: String
+    }
+  },
  data() {
    return {
      name: '',
@@ -46,22 +55,49 @@ export default {
  .icon-body {
    width: 100%;
    padding: 10px;
+    .icon-search {
+      position: relative;
+      margin-bottom: 5px;
+    }
    .icon-list {
      height: 200px;
-      overflow-y: scroll;
-      div {
-        height: 30px;
-        line-height: 30px;
-        margin-bottom: -5px;
+      overflow: auto;
+      .list-container {
+        display: flex;
+        flex-wrap: wrap;
+        .icon-item-wrapper {
+          width: calc(100% / 3);
+          height: 25px;
+          line-height: 25px;
          cursor: pointer;
-        width: 33%;
-        float: left;
+          display: flex;
+          .icon-item {
+            display: flex;
+            max-width: 100%;
+            height: 100%;
+            padding: 0 5px;
+            &:hover {
+              background: #ececec;
+              border-radius: 5px;
+            }
+            .icon {
+              flex-shrink: 0;
            }
            span {
              display: inline-block;
              vertical-align: -0.15em;
              fill: currentColor;
+              padding-left: 2px;
              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+          }
+          .icon-item.active {
+            background: #ececec;
+            border-radius: 5px;
+          }
+        }
      }
    }
  }
--- a/ruoyi-ui/src/components/TopNav/index.vue
+++ b/ruoyi-ui/src/components/TopNav/index.vue
@@ -127,7 +127,13 @@ export default {
        window.open(key, "_blank");
      } else if (!route || !route.children) {
        // 没有子路由路径内部打开
+        const routeMenu = this.childrenMenus.find(item => item.path === key);
+        if (routeMenu && routeMenu.query) {
+          let query = JSON.parse(routeMenu.query);
+          this.$router.push({ path: key, query: query });
+        } else {
          this.$router.push({ path: key });
+        }
        this.$store.dispatch('app/toggleSideBarHide', true);
      } else {
        // 显示左侧联动菜单
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -59,3 +59,26 @@ export default {
  }
 }
 </style>
+
+<style lang="scss">
+// fix css style bug in open el-dialog
+.el-popup-parent--hidden {
+  .fixed-header {
+    padding-right: 6px;
+  }
+}
+
+::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+::-webkit-scrollbar-track {
+  background-color: #f1f1f1;
+}
+
+::-webkit-scrollbar-thumb {
+  background-color: #c0c0c0;
+  border-radius: 3px;
+}
+</style>
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -87,7 +87,7 @@ export default {
      bottom: 0px;
    }
    .el-scrollbar__wrap {
-      height: 49px;
+      height: 39px;
    }
  }
 }
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -72,18 +72,6 @@ export default {
    height: 100%;
    width: 100%;

-    .el-scrollbar{
-      height: 100%;
-    }
-
-    ::v-deep .el-scrollbar__bar.is-vertical {
-      z-index: 10;
-    }
-
-    ::v-deep .el-scrollbar__wrap {
-      overflow-x: hidden;
-    }
-
    &.mobile.openSidebar {
      position: fixed;
      top: 0;
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@@ -166,9 +166,15 @@ export const dynamicRoutes = [

 // 防止连续点击多次路由报错
 let routerPush = Router.prototype.push;
+let routerReplace = Router.prototype.replace;
+// push
 Router.prototype.push = function push(location) {
  return routerPush.call(this, location).catch(err => err)
 }
+// replace
+Router.prototype.replace = function push(location) {
+  return routerReplace.call(this, location).catch(err => err)
+}

 export default new Router({
  base: process.env.VUE_APP_CONTEXT_PATH,
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -145,7 +145,7 @@ export default {
  data() {
    return {
      // 版本号
-      version: "1.6.0",
+      version: "1.7.0",
    };
  },
  methods: {
--- a/ruoyi-ui/src/views/system/menu/index.vue
+++ b/ruoyi-ui/src/views/system/menu/index.vue
@@ -134,7 +134,7 @@
                trigger="click"
                @show="$refs['iconSelect'].reset()"
              >
-                <IconSelect ref="iconSelect" @selected="selected" />
+                <IconSelect ref="iconSelect" @selected="selected" :active-icon="form.icon" />
                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
                  <svg-icon
                    v-if="form.icon"
--- 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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/ruoyi-visual/ruoyi-nacos/Dockerfile
+++ b/ruoyi-visual/ruoyi-nacos/Dockerfile
@@ -1,4 +1,4 @@
-FROM anapsix/alpine-java:8_server-jre_unlimited
+FROM openjdk:8u201-jre-alpine

 MAINTAINER Lion Li

--- a/ruoyi-visual/ruoyi-nacos/pom.xml
+++ b/ruoyi-visual/ruoyi-nacos/pom.xml
@@ -21,7 +21,7 @@
    <parent>
        <groupId>com.ruoyi</groupId>
        <artifactId>ruoyi-visual</artifactId>
-        <version>1.6.0</version>
+        <version>1.7.0</version>
    </parent>
    <artifactId>ruoyi-nacos</artifactId>
    <packaging>jar</packaging>
--- 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.6.0</version>
+        <version>1.7.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.6.0</version>
+        <version>1.7.0</version>
    </parent>

    <artifactId>ruoyi-sentinel-dashboard</artifactId>
--- 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.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 	<artifactId>ruoyi-xxl-job-admin</artifactId>
 	<packaging>jar</packaging>
Author	SHA1	Message	Date
疯狂的狮子li	14ddce0feb	Merge remote-tracking branch 'origin/dev' # Conflicts: # README.md	2023-05-10 09:37:03 +08:00
疯狂的狮子li	4423a091d5	⚔ 发布 1.7.0 稳定性版本	2023-05-10 09:34:34 +08:00
疯狂的狮子Li	2bade9d2b9	update 更改说明 cglib 基于get set拷贝不属于深拷贝	2023-05-10 00:01:39 +08:00
疯狂的狮子li	dc47714d20	fix 修复 nacos 新版本升级后与 docker 基础镜像系统存在兼容性问题	2023-05-06 15:30:26 +08:00
疯狂的狮子li	5ffa69b02e	update 同步 ruoyi * update 优化避免鼠标移出时无法隐藏滚动条的问题 * update 优化已选择下拉图标高亮回显 * fix 修复开启TopNav后一级菜单路由参数设置无效问题 * update 优化 DictTag组件当value没有匹配的值时展示value * fix 修复路由跳转被阻止时vue-router内部产生报错信息问题 * update 优化恢复翻页/切换路由滚动功能	2023-05-04 19:12:36 +08:00
疯狂的狮子Li	68141a88a0	update springboot 2.7.10 => 2.7.11 修复CVE漏洞 update springcloud 2021.0.6 => 2021.0.7 update hutool 5.8.15 => 5.8.18 update redisson 3.20.0 => 3.20.1 update lombok 1.18.24 => 1.18.26 udpate dubbo 3.1.8 => 3.1.10	2023-04-28 23:57:36 +08:00
疯狂的狮子Li	86ea7e0f4d	add 新增 SecurityUtils.encryptBySm3 加密方法	2023-04-28 22:50:50 +08:00
疯狂的狮子li	94d6f703ed	update 遗漏了 vue3 前端链接	2023-03-30 12:06:13 +08:00
疯狂的狮子li	a2f2e047d0	update 重写项目 readme 说明	2023-03-29 17:24:57 +08:00
疯狂的狮子li	e941a9bee9	fix 修复文档前端地址修改错误	2023-03-28 18:09:03 +08:00
疯狂的狮子Li	0693cb6c7d	update 全新 logo 全新背景图(设计师打造)	2023-03-25 00:21:05 +08:00
疯狂的狮子li	aa4bcc0ade	update 项目正式入驻 dromara 开源社区更改项目地址	2023-03-23 17:24:21 +08:00
疯狂的狮子li	a19e5c79d8	fix 修复代码生成点选按钮不生效问题	2023-03-16 18:25:29 +08:00
疯狂的狮子li	2a268c7296	fix 修复代码生成点选按钮不生效问题	2023-03-16 18:25:28 +08:00
疯狂的狮子li	9db71ea71f	Merge remote-tracking branch 'origin/dev'	2023-03-14 09:57:19 +08:00
疯狂的狮子Li	0fd7fa616c	删除文件 ruoyi-common/ruoyi-common-dubbo/src/main/java/org/apache/dubbo/metadata	2023-01-15 13:28:19 +00:00
疯狂的狮子li	7249d05e34	Merge remote-tracking branch 'origin/dev'	2023-01-13 10:14:37 +08:00
疯狂的狮子li	f4be121c7d	update 优化更细致的 issue 提问模板	2022-12-28 18:57:58 +08:00
疯狂的狮子li	948534e3b8	Merge remote-tracking branch 'origin/dev' # Conflicts: # ruoyi-common/ruoyi-common-alibaba-bom/pom.xml	2022-12-01 13:45:38 +08:00
疯狂的狮子li	b2a4f62c78	fix 临时修复 dubbo 重启服务元数据未更新消费者调用端口错乱问题	2022-11-01 12:40:48 +08:00
疯狂的狮子Li	bf9f7817cb	reset 回滚降级 dubbo 3.1.1 => 3.1.0 严重运行时问题(等待 3.1.2 解决)	2022-10-17 20:41:09 +08:00
疯狂的狮子li	91d2624e0e	Merge remote-tracking branch 'origin/master'	2022-09-29 13:23:07 +08:00
疯狂的狮子Li	4b7b511f8a	remove 删除重复 insert sql	2022-08-13 10:43:18 +08:00