From f64f806a4242b070d380927faaae743111b9fa89 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 30 Sep 2020 09:54:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D=202.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
pom.xml | 4 ++--
ruoyi-api/pom.xml | 2 +-
ruoyi-api/ruoyi-api-system/pom.xml | 2 +-
ruoyi-auth/pom.xml | 2 +-
ruoyi-common/pom.xml | 2 +-
ruoyi-common/ruoyi-common-core/pom.xml | 2 +-
ruoyi-common/ruoyi-common-datascope/pom.xml | 2 +-
ruoyi-common/ruoyi-common-log/pom.xml | 2 +-
ruoyi-common/ruoyi-common-redis/pom.xml | 2 +-
ruoyi-common/ruoyi-common-security/pom.xml | 2 +-
.../com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 4 ++--
ruoyi-common/ruoyi-common-swagger/pom.xml | 2 +-
ruoyi-gateway/pom.xml | 2 +-
ruoyi-modules/pom.xml | 2 +-
ruoyi-modules/ruoyi-gen/pom.xml | 2 +-
ruoyi-modules/ruoyi-job/pom.xml | 2 +-
ruoyi-modules/ruoyi-system/pom.xml | 2 +-
ruoyi-ui/package.json | 2 +-
ruoyi-visual/pom.xml | 2 +-
ruoyi-visual/ruoyi-monitor/pom.xml | 2 +-
21 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index 1793f7b5..4f929cac 100644
--- a/README.md
+++ b/README.md
@@ -79,7 +79,7 @@ com.ruoyi
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-39bf2584ec3a529b0d5a3b70d15c9b37646.png"/></td>
- <td><img src="https://oscimg.oschina.net/oscnet/up-936ec82d1f4872e1bc980927654b6007307.png"/></td>
+ <td><img src="https://oscimg.oschina.net/oscnet/up-4148b24f58660a9dc347761e4cf6162f28f.png"/></td>
</tr>
<tr>
<td><img src="https://oscimg.oschina.net/oscnet/up-b2d62ceb95d2dd9b3fbe157bb70d26001e9.png"/></td>
diff --git a/pom.xml b/pom.xml
index ecdc3f8b..1a58385d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,14 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
<name>ruoyi</name>
<url>http://www.ruoyi.vip</url>
<description>若依微服务系统</description>
<properties>
- <ruoyi.version>2.1.0</ruoyi.version>
+ <ruoyi.version>2.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>
diff --git a/ruoyi-api/pom.xml b/ruoyi-api/pom.xml
index 669125ef..95575f23 100644
--- a/ruoyi-api/pom.xml
+++ b/ruoyi-api/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-api/ruoyi-api-system/pom.xml b/ruoyi-api/ruoyi-api-system/pom.xml
index 35d0a771..d979b31f 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml
index 9af75259..d36e1b29 100644
--- a/ruoyi-auth/pom.xml
+++ b/ruoyi-auth/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 2b4636a1..6fc15f71 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml
index a372e07a..1c71f8a7 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-datascope/pom.xml b/ruoyi-common/ruoyi-common-datascope/pom.xml
index e8e0d5fe..ac0fc4d4 100644
--- a/ruoyi-common/ruoyi-common-datascope/pom.xml
+++ b/ruoyi-common/ruoyi-common-datascope/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-log/pom.xml b/ruoyi-common/ruoyi-common-log/pom.xml
index 761546b5..dc90def8 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml
index 04484c82..2e4e2629 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-security/pom.xml b/ruoyi-common/ruoyi-common-security/pom.xml
index 092ca4fa..7013a8cd 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
index 777b5b1c..64c9f17b 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -79,7 +79,7 @@ public class PreAuthorizeAspect
}
throw new PreAuthorizeException();
}
- else if (StringUtils.isEmpty(annotation.lacksRole()))
+ else if (!StringUtils.isEmpty(annotation.lacksRole()))
{
if (lacksRole(annotation.lacksRole()))
{
@@ -87,7 +87,7 @@ public class PreAuthorizeAspect
}
throw new PreAuthorizeException();
}
- else if (StringUtils.isEmpty(annotation.hasAnyRoles()))
+ else if (!StringUtils.isEmpty(annotation.hasAnyRoles()))
{
if (hasAnyRoles(annotation.hasAnyRoles()))
{
diff --git a/ruoyi-common/ruoyi-common-swagger/pom.xml b/ruoyi-common/ruoyi-common-swagger/pom.xml
index 9cf36de4..e5f90633 100644
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml
index 7173ed8a..3b384b42 100644
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml
index fe157bd2..d5d82bc4 100644
--- a/ruoyi-modules/pom.xml
+++ b/ruoyi-modules/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml
index b5bd0db6..6f9ce47d 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml
index cdee36ff..6e6ffeba 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml
index 9b11d450..29ba86f1 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index ecfc77d2..a23a85ab 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "ruoyi",
- "version": "2.1.0",
+ "version": "2.2.0",
"description": "若依管理系统",
"author": "若依",
"license": "MIT",
diff --git a/ruoyi-visual/pom.xml b/ruoyi-visual/pom.xml
index 292b6810..26122b02 100644
--- a/ruoyi-visual/pom.xml
+++ b/ruoyi-visual/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
- <version>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml
index c60a8fb7..c5ad6b75 100644
--- 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>2.1.0</version>
+ <version>2.2.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>