refactor: 全部服务间 feign client 支持服务发现双模式

继 other(146db16) 之后，wallet/external/order/live/auth 的 inner-api
feign client 同样改为 contextId + name=<Nacos服务名> + url=${feign.X.url:} + path。

启动参数 --feign.X.url= 置空即走 Nacos 服务发现；保留原值则走固定 URL。
console/gateway 无 feign client，无需改动；game-fruit 原样保留。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

.gitignore

@@ -97,3 +97,5 @@ devops-monitor-id_rsa.key
 /claude/
 
 .local-run/
+
+.env

nacos_config/rc-gateway/application.yml

@@ -175,6 +175,7 @@ gateway:
         - /product/apple/config
         - /game/sud/**
         - /web/pay/**
+        - /order/web/pay/**
         - /external/oss/upload
         - /telegram/webhook
         - /account/create/getRegion
@@ -197,6 +198,12 @@ gateway:
         - /go/resident-activity/specified-gift-weekly-rank/**
         - /resident-activity/specified-gift-weekly-rank/**
         - /go/resident-activity/week-star/**
+        - /getUserInfo
+        - /go/getUserInfo
+        - /updateBalance
+        - /go/updateBalance
+        - /game/hotgame/**
+        - /go/game/hotgame/**
         - /resident-activity/week-star/**
         - /resident-activity/sign-in-reward/**
         - /resident-activity/vip/**
@@ -206,6 +213,7 @@ gateway:
         - /resident-activity/voice-room-rocket/**
         - /resident-activity/wheel/**
         - /resident-activity/smash-golden-egg/**
+        - /operate/hotgame-game/**
         - /operate/baishun-game/**
         - /operate/lingxian-game/**
         - /app-system/home-popups/**

nacos_config/rc-service-other/application.yml

@@ -128,6 +128,13 @@ task:
         topic: ${TASK_CENTER_EVENT_MQ_TOPIC:RC_DEFAULT_APP_ORDINARY}
         tag: ${TASK_CENTER_EVENT_MQ_TAG:task_center_event}
 
+cp:
+  relation-broadcast:
+    mq:
+      enabled: ${CP_RELATION_BROADCAST_MQ_ENABLED:true}
+      topic: ${CP_RELATION_BROADCAST_MQ_TOPIC:RC_DEFAULT_APP_ORDINARY}
+      tag: ${CP_RELATION_BROADCAST_MQ_TAG:cp_relation_broadcast}
+
 voice-room:
   region-broadcast:
     go:

rc-auth/src/main/java/com/red/circle/auth/common/LoginAccessValidationService.java

@@ -39,10 +39,11 @@ public class LoginAccessValidationService {
       "香港", "澳门", "澳門", "台湾", "台灣", "Hong Kong", "Macau", "Macao", "Taiwan"
   );
   private static final List<String> BLOCKED_COUNTRY_CODES = List.of(
-      "MO"
+      "HK", "MO", "TW", "SG"
   );
   private static final List<String> BLOCKED_COUNTRY_NAMES = List.of(
-      "澳门", "澳門", "Macau", "Macao"
+      "香港", "澳门", "澳門", "台湾", "台灣", "新加坡",
+      "Hong Kong", "Macau", "Macao", "Taiwan", "Singapore"
   );
   private static final List<IpGeoProvider> IP_GEO_PROVIDERS = List.of(
       new IpGeoProvider("ip.sb", "https://api.ip.sb/geoip/%s"),

rc-auth/src/test/java/com/red/circle/auth/common/LoginAccessValidationServiceTest.java

@@ -70,22 +70,22 @@ public class LoginAccessValidationServiceTest {
   }
 
   @Test
-  public void allowHongKongRegion() {
+  public void blockHongKongRegion() {
     JSONObject data = JSON.parseObject("""
         {"country_id":"CN","country":"中国","region":"香港"}
         """);
 
     assertFalse(LoginAccessValidationService.isMainlandChina(data));
-    assertFalse(LoginAccessValidationService.isBlockedIpRegion(data));
+    assertTrue(LoginAccessValidationService.isBlockedIpRegion(data));
   }
 
   @Test
-  public void allowHongKongCountryCode() {
+  public void blockHongKongCountryCode() {
     JSONObject data = JSON.parseObject("""
         {"country_id":"HK","country":"Hong Kong","region":"Kwai Tsing District"}
         """);
 
-    assertFalse(LoginAccessValidationService.isBlockedIpRegion(data));
+    assertTrue(LoginAccessValidationService.isBlockedIpRegion(data));
   }
 
   @Test
@@ -98,30 +98,30 @@ public class LoginAccessValidationServiceTest {
   }
 
   @Test
-  public void allowSingaporeCountryCode() {
+  public void blockSingaporeCountryCode() {
     JSONObject data = JSON.parseObject("""
         {"country_id":"SG","country":"Singapore","region":""}
         """);
 
-    assertFalse(LoginAccessValidationService.isBlockedIpRegion(data));
+    assertTrue(LoginAccessValidationService.isBlockedIpRegion(data));
   }
 
   @Test
-  public void allowTaiwanRegion() {
+  public void blockTaiwanRegion() {
     JSONObject data = JSON.parseObject("""
         {"country_id":"CN","country":"中国","region":"台湾"}
         """);
 
     assertFalse(LoginAccessValidationService.isMainlandChina(data));
-    assertFalse(LoginAccessValidationService.isBlockedIpRegion(data));
+    assertTrue(LoginAccessValidationService.isBlockedIpRegion(data));
   }
 
   @Test
-  public void allowTaiwanCountryCode() {
+  public void blockTaiwanCountryCode() {
     JSONObject data = JSON.parseObject("""
         {"country_id":"TW","country":"Taiwan","region":""}
         """);
 
-    assertFalse(LoginAccessValidationService.isBlockedIpRegion(data));
+    assertTrue(LoginAccessValidationService.isBlockedIpRegion(data));
   }
 }

rc-common-business/common-business-dto/src/main/java/com/red/circle/common/business/enums/ConsoleAccountStatusEnum.java

@@ -39,7 +39,7 @@ public enum ConsoleAccountStatusEnum {
   /**
    * 账号解封.
    */
-  UNTIE_ACOOUNT("UNTIE_DEVICE", "账号解封"),
+  UNTIE_ACOOUNT("UNTIE_ACOOUNT", "账号解封"),
 
   /**
    * 设备+账户解封.

rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/gift/GiveGiftConfig.java

@@ -51,4 +51,9 @@ public class GiveGiftConfig implements Serializable {
    */
   private String giftTab;
 
+  /**
+   * CP礼物关系类型：CP/BROTHER/SISTERS.
+   */
+  private String cpRelationType;
+
 }

rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/pay/BuySuccessEvent.java

@@ -56,6 +56,10 @@ public class BuySuccessEvent implements Serializable {
    */
   String payPlatform;
 
+  /**
+   * 本次充值请求的App版本.
+   */
+  String appVersion;
   /**
    * 来源.
    */

rc-common-business/common-business-mq/business-mq-model/src/main/java/com/red/circle/mq/business/model/event/pay/RechargeSuccessEvent.java

@@ -0,0 +1,39 @@
+package com.red.circle.mq.business.model.event.pay;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import java.io.Serializable;
+import java.util.Map;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * 通用充值成功事件。
+ */
+@Data
+@Accessors(chain = true)
+public class RechargeSuccessEvent implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  private String eventId;
+  private String sysOrigin;
+
+  @JsonSerialize(using = ToStringSerializer.class)
+  private Long userId;
+
+  @JsonSerialize(using = ToStringSerializer.class)
+  private Long amountCents;
+
+  private String amountUsd;
+  private String currency;
+  private String payPlatform;
+  private String paymentMethod;
+  private String googleProductId;
+  private String productId;
+  private String appVersion;
+  private String sourceOrderId;
+  private String orderId;
+  private String occurredAt;
+  private Map<String, Object> payload;
+}

rc-common-business/common-business-mq/business-rocketmq/src/main/java/com/red/circle/mq/rocket/business/constant/QueueNameConstant.java

@@ -22,6 +22,11 @@ public interface QueueNameConstant {
    */
   String BUY_SUCCESS = "BUY_SUCCESS";
 
+  /**
+   * 通用充值成功。
+   */
+  String RECHARGE_SUCCESS = "RECHARGE_SUCCESS";
+
   /**
    * 视频语音房间会话
    */

rc-common-business/common-business-mq/business-rocketmq/src/main/java/com/red/circle/mq/rocket/business/streams/RechargeSuccessSink.java

@@ -0,0 +1,12 @@
+package com.red.circle.mq.rocket.business.streams;
+
+import com.red.circle.mq.rocket.business.constant.QueueNameConstant;
+
+/**
+ * 通用充值成功事件。
+ */
+public interface RechargeSuccessSink {
+
+  String INPUT = QueueNameConstant.RECHARGE_SUCCESS;
+  String TAG = "recharge_success_v1";
+}

rc-service/rc-inner-api/auth-inner-api/src/main/java/com/red/circle/auth/inner/endpoint/AuthClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/8/16
  */
-@FeignClient(name = "authClient", url = "${feign.auth.url}" + AuthClientApi.API_PREFIX)
+@FeignClient(contextId = "authClient", name = "rc-auth", url = "${feign.auth.url:}", path = AuthClientApi.API_PREFIX)
 public interface AuthClient extends AuthClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/aichat/minimax/MiniMaxClient.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/15
  */
-@FeignClient(name = "miniMaxClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "miniMaxClient", name = "rc-service-external", url = "${feign.external.url:}", path = MiniMaxClientApi.API_PREFIX)
-        MiniMaxClientApi.API_PREFIX)
 public interface MiniMaxClient extends MiniMaxClientApi {
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/aichat/qianfan/QianFanClient.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/15
  */
-@FeignClient(name = "qianFanClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "qianFanClient", name = "rc-service-external", url = "${feign.external.url:}", path = QianFanClientApi.API_PREFIX)
-        QianFanClientApi.API_PREFIX)
 public interface QianFanClient extends QianFanClientApi {
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/aichat/tts/TtsClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/15
  */
-@FeignClient(name = "ttsClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "ttsClient", name = "rc-service-external", url = "${feign.external.url:}", path = OssServiceClientApi.API_PREFIX)
-        OssServiceClientApi.API_PREFIX)
 public interface TtsClient extends TtsClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/baishun/BarrageGameClient.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/15
  */
-@FeignClient(name = "barrageGameClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "barrageGameClient", name = "rc-service-external", url = "${feign.external.url:}", path = BarrageGameClientApi.API_PREFIX)
-        BarrageGameClientApi.API_PREFIX)
 public interface BarrageGameClient extends BarrageGameClientApi {
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/binance/BinanceClient.java

@@ -9,7 +9,6 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/17
  */
-@FeignClient(name = "binanceClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "binanceClient", name = "rc-service-external", url = "${feign.external.url:}", path = CensorImageClientApi.API_PREFIX)
-        CensorImageClientApi.API_PREFIX)
 public interface BinanceClient extends BinanceClientApi {
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/censor/CensorImageClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/17
  */
-@FeignClient(name = "censorImageClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "censorImageClient", name = "rc-service-external", url = "${feign.external.url:}", path = CensorImageClientApi.API_PREFIX)
-        CensorImageClientApi.API_PREFIX)
 public interface CensorImageClient extends CensorImageClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/google/GoogleTransactionClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author zongpubin on 2023/11/8
  */
-@FeignClient(name = "googleTransactionClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "googleTransactionClient", name = "rc-service-external", url = "${feign.external.url:}", path = GoogleTransactionClientApi.API_PREFIX)
-        GoogleTransactionClientApi.API_PREFIX)
 public interface GoogleTransactionClient extends GoogleTransactionClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/AgoraClient.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/7/12
  */
-@FeignClient(name = "agoraClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "agoraClient", name = "rc-service-external", url = "${feign.external.url:}", path = AgoraClientApi.API_PREFIX)
-        AgoraClientApi.API_PREFIX)
 public interface AgoraClient extends AgoraClientApi {
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/ImAccountClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/7/12
  */
-@FeignClient(name = "imAccountClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "imAccountClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImAccountClientApi.API_PREFIX)
-        ImAccountClientApi.API_PREFIX)
 public interface ImAccountClient extends ImAccountClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/ImGroupAvClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/7
  */
-@FeignClient(name = "imGroupAvClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "imGroupAvClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImAccountClientApi.API_PREFIX)
-        ImAccountClientApi.API_PREFIX)
 public interface ImGroupAvClient extends ImGroupAvClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/ImGroupClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/8/16
  */
-@FeignClient(name = "imGroupClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "imGroupClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImGroupClientApi.API_PREFIX)
-        ImGroupClientApi.API_PREFIX)
 public interface ImGroupClient extends ImGroupClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/ImGroupMemberClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author pengliang on 2023/12/28
  */
-@FeignClient(name = "imGroupMemberClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "imGroupMemberClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImGroupMemberClientApi.API_PREFIX)
-        ImGroupMemberClientApi.API_PREFIX)
 public interface ImGroupMemberClient extends ImGroupMemberClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/ImMessageClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/7/12
  */
-@FeignClient(name = "imMessageClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "imMessageClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImMessageClientApi.API_PREFIX)
-        ImMessageClientApi.API_PREFIX)
 public interface ImMessageClient extends ImMessageClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/ImOperationClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/16
  */
-@FeignClient(name = "imOperationClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "imOperationClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImOperationClientApi.API_PREFIX)
-        ImOperationClientApi.API_PREFIX)
 public interface ImOperationClient extends ImOperationClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/NewsletterClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/8/15
  */
-@FeignClient(name = "newsletterClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "newsletterClient", name = "rc-service-external", url = "${feign.external.url:}", path = NewsletterClientApi.API_PREFIX)
-        NewsletterClientApi.API_PREFIX)
 public interface NewsletterClient extends NewsletterClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/OfficialNoticeClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/7/12
  */
-@FeignClient(name = "officialNoticeClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "officialNoticeClient", name = "rc-service-external", url = "${feign.external.url:}", path = OfficialNoticeClientApi.API_PREFIX)
-        OfficialNoticeClientApi.API_PREFIX)
 public interface OfficialNoticeClient extends OfficialNoticeClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/SmsClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/8/14
  */
-@FeignClient(name = "smsClient", url = "${feign.external.url}" + SmsClientApi.API_PREFIX)
+@FeignClient(contextId = "smsClient", name = "rc-service-external", url = "${feign.external.url:}", path = SmsClientApi.API_PREFIX)
 public interface SmsClient extends SmsClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/TrtcClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/17
  */
-@FeignClient(name = "trtcClient", url = "${feign.external.url}" + TrtcClientApi.API_PREFIX)
+@FeignClient(contextId = "trtcClient", name = "rc-service-external", url = "${feign.external.url:}", path = TrtcClientApi.API_PREFIX)
 public interface TrtcClient extends TrtcClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/message/api/ImMessageClientApi.java

@@ -1,7 +1,11 @@
 package com.red.circle.external.inner.endpoint.message.api;
 
 import com.red.circle.framework.dto.ResultResponse;
+import com.red.circle.external.inner.model.cmd.message.CustomC2cMsgBodyCmd;
+import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -29,4 +33,10 @@ public interface ImMessageClientApi {
       @RequestParam("toAccount") Long toAccount,
       @RequestParam("text") String text);
 
+  /**
+   * 发送 C2C 自定义消息.
+   */
+  @PostMapping("/sendCustomMessage")
+  ResultResponse<Void> sendCustomMessage(@RequestBody @Valid CustomC2cMsgBodyCmd cmd);
+
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/oss/OssServiceClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/15
  */
-@FeignClient(name = "ossServiceClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "ossServiceClient", name = "rc-service-external", url = "${feign.external.url:}", path = OssServiceClientApi.API_PREFIX)
-        OssServiceClientApi.API_PREFIX)
 public interface OssServiceClient extends OssServiceClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/push/GoogleFirebasePushClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author lisizhe on 2023/11/8
  */
-@FeignClient(name = "pushSendClient", url = "${feign.external.url}" +
+@FeignClient(contextId = "pushSendClient", name = "rc-service-external", url = "${feign.external.url:}", path = GoogleFirebasePushClientApi.API_PREFIX)
-        GoogleFirebasePushClientApi.API_PREFIX)
 public interface GoogleFirebasePushClient extends GoogleFirebasePushClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-api/src/main/java/com/red/circle/external/inner/endpoint/tencent/ImClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author longli on  2024/3/25
  */
-@FeignClient(name = "ImClient", url = "${feign.external.url}" + ImClientApi.API_PREFIX)
+@FeignClient(contextId = "ImClient", name = "rc-service-external", url = "${feign.external.url:}", path = ImClientApi.API_PREFIX)
 public interface ImClient extends ImClientApi {
 
 }

rc-service/rc-inner-api/external-inner/external-inner-model/src/main/java/com/red/circle/external/inner/model/cmd/message/CustomC2cMsgBodyCmd.java

@@ -0,0 +1,91 @@
+package com.red.circle.external.inner.model.cmd.message;
+
+import com.red.circle.framework.dto.Command;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import java.io.Serial;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * C2C custom IM message.
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class CustomC2cMsgBodyCmd extends Command {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  @NotBlank(message = "fromAccount required.")
+  private String fromAccount;
+
+  @NotBlank(message = "toAccount required.")
+  private String toAccount;
+
+  @NotBlank(message = "desc required.")
+  private String desc;
+
+  @NotNull(message = "data required.")
+  private Object data;
+
+  private Integer syncOtherMachine;
+
+  public static CustomC2cMsgBodyBuilder builder() {
+    return new CustomC2cMsgBodyBuilder();
+  }
+
+  public static class CustomC2cMsgBodyBuilder {
+
+    private String fromAccount;
+    private String toAccount;
+    private String desc;
+    private Object data;
+    private Integer syncOtherMachine;
+
+    public CustomC2cMsgBodyBuilder fromAccount(String fromAccount) {
+      this.fromAccount = fromAccount;
+      return this;
+    }
+
+    public CustomC2cMsgBodyBuilder fromAccount(Long fromAccount) {
+      this.fromAccount = String.valueOf(fromAccount);
+      return this;
+    }
+
+    public CustomC2cMsgBodyBuilder toAccount(String toAccount) {
+      this.toAccount = toAccount;
+      return this;
+    }
+
+    public CustomC2cMsgBodyBuilder toAccount(Long toAccount) {
+      this.toAccount = String.valueOf(toAccount);
+      return this;
+    }
+
+    public CustomC2cMsgBodyBuilder desc(String desc) {
+      this.desc = desc;
+      return this;
+    }
+
+    public CustomC2cMsgBodyBuilder data(Object data) {
+      this.data = data;
+      return this;
+    }
+
+    public CustomC2cMsgBodyBuilder syncOtherMachine(Integer syncOtherMachine) {
+      this.syncOtherMachine = syncOtherMachine;
+      return this;
+    }
+
+    public CustomC2cMsgBodyCmd build() {
+      CustomC2cMsgBodyCmd cmd = new CustomC2cMsgBodyCmd();
+      cmd.setFromAccount(this.fromAccount);
+      cmd.setToAccount(this.toAccount);
+      cmd.setDesc(this.desc);
+      cmd.setData(this.data);
+      cmd.setSyncOtherMachine(this.syncOtherMachine);
+      return cmd;
+    }
+  }
+}

rc-service/rc-inner-api/live-inner/live-inner-api/src/main/java/com/red/circle/live/inner/endpoint/LiveMicClient.java

@@ -6,7 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author pengliang on 2023/12/13
  */
-@FeignClient(name = "liveMicClient", url = "${feign.live.url}" + LiveMicClientApi.API_PREFIX)
+@FeignClient(contextId = "liveMicClient", name = "rc-service-live", url = "${feign.live.url:}", path = LiveMicClientApi.API_PREFIX)
 public interface LiveMicClient extends LiveMicClientApi {
 
 }

rc-service/rc-inner-api/live-inner/live-inner-api/src/main/java/com/red/circle/live/inner/endpoint/LiveRoomUserClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/12/26
  */
-@FeignClient(name = "liveRoomUserClient", url = "${feign.live.url}" +
+@FeignClient(contextId = "liveRoomUserClient", name = "rc-service-live", url = "${feign.live.url:}", path = LiveRoomUserClientApi.API_PREFIX)
-        LiveRoomUserClientApi.API_PREFIX)
 public interface LiveRoomUserClient extends LiveRoomUserClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/InAppPurchaseDetailsClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/3
  */
-@FeignClient(name = "inAppPurchaseDetailsClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "inAppPurchaseDetailsClient", name = "rc-service-order", url = "${feign.order.url:}", path = InAppPurchaseDetailsClientApi.API_PREFIX)
-        InAppPurchaseDetailsClientApi.API_PREFIX)
 public interface InAppPurchaseDetailsClient extends InAppPurchaseDetailsClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/MonthlyRechargeUserClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2024/1/23
  */
-@FeignClient(name = "monthlyRechargeUserClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "monthlyRechargeUserClient", name = "rc-service-order", url = "${feign.order.url:}", path = MonthlyRechargeUserClientApi.API_PREFIX)
-        MonthlyRechargeUserClientApi.API_PREFIX)
 public interface MonthlyRechargeUserClient extends MonthlyRechargeUserClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/OrderAbnormalLogClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/3
  */
-@FeignClient(name = "orderAbnormalLogClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "orderAbnormalLogClient", name = "rc-service-order", url = "${feign.order.url:}", path = OrderAbnormalLogClientApi.API_PREFIX)
-        OrderAbnormalLogClientApi.API_PREFIX)
 public interface OrderAbnormalLogClient extends OrderAbnormalLogClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/OrderOtherRechargeClientClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/3
  */
-@FeignClient(name = "orderOtherRechargeClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "orderOtherRechargeClient", name = "rc-service-order", url = "${feign.order.url:}", path = OrderOtherRechargeClientClientApi.API_PREFIX)
-        OrderOtherRechargeClientClientApi.API_PREFIX)
 public interface OrderOtherRechargeClientClient extends OrderOtherRechargeClientClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/OrderPurchaseFriendshipRecordClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/3
  */
-@FeignClient(name = "orderPurchaseFriendshipRecordClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "orderPurchaseFriendshipRecordClient", name = "rc-service-order", url = "${feign.order.url:}", path = OrderPurchaseFriendshipRecordClientApi.API_PREFIX)
-        OrderPurchaseFriendshipRecordClientApi.API_PREFIX)
 public interface OrderPurchaseFriendshipRecordClient extends
     OrderPurchaseFriendshipRecordClientApi {
 

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/OrderPurchaseHistoryClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/3
  */
-@FeignClient(name = "orderPurchaseHistoryClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "orderPurchaseHistoryClient", name = "rc-service-order", url = "${feign.order.url:}", path = OrderPurchaseHistoryClientApi.API_PREFIX)
-        OrderPurchaseHistoryClientApi.API_PREFIX)
 public interface OrderPurchaseHistoryClient extends OrderPurchaseHistoryClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/PayApplicationClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/11/3
  */
-@FeignClient(name = "payApplicationClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "payApplicationClient", name = "rc-service-order", url = "${feign.order.url:}", path = PayApplicationClientApi.API_PREFIX)
-        PayApplicationClientApi.API_PREFIX)
 public interface PayApplicationClient extends PayApplicationClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/PayChannelClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/11/3
  */
-@FeignClient(name = "payChannelClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "payChannelClient", name = "rc-service-order", url = "${feign.order.url:}", path = PayChannelClientApi.API_PREFIX)
-        PayChannelClientApi.API_PREFIX)
 public interface PayChannelClient extends PayChannelClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/PayCountryClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/11/3
  */
-@FeignClient(name = "payCountryClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "payCountryClient", name = "rc-service-order", url = "${feign.order.url:}", path = PayCountryClientApi.API_PREFIX)
-        PayCountryClientApi.API_PREFIX)
 public interface PayCountryClient extends PayCountryClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/PayFactoryClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/11/3
  */
-@FeignClient(name = "payFactoryClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "payFactoryClient", name = "rc-service-order", url = "${feign.order.url:}", path = PayFactoryClientApi.API_PREFIX)
-        PayFactoryClientApi.API_PREFIX)
 public interface PayFactoryClient extends PayFactoryClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/ProductClient.java

@@ -8,7 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/9/13
  */
-@FeignClient(name = "productClient", url = "${feign.order.url}" + ProductClientApi.API_PREFIX)
+@FeignClient(contextId = "productClient", name = "rc-service-order", url = "${feign.order.url:}", path = ProductClientApi.API_PREFIX)
 public interface ProductClient extends ProductClientApi {
 
 

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/RoomRefundAnchorTrackRecordClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/12/23
  */
-@FeignClient(name = "roomRefundAnchorTrackRecordClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "roomRefundAnchorTrackRecordClient", name = "rc-service-order", url = "${feign.order.url:}", path = RoomRefundAnchorTrackRecordClientApi.API_PREFIX)
-        RoomRefundAnchorTrackRecordClientApi.API_PREFIX)
 public interface RoomRefundAnchorTrackRecordClient extends RoomRefundAnchorTrackRecordClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/SysProductConfigClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2023/11/1
  */
-@FeignClient(name = "sysProductConfigClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "sysProductConfigClient", name = "rc-service-order", url = "${feign.order.url:}", path = SysProductConfigClientApi.API_PREFIX)
-        SysProductConfigClientApi.API_PREFIX)
 public interface SysProductConfigClient extends SysProductConfigClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/TotalRechargeClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2024/1/23
  */
-@FeignClient(name = "userTotalRechargeClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "userTotalRechargeClient", name = "rc-service-order", url = "${feign.order.url:}", path = TotalRechargeClientApi.API_PREFIX)
-        TotalRechargeClientApi.API_PREFIX)
 public interface TotalRechargeClient extends TotalRechargeClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/TotalRechargeUserClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2024/1/23
  */
-@FeignClient(name = "totalRechargeUserClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "totalRechargeUserClient", name = "rc-service-order", url = "${feign.order.url:}", path = TotalRechargeUserClientApi.API_PREFIX)
-        TotalRechargeUserClientApi.API_PREFIX)
 public interface TotalRechargeUserClient extends TotalRechargeUserClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/UserFreightRechargeRecordClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/12/27
  */
-@FeignClient(name = "userFreightRechargeRecordClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "userFreightRechargeRecordClient", name = "rc-service-order", url = "${feign.order.url:}", path = UserFreightRechargeRecordClientApi.API_PREFIX)
-        UserFreightRechargeRecordClientApi.API_PREFIX)
 public interface UserFreightRechargeRecordClient extends UserFreightRechargeRecordClientApi {
 
 

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/UserMonthlyRechargeClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2024/1/23
  */
-@FeignClient(name = "userMonthlyRechargeClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "userMonthlyRechargeClient", name = "rc-service-order", url = "${feign.order.url:}", path = UserMonthlyRechargeClientApi.API_PREFIX)
-        UserMonthlyRechargeClientApi.API_PREFIX)
 public interface UserMonthlyRechargeClient extends UserMonthlyRechargeClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/UserRechargeCountClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/9/13
  */
-@FeignClient(name = "userRechargeCountClient", url = "${feign.order.url}" +
+@FeignClient(contextId = "userRechargeCountClient", name = "rc-service-order", url = "${feign.order.url:}", path = UserRechargeCountClientApi.API_PREFIX)
-        UserRechargeCountClientApi.API_PREFIX)
 public interface UserRechargeCountClient extends UserRechargeCountClientApi {
 
 }

rc-service/rc-inner-api/order-inner/order-inner-api/src/main/java/com/red/circle/order/inner/endpoint/api/PayCountryClientApi.java

@@ -6,7 +6,9 @@ import com.red.circle.framework.dto.ResultResponse;
 import com.red.circle.order.inner.model.cmd.SysPayCountryAddCmd;
 import com.red.circle.order.inner.model.cmd.SysPayCountryChannelCmd;
 import com.red.circle.order.inner.model.cmd.SysPayCountryChannelDetailsCmd;
+import com.red.circle.order.inner.model.cmd.SysPayCountryCurrencyRateSyncCmd;
 import com.red.circle.order.inner.model.cmd.SysPayCountryQryCmd;
+import com.red.circle.order.inner.model.dto.PayCountryCurrencyRateSyncDTO;
 import com.red.circle.order.inner.model.dto.PayCountryDTO;
 import com.red.circle.order.inner.model.dto.SysPayCountryChannelDTO;
 import com.red.circle.order.inner.model.dto.SysPayCountryChannelDetailsDTO;
@@ -88,6 +90,10 @@ public interface PayCountryClientApi {
   @GetMapping("/shelf")
   ResultResponse<Void> shelf(@RequestParam("id") Long id, @RequestParam("shelf") Boolean shelf);
 
+  @PostMapping("/syncCurrencyRates")
+  ResultResponse<PayCountryCurrencyRateSyncDTO> syncCurrencyRates(
+      @RequestBody SysPayCountryCurrencyRateSyncCmd cmd);
+
   @GetMapping("/listPayCountryByRegionId")
   ResultResponse<List<PayCountryDTO>> listPayCountryByRegionId(
       @RequestParam("regionId") String regionId);

rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/SysPayApplicationCommodityCmd.java

@@ -7,6 +7,7 @@ import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import java.io.Serial;
 import java.math.BigDecimal;
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -46,6 +47,12 @@ public class SysPayApplicationCommodityCmd extends CommonCommand {
   @JsonSerialize(using = ToStringSerializer.class)
   private Long payCountryId;
 
+  /**
+   * 批量创建时的国家列表；表结构仍是一条商品对应一个国家，所以只在新增时拆成多条记录.
+   */
+  @JsonSerialize(contentUsing = ToStringSerializer.class)
+  private List<Long> payCountryIds;
+
   /**
    * 区域ID.
    */

rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/SysPayCountryCurrencyRateSyncCmd.java

@@ -0,0 +1,33 @@
+package com.red.circle.order.inner.model.cmd;
+
+import com.red.circle.framework.core.dto.CommonCommand;
+import jakarta.validation.constraints.DecimalMax;
+import jakarta.validation.constraints.DecimalMin;
+import jakarta.validation.constraints.Digits;
+import jakarta.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 支付国家货币汇率同步命令.
+ *
+ * @author system
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class SysPayCountryCurrencyRateSyncCmd extends CommonCommand {
+
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 上浮比例，5 表示在实时汇率基础上增加 5%.
+   */
+  @NotNull
+  @DecimalMin("0")
+  @DecimalMax("100")
+  @Digits(integer = 3, fraction = 4)
+  private BigDecimal markupPercent;
+}

rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/cmd/inapp/InAppPurchaseDetailsQryCmd.java

@@ -102,4 +102,9 @@ public class InAppPurchaseDetailsQryCmd extends Command {
    * 条数.
    */
   private Integer limit;
+
+  /**
+   * 是否导出全部筛选结果；导出时不使用 lastId 和 limit 分页.
+   */
+  private Boolean exportAll;
 }

rc-service/rc-inner-api/order-inner/order-inner-model/src/main/java/com/red/circle/order/inner/model/dto/PayCountryCurrencyRateSyncDTO.java

@@ -0,0 +1,47 @@
+package com.red.circle.order.inner.model.dto;
+
+import com.red.circle.framework.dto.DTO;
+import java.io.Serial;
+import java.util.List;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 支付国家货币汇率同步结果.
+ *
+ * @author system
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+public class PayCountryCurrencyRateSyncDTO extends DTO {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  /**
+   * 参与同步的支付国家数量.
+   */
+  private Integer totalCount;
+
+  /**
+   * 已更新的支付国家数量.
+   */
+  private Integer updatedCount;
+
+  /**
+   * 跳过的支付国家数量.
+   */
+  private Integer skippedCount;
+
+  /**
+   * 汇率来源.
+   */
+  private String sourceName;
+
+  /**
+   * 被跳过的国家说明.
+   */
+  private List<String> skippedCountries;
+}

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/ActivityAgentAnchorCountClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author longli on @date 2024/3/14
  */
-@FeignClient(name = "activityAgentAnchorCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "activityAgentAnchorCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = ActivityAgentAnchorCountClientApi.API_PREFIX)
-        ActivityAgentAnchorCountClientApi.API_PREFIX)
 public interface ActivityAgentAnchorCountClient extends ActivityAgentAnchorCountClientApi {
 
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/ActivityGlobalizationDescriptionClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/8
  */
-@FeignClient(name = "activityGlobalizationDescriptionClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "activityGlobalizationDescriptionClient", name = "rc-service-other", url = "${feign.other.url:}", path = ActivityGlobalizationDescriptionClientApi.API_PREFIX)
-        ActivityGlobalizationDescriptionClientApi.API_PREFIX)
 public interface ActivityGlobalizationDescriptionClient extends
     ActivityGlobalizationDescriptionClientApi {
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/ActivityHallFameClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/10/9
  */
-@FeignClient(name = "activityHallFameClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "activityHallFameClient", name = "rc-service-other", url = "${feign.other.url:}", path = ActivityHallFameClientApi.API_PREFIX)
-        ActivityHallFameClientApi.API_PREFIX)
 public interface ActivityHallFameClient extends ActivityHallFameClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/ActivityPictureConfigClient.java

@@ -7,8 +7,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * 活动图片配置
  * @author zongpubin on 2024/1/29
  */
-@FeignClient(name = "activityPictureConfigClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "activityPictureConfigClient", name = "rc-service-other", url = "${feign.other.url:}", path = ActivityPictureConfigClientApi.API_PREFIX)
-        ActivityPictureConfigClientApi.API_PREFIX)
 public interface ActivityPictureConfigClient extends ActivityPictureConfigClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/AgentActivityCountClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author zongpubin on 2023/8/15
  */
-@FeignClient(name = "agentActivityCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "agentActivityCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = AgentActivityCountClientApi.API_PREFIX)
-        AgentActivityCountClientApi.API_PREFIX)
 public interface AgentActivityCountClient extends AgentActivityCountClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/AppRankCountClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/8/16
  */
-@FeignClient(name = "appRankCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "appRankCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = AppRankCountClientApi.API_PREFIX)
-        AppRankCountClientApi.API_PREFIX)
 public interface AppRankCountClient extends AppRankCountClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/CumulativeRechargeClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/8/18
  */
-@FeignClient(name = "cumulativeRechargeClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "cumulativeRechargeClient", name = "rc-service-other", url = "${feign.other.url:}", path = CumulativeRechargeClientApi.API_PREFIX)
-    CumulativeRechargeClientApi.API_PREFIX)
 public interface CumulativeRechargeClient extends CumulativeRechargeClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/InviteActivityCountClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * @author pengliang on 2023/5/26
  */
-@FeignClient(name = "inviteActivityCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "inviteActivityCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = InviteActivityCountClientApi.API_PREFIX)
-    InviteActivityCountClientApi.API_PREFIX)
 public interface InviteActivityCountClient extends InviteActivityCountClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryActivityClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryActivityClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryActivityClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryActivityClientApi.API_PREFIX)
-        LotteryActivityClientApi.API_PREFIX)
 public interface LotteryActivityClient extends LotteryActivityClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryActivityManageClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryActivityManageClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryActivityManageClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryActivityManageClientApi.API_PREFIX)
-        LotteryActivityManageClientApi.API_PREFIX)
 public interface LotteryActivityManageClient extends LotteryActivityManageClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryActivityQueryClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryActivityQueryClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryActivityQueryClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryActivityQueryClientApi.API_PREFIX)
-        LotteryActivityQueryClientApi.API_PREFIX)
 public interface LotteryActivityQueryClient extends LotteryActivityQueryClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryPrizeClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryPrizeClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryPrizeClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryPrizeClientApi.API_PREFIX)
-        LotteryPrizeClientApi.API_PREFIX)
 public interface LotteryPrizeClient extends LotteryPrizeClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryPrizeManageClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryPrizeManageClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryPrizeManageClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryPrizeManageClientApi.API_PREFIX)
-        LotteryPrizeManageClientApi.API_PREFIX)
 public interface LotteryPrizeManageClient extends LotteryPrizeManageClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryRecordClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryRecordClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryRecordClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryRecordClientApi.API_PREFIX)
-        LotteryRecordClientApi.API_PREFIX)
 public interface LotteryRecordClient extends LotteryRecordClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryRecordManageClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryRecordManageClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryRecordManageClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryRecordManageClientApi.API_PREFIX)
-        LotteryRecordManageClientApi.API_PREFIX)
 public interface LotteryRecordManageClient extends LotteryRecordManageClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryTicketClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryTicketClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryTicketClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryTicketClientApi.API_PREFIX)
-        LotteryTicketClientApi.API_PREFIX)
 public interface LotteryTicketClient extends LotteryTicketClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryTicketManageClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryTicketManageClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryTicketManageClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryTicketManageClientApi.API_PREFIX)
-        LotteryTicketManageClientApi.API_PREFIX)
 public interface LotteryTicketManageClient extends LotteryTicketManageClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/LotteryUserCountClient.java

@@ -9,8 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  * @author system
  * @since 2025-10-18
  */
-@FeignClient(name = "lotteryUserCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "lotteryUserCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = LotteryUserCountClientApi.API_PREFIX)
-        LotteryUserCountClientApi.API_PREFIX)
 public interface LotteryUserCountClient extends LotteryUserCountClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/PropsActivityClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/6/5
  */
-@FeignClient(name = "propsActivityCnfClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "propsActivityCnfClient", name = "rc-service-other", url = "${feign.other.url:}", path = PropsActivityClientApi.API_PREFIX)
-    PropsActivityClientApi.API_PREFIX)
 public interface PropsActivityClient extends PropsActivityClientApi {
 
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/RoomContributionActivityCountClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/2
  */
-@FeignClient(name = "roomContributionActivityCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "roomContributionActivityCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = RoomContributionActivityCountClientApi.API_PREFIX)
-    RoomContributionActivityCountClientApi.API_PREFIX)
 public interface RoomContributionActivityCountClient extends
     RoomContributionActivityCountClientApi {
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/RoomContributionCountClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/23
  */
-@FeignClient(name = "roomContributionCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "roomContributionCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = RoomContributionCountClientApi.API_PREFIX)
-    RoomContributionCountClientApi.API_PREFIX)
 public interface RoomContributionCountClient extends RoomContributionCountClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/TemporaryActivityCountClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lixiaofei on 2024/7/8
  */
-@FeignClient(name = "temporaryActivityCountClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "temporaryActivityCountClient", name = "rc-service-other", url = "${feign.other.url:}", path = TemporaryActivityCountClientApi.API_PREFIX)
-        TemporaryActivityCountClientApi.API_PREFIX)
 public interface TemporaryActivityCountClient extends TemporaryActivityCountClientApi {
 
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/activity/UserActivityRechargeClient.java

@@ -6,8 +6,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 /**
  * 用户活动充值服务
  */
-@FeignClient(name = "userActivityRechargeClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "userActivityRechargeClient", name = "rc-service-other", url = "${feign.other.url:}", path = UserActivityRechargeClientApi.API_PREFIX)
-    UserActivityRechargeClientApi.API_PREFIX)
 public interface UserActivityRechargeClient extends UserActivityRechargeClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/ai/qian/AiQianFanChatClient.java

@@ -8,7 +8,6 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/16
  */
-@FeignClient(name = "aiQianFanChatClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "aiQianFanChatClient", name = "rc-service-other", url = "${feign.other.url:}", path = AiQianFanChatClientApi.API_PREFIX)
-        AiQianFanChatClientApi.API_PREFIX)
 public interface AiQianFanChatClient extends AiQianFanChatClientApi {
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/approval/ApprovalUserSettingDataClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/5/25
  */
-@FeignClient(name = "approvalUserSettingDataClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "approvalUserSettingDataClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalUserSettingDataClientApi.API_PREFIX)
-    ApprovalUserSettingDataClientApi.API_PREFIX)
 public interface ApprovalUserSettingDataClient extends ApprovalUserSettingDataClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/approval/ApprovalUserViolationHistoryClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2024/1/22
  */
-@FeignClient(name = "approvalUserViolationHistoryClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "approvalUserViolationHistoryClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalUserViolationHistoryClientApi.API_PREFIX)
-    ApprovalUserViolationHistoryClientApi.API_PREFIX)
 public interface ApprovalUserViolationHistoryClient extends ApprovalUserViolationHistoryClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/approval/ManagerApprovalNotPassClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/12/27
  */
-@FeignClient(name = "managerApprovalNotPassClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "managerApprovalNotPassClient", name = "rc-service-other", url = "${feign.other.url:}", path = ManagerApprovalNotPassClientApi.API_PREFIX)
-    ManagerApprovalNotPassClientApi.API_PREFIX)
 public interface ManagerApprovalNotPassClient extends ManagerApprovalNotPassClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/approval/TeamApplicationProcessApprovalClient.java

@@ -3,8 +3,7 @@ package com.red.circle.other.inner.endpoint.approval;
 import com.red.circle.other.inner.endpoint.approval.api.TeamApplicationProcessApprovalClientApi;
 import org.springframework.cloud.openfeign.FeignClient;
 
-@FeignClient(name = "teamApplicationProcessApprovalClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "teamApplicationProcessApprovalClient", name = "rc-service-other", url = "${feign.other.url:}", path = TeamApplicationProcessApprovalClientApi.API_PREFIX)
-        TeamApplicationProcessApprovalClientApi.API_PREFIX)
 public interface TeamApplicationProcessApprovalClient extends
         TeamApplicationProcessApprovalClientApi {
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/approval/TeamApplicationProcessClient.java

@@ -4,8 +4,7 @@ package com.red.circle.other.inner.endpoint.approval;
 import com.red.circle.other.inner.endpoint.approval.api.TeamApplicationProcessClientApi;
 import org.springframework.cloud.openfeign.FeignClient;
 
-@FeignClient(name = "teamApplicationProcessClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "teamApplicationProcessClient", name = "rc-service-other", url = "${feign.other.url:}", path = TeamApplicationProcessClientApi.API_PREFIX)
-        TeamApplicationProcessClientApi.API_PREFIX)
 public interface TeamApplicationProcessClient extends TeamApplicationProcessClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/approval/TeamTerminationFeeRecordClient.java

@@ -3,8 +3,7 @@ package com.red.circle.other.inner.endpoint.approval;
 import com.red.circle.other.inner.endpoint.approval.api.TeamTerminationFeeRecordClientApi;
 import org.springframework.cloud.openfeign.FeignClient;
 
-@FeignClient(name = "teamTerminationFeeRecordClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "teamTerminationFeeRecordClient", name = "rc-service-other", url = "${feign.other.url:}", path = TeamTerminationFeeRecordClientApi.API_PREFIX)
-        TeamTerminationFeeRecordClientApi.API_PREFIX)
 public interface TeamTerminationFeeRecordClient extends TeamTerminationFeeRecordClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/count/StatisticsPropsSaleQuotaClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/17
  */
-@FeignClient(name = "statisticsPropsSaleQuotaClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "statisticsPropsSaleQuotaClient", name = "rc-service-other", url = "${feign.other.url:}", path = StatisticsPropsSaleQuotaClientApi.API_PREFIX)
-    StatisticsPropsSaleQuotaClientApi.API_PREFIX)
 public interface StatisticsPropsSaleQuotaClient extends StatisticsPropsSaleQuotaClientApi {
 
 

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/count/StatisticsRoomActiveClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author pengliang on 2023/11/16
  */
-@FeignClient(name = "statisticsRoomActiveClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "statisticsRoomActiveClient", name = "rc-service-other", url = "${feign.other.url:}", path = StatisticsRoomActiveClientApi.API_PREFIX)
-    StatisticsRoomActiveClientApi.API_PREFIX)
 public interface StatisticsRoomActiveClient extends StatisticsRoomActiveClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/ApprovalDataInfoClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2024/1/22
  */
-@FeignClient(name = "approvalDateInfoClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "approvalDateInfoClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalDataInfoClientApi.API_PREFIX)
-    ApprovalDataInfoClientApi.API_PREFIX)
 public interface ApprovalDataInfoClient extends ApprovalDataInfoClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/ApprovalDynamicClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2024/1/19
  */
-@FeignClient(name = "ApprovalDynamicClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "ApprovalDynamicClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalDynamicClientApi.API_PREFIX)
-    ApprovalDynamicClientApi.API_PREFIX)
 public interface ApprovalDynamicClient extends ApprovalDynamicClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/ApprovalDynamicReportClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2024/1/20
  */
-@FeignClient(name = "approvalDynamicReportClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "approvalDynamicReportClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalDynamicReportClientApi.API_PREFIX)
-    ApprovalDynamicReportClientApi.API_PREFIX)
 public interface ApprovalDynamicReportClient extends ApprovalDynamicReportClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/ApprovalFamilySettingDataClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2024/1/20
  */
-@FeignClient(name = "approvalFamilySettingDataClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "approvalFamilySettingDataClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalFamilySettingDataClientApi.API_PREFIX)
-    ApprovalFamilySettingDataClientApi.API_PREFIX)
 public interface ApprovalFamilySettingDataClient extends ApprovalFamilySettingDataClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/ApprovalUserSettingInfoClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author zongpubin on 2024/1/22
  */
-@FeignClient(name = "approvalUserSettingInfoClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "approvalUserSettingInfoClient", name = "rc-service-other", url = "${feign.other.url:}", path = ApprovalUserSettingInfoClientApi.API_PREFIX)
-    ApprovalUserSettingInfoClientApi.API_PREFIX)
 public interface ApprovalUserSettingInfoClient extends ApprovalUserSettingInfoClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/DynamicBlacklistClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/10/5
  */
-@FeignClient(name = "dynamicBlacklistClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "dynamicBlacklistClient", name = "rc-service-other", url = "${feign.other.url:}", path = DynamicBlacklistClientApi.API_PREFIX)
-    DynamicBlacklistClientApi.API_PREFIX)
 public interface DynamicBlacklistClient extends DynamicBlacklistClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/DynamicCacheClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/10/5
  */
-@FeignClient(name = "dynamicCacheClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "dynamicCacheClient", name = "rc-service-other", url = "${feign.other.url:}", path = DynamicCacheClientApi.API_PREFIX)
-    DynamicCacheClientApi.API_PREFIX)
 public interface DynamicCacheClient extends DynamicCacheClientApi {
 
 }

rc-service/rc-inner-api/other-inner/other-inner-api/src/main/java/com/red/circle/other/inner/endpoint/dynamic/DynamicContentClient.java

@@ -8,8 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
  *
  * @author lisizhe on 2023/10/5
  */
-@FeignClient(name = "dynamicContentClient", url = "${feign.other.url}" +
+@FeignClient(contextId = "dynamicContentClient", name = "rc-service-other", url = "${feign.other.url:}", path = DynamicContentClientApi.API_PREFIX)
-    DynamicContentClientApi.API_PREFIX)
 public interface DynamicContentClient extends DynamicContentClientApi {
 
 }