From 01bf26d39f9cad0394c57fc2717d63f97ce9bd30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Mon, 26 May 2025 16:15:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20ruoyi-common-dict?= =?UTF-8?q?=20=E6=94=B9=E4=B8=BA=E4=B8=BA=20ruoyi-common-service-impl=20?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E5=8F=98=E6=9B=B4=E4=B8=BA=E9=80=9A=E7=94=A8?= =?UTF-8?q?service=E5=AE=9E=E7=8E=B0=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-bom/pom.xml | 4 ++-- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 - .../{ruoyi-common-dict => ruoyi-common-service-impl}/pom.xml | 4 ++-- .../dromara/common/core}/service/impl/DictServiceImpl.java | 2 +- .../main/java/org/dromara/common/core}/utils/DictUtils.java | 2 +- ...ingframework.boot.autoconfigure.AutoConfiguration.imports | 1 + ruoyi-common/ruoyi-common-translation/pom.xml | 2 +- ruoyi-modules/ruoyi-job/pom.xml | 5 ----- ruoyi-modules/ruoyi-system/pom.xml | 2 +- 10 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename ruoyi-common/{ruoyi-common-dict => ruoyi-common-service-impl}/pom.xml (86%) rename ruoyi-common/{ruoyi-common-dict/src/main/java/org/dromara/common/dict => ruoyi-common-service-impl/src/main/java/org/dromara/common/core}/service/impl/DictServiceImpl.java (98%) rename ruoyi-common/{ruoyi-common-dict/src/main/java/org/dromara/common/dict => ruoyi-common-service-impl/src/main/java/org/dromara/common/core}/utils/DictUtils.java (96%) create mode 100644 ruoyi-common/ruoyi-common-service-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 48e00955..a17a0914 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -12,7 +12,7 @@ ruoyi-common-bom ruoyi-common-alibaba-bom ruoyi-common-log - ruoyi-common-dict + ruoyi-common-service-impl ruoyi-common-excel ruoyi-common-core ruoyi-common-redis diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index ea018a87..7ed33327 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -54,10 +54,10 @@ ${revision} - + org.dromara - ruoyi-common-dict + ruoyi-common-service-impl ${revision} diff --git a/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 2b0acfe9..00000000 --- a/ruoyi-common/ruoyi-common-dict/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.dict.service.impl.DictServiceImpl diff --git a/ruoyi-common/ruoyi-common-dict/pom.xml b/ruoyi-common/ruoyi-common-service-impl/pom.xml similarity index 86% rename from ruoyi-common/ruoyi-common-dict/pom.xml rename to ruoyi-common/ruoyi-common-service-impl/pom.xml index e7dcf05f..2af5d3d6 100644 --- a/ruoyi-common/ruoyi-common-dict/pom.xml +++ b/ruoyi-common/ruoyi-common-service-impl/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - ruoyi-common-dict + ruoyi-common-service-impl - ruoyi-common-dict 字典 + ruoyi-common-service-impl 通用service实现模块(用于处理core模块中的通用业务service类) diff --git a/ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java b/ruoyi-common/ruoyi-common-service-impl/src/main/java/org/dromara/common/core/service/impl/DictServiceImpl.java similarity index 98% rename from ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java rename to ruoyi-common/ruoyi-common-service-impl/src/main/java/org/dromara/common/core/service/impl/DictServiceImpl.java index 09fb74eb..fb296840 100644 --- a/ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/service/impl/DictServiceImpl.java +++ b/ruoyi-common/ruoyi-common-service-impl/src/main/java/org/dromara/common/core/service/impl/DictServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.common.dict.service.impl; +package org.dromara.common.core.service.impl; import com.github.benmanes.caffeine.cache.Cache; import org.apache.dubbo.config.annotation.DubboReference; diff --git a/ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java b/ruoyi-common/ruoyi-common-service-impl/src/main/java/org/dromara/common/core/utils/DictUtils.java similarity index 96% rename from ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java rename to ruoyi-common/ruoyi-common-service-impl/src/main/java/org/dromara/common/core/utils/DictUtils.java index 93b24037..dce64cc3 100644 --- a/ruoyi-common/ruoyi-common-dict/src/main/java/org/dromara/common/dict/utils/DictUtils.java +++ b/ruoyi-common/ruoyi-common-service-impl/src/main/java/org/dromara/common/core/utils/DictUtils.java @@ -1,4 +1,4 @@ -package org.dromara.common.dict.utils; +package org.dromara.common.core.utils; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.redis.utils.CacheUtils; diff --git a/ruoyi-common/ruoyi-common-service-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-service-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000..0c39e3d6 --- /dev/null +++ b/ruoyi-common/ruoyi-common-service-impl/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.common.core.service.impl.DictServiceImpl diff --git a/ruoyi-common/ruoyi-common-translation/pom.xml b/ruoyi-common/ruoyi-common-translation/pom.xml index 030dd7d3..7dc57398 100644 --- a/ruoyi-common/ruoyi-common-translation/pom.xml +++ b/ruoyi-common/ruoyi-common-translation/pom.xml @@ -24,7 +24,7 @@ org.dromara - ruoyi-common-dict + ruoyi-common-service-impl diff --git a/ruoyi-modules/ruoyi-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml index 5de4ab6a..ab2e869e 100644 --- a/ruoyi-modules/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/pom.xml @@ -28,11 +28,6 @@ ruoyi-common-log - - org.dromara - ruoyi-common-dict - - org.dromara ruoyi-common-web diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 7eb85bf3..55c3547b 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -35,7 +35,7 @@ org.dromara - ruoyi-common-dict + ruoyi-common-service-impl