Metrge branch 'master' into feature/axf-xxhf-open-sdk

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

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

app/src/main/resources/application.yml

@@ -116,4 +116,4 @@ weChat:
     domain: wechat-xmfit
 
 rpc:
-  apps: fcfos
\ No newline at end of file
+  apps: fcfos,fcauth,fcapi,fccfg
\ No newline at end of file

pom.xml

@@ -82,18 +82,29 @@
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
+        <groupId>com.jiejing.app</groupId>
+        <artifactId>promotion-api</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+      </dependency>
+      <dependency>
         <groupId>com.jiejing.fitness</groupId>
         <artifactId>message-sdk</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.0.2-SNAPSHOT</version>
+        <exclusions>
+          <exclusion>
+            <groupId>com.jiejing.base</groupId>
+            <artifactId>usercenter-api</artifactId>
+          </exclusion>
+        </exclusions>
       </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>
       </dependency>
       <dependency>
-        <groupId>com.jiejing.base</groupId>
-        <artifactId>configcenter-api</artifactId>
+        <groupId>com.jiejing.function</groupId>
+        <artifactId>xmfc-config-sdk</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
@@ -157,7 +168,7 @@
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       <dependency>
-        <groupId>com.jiejing.fitness</groupId>
+        <groupId>com.jiejing.common</groupId>
         <artifactId>wechat-client</artifactId>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>

service/pom.xml

@@ -32,16 +32,20 @@
       <artifactId>message-api</artifactId>
     </dependency>
     <dependency>
+      <groupId>com.jiejing.app</groupId>
+      <artifactId>promotion-api</artifactId>
+    </dependency>
+    <dependency>
       <groupId>com.jiejing.fitness</groupId>
       <artifactId>message-sdk</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.jiejing.base</groupId>
-      <artifactId>permcenter-api</artifactId>
+      <groupId>com.jiejing.function</groupId>
+      <artifactId>xmfc-auth-sdk</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.jiejing.base</groupId>
-      <artifactId>configcenter-api</artifactId>
+      <groupId>com.jiejing.function</groupId>
+      <artifactId>xmfc-config-sdk</artifactId>
     </dependency>
     <dependency>
       <groupId>com.jiejing.base</groupId>
@@ -94,7 +98,7 @@
       <artifactId>ding-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.jiejing.fitness</groupId>
+      <groupId>com.jiejing.common</groupId>
       <artifactId>wechat-client</artifactId>
     </dependency>
     <dependency>

service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java

@@ -42,20 +42,20 @@ import com.jiejing.fos.api.vo.ResourceInfoVO;
 import com.jiejing.message.enums.MsgChannelEnum;
 import com.jiejing.message.event.SendCommonMsgEvent;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
-import com.jiejing.paycenter.common.enums.merchant.SubChannelOpenTypeEnums;
-import com.jiejing.paycenter.common.event.MerchantSubChannelEvent;
-import com.jiejing.paycenter.common.model.request.SubChannelConfigInfo;
-import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
-import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
-import com.jiejing.paycenter.common.model.vo.MerchantVO;
-import com.jiejing.paycenter.common.model.vo.SubChannelAuthVO;
 import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.enums.merchant.ResourceTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelAuthTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelConfigTypeEnums;
 import com.jiejing.paycenter.common.enums.merchant.SubChannelEnums;
+import com.jiejing.paycenter.common.enums.merchant.SubChannelOpenTypeEnums;
 import com.jiejing.paycenter.common.event.MerchantEvent;
+import com.jiejing.paycenter.common.event.MerchantSubChannelEvent;
 import com.jiejing.paycenter.common.model.request.ResourceInfo;
+import com.jiejing.paycenter.common.model.request.SubChannelConfigInfo;
+import com.jiejing.paycenter.common.model.vo.AuthSubChannelVO;
+import com.jiejing.paycenter.common.model.vo.ConfigSubChannelVO;
+import com.jiejing.paycenter.common.model.vo.MerchantVO;
+import com.jiejing.paycenter.common.model.vo.SubChannelAuthVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelConfigVO;
 import com.jiejing.paycenter.common.model.vo.SubChannelVO;
 import com.jiejing.studio.api.studio.vo.StudioVO;
@@ -63,9 +63,7 @@ import com.jiejing.wechat.WeXcxService;
 import com.jiejing.wechat.vo.xcx.HalfScreenXcxAuthVO;
 import com.jiejing.wechat.vo.xcx.HalfScreenXcxAuthVO.AuthXcxInfo;
 import com.xiaomai.event.EventAgent;
-import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -78,7 +76,6 @@ import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.Page;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

service/src/main/java/com/jiejing/fitness/finance/service/pay/impl/RefundServiceImpl.java

@@ -32,7 +32,7 @@ import com.jiejing.fitness.finance.service.merchant.StudioMerchantService;
 import com.jiejing.fitness.finance.service.pay.RefundService;
 import com.jiejing.fitness.finance.service.pay.convert.RefundConvert;
 import com.jiejing.fitness.finance.service.pay.params.StudioMerchantRefundParams;
-import com.jiejing.fitness.finance.service.rpc.ConfigRpcService;
+import com.jiejing.fitness.finance.service.rpc.FitConfigService;
 import com.jiejing.fitness.finance.service.rpc.PayRpcService;
 import com.jiejing.fitness.finance.service.rpc.PermissionRpcService;
 import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
@@ -91,7 +91,7 @@ public class RefundServiceImpl implements RefundService {
   private ConfigService configService;
 
   @Resource
-  private ConfigRpcService configRpcService;
+  private FitConfigService fitConfigService;
 
   @Resource
   private WeChatInstParam weChatInstParam;
@@ -229,8 +229,8 @@ public class RefundServiceImpl implements RefundService {
       return;
     }
 
-    Boolean wx = configRpcService.getStudioBoolConfig(record.getStudioId(), "WECHAT_MEMBER_REFUND_SUCCESS");
-    Boolean sms = configRpcService.getStudioBoolConfig(record.getStudioId(), "SMS_MEMBER_REFUND_SUCCESS");
+    Boolean wx = fitConfigService.getStudioBoolConfig(record.getStudioId(), "WECHAT_MEMBER_REFUND_SUCCESS");
+    Boolean sms = fitConfigService.getStudioBoolConfig(record.getStudioId(), "SMS_MEMBER_REFUND_SUCCESS");
 
     String targetId = this.getTargetId(record, extra);
     List<MsgChannelEnum> channels = this.getMsgChannels(extra, wx, sms);

service/src/main/java/com/jiejing/fitness/finance/service/rpc/ConfigRpcService.java → service/src/main/java/com/jiejing/fitness/finance/service/rpc/FitConfigService.java

@@ -2,14 +2,16 @@ package com.jiejing.fitness.finance.service.rpc;
 
 import com.google.common.collect.Lists;
 import com.jiejing.common.model.JsonResult;
-import com.jiejing.configcenter.api.config.ConfigApi;
+import com.jiejing.configcenter.ConfigRpcService;
 import com.jiejing.configcenter.api.config.request.GetConfigDetailsRequest;
 import com.jiejing.configcenter.api.config.vo.DetailVO;
 import com.jiejing.fitness.enums.config.ObjectTypeEnum;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import javax.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -19,17 +21,13 @@ import org.springframework.stereotype.Service;
  */
 @Slf4j
 @Service
-public class ConfigRpcService {
+public class FitConfigService {
 
   @Resource
-  private ConfigApi configApi;
+  private ConfigRpcService configRpcService;
 
   public List<DetailVO> listConfig(ObjectTypeEnum objectType, Long objectId, List<String> codes) {
-    JsonResult<List<DetailVO>> result = configApi.getConfigDetails(
-        GetConfigDetailsRequest.builder().objectType(objectType.getCode()).objectId(objectId).codes(codes)
-            .build());
-    result.assertSuccess();
-    return Optional.ofNullable(result.getResult()).orElse(new ArrayList<>());
+    return configRpcService.getConfigDetails(String.valueOf(objectId), objectType.getCode(), codes);
   }
 
   public DetailVO getConfig(ObjectTypeEnum objectType, Long objectId, String code) {

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 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.fitness.enums.auth.AuthDomainEnum;
 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.HashSet;
 import java.util.List;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Service;
 public class PermissionRpcService {
 
   @Resource
-  private AuthorityPermApi authorityPermApi;
+  private AuthorityAuthRpcService authorityPermRpcService;
 
   /**
    * 查询改作用域下具有改权限的人
@@ -41,8 +41,8 @@ public class PermissionRpcService {
     QueryUserIdByCodeRequest request = QueryUserIdByCodeRequest.builder()
         .domain(domain).tenantKey(tenantKey)
         .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,