From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index d66763d..7b415c2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -1,10 +1,14 @@
package com.ruoyi.system.api.feignClient;
+import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.api.domain.CustomConfig;
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.WebsocketMessageDTO;
+import com.ruoyi.system.api.domain.dto.MgtAfterSaleSettingDTO;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
@@ -12,6 +16,7 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
@FeignClient(contextId = "sysUserClient", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = SysUserFallbackFactory.class)
public interface SysUserClient {
@@ -64,6 +69,9 @@
@PostMapping("/user/queryUserByPhone")
R<SysUser> queryUserByPhone(@RequestBody String phone);
+ @PostMapping("/user/queryUserByPhone1")
+ R<SysUser> queryUserByPhone1(@RequestBody String phone);
+
/**
* 通过账号查询用户
* @param userName
@@ -75,12 +83,33 @@
/**
* 延时任务控制
*/
- @PostMapping("/config/getDelayTask")
- public R<DelayTask> getDelayTask(@RequestBody String key);
+ @PostMapping("/delay-task/getDelayTask")
+ public R<DelayTask> getDelayTask(@RequestBody String key,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/config/addDelayTask")
- public R<?> addDelayTask(@RequestBody DelayTask delayTask);
+ @PostMapping("/delay-task/addDelayTask")
+ public R<?> addDelayTask(@RequestBody DelayTask delayTask,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
- @PostMapping("/config/deleteDelayTask")
- public R<?> deleteDelayTask(@RequestBody String key);
+ @PostMapping("/delay-task/deleteDelayTask")
+ public R<?> deleteDelayTask(@RequestBody String key,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @GetMapping("/custom-config/{configId}")
+ R<CustomConfig> getconfig(@PathVariable("configId") String configId);
+
+ @PostMapping("/user/list-by-name")
+ R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @GetMapping("/custom-config/get-after-sale-setting")
+ R<MgtAfterSaleSettingDTO> getAfterSaleSetting();
+
+ @PostMapping("/websocket/push-by-client-type")
+ R<?> pushByClientType(@RequestBody WebsocketMessageDTO dto,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+ @GetMapping("/websocket/push-all/{message}")
+ R<?> pushAll(@PathVariable("message") String message,
+ @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}
--
Gitblit v1.7.1