Merge remote-tracking branch 'origin/master'

mitao

2024-07-29 fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java

@@ -3,7 +3,12 @@
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.*;
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;
@@ -64,6 +69,9 @@
    @PostMapping("/user/queryUserByPhone")
    R<SysUser>  queryUserByPhone(@RequestBody String phone);

    @PostMapping("/user/queryUserByPhone1")
    R<SysUser>  queryUserByPhone1(@RequestBody String phone);

    /**
     * 通过账号查询用户
     * @param userName
@@ -89,4 +97,19 @@

    @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);
}