Merge remote-tracking branch 'origin/master'

mitao

2025-01-20 2b79f2033d7606eb9fb449af39ae3c41145edecd

 ruoyi-api/ruoyi-api-company/src/main/java/com/ruoyi/company/api/RemoteCompanyUserService.java

@@ -1,13 +1,13 @@
package com.ruoyi.company.api;

import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.company.api.domain.User;
import com.ruoyi.company.api.factory.RemoteCompanyUserServiceFallbackFactory;
import com.ruoyi.company.api.model.RegisterUser;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
        import com.ruoyi.common.core.constant.SecurityConstants;
        import com.ruoyi.common.core.constant.ServiceNameConstants;
        import com.ruoyi.common.core.domain.R;
        import com.ruoyi.company.api.domain.User;
        import com.ruoyi.company.api.factory.RemoteCompanyUserServiceFallbackFactory;
        import com.ruoyi.company.api.model.RegisterUser;
        import org.springframework.cloud.openfeign.FeignClient;
        import org.springframework.web.bind.annotation.*;

@FeignClient(contextId = "remoteCompanyUserService", value = ServiceNameConstants.COMPANY_SERVICE, fallbackFactory = RemoteCompanyUserServiceFallbackFactory.class)
public interface RemoteCompanyUserService {
@@ -16,4 +16,7 @@

    @GetMapping("/user/getUserByAccountName")
    public R<User> getUserByAccountName(@RequestParam("accountName") String accountName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

    @GetMapping("/user/getUserByPhone")
    public R<User> getUserByPhone(@RequestParam("phone") String phone, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}