Revert "[重大更新] 使用 spring 新特性 HttpServiceClient 替代 Dubbo 降低框架使用难度(半成本 数据权限不好使)"

This reverts commit b6d2274b

ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/RuoYiResourceApplication.java

@@ -1,5 +1,6 @@
 package org.dromara.resource;
 
+import org.apache.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup;
@@ -10,6 +11,7 @@ import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
  *
  * @author Lion Li
  */
+@EnableDubbo
 @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
 public class RuoYiResourceApplication {
     public static void main(String[] args) {

ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteFileServiceImpl.java

@@ -3,7 +3,7 @@ package org.dromara.resource.remote;
 import cn.hutool.core.convert.Convert;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.http.annotation.RemoteServiceController;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
@@ -17,6 +17,7 @@ import org.dromara.resource.domain.SysOssExt;
 import org.dromara.resource.domain.bo.SysOssBo;
 import org.dromara.resource.domain.vo.SysOssVo;
 import org.dromara.resource.service.ISysOssService;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -27,8 +28,9 @@ import java.util.List;
  * @author Lion Li
  */
 @Slf4j
+@Service
 @RequiredArgsConstructor
-@RemoteServiceController
+@DubboService
 public class RemoteFileServiceImpl implements RemoteFileService {
 
     private final ISysOssService sysOssService;

ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMailServiceImpl.java

@@ -2,10 +2,11 @@ package org.dromara.resource.remote;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.http.annotation.RemoteServiceController;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.mail.utils.MailUtils;
 import org.dromara.resource.api.RemoteMailService;
+import org.springframework.stereotype.Service;
 
 /**
  * 邮件服务
@@ -14,7 +15,8 @@ import org.dromara.resource.api.RemoteMailService;
  */
 @Slf4j
 @RequiredArgsConstructor
-@RemoteServiceController
+@Service
+@DubboService
 public class RemoteMailServiceImpl implements RemoteMailService {
 
     /**

ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteMessageServiceImpl.java

@@ -2,10 +2,11 @@ package org.dromara.resource.remote;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.http.annotation.RemoteServiceController;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.sse.dto.SseMessageDTO;
 import org.dromara.common.sse.utils.SseMessageUtils;
 import org.dromara.resource.api.RemoteMessageService;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -16,7 +17,8 @@ import java.util.List;
  */
 @Slf4j
 @RequiredArgsConstructor
-@RemoteServiceController
+@Service
+@DubboService
 public class RemoteMessageServiceImpl implements RemoteMessageService {
 
     /**

ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/remote/RemoteSmsServiceImpl.java

@@ -2,14 +2,13 @@ package org.dromara.resource.remote;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.http.annotation.RemoteServiceController;
+import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.resource.api.RemoteSmsService;
 import org.dromara.resource.api.domain.RemoteSms;
-import org.dromara.resource.api.domain.RemoteSmsBatch;
-import org.dromara.resource.api.domain.RemoteSmsDelayBatch;
 import org.dromara.sms4j.api.SmsBlend;
 import org.dromara.sms4j.api.entity.SmsResponse;
 import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.stereotype.Service;
 
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -21,7 +20,8 @@ import java.util.List;
  */
 @Slf4j
 @RequiredArgsConstructor
-@RemoteServiceController
+@Service
+@DubboService
 public class RemoteSmsServiceImpl implements RemoteSmsService {
 
     /**
@@ -122,11 +122,6 @@ public class RemoteSmsServiceImpl implements RemoteSmsService {
         return getRemoteSms(smsResponse);
     }
 
-    @Override
-    public RemoteSms messageTextingTemplate(RemoteSmsBatch request) {
-        return messageTexting(request.phones(), request.templateId(), request.messages());
-    }
-
     /**
      * 异步方法：发送简单文本短信
      *
@@ -200,11 +195,6 @@ public class RemoteSmsServiceImpl implements RemoteSmsService {
         getSmsBlend().delayMassTexting(phones, templateId, messages, delayedTime);
     }
 
-    @Override
-    public void delayMessageTextingTemplate(RemoteSmsDelayBatch request) {
-        delayMessageTexting(request.phones(), request.templateId(), request.messages(), request.delayedTime());
-    }
-
     /**
      * 加入黑名单
      *