Merge branch 'feature/fc-auth' into feature/rc-test-fc-auth

# Conflicts:
#	app/src/main/java/com/jiejing/fitness/finance/app/FitnessFinanceApplication.java

app/src/main/java/com/jiejing/fitness/finance/app/FitnessFinanceApplication.java

@@ -44,7 +44,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
     "com.jiejing.studio.api",
     "com.jiejing.studio.api",
     "com.jiejing.message.api",
     "com.jiejing.message.api",
     "com.jiejing.fitness.rpc.api",
     "com.jiejing.fitness.rpc.api",
-    "com.jiejing.permcenter.api",
+    "com.jiejing.auth.api",
     "com.jiejing.configcenter.api",
     "com.jiejing.configcenter.api",
     "com.jiejing.workflow.api",
     "com.jiejing.workflow.api",
 })
 })

pom.xml

@@ -85,10 +85,16 @@
         <groupId>com.jiejing.fitness</groupId>
         <groupId>com.jiejing.fitness</groupId>
         <artifactId>message-sdk</artifactId>
         <artifactId>message-sdk</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <version>0.0.1-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.jiejing.base</groupId>
+            <artifactId>usercenter-api</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       </dependency>
       <dependency>
       <dependency>
-        <groupId>com.jiejing.base</groupId>
-        <artifactId>permcenter-api</artifactId>
+        <groupId>com.jiejing.function</groupId>
+        <artifactId>xmfc-auth-sdk</artifactId>
         <version>0.0.1-SNAPSHOT</version>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       </dependency>
       <dependency>
       <dependency>

service/pom.xml

@@ -36,8 +36,8 @@
       <artifactId>message-sdk</artifactId>
       <artifactId>message-sdk</artifactId>
     </dependency>
     </dependency>
     <dependency>
     <dependency>
-      <groupId>com.jiejing.base</groupId>
-      <artifactId>permcenter-api</artifactId>
+      <groupId>com.jiejing.function</groupId>
+      <artifactId>xmfc-auth-sdk</artifactId>
     </dependency>
     </dependency>
     <dependency>
     <dependency>
       <groupId>com.jiejing.base</groupId>
       <groupId>com.jiejing.base</groupId>

service/src/main/java/com/jiejing/fitness/finance/service/rpc/PermissionRpcService.java

@@ -3,11 +3,11 @@ package com.jiejing.fitness.finance.service.rpc;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toList;
 
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Lists;
+import com.jiejing.auth.api.perm.authority.AuthorityAuthRpcService;
+import com.jiejing.auth.api.perm.authority.request.QueryUserIdByCodeRequest;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.common.model.JsonResult;
 import com.jiejing.fitness.enums.auth.AuthDomainEnum;
 import com.jiejing.fitness.enums.auth.AuthDomainEnum;
 import com.jiejing.fitness.enums.tenant.TenantTypeEnum;
 import com.jiejing.fitness.enums.tenant.TenantTypeEnum;
-import com.jiejing.permcenter.api.config.request.QueryUserIdByCodeRequest;
-import com.jiejing.permcenter.api.perm.AuthorityPermApi;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Service;
 public class PermissionRpcService {
 public class PermissionRpcService {
 
 
   @Resource
   @Resource
-  private AuthorityPermApi authorityPermApi;
+  private AuthorityAuthRpcService authorityPermRpcService;
 
 
   /**
   /**
    * 查询改作用域下具有改权限的人
    * 查询改作用域下具有改权限的人
@@ -41,8 +41,8 @@ public class PermissionRpcService {
     QueryUserIdByCodeRequest request = QueryUserIdByCodeRequest.builder()
     QueryUserIdByCodeRequest request = QueryUserIdByCodeRequest.builder()
         .domain(domain).tenantKey(tenantKey)
         .domain(domain).tenantKey(tenantKey)
         .permissionCode(permissionCode).includeSubTree(includeSubTree).build();
         .permissionCode(permissionCode).includeSubTree(includeSubTree).build();
-    JsonResult<Set<Long>> result = authorityPermApi.queryUserIdByCode(request);
-    return Optional.ofNullable(result.getResult()).orElse(new HashSet<>(1));
+    Set<Long> result = authorityPermRpcService.queryUserIdByCode(request);
+    return Optional.ofNullable(result).orElse(new HashSet<>(1));
   }
   }
 
 
   public List<Long> getUserIdsByCodeList(String domain, Long studioId, List<String> permissionCodeList,
   public List<Long> getUserIdsByCodeList(String domain, Long studioId, List<String> permissionCodeList,