updated

app/src/main/resources/application.yml

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

pom.xml

@@ -84,7 +84,7 @@
       <dependency>
       <dependency>
         <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.2-SNAPSHOT</version>
         <exclusions>
         <exclusions>
           <exclusion>
           <exclusion>
             <groupId>com.jiejing.base</groupId>
             <groupId>com.jiejing.base</groupId>
@@ -98,8 +98,8 @@
         <version>0.0.1-SNAPSHOT</version>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       </dependency>
       <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>
         <version>0.0.1-SNAPSHOT</version>
       </dependency>
       </dependency>
       <dependency>
       <dependency>

service/pom.xml

@@ -40,8 +40,8 @@
       <artifactId>xmfc-auth-sdk</artifactId>
       <artifactId>xmfc-auth-sdk</artifactId>
     </dependency>
     </dependency>
     <dependency>
     <dependency>
-      <groupId>com.jiejing.base</groupId>
-      <artifactId>configcenter-api</artifactId>
+      <groupId>com.jiejing.function</groupId>
+      <artifactId>xmfc-config-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/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.RefundService;
 import com.jiejing.fitness.finance.service.pay.convert.RefundConvert;
 import com.jiejing.fitness.finance.service.pay.convert.RefundConvert;
 import com.jiejing.fitness.finance.service.pay.params.StudioMerchantRefundParams;
 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.PayRpcService;
 import com.jiejing.fitness.finance.service.rpc.PermissionRpcService;
 import com.jiejing.fitness.finance.service.rpc.PermissionRpcService;
 import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
 import com.jiejing.fitness.finance.service.rpc.StudioRpcService;
@@ -91,7 +91,7 @@ public class RefundServiceImpl implements RefundService {
   private ConfigService configService;
   private ConfigService configService;
 
 
   @Resource
   @Resource
-  private ConfigRpcService configRpcService;
+  private FitConfigService fitConfigService;
 
 
   @Resource
   @Resource
   private WeChatInstParam weChatInstParam;
   private WeChatInstParam weChatInstParam;
@@ -229,8 +229,8 @@ public class RefundServiceImpl implements RefundService {
       return;
       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);
     String targetId = this.getTargetId(record, extra);
     List<MsgChannelEnum> channels = this.getMsgChannels(extra, wx, sms);
     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.google.common.collect.Lists;
 import com.jiejing.common.model.JsonResult;
 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.request.GetConfigDetailsRequest;
 import com.jiejing.configcenter.api.config.vo.DetailVO;
 import com.jiejing.configcenter.api.config.vo.DetailVO;
 import com.jiejing.fitness.enums.config.ObjectTypeEnum;
 import com.jiejing.fitness.enums.config.ObjectTypeEnum;
+
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
+
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -19,17 +21,13 @@ import org.springframework.stereotype.Service;
  */
  */
 @Slf4j
 @Slf4j
 @Service
 @Service
-public class ConfigRpcService {
+public class FitConfigService {
 
 
   @Resource
   @Resource
-  private ConfigApi configApi;
+  private ConfigRpcService configRpcService;
 
 
   public List<DetailVO> listConfig(ObjectTypeEnum objectType, Long objectId, List<String> codes) {
   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) {
   public DetailVO getConfig(ObjectTypeEnum objectType, Long objectId, String code) {