Merge pull request 'feat/multi-channel-framework' (#15) from feat/multi-channel-framework into main

Reviewed-on: http://ashai.com.cn:3005/MerCry/ai-robot-channel/pulls/15

spec/ai-robot/openapi.deps.yaml

@@ -37,6 +37,15 @@ paths:
         - AC-MCA-05
         - AC-MCA-06
         - AC-MCA-07
+      parameters:
+        - name: X-Tenant-Id
+          in: header
+          required: true
+          schema:
+            type: string
+            minLength: 1
+            maxLength: 64
+          description: 租户ID，用于多租户场景下的租户标识
       requestBody:
         required: true
         content:

src/main/java/com/wecom/robot/adapter/ChannelAdapterFactory.java

@@ -3,6 +3,7 @@ package com.wecom.robot.adapter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -17,7 +18,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Component
 public class ChannelAdapterFactory {
-
+    @Resource(name = "channelAdapters")
     private final Map<String, ChannelAdapter> adapterMap;
 
     public ChannelAdapterFactory(List<ChannelAdapter> adapters) {

src/main/java/com/wecom/robot/config/AiServiceConfig.java

@@ -12,4 +12,6 @@ public class AiServiceConfig {
     private String url;
 
     private int timeout = 5000;
+
+    private String tenantId = "szmp@ash@2026";
 }

src/main/java/com/wecom/robot/config/ChannelAdapterConfig.java

@@ -0,0 +1,30 @@
+package com.wecom.robot.config;
+
+import com.wecom.robot.adapter.ChannelAdapter;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+@Configuration
+public class ChannelAdapterConfig {
+
+    @Bean
+    @Primary
+    public Map<String, ChannelAdapter> channelAdapters(
+            ObjectProvider<List<ChannelAdapter>> adapterProvider) {
+        return adapterProvider.getIfAvailable(Collections::emptyList)
+            .stream()
+            .collect(Collectors.toMap(
+                ChannelAdapter::getChannelType,
+                Function.identity(),
+                (existing, replacement) -> existing  // 处理重复key
+            ));
+    }
+}

src/main/java/com/wecom/robot/config/ChannelConfig.java

@@ -1,10 +1,16 @@
 package com.wecom.robot.config;
 
+import com.wecom.robot.adapter.ChannelAdapter;
 import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 @Data
 @Component

src/main/java/com/wecom/robot/config/RestTemplateConfig.java

@@ -12,7 +12,7 @@ public class RestTemplateConfig {
     public RestTemplate restTemplate() {
         SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory();
         factory.setConnectTimeout(5000);
-        factory.setReadTimeout(5000);
+        factory.setReadTimeout(30000);
         return new RestTemplate(factory);
     }
 }

src/main/java/com/wecom/robot/controller/WecomCallbackController.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import java.util.Map;
 
 /**
@@ -31,6 +32,7 @@ public class WecomCallbackController {
     private final WecomConfig wecomConfig;
     private final MessageProcessService messageProcessService;
     private final MessageRouterService messageRouterService;
+    @Resource(name = "channelAdapters")
     private final Map<String, ChannelAdapter> channelAdapters;
 
     @GetMapping("/callback")

src/main/java/com/wecom/robot/service/MessageProcessService.java

@@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 
@@ -35,6 +36,7 @@ public class MessageProcessService {
     private final WecomApiService wecomApiService;
     private final WebSocketService webSocketService;
     private final MessageRouterService messageRouterService;
+    @Resource(name = "channelAdapters")
     private final Map<String, ChannelAdapter> channelAdapters;
 
     @Async

src/main/java/com/wecom/robot/service/impl/AiServiceClientImpl.java

@@ -37,6 +37,7 @@ public class AiServiceClientImpl implements AiServiceClient {
         String url = aiServiceConfig.getUrl() + CHAT_ENDPOINT;
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("X-Tenant-Id", aiServiceConfig.getTenantId());
         HttpEntity<ChatRequest> entity = new HttpEntity<>(request, headers);
 
         ResponseEntity<ChatResponse> response = restTemplate.postForEntity(

src/main/java/com/wecom/robot/service/impl/MessageRouterServiceImpl.java

@@ -11,10 +11,12 @@ import com.wecom.robot.entity.Session;
 import com.wecom.robot.service.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -32,7 +34,8 @@ public class MessageRouterServiceImpl implements MessageRouterService {
     private final AiServiceClient aiServiceClient;
     private final TransferService transferService;
     private final WebSocketService webSocketService;
-    private final Map<String, ChannelAdapter> channelAdapters;
+    @Resource(name = "channelAdapters")
+    private final Map<String, ChannelAdapter> channelAdapterMap;
     private final StringRedisTemplate redisTemplate;
 
     @Override
@@ -198,7 +201,7 @@ public class MessageRouterServiceImpl implements MessageRouterService {
 
         String transferReply = reply + "\n\n正在为您转接人工客服，请稍候...";
 
-        ChannelAdapter adapter = channelAdapters.get(message.getChannelType());
+        ChannelAdapter adapter = channelAdapterMap.get(message.getChannelType());
         if (adapter != null) {
             OutboundMessage outbound = OutboundMessage.builder()
                     .channelType(message.getChannelType())
@@ -222,7 +225,7 @@ public class MessageRouterServiceImpl implements MessageRouterService {
     }
 
     private void sendReplyToUser(Session session, InboundMessage message, String reply) {
-        ChannelAdapter adapter = channelAdapters.get(message.getChannelType());
+        ChannelAdapter adapter = channelAdapterMap.get(message.getChannelType());
         if (adapter != null) {
             OutboundMessage outbound = OutboundMessage.builder()
                     .channelType(message.getChannelType())

src/main/resources/application.yml

@@ -32,12 +32,13 @@ transfer:
     - 人工客服
   confidence-threshold: 0.6
   max-fail-rounds: 3
-  max-session-duration: 1800000
+  max-session-duration: 180000000
   max-message-rounds: 50
 
 ai-service:
   url: http://localhost:8000
   timeout: 5000
+  tenantId: szmp@ash@2026
 
 channel:
   default-channel: wechat