From 990a0f4b01108b11385ec237db97312beb3bac61 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: Tue, 24 Mar 2026 18:04:13 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"update=20=E5=B0=86dubbo=E5=8C=85?= =?UTF-8?q?=E5=90=8D=E6=94=B9=E4=B8=BAremote=E5=8C=85=E5=90=8D"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 792941fe --- pom.xml | 7 +++++++ .../resource/{remote => dubbo}/RemoteFileServiceImpl.java | 2 +- .../resource/{remote => dubbo}/RemoteMailServiceImpl.java | 2 +- .../{remote => dubbo}/RemoteMessageServiceImpl.java | 2 +- .../resource/{remote => dubbo}/RemoteSmsServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteClientServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteConfigServiceImpl.java | 2 +- .../{remote => dubbo}/RemoteDataScopeServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteDeptServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteDictServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteLogServiceImpl.java | 2 +- .../{remote => dubbo}/RemotePermissionServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemotePostServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteRoleServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteSocialServiceImpl.java | 2 +- .../{remote => dubbo}/RemoteTaskAssigneeServiceImpl.java | 2 +- .../system/{remote => dubbo}/RemoteUserServiceImpl.java | 2 +- .../{remote => dubbo}/RemoteWorkflowServiceImpl.java | 2 +- 18 files changed, 24 insertions(+), 17 deletions(-) rename ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/{remote => dubbo}/RemoteFileServiceImpl.java (98%) rename ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/{remote => dubbo}/RemoteMailServiceImpl.java (95%) rename ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/{remote => dubbo}/RemoteMessageServiceImpl.java (96%) rename ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/{remote => dubbo}/RemoteSmsServiceImpl.java (99%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteClientServiceImpl.java (96%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteConfigServiceImpl.java (98%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteDataScopeServiceImpl.java (98%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteDeptServiceImpl.java (98%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteDictServiceImpl.java (97%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteLogServiceImpl.java (97%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemotePermissionServiceImpl.java (95%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemotePostServiceImpl.java (97%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteRoleServiceImpl.java (97%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteSocialServiceImpl.java (98%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteTaskAssigneeServiceImpl.java (99%) rename ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/{remote => dubbo}/RemoteUserServiceImpl.java (99%) rename ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/{remote => dubbo}/RemoteWorkflowServiceImpl.java (98%) diff --git a/pom.xml b/pom.xml index 96a9c8ffc..8cc7b9520 100644 --- a/pom.xml +++ b/pom.xml @@ -352,6 +352,13 @@ ${fastjson.version} + + + redis.clients + jedis + 5.1.0 + + io.github.linpeilie mapstruct-plus-spring-boot-starter diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java index dabae105f..b138e9d6c 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.remote; +package org.dromara.resource.dubbo; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java index 1340af467..b31c65faf 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.remote; +package org.dromara.resource.dubbo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java index 9bfcce8df..80888ff67 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.remote; +package org.dromara.resource.dubbo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java index a7064529f..5062b0dcf 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.remote; +package org.dromara.resource.dubbo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteClientServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java index 9c3824d5c..41ed1bfc1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java index f09c8d052..94d9f733a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.lang.Dict; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDataScopeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java index 48fdd830a..858a436de 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDeptServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java index 689a361d6..582f8a42a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDictServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDictServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java index f0ec347a1..cbd0db5f5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDictServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteLogServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java index 5b4ae7233..e3a316698 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePermissionServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePermissionServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePermissionServiceImpl.java index b198e7aa9..9094a017d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePermissionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePostServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java index 13e3bf03b..a0258cd7c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteRoleServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java index 341b7011a..277ec37fc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteSocialServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java index ddf3bf280..b5e1af1ef 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteSocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteTaskAssigneeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java index e7da95f8a..2fe552d34 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteUserServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java index 24447bc61..c5553c1a7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.remote; +package org.dromara.system.dubbo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/remote/RemoteWorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/remote/RemoteWorkflowServiceImpl.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java index 82fbd7be5..b60d94624 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/remote/RemoteWorkflowServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.remote; +package org.dromara.workflow.dubbo; import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboService;