UAA登录

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZOUFallback.java.ftl

@@ -3,14 +3,16 @@ TARGET=PSSYSTEM
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.util.client;
 
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+import java.util.Set;
+
 @Component
 public class IBZOUFallback implements IBZOUFeignClient {
 
     @Override
-    public JSONObject getOrgInfo(String loginName) {
+    public Map<String, Set<String>> getOUMapsByUserId(String userId) {
         return null;
     }
 }

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZOUFeignClient.java.ftl

@@ -3,20 +3,22 @@ TARGET=PSSYSTEM
 </#ibiztemplate>
 package ${pub.getPKGCodeName()}.util.client;
 
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
-@FeignClient(value = "ibzou",fallback = IBZOUFallback.class)
+import java.util.Map;
+import java.util.Set;
+
+@FeignClient(value = "ibzou-api",fallback = IBZOUFallback.class)
 public interface IBZOUFeignClient
 {
-
 	/**
 	 * 从ou中获取当前上下级组织、部门信息
-	 * @param loginName 登录名
+	 * @param userId
 	 * @return
 	 */
-	@GetMapping(value = "/ibzou/org/{loginname}")
-	JSONObject getOrgInfo(@PathVariable("loginname") String loginName);
+	@GetMapping("/ibzemployees/{userId}/oumaps")
+	Map<String, Set<String>> getOUMapsByUserId(@PathVariable("userId") String userId);
+
 }

SLN/%PUBPRJ%-util/src/main/java/%SYS_PKGPATH%/util/client/IBZUAAFeignClient.java.ftl

@@ -9,7 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 
-@FeignClient(value = "ibzuaa",fallback = IBZUAAFallback.class)
+@FeignClient(value = "ibzuaa-api",fallback = IBZUAAFallback.class)
 public interface IBZUAAFeignClient
 {
 	/**