fix: 修复最大仓位金额未生效和交易receipt解析问题

1. 修复 CopyTradingFilterService 中最大仓位金额(maxPositionValue)未生效的问题 - 当只配置了最大仓位金额但未配置 maxSpread 或 minOrderDepth 时，仓位检查被跳过导致过滤失效 - 将仓位检查移到 needOrderbook 判断之前，确保始终执行仓位检查 2. 修复 OnChainWsService 中交易 receipt 为 JsonNull 时的空指针问题 - 添加 JsonNull 检查，防止解析失败时出现异常
refactor: 将 Polymarket API URL 配置改为代码常量
2026-01-14 05:04:31 +08:00 · 2026-01-13 16:07:19 +08:00 · 2026-01-13 16:04:20 +08:00 · 2026-01-13 03:38:05 +08:00
18 changed files with 465 additions and 303 deletions
@@ -130,7 +130,7 @@ export PROXY_PORT=8888
 - 代理配置错误

 **排查步骤**:
-1. 检查 `polymarket.rtds.ws-url` 配置是否正确
+1. 检查 Polymarket RTDS WebSocket URL（现在使用代码常量 `PolymarketConstants.RTDS_WS_URL`）
 2. 检查网络连接
 3. 查看详细错误日志

@@ -2,8 +2,8 @@ package com.wrbug.polymarketbot.config

 import com.google.gson.Gson
 import com.wrbug.polymarketbot.api.PolymarketClobApi
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.util.createClient
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import retrofit2.Retrofit
@@ -23,9 +23,6 @@ class RetrofitConfig(
    private val gson: Gson
 ) {
    
-    @Value("\${polymarket.clob.base-url}")
-    private lateinit var clobBaseUrl: String
-    
    /**
     * 创建 CLOB API 客户端
     * 用于跟单系统的订单操作和交易查询
@@ -38,7 +35,7 @@ class RetrofitConfig(
        val okHttpClient = createClient().build()
        
        return Retrofit.Builder()
-            .baseUrl(clobBaseUrl)
+            .baseUrl(PolymarketConstants.CLOB_BASE_URL)
            .client(okHttpClient)
            .addConverterFactory(GsonConverterFactory.create(gson))
            .build()
@@ -0,0 +1,48 @@
+package com.wrbug.polymarketbot.constants
+
+/**
+ * Polymarket API 常量
+ * 集中管理所有 Polymarket API 的 URL 配置
+ */
+object PolymarketConstants {
+    
+    /**
+     * Polymarket CLOB API 基础 URL
+     */
+    const val CLOB_BASE_URL = "https://clob.polymarket.com"
+    
+    /**
+     * Polymarket RTDS WebSocket URL
+     * 用于订单推送服务
+     */
+    const val RTDS_WS_URL = "wss://ws-subscriptions-clob.polymarket.com"
+    
+    /**
+     * Polymarket User Channel WebSocket URL
+     * 用于跟单服务（订阅 Leader 交易）
+     */
+    const val USER_WS_URL = "wss://ws-live-data.polymarket.com"
+    
+    /**
+     * Polymarket Activity WebSocket URL
+     * 用于 Activity 全局交易流监听
+     */
+    const val ACTIVITY_WS_URL = "wss://ws-live-data.polymarket.com"
+    
+    /**
+     * Polymarket Data API 基础 URL
+     */
+    const val DATA_API_BASE_URL = "https://data-api.polymarket.com"
+    
+    /**
+     * Polymarket Gamma API 基础 URL
+     */
+    const val GAMMA_BASE_URL = "https://gamma-api.polymarket.com"
+    
+    /**
+     * Builder Relayer API URL
+     * 用于 Gasless 交易
+     */
+    const val BUILDER_RELAYER_URL = "https://relayer-v2.polymarket.com/"
+}
+
@@ -7,11 +7,11 @@ import com.wrbug.polymarketbot.api.JsonRpcResponse
 import com.wrbug.polymarketbot.api.PolymarketDataApi
 import com.wrbug.polymarketbot.api.PositionResponse
 import com.wrbug.polymarketbot.api.ValueResponse
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.util.EthereumUtils
 import com.wrbug.polymarketbot.util.RetrofitFactory
 import com.wrbug.polymarketbot.util.createClient
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import com.wrbug.polymarketbot.service.system.RelayClientService
 import com.wrbug.polymarketbot.service.system.RpcNodeService
 import org.springframework.stereotype.Service
@@ -26,8 +26,6 @@ import java.math.BigInteger
 */
@Service
 class BlockchainService(
-    @Value("\${polymarket.data-api.base-url:https://data-api.polymarket.com}")
-    private val dataApiBaseUrl: String,
    private val retrofitFactory: RetrofitFactory,
    private val relayClientService: RelayClientService,
    private val rpcNodeService: RpcNodeService,
@@ -61,10 +59,10 @@ class BlockchainService(
    private val computeProxyAddressFunctionSignature = "computeProxyAddress(address)"
    
    private val dataApi: PolymarketDataApi by lazy {
-        val baseUrl = if (dataApiBaseUrl.endsWith("/")) {
-            dataApiBaseUrl.dropLast(1)
+        val baseUrl = if (PolymarketConstants.DATA_API_BASE_URL.endsWith("/")) {
+            PolymarketConstants.DATA_API_BASE_URL.dropLast(1)
        } else {
-            dataApiBaseUrl
+            PolymarketConstants.DATA_API_BASE_URL
        }
        val okHttpClient = createClient()
            .followRedirects(true)
@@ -3,12 +3,12 @@ package com.wrbug.polymarketbot.service.common
 import com.google.gson.Gson
 import com.wrbug.polymarketbot.api.ApiKeyResponse
 import com.wrbug.polymarketbot.api.PolymarketClobApi
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.util.PolymarketL1AuthInterceptor
 import com.wrbug.polymarketbot.util.RetrofitFactory
 import com.wrbug.polymarketbot.util.createClient
 import kotlinx.coroutines.runBlocking
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -19,8 +19,6 @@ import retrofit2.converter.gson.GsonConverterFactory
 */
@Service
 class PolymarketApiKeyService(
-    @Value("\${polymarket.clob.base-url}")
-    private val clobBaseUrl: String,
    private val gson: Gson
 ) {
    
@@ -224,7 +222,7 @@ class PolymarketApiKeyService(
            .build()
        
        return Retrofit.Builder()
-            .baseUrl(clobBaseUrl)
+            .baseUrl(PolymarketConstants.CLOB_BASE_URL)
            .client(okHttpClient)
            .addConverterFactory(GsonConverterFactory.create(gson))
            .build()
@@ -238,7 +236,7 @@ class PolymarketApiKeyService(
        val okHttpClient = createClient().build()
        
        return Retrofit.Builder()
-            .baseUrl(clobBaseUrl)
+            .baseUrl(PolymarketConstants.CLOB_BASE_URL)
            .client(okHttpClient)
            .addConverterFactory(GsonConverterFactory.create(gson))
            .build()
@@ -71,12 +71,20 @@ class CopyTradingFilterService(
            }
        }
        
-        // 3. 检查是否需要获取订单簿
-        // 只有在配置了需要订单簿的过滤条件时才获取
+        // 3. 检查是否需要获取订单簿或需要执行仓位检查
+        // 只有在配置了需要订单簿的过滤条件时才获取订单簿
        val needOrderbook = copyTrading.maxSpread != null || copyTrading.minOrderDepth != null
        
+        // 3.5. 如果不需要订单簿，则跳过订单簿相关的检查，但仍然需要检查仓位限制
        if (!needOrderbook) {
-            // 不需要订单簿，直接通过
+            // 仓位检查（如果配置了最大仓位限制且提供了跟单金额和市场ID）
+            if (copyOrderAmount != null && marketId != null) {
+                val positionCheck = checkPositionLimits(copyTrading, copyOrderAmount, marketId)
+                if (!positionCheck.isPassed) {
+                    return positionCheck
+                }
+            }
+            // 通过所有检查
            return FilterResult.passed()
        }
        
@@ -9,8 +9,8 @@ import com.wrbug.polymarketbot.repository.CopyTradingTemplateRepository
 import com.wrbug.polymarketbot.websocket.PolymarketWebSocketClient
 import jakarta.annotation.PreDestroy
 import kotlinx.coroutines.*
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import com.wrbug.polymarketbot.service.copytrading.statistics.CopyOrderTrackingService
 import org.springframework.stereotype.Service
 import java.util.concurrent.ConcurrentHashMap
@@ -28,8 +28,7 @@ class CopyTradingWebSocketService(
    
    private val logger = LoggerFactory.getLogger(CopyTradingWebSocketService::class.java)
    
-    @Value("\${polymarket.websocket.url:wss://ws-live-data.polymarket.com}")
-    private var websocketUrl: String = "wss://ws-live-data.polymarket.com"
+    private val websocketUrl: String = PolymarketConstants.USER_WS_URL
    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
    
    // 存储每个Leader的WebSocket客户端：leaderId -> WebSocketClient
@@ -1,5 +1,6 @@
 package com.wrbug.polymarketbot.service.copytrading.monitor

+import com.google.gson.JsonNull
 import com.wrbug.polymarketbot.api.*
 import com.wrbug.polymarketbot.entity.Leader
 import com.wrbug.polymarketbot.repository.LeaderRepository
@@ -23,12 +24,12 @@ class OnChainWsService(
    private val copyOrderTrackingService: CopyOrderTrackingService,
    private val leaderRepository: LeaderRepository
 ) {
-    
+
    private val logger = LoggerFactory.getLogger(OnChainWsService::class.java)
-    
+
    // 存储需要监听的Leader：leaderId -> Leader
    private val monitoredLeaders = ConcurrentHashMap<Long, Leader>()
-    
+
    /**
     * 启动链上 WebSocket 监听
     * 通过统一服务订阅所有 Leader
@@ -40,14 +41,14 @@ class OnChainWsService(
            stop()
            return
        }
-        
+
        // 更新 Leader 列表
        monitoredLeaders.clear()
        leaders.forEach { leader ->
            addLeader(leader)
        }
    }
-    
+
    /**
     * 添加Leader监听
     * 通过统一服务订阅该 Leader 的地址
@@ -57,17 +58,17 @@ class OnChainWsService(
            logger.warn("Leader ID为空，跳过: ${leader.leaderAddress}")
            return
        }
-        
+
        val leaderId = leader.id!!
-        
+
        // 如果已经在监听列表中，不重复添加
        if (monitoredLeaders.containsKey(leaderId)) {
            logger.debug("Leader 已在监听列表中: ${leader.leaderName} (${leader.leaderAddress})")
            return
        }
-        
+
        monitoredLeaders[leaderId] = leader
-        
+
        // 通过统一服务订阅
        val subscriptionId = "LEADER_$leaderId"
        unifiedOnChainWsService.subscribe(
@@ -79,40 +80,45 @@ class OnChainWsService(
                handleLeaderTransaction(leaderId, txHash, httpClient, rpcApi)
            }
        )
-        
+
        logger.info("添加 Leader 监听: ${leader.leaderName} (${leader.leaderAddress})")
    }
-    
+
    /**
     * 处理 Leader 的交易
     */
-    private suspend fun handleLeaderTransaction(leaderId: Long, txHash: String, httpClient: OkHttpClient, rpcApi: EthereumRpcApi) {
+    private suspend fun handleLeaderTransaction(
+        leaderId: Long,
+        txHash: String,
+        httpClient: OkHttpClient,
+        rpcApi: EthereumRpcApi
+    ) {
        val leader = monitoredLeaders[leaderId] ?: return
-        
+
        logger.debug("开始处理 Leader 交易: leaderId=$leaderId, txHash=$txHash, leaderAddress=${leader.leaderAddress}")
-        
+
        try {
            // 获取交易 receipt
            val receiptRequest = JsonRpcRequest(
                method = "eth_getTransactionReceipt",
                params = listOf(txHash)
            )
-            
+
            val receiptResponse = rpcApi.call(receiptRequest)
            if (!receiptResponse.isSuccessful || receiptResponse.body() == null) {
                logger.warn("获取交易 receipt 失败: leaderId=$leaderId, txHash=$txHash, code=${receiptResponse.code()}")
                return
            }
-            
+
            val receiptRpcResponse = receiptResponse.body()!!
-            if (receiptRpcResponse.error != null || receiptRpcResponse.result == null) {
+            if (receiptRpcResponse.error != null || receiptRpcResponse.result == null || receiptRpcResponse.result is JsonNull) {
                logger.warn("交易 receipt 错误: leaderId=$leaderId, txHash=$txHash, error=${receiptRpcResponse.error}")
                return
            }
-            
+
            // 使用 Gson 解析 receipt JSON
            val receiptJson = receiptRpcResponse.result.asJsonObject
-            
+
            // 获取区块号和时间戳
            val blockNumber = receiptJson.get("blockNumber")?.asString
            val blockTimestamp = if (blockNumber != null) {
@@ -120,7 +126,7 @@ class OnChainWsService(
            } else {
                null
            }
-            
+
            // 解析 receipt 中的 Transfer 日志
            val logs = receiptJson.getAsJsonArray("logs") ?: run {
                logger.warn("交易 receipt 中没有日志: leaderId=$leaderId, txHash=$txHash")
@@ -128,7 +134,7 @@ class OnChainWsService(
            }
            val (erc20Transfers, erc1155Transfers) = OnChainWsUtils.parseReceiptTransfers(logs)
            logger.debug("解析交易日志: leaderId=$leaderId, txHash=$txHash, erc20Transfers=${erc20Transfers.size}, erc1155Transfers=${erc1155Transfers.size}")
-            
+
            // 解析交易信息
            val trade = OnChainWsUtils.parseTradeFromTransfers(
                txHash = txHash,
@@ -138,7 +144,7 @@ class OnChainWsService(
                erc1155Transfers = erc1155Transfers,
                retrofitFactory = retrofitFactory
            )
-            
+
            if (trade != null) {
                logger.info("成功解析交易: leaderId=$leaderId, txHash=$txHash, side=${trade.side}, market=${trade.market}, size=${trade.size}")
                // 调用 processTrade 处理交易
@@ -154,21 +160,21 @@ class OnChainWsService(
            logger.error("处理 Leader 交易失败: leaderId=$leaderId, txHash=$txHash, ${e.message}", e)
        }
    }
-    
+
    /**
     * 移除Leader监听
     * 取消该 Leader 的订阅
     */
    fun removeLeader(leaderId: Long) {
        monitoredLeaders.remove(leaderId)
-        
+
        // 通过统一服务取消订阅
        val subscriptionId = "LEADER_$leaderId"
        unifiedOnChainWsService.unsubscribe(subscriptionId)
-        
+
        logger.info("移除 Leader 监听: leaderId=$leaderId")
    }
-    
+
    /**
     * 停止监听
     */
@@ -180,7 +186,7 @@ class OnChainWsService(
        }
        monitoredLeaders.clear()
    }
-    
+
    @PreDestroy
    fun destroy() {
        stop()
@@ -7,11 +7,11 @@ import com.wrbug.polymarketbot.entity.Leader
 import com.wrbug.polymarketbot.repository.LeaderRepository
 import com.wrbug.polymarketbot.service.copytrading.statistics.CopyOrderTrackingService
 import com.wrbug.polymarketbot.util.fromJson
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.websocket.PolymarketWebSocketClient
 import jakarta.annotation.PreDestroy
 import kotlinx.coroutines.*
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import java.math.BigDecimal
 import java.util.concurrent.ConcurrentHashMap
@@ -29,8 +29,7 @@ class PolymarketActivityWsService(

    private val logger = LoggerFactory.getLogger(PolymarketActivityWsService::class.java)

-    @Value("\${polymarket.websocket.activity.url:wss://ws-live-data.polymarket.com}")
-    private var websocketUrl: String = "wss://ws-live-data.polymarket.com"
+    private val websocketUrl: String = PolymarketConstants.ACTIVITY_WS_URL

    private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())

@@ -44,6 +43,13 @@ class PolymarketActivityWsService(
    @Volatile
    private var isSubscribed = false

+    // 最后一次收到 activity 消息的时间（毫秒时间戳）
+    @Volatile
+    private var lastActivityTime: Long = 0
+
+    // Activity 消息超时检测任务
+    private var activityTimeoutJob: Job? = null
+
    /**
     * 启动监听
     */
@@ -184,6 +190,10 @@ class PolymarketActivityWsService(

            client.sendMessage(subscribeMessage)
            isSubscribed = true
+            // 重置最后一次收到 activity 消息的时间
+            lastActivityTime = System.currentTimeMillis()
+            // 启动 Activity 消息超时检测
+            startActivityTimeoutCheck()
            logger.info("Activity WebSocket 订阅成功（全局交易流）")
        } catch (e: Exception) {
            logger.error("订阅 Activity WebSocket 失败", e)
@@ -191,6 +201,54 @@ class PolymarketActivityWsService(
        }
    }

+    /**
+     * 启动 Activity 消息超时检测
+     * 每30秒检查一次，如果超过30秒没有收到activity消息，则重连
+     */
+    private fun startActivityTimeoutCheck() {
+        // 先停止之前的检测任务
+        stopActivityTimeoutCheck()
+        
+        activityTimeoutJob = scope.launch {
+            while (isActive && isSubscribed) {
+                delay(30000)  // 每30秒检查一次
+                
+                // 如果已经取消订阅，停止检测
+                if (!isSubscribed) {
+                    break
+                }
+                
+                // 如果 lastActivityTime 为 0，说明还没有收到过消息，跳过本次检测
+                if (lastActivityTime == 0L) {
+                    continue
+                }
+                
+                val currentTime = System.currentTimeMillis()
+                val timeSinceLastActivity = currentTime - lastActivityTime
+                
+                // 如果超过30秒没有收到activity消息，触发重连
+                if (timeSinceLastActivity >= 30000) {
+                    logger.warn("超过30秒未收到 Activity 消息，触发重连。距离上次消息: ${timeSinceLastActivity}ms")
+                    // 关闭当前连接并重连
+                    wsClient?.closeConnection()
+                    wsClient = null
+                    isSubscribed = false
+                    // 重新连接
+                    connectAndSubscribe()
+                    break  // 重连后会重新启动检测任务
+                }
+            }
+        }
+    }
+    
+    /**
+     * 停止 Activity 消息超时检测
+     */
+    private fun stopActivityTimeoutCheck() {
+        activityTimeoutJob?.cancel()
+        activityTimeoutJob = null
+    }
+
    /**
     * 处理消息
     */
@@ -214,6 +272,9 @@ class PolymarketActivityWsService(
                return
            }
            
+            // 更新最后一次收到 activity 消息的时间（即使不是我们监听的 Leader 的交易）
+            lastActivityTime = System.currentTimeMillis()
+            
            val payload = tradeMessage.payload
            
            // 提取交易者地址
@@ -383,10 +444,12 @@ class PolymarketActivityWsService(
     */
    fun stop() {
        logger.info("停止 Activity WebSocket 监听")
+        stopActivityTimeoutCheck()
        wsClient?.closeConnection()
        wsClient = null
        isSubscribed = false
        monitoredAddresses.clear()
+        lastActivityTime = 0
    }

    /**
@@ -129,12 +129,20 @@ class UnifiedOnChainWsService(
        }
        addressConnections.clear()
    }
-    
+
+    /**
+     * 获取连接状态
+     * @return Map<address, isConnected>
+     */
+    fun getConnectionStatuses(): Map<String, Boolean> {
+        return addressConnections.mapValues { (_, connection) -> connection.isConnected() }
+    }
+
    @PostConstruct
    fun init() {
        logger.info("统一链上 WebSocket 服务已初始化 (独立连接模式)")
    }
-    
+
    @PreDestroy
    fun destroy() {
        stop()
@@ -211,6 +219,10 @@ class UnifiedOnChainWsService(
            return subscriptions.isEmpty()
        }

+        fun isConnected(): Boolean {
+            return isConnected
+        }
+
        private suspend fun startConnectionLoop() {
            while (scope.isActive) {
                try {
@@ -18,6 +18,7 @@ import com.wrbug.polymarketbot.util.CryptoUtils
 import com.wrbug.polymarketbot.repository.CopyOrderTrackingRepository
 import com.wrbug.polymarketbot.repository.CopyTradingRepository
 import com.wrbug.polymarketbot.repository.LeaderRepository
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.service.common.MarketService
 import org.springframework.stereotype.Service
 import java.util.concurrent.ConcurrentHashMap
@@ -41,8 +42,7 @@ class OrderPushService(

    private val logger = LoggerFactory.getLogger(OrderPushService::class.java)

-    @Value("\${polymarket.rtds.ws-url}")
-    private lateinit var polymarketWsUrl: String
+    private val polymarketWsUrl: String = PolymarketConstants.RTDS_WS_URL

    // 存储账户 ID 和对应的 WebSocket 连接
    private val accountConnections = ConcurrentHashMap<Long, PolymarketWebSocketClient>()
@@ -450,27 +450,19 @@ class OrderStatusUpdateService(
                        
                        logger.info("更新卖出订单价格成功: orderId=${record.sellOrderId}, 原价格=${record.sellPrice}, 新价格=$actualSellPrice")
                        
-                        // 重新从数据库查询最新的记录状态，检查是否已被其他任务标记为已处理
-                        val latestRecord = sellMatchRecordRepository.findById(record.id!!).orElse(null)
-                        if (latestRecord == null) {
-                            logger.warn("卖出记录已被删除，跳过发送通知: orderId=${record.sellOrderId}, recordId=${record.id}")
-                        } else if (latestRecord.priceUpdated) {
-                            logger.debug("卖出记录已被标记为已处理，跳过重复发送通知: orderId=${record.sellOrderId}, recordId=${record.id}")
-                        } else {
-                            // 发送通知（使用实际价格）
-                            sendSellOrderNotification(
-                                record = updatedRecord,
-                                actualPrice = actualSellPrice.toString(),
-                                actualSize = record.totalMatchedQuantity.toString(),
-                                account = account,
-                                copyTrading = copyTrading,
-                                clobApi = clobApi,
-                                apiSecret = apiSecret,
-                                apiPassphrase = apiPassphrase,
-                                orderCreatedAt = record.createdAt
-                            )
-                            logger.info("卖出订单通知已发送: orderId=${record.sellOrderId}")
-                        }
+                        // 发送通知（使用实际价格）
+                        sendSellOrderNotification(
+                            record = updatedRecord,
+                            actualPrice = actualSellPrice.toString(),
+                            actualSize = record.totalMatchedQuantity.toString(),
+                            account = account,
+                            copyTrading = copyTrading,
+                            clobApi = clobApi,
+                            apiSecret = apiSecret,
+                            apiPassphrase = apiPassphrase,
+                            orderCreatedAt = record.createdAt
+                        )
+                        logger.info("卖出订单通知已发送: orderId=${record.sellOrderId}")
                    } else {
                        // 价格相同，但已经查询过，先标记为已处理再发送通知
                        val updatedRecord = SellMatchRecord(
@@ -491,27 +483,19 @@ class OrderStatusUpdateService(
                        
                        logger.debug("卖出订单价格无需更新: orderId=${record.sellOrderId}, price=$actualSellPrice")
                        
-                        // 重新从数据库查询最新的记录状态，检查是否已被其他任务标记为已处理
-                        val latestRecord = sellMatchRecordRepository.findById(record.id!!).orElse(null)
-                        if (latestRecord == null) {
-                            logger.warn("卖出记录已被删除，跳过发送通知: orderId=${record.sellOrderId}, recordId=${record.id}")
-                        } else if (latestRecord.priceUpdated) {
-                            logger.debug("卖出记录已被标记为已处理，跳过重复发送通知: orderId=${record.sellOrderId}, recordId=${record.id}")
-                        } else {
-                            // 发送通知
-                            sendSellOrderNotification(
-                                record = updatedRecord,
-                                actualPrice = actualSellPrice.toString(),
-                                actualSize = record.totalMatchedQuantity.toString(),
-                                account = account,
-                                copyTrading = copyTrading,
-                                clobApi = clobApi,
-                                apiSecret = apiSecret,
-                                apiPassphrase = apiPassphrase,
-                                orderCreatedAt = record.createdAt
-                            )
-                            logger.info("卖出订单通知已发送: orderId=${record.sellOrderId}")
-                        }
+                        // 发送通知
+                        sendSellOrderNotification(
+                            record = updatedRecord,
+                            actualPrice = actualSellPrice.toString(),
+                            actualSize = record.totalMatchedQuantity.toString(),
+                            account = account,
+                            copyTrading = copyTrading,
+                            clobApi = clobApi,
+                            apiSecret = apiSecret,
+                            apiPassphrase = apiPassphrase,
+                            orderCreatedAt = record.createdAt
+                        )
+                        logger.info("卖出订单通知已发送: orderId=${record.sellOrderId}")
                    }
                } catch (e: Exception) {
                    logger.warn("更新卖出订单价格失败: orderId=${record.sellOrderId}, error=${e.message}", e)
@@ -566,15 +550,7 @@ class OrderStatusUpdateService(
                        )
                        copyOrderTrackingRepository.save(updatedOrder)
                        
-                        // 重新从数据库查询最新的订单状态，检查是否已被其他任务标记为已发送通知
-                        val latestOrder = copyOrderTrackingRepository.findById(order.id!!).orElse(null)
-                        if (latestOrder == null) {
-                            logger.warn("订单已被删除，跳过发送通知: orderId=${order.buyOrderId}, copyOrderTrackingId=${order.id}")
-                        } else if (latestOrder.notificationSent) {
-                            logger.debug("订单已被标记为已发送通知，跳过重复发送: orderId=${order.buyOrderId}, copyOrderTrackingId=${order.id}")
-                        } else {
-                            sendBuyOrderNotification(updatedOrder, useTemporaryData = true, orderCreatedAt = order.createdAt)
-                        }
+                        sendBuyOrderNotification(updatedOrder, useTemporaryData = true, orderCreatedAt = order.createdAt)
                        continue
                    }
                    
@@ -662,44 +638,37 @@ class OrderStatusUpdateService(
                    // 更新订单数据（如果实际数据与临时数据不同）
                    val needUpdate = actualPrice != order.price || actualSize != order.quantity
                    
-                    // 先保存更新后的订单，标记 notificationSent = true
-                    // 这样可以防止其他并发任务重复发送通知
-                    val updatedOrder = CopyOrderTracking(
-                        id = order.id,
-                        copyTradingId = order.copyTradingId,
-                        accountId = order.accountId,
-                        leaderId = order.leaderId,
-                        marketId = order.marketId,
-                        side = order.side,
-                        outcomeIndex = order.outcomeIndex,
-                        buyOrderId = order.buyOrderId,
-                        leaderBuyTradeId = order.leaderBuyTradeId,
-                        quantity = actualSize,  // 使用实际数量
-                        price = actualPrice,  // 使用实际价格
-                        matchedQuantity = order.matchedQuantity,
-                        remainingQuantity = order.remainingQuantity,
-                        status = order.status,
-                        notificationSent = true,  // 标记为已发送通知
-                        createdAt = order.createdAt,
-                        updatedAt = System.currentTimeMillis()
-                    )
-                    
-                    // 保存更新后的订单（在发送通知之前保存）
-                    copyOrderTrackingRepository.save(updatedOrder)
-                    
-                    if (needUpdate) {
-                        logger.info("更新买入订单数据成功: orderId=${order.buyOrderId}, 原价格=${order.price}, 新价格=$actualPrice, 原数量=${order.quantity}, 新数量=$actualSize")
-                    } else {
-                        logger.debug("买入订单数据无需更新: orderId=${order.buyOrderId}")
-                    }
-                    
-                    // 重新从数据库查询最新的订单状态，检查是否已被其他任务标记为已发送通知
-                    val latestOrder = copyOrderTrackingRepository.findById(order.id!!).orElse(null)
-                    if (latestOrder == null) {
-                        logger.warn("订单已被删除，跳过发送通知: orderId=${order.buyOrderId}, copyOrderTrackingId=${order.id}")
-                    } else if (latestOrder.notificationSent) {
-                        logger.debug("订单已被标记为已发送通知，跳过重复发送: orderId=${order.buyOrderId}, copyOrderTrackingId=${order.id}")
-                    } else {
+                        // 先保存更新后的订单，标记 notificationSent = true
+                        // 这样可以防止其他并发任务重复发送通知
+                        val updatedOrder = CopyOrderTracking(
+                            id = order.id,
+                            copyTradingId = order.copyTradingId,
+                            accountId = order.accountId,
+                            leaderId = order.leaderId,
+                            marketId = order.marketId,
+                            side = order.side,
+                            outcomeIndex = order.outcomeIndex,
+                            buyOrderId = order.buyOrderId,
+                            leaderBuyTradeId = order.leaderBuyTradeId,
+                            quantity = actualSize,  // 使用实际数量
+                            price = actualPrice,  // 使用实际价格
+                            matchedQuantity = order.matchedQuantity,
+                            remainingQuantity = order.remainingQuantity,
+                            status = order.status,
+                            notificationSent = true,  // 标记为已发送通知
+                            createdAt = order.createdAt,
+                            updatedAt = System.currentTimeMillis()
+                        )
+                        
+                        // 保存更新后的订单（在发送通知之前保存）
+                        copyOrderTrackingRepository.save(updatedOrder)
+                        
+                        if (needUpdate) {
+                            logger.info("更新买入订单数据成功: orderId=${order.buyOrderId}, 原价格=${order.price}, 新价格=$actualPrice, 原数量=${order.quantity}, 新数量=$actualSize")
+                        } else {
+                            logger.debug("买入订单数据无需更新: orderId=${order.buyOrderId}")
+                        }
+                        
                        // 发送通知（使用实际数据）
                        sendBuyOrderNotification(
                            order = updatedOrder,
@@ -713,7 +682,6 @@ class OrderStatusUpdateService(
                            apiPassphrase = apiPassphrase,
                            orderCreatedAt = order.createdAt
                        )
-                    }
                } catch (e: Exception) {
                    logger.warn("更新买入订单失败: orderId=${order.buyOrderId}, error=${e.message}", e)
                    // 继续处理下一条记录
@@ -1,5 +1,6 @@
 package com.wrbug.polymarketbot.service.system

+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.dto.ApiHealthCheckDto
 import com.wrbug.polymarketbot.dto.ApiHealthCheckResponse
 import com.wrbug.polymarketbot.util.createClient
@@ -11,9 +12,9 @@ import org.slf4j.LoggerFactory
 import org.springframework.beans.BeansException
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
-import org.springframework.beans.factory.annotation.Value
 import com.wrbug.polymarketbot.service.copytrading.orders.OrderPushService
-import com.wrbug.polymarketbot.service.copytrading.monitor.CopyTradingWebSocketService
+import com.wrbug.polymarketbot.service.copytrading.monitor.PolymarketActivityWsService
+import com.wrbug.polymarketbot.service.copytrading.monitor.UnifiedOnChainWsService
 import org.springframework.stereotype.Service
 import java.util.concurrent.TimeUnit

@@ -22,16 +23,6 @@ import java.util.concurrent.TimeUnit
 */
@Service
 class ApiHealthCheckService(
-    @Value("\${polymarket.clob.base-url}")
-    private val clobBaseUrl: String,
-    @Value("\${polymarket.data-api.base-url}")
-    private val dataApiBaseUrl: String,
-    @Value("\${polymarket.gamma.base-url}")
-    private val gammaBaseUrl: String,
-    @Value("\${polymarket.rtds.ws-url}")
-    private val polymarketWsUrl: String,
-    @Value("\${polymarket.builder.relayer-url:}")
-    private val builderRelayerUrl: String,
    private val rpcNodeService: RpcNodeService
 ) : ApplicationContextAware {

@@ -52,17 +43,6 @@ class ApiHealthCheckService(
        }
    }

-    /**
-     * 获取跟单 WebSocket 服务（通过 ApplicationContext 避免循环依赖）
-     */
-    private fun getCopyTradingWebSocketService(): CopyTradingWebSocketService? {
-        return try {
-            applicationContext?.getBean(CopyTradingWebSocketService::class.java)
-        } catch (e: BeansException) {
-            null
-        }
-    }
-    
    /**
     * 获取 RelayClientService（通过 ApplicationContext 避免循环依赖）
     */
@@ -74,6 +54,28 @@ class ApiHealthCheckService(
        }
    }

+    /**
+     * 获取 PolymarketActivityWsService（通过 ApplicationContext 避免循环依赖）
+     */
+    private fun getPolymarketActivityWsService(): PolymarketActivityWsService? {
+        return try {
+            applicationContext?.getBean(PolymarketActivityWsService::class.java)
+        } catch (e: BeansException) {
+            null
+        }
+    }
+
+    /**
+     * 获取 UnifiedOnChainWsService（通过 ApplicationContext 避免循环依赖）
+     */
+    private fun getUnifiedOnChainWsService(): UnifiedOnChainWsService? {
+        return try {
+            applicationContext?.getBean(UnifiedOnChainWsService::class.java)
+        } catch (e: BeansException) {
+            null
+        }
+    }
+
    private val logger = LoggerFactory.getLogger(ApiHealthCheckService::class.java)

    /**
@@ -89,7 +91,9 @@ class ApiHealthCheckService(
                async { checkDataApi() },
                async { checkGammaApi() },
                async { checkPolygonRpc() },
-                async { checkPolymarketWebSocket() },
+                async { checkPolymarketRtdsWebSocket() },
+                async { checkPolymarketActivityWebSocket() },
+                async { checkUnifiedOnChainWebSocket() },
                async { checkBuilderRelayerApi() },
                async { checkGitHubApi() }
            )
@@ -106,7 +110,7 @@ class ApiHealthCheckService(
     * 检查 Polymarket CLOB API
     */
    private suspend fun checkClobApi(): ApiHealthCheckDto = withContext(Dispatchers.IO) {
-        val url = "$clobBaseUrl/"
+        val url = "${PolymarketConstants.CLOB_BASE_URL}/"
        checkApi("Polymarket CLOB API", url)
    }

@@ -114,7 +118,7 @@ class ApiHealthCheckService(
     * 检查 Polymarket Data API
     */
    private suspend fun checkDataApi(): ApiHealthCheckDto = withContext(Dispatchers.IO) {
-        val url = "$dataApiBaseUrl/"
+        val url = "${PolymarketConstants.DATA_API_BASE_URL}/"
        checkApi("Polymarket Data API", url)
    }

@@ -131,7 +135,7 @@ class ApiHealthCheckService(
                .build()

            // 使用 /markets 接口检查（不传参数，返回空列表或少量市场数据）
-            val url = "$gammaBaseUrl/markets"
+            val url = "${PolymarketConstants.GAMMA_BASE_URL}/markets"
            val request = Request.Builder()
                .url(url)
                .get()
@@ -176,7 +180,7 @@ class ApiHealthCheckService(
            logger.warn("检查 Polymarket Gamma API 失败", e)
            ApiHealthCheckDto(
                name = "Polymarket Gamma API",
-                url = "$gammaBaseUrl/markets",
+                url = "${PolymarketConstants.GAMMA_BASE_URL}/markets",
                status = "error",
                message = e.message ?: "连接失败"
            )
@@ -194,69 +198,143 @@ class ApiHealthCheckService(
    }

    /**
-     * 检查 Polymarket WebSocket 连接状态
-     * 不显示延时，只显示连接状态
+     * 检查 Polymarket RTDS WebSocket 连接状态
+     * 用于订单推送服务
     */
-    private suspend fun checkPolymarketWebSocket(): ApiHealthCheckDto = withContext(Dispatchers.Default) {
+    private suspend fun checkPolymarketRtdsWebSocket(): ApiHealthCheckDto = withContext(Dispatchers.Default) {
        try {
-            // 检查订单推送服务的连接状态
            val orderPushService = getOrderPushService()
-            val orderPushStatuses = orderPushService?.getConnectionStatuses() ?: emptyMap()
-            val orderPushConnected = orderPushStatuses.values.any { it }
-            val orderPushTotal = orderPushStatuses.size
-            val orderPushConnectedCount = orderPushStatuses.values.count { it }
+            val statuses = orderPushService?.getConnectionStatuses() ?: emptyMap()
+            val total = statuses.size
+            val connected = statuses.values.count { it }

-            // 检查跟单 WebSocket 服务的连接状态
-            val copyTradingWebSocketService = getCopyTradingWebSocketService()
-            val copyTradingStatuses = copyTradingWebSocketService?.getConnectionStatuses() ?: emptyMap()
-            val copyTradingConnected = copyTradingStatuses.values.any { it }
-            val copyTradingTotal = copyTradingStatuses.size
-            val copyTradingConnectedCount = copyTradingStatuses.values.count { it }
-
-            // 计算总体状态
-            val totalConnections = orderPushTotal + copyTradingTotal
-            val connectedConnections = orderPushConnectedCount + copyTradingConnectedCount
-
-            val url = polymarketWsUrl
-            val hasAnyConnection = orderPushConnected || copyTradingConnected
-
-            if (totalConnections == 0) {
-                // 没有配置任何 WebSocket 连接
+            if (total == 0) {
                ApiHealthCheckDto(
-                    name = "Polymarket WebSocket",
-                    url = url,
+                    name = "Polymarket RTDS WebSocket",
+                    url = PolymarketConstants.RTDS_WS_URL,
                    status = "skipped",
-                    message = "未配置 WebSocket 连接"
+                    message = "未配置账户连接"
                )
-            } else if (hasAnyConnection) {
-                // 至少有一个连接是活跃的
-                val message = if (connectedConnections == totalConnections) {
-                    "所有连接正常 ($connectedConnections/$totalConnections)"
+            } else if (connected > 0) {
+                val message = if (connected == total) {
+                    "所有账户连接正常 ($connected/$total)"
                } else {
-                    "部分连接正常 ($connectedConnections/$totalConnections)"
+                    "部分账户连接正常 ($connected/$total)"
                }
                ApiHealthCheckDto(
-                    name = "Polymarket WebSocket",
-                    url = url,
+                    name = "Polymarket RTDS WebSocket",
+                    url = PolymarketConstants.RTDS_WS_URL,
                    status = "success",
                    message = message
-                    // 不设置 responseTime，WebSocket 不显示延时
                )
            } else {
-                // 所有连接都断开
                ApiHealthCheckDto(
-                    name = "Polymarket WebSocket",
-                    url = url,
+                    name = "Polymarket RTDS WebSocket",
+                    url = PolymarketConstants.RTDS_WS_URL,
                    status = "error",
-                    message = "所有连接断开 ($connectedConnections/$totalConnections)"
-                    // 不设置 responseTime，WebSocket 不显示延时
+                    message = "所有账户连接断开 (0/$total)"
                )
            }
        } catch (e: Exception) {
-            logger.warn("检查 Polymarket WebSocket 状态失败", e)
+            logger.warn("检查 Polymarket RTDS WebSocket 状态失败", e)
            ApiHealthCheckDto(
-                name = "Polymarket WebSocket",
-                url = polymarketWsUrl,
+                name = "Polymarket RTDS WebSocket",
+                url = PolymarketConstants.RTDS_WS_URL,
+                status = "error",
+                message = "检查失败：${e.message}"
+            )
+        }
+    }
+
+    /**
+     * 检查 Polymarket Activity WebSocket 连接状态
+     * 用于 Activity 全局交易流监听
+     */
+    private suspend fun checkPolymarketActivityWebSocket(): ApiHealthCheckDto = withContext(Dispatchers.Default) {
+        try {
+            val activityWsService = getPolymarketActivityWsService()
+            val isConnected = activityWsService?.isConnected() ?: false
+
+            if (isConnected) {
+                ApiHealthCheckDto(
+                    name = "Polymarket Activity WebSocket",
+                    url = PolymarketConstants.ACTIVITY_WS_URL,
+                    status = "success",
+                    message = "连接正常"
+                )
+            } else {
+                ApiHealthCheckDto(
+                    name = "Polymarket Activity WebSocket",
+                    url = PolymarketConstants.ACTIVITY_WS_URL,
+                    status = "error",
+                    message = "连接断开"
+                )
+            }
+        } catch (e: Exception) {
+            logger.warn("检查 Polymarket Activity WebSocket 状态失败", e)
+            ApiHealthCheckDto(
+                name = "Polymarket Activity WebSocket",
+                url = PolymarketConstants.ACTIVITY_WS_URL,
+                status = "error",
+                message = "检查失败：${e.message}"
+            )
+        }
+    }
+
+    /**
+     * 检查统一链上 WebSocket 连接状态
+     * 用于监听链上事件
+     */
+    private suspend fun checkUnifiedOnChainWebSocket(): ApiHealthCheckDto = withContext(Dispatchers.Default) {
+        try {
+            val unifiedOnChainWsService = getUnifiedOnChainWsService()
+
+            if (unifiedOnChainWsService == null) {
+                return@withContext ApiHealthCheckDto(
+                    name = "链上 WebSocket",
+                    url = rpcNodeService.getWsUrl(),
+                    status = "error",
+                    message = "服务未初始化"
+                )
+            }
+
+            // 检查连接状态
+            val statuses = unifiedOnChainWsService.getConnectionStatuses()
+            val total = statuses.size
+            val connected = statuses.values.count { it }
+
+            if (total == 0) {
+                ApiHealthCheckDto(
+                    name = "链上 WebSocket",
+                    url = rpcNodeService.getWsUrl(),
+                    status = "skipped",
+                    message = "未配置地址监听"
+                )
+            } else if (connected > 0) {
+                val message = if (connected == total) {
+                    "所有地址连接正常 ($connected/$total)"
+                } else {
+                    "部分地址连接正常 ($connected/$total)"
+                }
+                ApiHealthCheckDto(
+                    name = "链上 WebSocket",
+                    url = rpcNodeService.getWsUrl(),
+                    status = "success",
+                    message = message
+                )
+            } else {
+                ApiHealthCheckDto(
+                    name = "链上 WebSocket",
+                    url = rpcNodeService.getWsUrl(),
+                    status = "error",
+                    message = "所有地址连接断开 (0/$total)"
+                )
+            }
+        } catch (e: Exception) {
+            logger.warn("检查链上 WebSocket 状态失败", e)
+            ApiHealthCheckDto(
+                name = "链上 WebSocket",
+                url = rpcNodeService.getWsUrl(),
                status = "error",
                message = "检查失败：${e.message}"
            )
@@ -390,19 +468,10 @@ class ApiHealthCheckService(
    private suspend fun checkBuilderRelayerApi(): ApiHealthCheckDto = withContext(Dispatchers.IO) {
        val relayClientService = getRelayClientService()
        
-        if (builderRelayerUrl.isBlank()) {
-            return@withContext ApiHealthCheckDto(
-                name = "Builder Relayer API",
-                url = "未配置",
-                status = "skipped",
-                message = "未配置 Builder Relayer URL"
-            )
-        }
-        
        if (relayClientService == null) {
            return@withContext ApiHealthCheckDto(
                name = "Builder Relayer API",
-                url = builderRelayerUrl,
+                url = PolymarketConstants.BUILDER_RELAYER_URL,
                status = "error",
                message = "服务未初始化"
            )
@@ -411,7 +480,7 @@ class ApiHealthCheckService(
        if (!relayClientService.isBuilderApiKeyConfigured()) {
            return@withContext ApiHealthCheckDto(
                name = "Builder Relayer API",
-                url = builderRelayerUrl,
+                url = PolymarketConstants.BUILDER_RELAYER_URL,
                status = "skipped",
                message = "Builder API Key 未配置"
            )
@@ -423,7 +492,7 @@ class ApiHealthCheckService(
                onSuccess = { responseTime ->
                    ApiHealthCheckDto(
                        name = "Builder Relayer API",
-                        url = builderRelayerUrl,
+                        url = PolymarketConstants.BUILDER_RELAYER_URL,
                        status = "success",
                        message = "连接成功",
                        responseTime = responseTime
@@ -432,7 +501,7 @@ class ApiHealthCheckService(
                onFailure = { e ->
                    ApiHealthCheckDto(
                        name = "Builder Relayer API",
-                        url = builderRelayerUrl,
+                        url = PolymarketConstants.BUILDER_RELAYER_URL,
                        status = "error",
                        message = e.message ?: "连接失败"
                    )
@@ -442,7 +511,7 @@ class ApiHealthCheckService(
            logger.warn("检查 Builder Relayer API 失败", e)
            ApiHealthCheckDto(
                name = "Builder Relayer API",
-                url = builderRelayerUrl,
+                url = PolymarketConstants.BUILDER_RELAYER_URL,
                status = "error",
                message = e.message ?: "连接失败"
            )
@@ -3,11 +3,11 @@ package com.wrbug.polymarketbot.service.system
 import com.wrbug.polymarketbot.api.BuilderRelayerApi
 import com.wrbug.polymarketbot.api.EthereumRpcApi
 import com.wrbug.polymarketbot.api.JsonRpcRequest
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import com.wrbug.polymarketbot.util.EthereumUtils
 import com.wrbug.polymarketbot.util.RetrofitFactory
 import com.wrbug.polymarketbot.util.createClient
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import java.math.BigInteger

@@ -24,8 +24,6 @@ import java.math.BigInteger
 */
@Service
 class RelayClientService(
-    @Value("\${polymarket.builder.relayer-url:}")
-    private val builderRelayerUrl: String,
    private val retrofitFactory: RetrofitFactory,
    private val systemConfigService: SystemConfigService,
    private val rpcNodeService: RpcNodeService
@@ -54,10 +52,10 @@ class RelayClientService(
        val builderApiKey = systemConfigService.getBuilderApiKey()
        val builderSecret = systemConfigService.getBuilderSecret()
        val builderPassphrase = systemConfigService.getBuilderPassphrase()
-        
+
        if (isBuilderRelayerEnabled(builderApiKey, builderSecret, builderPassphrase)) {
            return retrofitFactory.createBuilderRelayerApi(
-                relayerUrl = builderRelayerUrl,
+                relayerUrl = PolymarketConstants.BUILDER_RELAYER_URL,
                apiKey = builderApiKey!!,
                secret = builderSecret!!,
                passphrase = builderPassphrase!!
@@ -74,19 +72,19 @@ class RelayClientService(
        builderSecret: String?,
        builderPassphrase: String?
    ): Boolean {
-        return builderRelayerUrl.isNotBlank() &&
+        return PolymarketConstants.BUILDER_RELAYER_URL.isNotBlank() &&
                builderApiKey != null && builderApiKey.isNotBlank() &&
                builderSecret != null && builderSecret.isNotBlank() &&
                builderPassphrase != null && builderPassphrase.isNotBlank()
    }
-    
+
    /**
     * 检查 Builder API Key 是否已配置
     */
    fun isBuilderApiKeyConfigured(): Boolean {
        return systemConfigService.isBuilderApiKeyConfigured()
    }
-    
+
    /**
     * 检查 Builder Relayer API 健康状态（用于 API 健康检查）
     */
@@ -95,24 +93,24 @@ class RelayClientService(
            val builderApiKey = systemConfigService.getBuilderApiKey()
            val builderSecret = systemConfigService.getBuilderSecret()
            val builderPassphrase = systemConfigService.getBuilderPassphrase()
-            
+
            if (builderApiKey == null || builderSecret == null || builderPassphrase == null) {
                return Result.failure(IllegalStateException("Builder API Key 未配置"))
            }
-            
+
            val relayerApi = retrofitFactory.createBuilderRelayerApi(
-                relayerUrl = builderRelayerUrl,
+                relayerUrl = PolymarketConstants.BUILDER_RELAYER_URL,
                apiKey = builderApiKey,
                secret = builderSecret,
                passphrase = builderPassphrase
            )
-            
+
            // 使用一个测试地址来检查 API 是否可用（使用一个已知的地址，如零地址）
            val testAddress = "0x0000000000000000000000000000000000000000"
            val startTime = System.currentTimeMillis()
            val response = relayerApi.getDeployed(testAddress)
            val responseTime = System.currentTimeMillis() - startTime
-            
+
            if (response.isSuccessful) {
                Result.success(responseTime)
            } else {
@@ -228,11 +226,18 @@ class RelayClientService(
            val builderApiKey = systemConfigService.getBuilderApiKey()
            val builderSecret = systemConfigService.getBuilderSecret()
            val builderPassphrase = systemConfigService.getBuilderPassphrase()
-            
+
            // 优先使用 Builder Relayer（Gasless）
            if (isBuilderRelayerEnabled(builderApiKey, builderSecret, builderPassphrase)) {
                logger.info("使用 Builder Relayer 执行 Gasless 交易")
-                return executeViaBuilderRelayer(privateKey, proxyAddress, safeTx, builderApiKey!!, builderSecret!!, builderPassphrase!!)
+                return executeViaBuilderRelayer(
+                    privateKey,
+                    proxyAddress,
+                    safeTx,
+                    builderApiKey!!,
+                    builderSecret!!,
+                    builderPassphrase!!
+                )
            }

            // 回退到手动发送交易（需要用户支付 gas）
@@ -256,9 +261,8 @@ class RelayClientService(
        builderSecret: String,
        builderPassphrase: String
    ): Result<String> {
-        val rpcApi = polygonRpcApi
        val relayerApi = retrofitFactory.createBuilderRelayerApi(
-            relayerUrl = builderRelayerUrl,
+            relayerUrl = PolymarketConstants.BUILDER_RELAYER_URL,
            apiKey = builderApiKey,
            secret = builderSecret,
            passphrase = builderPassphrase
@@ -320,19 +324,19 @@ class RelayClientService(
        val messageWithPrefix = ByteArray(prefix.size + safeTxStructuredHash.size)
        System.arraycopy(prefix, 0, messageWithPrefix, 0, prefix.size)
        System.arraycopy(safeTxStructuredHash, 0, messageWithPrefix, prefix.size, safeTxStructuredHash.size)
-        
+
        // 对带前缀的消息进行 keccak256 哈希
        val keccak256 = org.bouncycastle.crypto.digests.KeccakDigest(256)
        keccak256.update(messageWithPrefix, 0, messageWithPrefix.size)
        val hashWithPrefix = ByteArray(keccak256.digestSize)
        keccak256.doFinal(hashWithPrefix, 0)
-        
+
        val ecKeyPair = org.web3j.crypto.ECKeyPair.create(privateKeyBigInt)
        val safeSignature = org.web3j.crypto.Sign.signMessage(hashWithPrefix, ecKeyPair, false)

        // 打包签名（参考 builder-relayer-client/src/utils/index.ts 的 splitAndPackSig）
        val packedSignature = splitAndPackSig(safeSignature)
-        
+
        // 调试日志（地址已遮蔽）
        logger.debug("=== Builder Relayer 签名调试 ===")
        logger.debug("Safe: ${proxyAddress.take(10)}..., From: ${fromAddress.take(10)}..., Nonce: $proxyNonce")
@@ -358,7 +362,7 @@ class RelayClientService(
            ),
            metadata = "Redeem positions via Builder Relayer"
        )
-        
+
        logger.debug("Request: type=${request.type}, dataLen=${request.data.length}, sigLen=${request.signature.length}, nonce=${request.nonce}")

        // 调用 Builder Relayer API（认证头通过拦截器添加）
@@ -372,7 +376,7 @@ class RelayClientService(

        val relayerResponse = response.body()!!
        val txHash = relayerResponse.transactionHash ?: relayerResponse.hash
-            ?: return Result.failure(Exception("Builder Relayer 返回的交易哈希为空"))
+        ?: return Result.failure(Exception("Builder Relayer 返回的交易哈希为空"))

        logger.info("Builder Relayer 执行成功: transactionID=${relayerResponse.transactionID}, txHash=$txHash")
        return Result.success(txHash)
@@ -381,14 +385,14 @@ class RelayClientService(
    /**
     * 打包签名（参考 builder-relayer-client/src/utils/index.ts 的 splitAndPackSig）
     * 将签名打包成 Gnosis Safe 接受的格式：encodePacked(["uint256", "uint256", "uint8"], [r, s, v])
-     * 
+     *
     * TypeScript 实现流程：
     * 1. 从签名字符串中提取 v（最后 2 个字符）
     * 2. 调整 v 值（0,1 -> +31; 27,28 -> +4）
     * 3. 修改签名字符串（替换最后 2 个字符）
     * 4. 从修改后的签名字符串中提取 r, s, v（作为十进制字符串）
     * 5. 使用 encodePacked 打包：uint256(BigInt(r)) + uint256(BigInt(s)) + uint8(parseInt(v))
-     * 
+     *
     * 关键：encodePacked 会将 BigInt 编码为 32 字节（64 个十六进制字符），uint8 编码为 1 字节（2 个十六进制字符）
     */
    private fun splitAndPackSig(signature: org.web3j.crypto.Sign.SignatureData): String {
@@ -403,37 +407,37 @@ class RelayClientService(
        }
        val originalVHex = String.format("%02x", originalV)
        val sigString = "0x$rHex$sHex$originalVHex"  // 130 个十六进制字符（65 字节）
-        
+
        // 2. 从签名字符串中提取 v（最后 2 个字符，作为十六进制）
        val sigV = sigString.substring(sigString.length - 2).toInt(16)
-        
+
        // 3. 调整 v 值（参考 TypeScript 实现）
        val adjustedV = when (sigV) {
            0, 1 -> sigV + 31
            27, 28 -> sigV + 4
            else -> throw IllegalArgumentException("Invalid signature v value: $sigV")
        }
-        
+
        // 4. 修改签名字符串（替换最后 2 个字符）
        val modifiedSigString = sigString.substring(0, sigString.length - 2) + String.format("%02x", adjustedV)
-        
+
        // 5. 从修改后的签名字符串中提取 r, s, v（作为十六进制字符串）
        // modifiedSigString 格式：0x + r(64) + s(64) + v(2) = 132 个字符
        val rHexStr = modifiedSigString.substring(2, 66)  // 64 个字符（十六进制）
        val sHexStr = modifiedSigString.substring(66, 130)  // 64 个字符（十六进制）
        val vHexStr = modifiedSigString.substring(130, 132)  // 2 个字符（十六进制）
-        
+
        // 6. 转换为 BigInteger 和 Int（模拟 TypeScript 的 BigInt 和 parseInt）
        val rBigInt = BigInteger(rHexStr, 16)
        val sBigInt = BigInteger(sHexStr, 16)
        val vInt = vHexStr.toInt(16)
-        
+
        // 7. 使用 encodePacked 打包：uint256(r) + uint256(s) + uint8(v)
        // encodePacked 会将 BigInt 编码为 32 字节（64 个十六进制字符），uint8 编码为 1 字节（2 个十六进制字符）
        val rEncoded = EthereumUtils.encodeUint256(rBigInt)  // 64 个十六进制字符
        val sEncoded = EthereumUtils.encodeUint256(sBigInt)  // 64 个十六进制字符
        val vEncoded = String.format("%02x", vInt)  // 2 个十六进制字符
-        
+
        return "0x$rEncoded$sEncoded$vEncoded"
    }

@@ -504,13 +508,13 @@ class RelayClientService(
            val messageWithPrefix = ByteArray(prefix.size + safeTxStructuredHash.size)
            System.arraycopy(prefix, 0, messageWithPrefix, 0, prefix.size)
            System.arraycopy(safeTxStructuredHash, 0, messageWithPrefix, prefix.size, safeTxStructuredHash.size)
-            
+
            // 对带前缀的消息进行 keccak256 哈希
            val keccak256 = org.bouncycastle.crypto.digests.KeccakDigest(256)
            keccak256.update(messageWithPrefix, 0, messageWithPrefix.size)
            val hashWithPrefix = ByteArray(keccak256.digestSize)
            keccak256.doFinal(hashWithPrefix, 0)
-            
+
            val ecKeyPair = org.web3j.crypto.ECKeyPair.create(privateKeyBigInt)
            val safeSignature = org.web3j.crypto.Sign.signMessage(hashWithPrefix, ecKeyPair, false)

@@ -572,7 +576,8 @@ class RelayClientService(
        redeemCallData: String,
        safeSignatureHex: String
    ): String {
-        val execFunctionSelector = EthereumUtils.getFunctionSelector("execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)")
+        val execFunctionSelector =
+            EthereumUtils.getFunctionSelector("execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)")

        val encodedTo = EthereumUtils.encodeAddress(safeTx.to)
        val encodedValue = EthereumUtils.encodeUint256(BigInteger.ZERO)
@@ -600,20 +605,20 @@ class RelayClientService(
        val encodedSignatures = safeSignatureHex

        return "0x" + execFunctionSelector.removePrefix("0x") +
-            encodedTo +
-            encodedValue +
-            encodedDataOffset +
-            encodedDataLength +
-            encodedData +
-            encodedOperation +
-            encodedSafeTxGas +
-            encodedBaseGas +
-            encodedGasPrice +
-            encodedGasToken +
-            encodedRefundReceiver +
-            encodedSignaturesOffset +
-            encodedSignaturesLength +
-            encodedSignatures
+                encodedTo +
+                encodedValue +
+                encodedDataOffset +
+                encodedDataLength +
+                encodedData +
+                encodedOperation +
+                encodedSafeTxGas +
+                encodedBaseGas +
+                encodedGasPrice +
+                encodedGasToken +
+                encodedRefundReceiver +
+                encodedSignaturesOffset +
+                encodedSignaturesLength +
+                encodedSignatures
    }

    /**
@@ -7,6 +7,7 @@ import com.wrbug.polymarketbot.api.GitHubApi
 import com.wrbug.polymarketbot.api.PolymarketClobApi
 import com.wrbug.polymarketbot.api.PolymarketDataApi
 import com.wrbug.polymarketbot.api.PolymarketGammaApi
+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import okhttp3.HttpUrl
 import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.Interceptor
@@ -18,7 +19,6 @@ import okhttp3.Response
 import okio.Buffer
 import java.util.concurrent.TimeUnit
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
@@ -34,10 +34,6 @@ import jakarta.annotation.PreDestroy
 */
@Component
 class RetrofitFactory(
-    @Value("\${polymarket.clob.base-url}")
-    private val clobBaseUrl: String,
-    @Value("\${polymarket.gamma.base-url}")
-    private val gammaBaseUrl: String,
    private val gson: Gson
 ) {
    
@@ -58,10 +54,10 @@ class RetrofitFactory(
    
    // 缓存 Gamma API 客户端（单例）
    private val gammaApi: PolymarketGammaApi by lazy {
-        val baseUrl = if (gammaBaseUrl.endsWith("/")) {
-            gammaBaseUrl.dropLast(1)
+        val baseUrl = if (PolymarketConstants.GAMMA_BASE_URL.endsWith("/")) {
+            PolymarketConstants.GAMMA_BASE_URL.dropLast(1)
        } else {
-            gammaBaseUrl
+            PolymarketConstants.GAMMA_BASE_URL
        }
        
        Retrofit.Builder()
@@ -74,7 +70,7 @@ class RetrofitFactory(
    
    // 缓存 Data API 客户端（单例）
    private val dataApi: PolymarketDataApi by lazy {
-        val baseUrl = "https://data-api.polymarket.com"
+        val baseUrl = PolymarketConstants.DATA_API_BASE_URL
        
        Retrofit.Builder()
            .baseUrl("$baseUrl/")
@@ -113,7 +109,7 @@ class RetrofitFactory(
    // 缓存不带认证的 CLOB API 客户端（单例）
    private val clobApiWithoutAuth: PolymarketClobApi by lazy {
        Retrofit.Builder()
-            .baseUrl(clobBaseUrl)
+            .baseUrl(PolymarketConstants.CLOB_BASE_URL)
            .client(sharedOkHttpClient)
            .addConverterFactory(GsonConverterFactory.create(gson))
            .build()
@@ -158,7 +154,7 @@ class RetrofitFactory(
                .build()
            
            Retrofit.Builder()
-                .baseUrl(clobBaseUrl)
+                .baseUrl(PolymarketConstants.CLOB_BASE_URL)
                .client(okHttpClient)
                .addConverterFactory(GsonConverterFactory.create(gson))
                .build()
@@ -1,7 +1,7 @@
 package com.wrbug.polymarketbot.websocket

+import com.wrbug.polymarketbot.constants.PolymarketConstants
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Component
 import org.springframework.web.socket.*
 import java.util.concurrent.ConcurrentHashMap
@@ -15,8 +15,7 @@ class PolymarketWebSocketHandler : WebSocketHandler {
    
    private val logger = LoggerFactory.getLogger(PolymarketWebSocketHandler::class.java)
    
-    @Value("\${polymarket.rtds.ws-url}")
-    private lateinit var polymarketWsUrl: String
+    private val polymarketWsUrl: String = PolymarketConstants.RTDS_WS_URL
    
    // 存储客户端会话和对应的 Polymarket 连接的映射
    private val clientSessions = ConcurrentHashMap<String, WebSocketSession>()
@@ -35,18 +35,14 @@ logging.level.com.wrbug.polymarketbot=${LOG_LEVEL_APP:INFO}
 logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss} - %msg%n

 # Polymarket API 配置
-polymarket.clob.base-url=https://clob.polymarket.com
-polymarket.rtds.ws-url=wss://ws-subscriptions-clob.polymarket.com
-polymarket.websocket.url=wss://ws-live-data.polymarket.com
-polymarket.websocket.activity.url=${POLYMARKET_WEBSOCKET_ACTIVITY_URL:wss://ws-live-data.polymarket.com}
-polymarket.data-api.base-url=https://data-api.polymarket.com
-polymarket.gamma.base-url=https://gamma-api.polymarket.com
+# 注意：Polymarket API URL 现在使用代码常量（PolymarketConstants），不再从配置文件读取
+# 如需修改，请修改 com.wrbug.polymarketbot.constants.PolymarketConstants 类

 # Builder Relayer 配置（用于 Gasless 交易）
 # 从 polymarket.com/settings?tab=builder 获取 Builder API 凭证
 # Builder API Key、Secret、Passphrase 现在通过系统设置页面配置，存储在数据库中
 # 如果未配置，将使用手动发送交易的方式（需要用户支付 gas）
-polymarket.builder.relayer-url=${POLYMARKET_BUILDER_RELAYER_URL:https://relayer-v2.polymarket.com/}
+# 注意：Builder Relayer URL 现在使用代码常量（PolymarketConstants.BUILDER_RELAYER_URL），不再从配置文件读取

 # 跟单轮询配置
 # 轮询间隔（毫秒），默认2秒
@@ -399,8 +399,8 @@ CopyOrderTrackingService.processTrade(
 ### 5.1 application.properties

 ```properties
-# Polymarket WebSocket
-polymarket.websocket.url=wss://ws-live-data.polymarket.com
+# 注意：Polymarket API URL 现在使用代码常量（PolymarketConstants），不再从配置文件读取
+# 如需修改，请修改 com.wrbug.polymarketbot.constants.PolymarketConstants 类

 # 监听策略
 copy.trading.monitor.strategy=dual
Author	SHA1	Message	Date
WrBug	64391503c2	fix: 修复最大仓位金额未生效和交易receipt解析问题 1. 修复 CopyTradingFilterService 中最大仓位金额(maxPositionValue)未生效的问题 - 当只配置了最大仓位金额但未配置 maxSpread 或 minOrderDepth 时，仓位检查被跳过导致过滤失效 - 将仓位检查移到 needOrderbook 判断之前，确保始终执行仓位检查 2. 修复 OnChainWsService 中交易 receipt 为 JsonNull 时的空指针问题 - 添加 JsonNull 检查，防止解析失败时出现异常	2026-01-14 05:04:31 +08:00
WrBug	92b75d1926	refactor: 将 Polymarket API URL 配置改为代码常量 - 创建 PolymarketConstants 常量类，集中管理所有 Polymarket API URL - 更新所有服务类，将配置注入改为使用常量： * ApiHealthCheckService: 移除配置注入，使用常量 * RetrofitFactory: 移除 CLOB 和 Gamma API URL 配置注入 * RelayClientService: 移除 Builder Relayer URL 配置注入 * BlockchainService: 移除 Data API URL 配置注入 * PolymarketApiKeyService: 移除 CLOB API URL 配置注入 * RetrofitConfig: 移除 CLOB API URL 配置注入 * OrderPushService: 移除 RTDS WebSocket URL 配置注入 * PolymarketActivityWsService: 移除 Activity WebSocket URL 配置注入 * CopyTradingWebSocketService: 移除 User WebSocket URL 配置注入 * PolymarketWebSocketHandler: 移除 RTDS WebSocket URL 配置注入 * UnifiedOnChainWsService: 添加连接状态查询方法 - 从 application.properties 移除相关配置项，添加说明注释 - 完善 API 健康检查，添加缺失的检测项： * Polymarket Activity WebSocket * 链上 WebSocket - 更新相关文档说明	2026-01-13 16:07:19 +08:00
WrBug	e072d0c894	feat: 添加 Activity WebSocket 消息超时检测和自动重连机制 - 添加 lastActivityTime 变量记录最后一次收到 activity 消息的时间 - 实现 startActivityTimeoutCheck() 方法，每30秒检查一次消息接收情况 - 如果超过30秒未收到 activity 消息，自动触发 WebSocket 重连 - 在订阅成功后自动启动超时检测任务 - 在 stop() 方法中正确清理检测任务资源	2026-01-13 16:04:20 +08:00
WrBug	3a78a84610	fix: 修复 v1.1.10 版本下单成功不发送通知的问题 - 移除 OrderStatusUpdateService 中错误的双重检查逻辑 - 修复买入订单和卖出订单通知逻辑 - 确保在标记为已发送后立即发送通知 - 问题：保存 notificationSent=true 后立即查询检查，导致通知永远被跳过 - 修复：改为标记后直接发送通知，利用数据库状态防止并发重复	2026-01-13 03:38:05 +08:00