diff --git a/pom.xml b/pom.xml index 9cac58f58..657610bfa 100644 --- a/pom.xml +++ b/pom.xml @@ -353,13 +353,6 @@ ${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/dubbo/RemoteFileServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java index 88871775e..8aad09b6e 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteFileServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.dubbo; +package org.dromara.resource.remote; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java index f5564d9e8..7aa6c4621 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMailServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.dubbo; +package org.dromara.resource.remote; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java index 4d84cc1a7..1a1118745 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteMessageServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.dubbo; +package org.dromara.resource.remote; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java rename to ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java index d2cb9f2d0..364de5507 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/dubbo/RemoteSmsServiceImpl.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.resource.dubbo; +package org.dromara.resource.remote; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteClientServiceImpl.java similarity index 96% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteClientServiceImpl.java index a5403dc21..292f4314e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteClientServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import lombok.RequiredArgsConstructor; import org.dromara.common.http.annotation.RemoteServiceController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteConfigServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteConfigServiceImpl.java index 6afb1332c..d7c6cf732 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteConfigServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import cn.hutool.core.lang.Dict; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDataScopeServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDataScopeServiceImpl.java index 9ff55785f..503a56d0e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDataScopeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDataScopeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; 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/dubbo/RemoteDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDeptServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDeptServiceImpl.java index dbc08873e..8c025f69d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDeptServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; 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/dubbo/RemoteDictServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDictServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDictServiceImpl.java index db36b0c43..220dcb805 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteDictServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteDictServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import lombok.RequiredArgsConstructor; import org.dromara.common.http.annotation.RemoteServiceController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteLogServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteLogServiceImpl.java index 0fa37d304..fe340bae6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteLogServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import lombok.RequiredArgsConstructor; import org.dromara.common.http.annotation.RemoteServiceController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePermissionServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePermissionServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePermissionServiceImpl.java index 154674bd7..2f2cacd43 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePermissionServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePermissionServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import lombok.RequiredArgsConstructor; import org.dromara.common.http.annotation.RemoteServiceController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePostServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePostServiceImpl.java index 0fc1d66d8..df19215f8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemotePostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemotePostServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; 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/dubbo/RemoteRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteRoleServiceImpl.java similarity index 97% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteRoleServiceImpl.java index e7017b434..bbeeb01ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteRoleServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; 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/dubbo/RemoteSocialServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteSocialServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteSocialServiceImpl.java index 55851b0b3..2cb5501d2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteSocialServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteSocialServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import lombok.RequiredArgsConstructor; import org.dromara.common.http.annotation.RemoteServiceController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteTaskAssigneeServiceImpl.java similarity index 99% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteTaskAssigneeServiceImpl.java index e56a17aae..dcf3edf3d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteTaskAssigneeServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteUserServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteUserServiceImpl.java index 566c78711..dc95d33a6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/remote/RemoteUserServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.system.dubbo; +package org.dromara.system.remote; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; @@ -32,10 +32,6 @@ import org.dromara.system.mapper.SysUserMapper; import org.dromara.system.mapper.SysUserPostMapper; import org.dromara.system.mapper.SysUserRoleMapper; import org.dromara.system.service.*; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.service.annotation.GetExchange; -import org.springframework.web.service.annotation.PostExchange; import java.util.*; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/remote/RemoteWorkflowServiceImpl.java similarity index 98% rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java rename to ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/remote/RemoteWorkflowServiceImpl.java index 8f8dc2526..82a569619 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/dubbo/RemoteWorkflowServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/remote/RemoteWorkflowServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.workflow.dubbo; +package org.dromara.workflow.remote; import lombok.RequiredArgsConstructor; import org.dromara.common.http.annotation.RemoteServiceController;