版本 1.1.2

适配 KTrader-Broker-API v1.1.2 更新
CtpTdApi 增加登录超时机制、登录进度消息推送
规范错误信息推送

Author: RationalityFrontline

README.md

@@ -139,7 +139,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.rationalityfrontline.ktrader:ktrader-broker-ctp:1.1.1")
+    implementation("org.rationalityfrontline.ktrader:ktrader-broker-ctp:1.1.2")
     // 如果需要使用其它版本的 JCTP，取消注释下面一行，并填入自己需要的版本号
 //    implementation("org.rationalityfrontline:jctp") { version { strictly("6.6.1_P1_CP-1.0.0") } }
 }
@@ -151,11 +151,11 @@ dependencies {
 <dependency>
     <groupId>org.rationalityfrontline.ktrader</groupId>
     <artifactId>ktrader-broker-ctp</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 </dependency>
 ```
 
-插件下载：
+**插件下载：**
 
 [Releases](https://github.com/ktrader-tech/ktrader-broker-ctp/releases)
 

examples/library-basic/app/build.gradle.kts

@@ -8,7 +8,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.rationalityfrontline.ktrader:ktrader-broker-ctp:1.1.1")
+    implementation("org.rationalityfrontline.ktrader:ktrader-broker-ctp:1.1.2")
     // 如果需要使用其它版本的 JCTP，取消注释下面一行，并填入自己需要的版本号
 //    implementation("org.rationalityfrontline:jctp") { version { strictly("6.6.1_P1_CP-1.0.0") } }
 }

examples/library-basic/app/src/main/kotlin/com/example/basic/App.kt

@@ -32,7 +32,7 @@ fun main() {
         val brokerEvent = event.data
         when (brokerEvent.type) {
             // Tick 推送
-            BrokerEventType.MD_TICK -> {
+            BrokerEventType.TICK -> {
                 val tick = brokerEvent.data as Tick
                 // 当某合约触及涨停价时，以跌停价挂1手多单开仓限价委托单
                 if (tick.lastPrice == tick.todayHighLimitPrice) {

examples/plugin-basic/app/build.gradle.kts

@@ -10,7 +10,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
     implementation("org.rationalityfrontline.workaround:pf4j:3.7.0")
-    implementation("org.rationalityfrontline.ktrader:ktrader-broker-api:1.1.1")
+    implementation("org.rationalityfrontline.ktrader:ktrader-broker-api:1.1.2")
 }
 
 application {

examples/plugin-basic/app/src/main/kotlin/com/example/basic/App.kt

@@ -52,7 +52,7 @@ fun main() {
             val brokerEvent = event.data
             when (brokerEvent.type) {
                 // Tick 推送
-                BrokerEventType.MD_TICK -> {
+                BrokerEventType.TICK -> {
                     val tick = brokerEvent.data as Tick
                 }
                 // 其它事件（网络连接、订单回报、成交回报等）

lib/build.gradle.kts

@@ -9,15 +9,15 @@ plugins {
 }
 
 group = "org.rationalityfrontline.ktrader"
-version = "1.1.1"
+version = "1.1.2"
 val NAME = "ktrader-broker-ctp"
 val DESC = "CTP implementation of KTrader-Broker-API"
 val GITHUB_REPO = "ktrader-tech/ktrader-broker-ctp"
 
 val pluginClass = "org.rationalityfrontline.ktrader.broker.ctp.CtpBrokerPlugin"
 val pluginId = "broker-ctp-rf"
 val pluginVersion = version as String
-val pluginRequires = "1.1.1"
+val pluginRequires = "1.1.2"
 val pluginDescription = DESC
 val pluginProvider = "RationalityFrontline"
 val pluginLicense = "Apache License 2.0"

lib/src/main/kotlin/org/rationalityfrontline/ktrader/broker/ctp/CtpMdApi.kt

@@ -219,7 +219,7 @@ internal class CtpMdApi(val config: CtpConfig, val kEvent: KEvent, val sourceId:
                 val errorInfo = "${pRspInfo.errorMsg}, requestId=$nRequestID, isLast=$bIsLast"
                 val connectRequests = requestMap.values.filter { it.tag == "connect" }
                 if (connectRequests.isEmpty()) {
-                    postBrokerEvent(BrokerEventType.MD_ERROR, errorInfo)
+                    postBrokerEvent(BrokerEventType.ERROR, "【行情接口发生错误】$errorInfo")
                 } else {
                     resumeRequestsWithException("connect", errorInfo)
                 }
@@ -275,7 +275,7 @@ internal class CtpMdApi(val config: CtpConfig, val kEvent: KEvent, val sourceId:
                 if (subscriptions.isNotEmpty() && tradingDay == pRspUserLogin.tradingDay) {
                     runBlocking {
                         runWithRetry({ subscribeMarketData(subscriptions.toList(), mapOf("isForce" to true)) }, { e ->
-                            postBrokerEvent(BrokerEventType.MD_ERROR, "重连后自动订阅行情失败：$e")
+                            postBrokerEvent(BrokerEventType.ERROR, "【行情接口发生错误】重连后自动订阅行情失败：$e")
                         })
                     }
                 }
@@ -284,7 +284,7 @@ internal class CtpMdApi(val config: CtpConfig, val kEvent: KEvent, val sourceId:
                     subscriptions.clear()
                     tradingDay = pRspUserLogin.tradingDay
                 }
-                postBrokerEvent(BrokerEventType.MD_USER_LOGGED_IN, Unit)
+                postBrokerEvent(BrokerEventType.MD_LOGGED_IN, Unit)
                 resumeRequests("connect", Unit)
             }, { errorCode, errorMsg ->
                 resumeRequestsWithException("connect", "请求用户登录失败：$errorMsg ($errorCode)")
@@ -357,11 +357,11 @@ internal class CtpMdApi(val config: CtpConfig, val kEvent: KEvent, val sourceId:
             val code = getCode(data.instrumentID)
             val lastTick = lastTicks[code]
             val newTick = Translator.tickC2A(code, data, lastTick, tdApi.instruments[code]?.volumeMultiple, tdApi.getInstrumentStatus(code)) { e ->
-                postBrokerEvent(BrokerEventType.MD_ERROR, "OnRtnDepthMarketData updateTime 解析失败：$code, ${data.updateTime}.${data.updateMillisec}, $e")
+                postBrokerEvent(BrokerEventType.ERROR, "【行情接口发生错误】OnRtnDepthMarketData updateTime 解析失败：$code, ${data.updateTime}.${data.updateMillisec}, $e")
             }
             lastTicks[code] = newTick
             // 过滤掉订阅时自动推送的第一笔数据
-            if (lastTick != null) postBrokerEvent(BrokerEventType.MD_TICK, newTick)
+            if (lastTick != null) postBrokerEvent(BrokerEventType.TICK, newTick)
         }
     }
 }