Merge branch 'master' into lql

src/main/java/com/sfa/system/api/RemoteUserService.java

 package com.sfa.system.api;
 
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import com.sfa.common.core.constant.SecurityConstants;
 import com.sfa.common.core.constant.ServiceNameConstants;
 import com.sfa.common.core.domain.R;
 import com.sfa.system.api.domain.SysUser;
 import com.sfa.system.api.factory.RemoteUserFallbackFactory;
 import com.sfa.system.api.model.LoginUser;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 用户服务
- * 
+ *
  * @author ruoyi
  */
 @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class)
@@ -32,6 +27,9 @@ public interface RemoteUserService
     @GetMapping("/system/user/info/{username}")
     public R<LoginUser> getUserInfo(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 
+    @GetMapping("/system/user/userInfoById")
+    public R<SysUser> getUserInfoById(@RequestParam("userId")Long userId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
     /**
      * 注册用户信息
      *

src/main/java/com/sfa/system/api/factory/RemoteUserFallbackFactory.java

@@ -11,7 +11,7 @@ import com.sfa.system.api.model.LoginUser;
 
 /**
  * 用户服务降级处理
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -31,6 +31,12 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
                 return R.fail("获取用户失败:" + throwable.getMessage());
             }
 
+            @Override
+            public R<SysUser> getUserInfoById(Long userId, String source) {
+                return R.fail("获取用户失败:" + throwable.getMessage());
+            }
+
+
             @Override
             public R<Boolean> registerUserInfo(SysUser sysUser, String source)
             {