RuoYi
2020-09-30 f64f806a4242b070d380927faaae743111b9fa89
若依 2.2
21 files modified
46 ■■■■ changed files
README.md 2 ●●● patch | view | raw | blame | history
pom.xml 4 ●●●● patch | view | raw | blame | history
ruoyi-api/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-api/ruoyi-api-system/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-auth/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-core/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-datascope/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-log/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-redis/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-security/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java 4 ●●●● patch | view | raw | blame | history
ruoyi-common/ruoyi-common-swagger/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-gateway/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-gen/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-job/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-modules/ruoyi-system/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-ui/package.json 2 ●●● patch | view | raw | blame | history
ruoyi-visual/pom.xml 2 ●●● patch | view | raw | blame | history
ruoyi-visual/ruoyi-monitor/pom.xml 2 ●●● patch | view | raw | blame | history
README.md
@@ -79,7 +79,7 @@
    </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>
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>
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>
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>
    
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>
    
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>
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>
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>
    
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>
    
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>
    
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>
    
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -79,7 +79,7 @@
            }
            throw new PreAuthorizeException();
        }
        else if (StringUtils.isEmpty(annotation.lacksRole()))
        else if (!StringUtils.isEmpty(annotation.lacksRole()))
        {
            if (lacksRole(annotation.lacksRole()))
            {
@@ -87,7 +87,7 @@
            }
            throw new PreAuthorizeException();
        }
        else if (StringUtils.isEmpty(annotation.hasAnyRoles()))
        else if (!StringUtils.isEmpty(annotation.hasAnyRoles()))
        {
            if (hasAnyRoles(annotation.hasAnyRoles()))
            {
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>
    
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>
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>
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>
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>
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>
    
ruoyi-ui/package.json
@@ -1,6 +1,6 @@
{
  "name": "ruoyi",
  "version": "2.1.0",
  "version": "2.2.0",
  "description": "若依管理系统",
  "author": "若依",
  "license": "MIT",
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>
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>