From 4f62d0a36e3c70b27d4edc2f05b9c5cc6ce93140 Mon Sep 17 00:00:00 2001 From: lingdu <990130556@qq.com> Date: Mon, 5 Jul 2021 16:22:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=B8=BA=E4=BB=85=E6=9C=AC=E4=BA=BA=E6=97=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/datascope/aspect/DataScopeAspect.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java index 453c79c8..b59f3584 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java +++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java @@ -19,7 +19,7 @@ import com.ruoyi.system.api.model.LoginUser; /** * 数据过滤处理 - * + * * @author ruoyi */ @Aspect @@ -96,7 +96,7 @@ public class DataScopeAspect /** * 数据范围过滤 - * + * * @param joinPoint 切点 * @param user 用户 * @param deptAlias 部门别名 @@ -139,7 +139,7 @@ public class DataScopeAspect else { // 数据权限为仅本人且没有userAlias别名不查询任何数据 - sqlString.append(" OR 1=0 "); + sqlString.append(StringUtils.format(" OR {}.dept_id is null ",deptAlias)); } } } From f7645a848ff322c049df170c6e70b9f1317a6189 Mon Sep 17 00:00:00 2001 From: lingdu <990130556@qq.com> Date: Wed, 20 Oct 2021 08:54:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=89=93=E5=8C=85jar=E5=8C=85=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=AD=98=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++--- ruoyi-auth/pom.xml | 46 +++++++++++++++++++------- ruoyi-gateway/pom.xml | 22 +++++++++++++ ruoyi-modules/ruoyi-file/pom.xml | 44 ++++++++++++++++++------- ruoyi-modules/ruoyi-gen/pom.xml | 52 +++++++++++++++++++++--------- ruoyi-modules/ruoyi-job/pom.xml | 46 +++++++++++++++++++------- ruoyi-modules/ruoyi-system/pom.xml | 50 ++++++++++++++++++++-------- ruoyi-visual/ruoyi-monitor/pom.xml | 40 +++++++++++++++++------ 8 files changed, 233 insertions(+), 77 deletions(-) diff --git a/pom.xml b/pom.xml index f1d97b31..f168e2b7 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,8 @@ 若依微服务系统 + + D:/ruoyi/jar/ 3.2.0 UTF-8 UTF-8 @@ -162,9 +164,9 @@ - - commons-collections - commons-collections + + commons-collections + commons-collections ${commons-collections.version} @@ -287,4 +289,4 @@ - \ No newline at end of file + diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index f0459836..70c0d2ce 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -7,53 +7,53 @@ 3.2.0 4.0.0 - + ruoyi-auth - + ruoyi-auth认证授权中心 - + - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-web - + org.springframework.boot spring-boot-starter-actuator - + com.ruoyi ruoyi-common-security - + - + ${project.artifactId} @@ -68,7 +68,29 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + - + diff --git a/ruoyi-gateway/pom.xml b/ruoyi-gateway/pom.xml index 50bf4875..075f3ff6 100644 --- a/ruoyi-gateway/pom.xml +++ b/ruoyi-gateway/pom.xml @@ -98,6 +98,28 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml index e335dadb..03f609a4 100644 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ b/ruoyi-modules/ruoyi-file/pom.xml @@ -16,56 +16,56 @@ - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-actuator - + com.github.tobato fastdfs-client - + io.minio minio ${minio.version} - + com.ruoyi ruoyi-api-system - + com.ruoyi ruoyi-common-swagger - + @@ -82,7 +82,29 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + - - \ No newline at end of file + + diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index 21d5b7e9..a1c5173b 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -16,62 +16,62 @@ - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-actuator - + io.springfox springfox-swagger-ui ${swagger.fox.version} - + org.apache.velocity velocity - + - - commons-collections - commons-collections + + commons-collections + commons-collections - + mysql mysql-connector-java - + com.ruoyi ruoyi-common-log - + com.ruoyi @@ -94,7 +94,29 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + - - \ No newline at end of file + + diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 9a831648..db261458 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -16,38 +16,38 @@ - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-actuator - + io.springfox springfox-swagger-ui ${swagger.fox.version} - + org.quartz-scheduler @@ -59,25 +59,25 @@ - + mysql mysql-connector-java - + com.ruoyi ruoyi-common-log - + com.ruoyi ruoyi-common-swagger - + @@ -94,7 +94,29 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + - - \ No newline at end of file + + diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 6411fb32..599d99b1 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -8,70 +8,70 @@ 3.2.0 4.0.0 - + ruoyi-modules-system ruoyi-modules-system系统模块 - + - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-actuator - + io.springfox springfox-swagger-ui ${swagger.fox.version} - + mysql mysql-connector-java - + com.ruoyi ruoyi-common-datasource - + com.ruoyi ruoyi-common-datascope - + com.ruoyi ruoyi-common-log - + com.ruoyi @@ -94,7 +94,29 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + - - \ No newline at end of file + + diff --git a/ruoyi-visual/ruoyi-monitor/pom.xml b/ruoyi-visual/ruoyi-monitor/pom.xml index 63c57ea6..83232a9b 100644 --- a/ruoyi-visual/ruoyi-monitor/pom.xml +++ b/ruoyi-visual/ruoyi-monitor/pom.xml @@ -7,7 +7,7 @@ 3.2.0 4.0.0 - + ruoyi-visual-monitor @@ -15,20 +15,20 @@ - + de.codecentric spring-boot-admin-starter-server ${spring-boot-admin.version} - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud @@ -40,19 +40,19 @@ com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-web - + org.springframework.boot spring-boot-starter-security - + @@ -69,7 +69,29 @@ + + + maven-antrun-plugin + + + copy + package + + + + + + + + + + + run + + + + - - \ No newline at end of file + + From 54bb6bbb16f06f55fa0a959fe7a82afc40011f7b Mon Sep 17 00:00:00 2001 From: lingdu <990130556@qq.com> Date: Wed, 20 Oct 2021 09:00:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=AE=E6=9C=8D=E5=8A=A1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=89=93=E5=8C=85jar=E5=8C=85=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=AD=98=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java index 046843dd..1cc40fc3 100644 --- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java +++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java @@ -119,7 +119,7 @@ public class DataScopeAspect else { // 数据权限为仅本人且没有userAlias别名不查询任何数据 - sqlString.append(StringUtils.format(" OR {}.dept_id is null ",deptAlias)); + sqlString.append(" OR 1=0 "); } } }