Merge remote-tracking branch 'origin/master' into feature/fc-auth

# Conflicts: # app/src/main/resources/application.yml

Merge remote-tracking branch 'origin/master' into feature/fc-auth
# Conflicts: # app/src/main/resources/application.yml
d6f7e0f6 · 陈攀 · fedcf55f · f9e6a289 · d6f7e0f6 · d6f7e0f6
Commit d6f7e0f6 authored Nov 22, 2024 by 陈攀
7 changed files
--- a/app/src/main/java/com/jiejing/fitness/finance/app/controller/TestController.java
+++ b/app/src/main/java/com/jiejing/fitness/finance/app/controller/TestController.java
 package com.jiejing.fitness.finance.app.controller;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.jiejing.common.model.JsonResult;
-import com.jiejing.common.request.IdRequest;
-import com.jiejing.filecenter.api.authority.AuthorityApi;
-import com.jiejing.filecenter.api.authority.request.GetAuthorityRequest;
-import com.jiejing.filecenter.api.authority.vo.SignatureVO;
-import com.jiejing.filecenter.api.common.enums.AccessTypeEnum;
-import com.jiejing.filecenter.api.common.util.UploadUtil;
-import com.jiejing.filecenter.api.resource.ResourceApi;
-import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
-import com.jiejing.fitness.finance.repository.service.StudioCashierRecordRpService;
-import com.jiejing.fitness.finance.repository.service.StudioMerchantApplyRpService;
 import com.jiejing.fitness.finance.service.merchant.StudioMerchantService;
-import com.jiejing.fitness.finance.service.utils.FileUtils;
 import com.jiejing.paycenter.api.merchant.MerchantQueryApi;
-import com.jiejing.paycenter.common.enums.common.OpenStateEnums;
 import com.jiejing.paycenter.common.event.MerchantEvent;
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.Map;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 /**
@@ -39,35 +23,6 @@ public class TestController {
  @Resource
  private MerchantQueryApi merchantApi;
-  @Resource
-  private ResourceApi resourceApi;
-  @Resource
-  private AuthorityApi authorityApi;
-  @PostMapping(value = "/private/test/upload")
-  public JsonResult<SignatureVO> upload(@RequestParam String url, @RequestParam Long tenantId)
-      throws IOException {
-    GetAuthorityRequest request = new GetAuthorityRequest();
-    request.setAccessTypeEnum(AccessTypeEnum.PRIVATE);
-    request.setBizCode("FINANCE_INFO");
-    request.setTenantId(tenantId);
-    request.setTenantType("BRAND");
-    request.setResourceName(IdWorker.getIdStr() + getSuffix(url));
-    Map<String, String> params = new HashMap<>(1);
-    params.put("tenantId", tenantId.toString());
-    request.setParamMap(params);
-    JsonResult<SignatureVO> result = authorityApi.getAuthoritySignatureForInner(request);
-    result.assertSuccess();
-    SignatureVO signatureVO = result.getResult();
-    UploadUtil.uploadFileContent(FileUtils.getInputStream(url), request.getResourceName(), signatureVO, 1000000);
-    return result;
-  }
-  @Resource
-  private StudioCashierRecordRpService studioCashierRecordRpService;
-  @Resource
  private StudioMerchantService studioMerchantService;

--- a/app/src/main/resources/application.yml
+++ b/app/src/main/resources/application.yml
@@ -116,4 +116,4 @@ weChat:
    domain: wechat-xmfit
 rpc:
-  apps: fcauth
+  apps: fcfos,fcauth
\ No newline at end of file
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,8 @@
      <!-- ======================= jiejing api start ======================= -->
      <dependency>
-        <groupId>com.jiejing.base</groupId>
+        <groupId>com.jiejing.function</groupId>
-        <artifactId>filecenter-api</artifactId>
+        <artifactId>xmfc-fos-sdk</artifactId>
        <version>0.0.1-SNAPSHOT</version>
      </dependency>
      <dependency>

--- a/service/pom.xml
+++ b/service/pom.xml
@@ -16,8 +16,8 @@
      <artifactId>repository</artifactId>
    </dependency>
    <dependency>
-      <groupId>com.jiejing.base</groupId>
+      <groupId>com.jiejing.function</groupId>
-      <artifactId>filecenter-api</artifactId>
+      <artifactId>xmfc-fos-sdk</artifactId>
    </dependency>
    <dependency>
      <groupId>com.jiejing.paycenter</groupId>

--- a/service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/merchant/convert/MerchantConvert.java
@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.convert.BeanUtil;
 import com.jiejing.common.utils.crypt.AesUtil;
-import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
 import com.jiejing.fitness.enums.finance.ApplyTypeEnum;
 import com.jiejing.fitness.enums.finance.PartyTypeEnum;
 import com.jiejing.fitness.finance.api.merchant.request.model.AddressInfo;
@@ -14,15 +13,14 @@ import com.jiejing.fitness.finance.api.merchant.vo.BrandBankCardVO;
 import com.jiejing.fitness.finance.api.merchant.vo.BrandLegalVO;
 import com.jiejing.fitness.finance.api.merchant.vo.BrandLicenseVO;
 import com.jiejing.fitness.finance.api.merchant.vo.BrandMerchantVO;
-import com.jiejing.fitness.finance.api.merchant.vo.StudioEmbeddedXcxVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantApplyVO;
 import com.jiejing.fitness.finance.api.merchant.vo.StudioMerchantVO;
 import com.jiejing.fitness.finance.repository.entity.PartyToMerchant;
-import com.jiejing.fitness.finance.repository.entity.StudioEmbeddedXcxApply;
 import com.jiejing.fitness.finance.repository.entity.StudioMerchantApply;
 import com.jiejing.fitness.finance.service.global.dto.SubChannelInfoDTO;
 import com.jiejing.fitness.finance.service.merchant.params.ApplyStudioMerchantParams;
 import com.jiejing.fitness.finance.service.utils.JsonUtil;
+import com.jiejing.fos.api.vo.ResourceInfoVO;
 import com.jiejing.paycenter.api.merchant.request.ApplyMerchantRequest;
 import com.jiejing.paycenter.api.merchant.request.UploadRequest;
 import com.jiejing.paycenter.common.enums.merchant.AuthPhaseEnums;

--- a/service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/merchant/impl/StudioMerchantServiceImpl.java
@@ -8,9 +8,6 @@ import com.jiejing.common.exception.BizException;
 import com.jiejing.common.model.PageVO;
 import com.jiejing.common.utils.collection.CollectionUtil;
 import com.jiejing.common.utils.convert.BeanUtil;
-import com.jiejing.common.utils.text.StringUtil;
-import com.jiejing.common.utils.time.TimeUtil;
-import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
 import com.jiejing.fitness.enums.finance.EmbededXcxEnum;
 import com.jiejing.fitness.enums.finance.PartyTypeEnum;
 import com.jiejing.fitness.finance.api.merchant.request.model.BrandResourceInfo;
@@ -41,6 +38,7 @@ import com.jiejing.fitness.finance.service.rpc.MerchantRpcService;
 import com.jiejing.fitness.finance.service.rpc.MessageRpcService;
 import com.jiejing.fitness.finance.service.rpc.ResourceRpcService;
 import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
+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;

--- a/service/src/main/java/com/jiejing/fitness/finance/service/rpc/ResourceRpcService.java
+++ b/service/src/main/java/com/jiejing/fitness/finance/service/rpc/ResourceRpcService.java
 package com.jiejing.fitness.finance.service.rpc;
+import com.google.common.collect.Sets;
 import com.jiejing.common.model.JsonResult;
-import com.jiejing.filecenter.api.common.enums.AccessTypeEnum;
-import com.jiejing.filecenter.api.resource.ResourceApi;
+import java.util.*;
-import com.jiejing.filecenter.api.resource.request.BatchQueryMultiResourceRequest;
-import com.jiejing.filecenter.api.resource.vo.ResourceInfoVO;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 import java.util.stream.Collectors;
-import javax.annotation.Resource;
+import com.jiejing.fos.api.vo.ResourceInfoVO;
+import com.jiejing.common.utils.collection.CollectionUtil;
+import com.jiejing.fitness.enums.tenant.TenantTypeEnum;
+import com.jiejing.fos.FosRpcService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 /**
@@ -19,33 +20,28 @@ import org.springframework.stereotype.Service;
 * @since 2024/1/25 18:05
 */
 @Service
+@RequiredArgsConstructor
 public class ResourceRpcService {
-  @Resource
+  private final FosRpcService fosRpcService;
-  private ResourceApi resourceApi;
-  public Map<Long, ResourceInfoVO> getResourceMap(Long partyId, List<Long> resourceIds) {
+  public Map<Long, String> getResourceUrlMap(Long brandId, Collection<Long> resourceIds) {
-    BatchQueryMultiResourceRequest request = new BatchQueryMultiResourceRequest();
+    if (CollectionUtil.isEmpty(resourceIds)) {
-    request.setAccessTypeEnum(AccessTypeEnum.PUBLIC);
+      return Collections.emptyMap();
-    request.setResourceIds(resourceIds);
+    }
-    request.setTenantId(partyId);
+    return fosRpcService.fetchTenantResources(TenantTypeEnum.BRAND.buildKey(brandId),
-    request.setExpire(TimeUnit.MINUTES.toMillis(10));
+            Sets.newHashSet(resourceIds)).stream()
-    JsonResult<List<ResourceInfoVO>> result = resourceApi.getInfoByIds(request);
+        .collect(Collectors.toMap(ResourceInfoVO::getResourceId, ResourceInfoVO::getUrl));
-    return Optional.ofNullable(result.getResult())
-        .map(list -> list.stream().collect(Collectors.toMap(ResourceInfoVO::getResourceId, e -> e)))
-        .orElse(new HashMap<>(1));
  }
-  public Map<Long, String> getResourceUrlMap(Long partyId, List<Long> resourceIds) {
+  public Map<Long, ResourceInfoVO> getResourceMap(Long brandId, List<Long> resourceIds) {
-    BatchQueryMultiResourceRequest request = new BatchQueryMultiResourceRequest();
+    if (CollectionUtil.isEmpty(resourceIds)) {
-    request.setAccessTypeEnum(AccessTypeEnum.PUBLIC);
+      return Collections.emptyMap();
-    request.setResourceIds(resourceIds);
+    }
-    request.setTenantId(partyId);
+    return fosRpcService.fetchTenantResources(TenantTypeEnum.BRAND.buildKey(brandId),
-    request.setExpire(TimeUnit.MINUTES.toMillis(10));
+            Sets.newHashSet(resourceIds)).stream()
-    JsonResult<List<ResourceInfoVO>> result = resourceApi.getInfoByIds(request);
+        .collect(Collectors.toMap(ResourceInfoVO::getResourceId, Function.identity()));
-    return Optional.ofNullable(result.getResult())
-        .map(list -> list.stream().collect(Collectors.toMap(ResourceInfoVO::getResourceId, e -> e.getUrl())))
-        .orElse(new HashMap<>(1));
  }
 }