diff --git a/README.md b/README.md index ab6be2d..c3ee8e3 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,15 @@ API参考官方C++版本的接口文档https://xtp.zts.com.cn/home - 如果您的linux是glibc2.12版本，请先手工将cpp/lib/linux_glibc2.12下的两个dll覆盖到cpp/lib/linux下，默认cpp/lib/linux下是同cpp/lib/linux_glibc2.14一样的glibc2.14版本编译的 + 如果您的linux是glibc2.12版本，请先手工将cpp/lib/linux_glibc2.12下的两个dll覆盖到cpp/lib/linsux下，默认cpp/lib/linux下是同cpp/lib/linux_glibc2.14一样的glibc2.14版本编译的 #Version history + v1.1.18.19-1.0.5 1.将java api中OrderResponse和OrderCancelResponse中的撤单id + 2.orderCancelXtpId由int改为String；扩充EtfReplaceType的枚举类型 + + v1.1.18.19-1.0.4 1.解决queryAllTicker响应异常问题 + v1.1.18.19-1.0.3 1.解决逐笔崩溃问题、解决逐笔与其他行情同时订阅崩溃问题 v1.1.18.19-1.0.2 1.增加trade的SetHeartBeatInterval、GetTradingDay、GetApiVersion、GetClientIDByXTPID、GetAccountByXTPID接口 diff --git a/build/libs/linux/usr/local/lib/libtradeplugin.so b/build/libs/linux/usr/local/lib/libtradeplugin.so index c20d296..e626af9 100644 Binary files a/build/libs/linux/usr/local/lib/libtradeplugin.so and b/build/libs/linux/usr/local/lib/libtradeplugin.so differ diff --git a/build/libs/macosx/usr/local/lib/libquoteplugin.dylib b/build/libs/macosx/usr/local/lib/libquoteplugin.dylib index 7b0c6c5..bfd8e63 100644 Binary files a/build/libs/macosx/usr/local/lib/libquoteplugin.dylib and b/build/libs/macosx/usr/local/lib/libquoteplugin.dylib differ diff --git a/build/libs/macosx/usr/local/lib/libtradeplugin.dylib b/build/libs/macosx/usr/local/lib/libtradeplugin.dylib index 492a755..d1aacd8 100644 Binary files a/build/libs/macosx/usr/local/lib/libtradeplugin.dylib and b/build/libs/macosx/usr/local/lib/libtradeplugin.dylib differ diff --git a/build/libs/win32/Windows/System32/quoteplugin.dll b/build/libs/win32/Windows/System32/quoteplugin.dll index a431737..d141cb3 100644 Binary files a/build/libs/win32/Windows/System32/quoteplugin.dll and b/build/libs/win32/Windows/System32/quoteplugin.dll differ diff --git a/build/libs/win32/Windows/System32/tradeplugin.dll b/build/libs/win32/Windows/System32/tradeplugin.dll index 4a9e0eb..3b8c8d7 100644 Binary files a/build/libs/win32/Windows/System32/tradeplugin.dll and b/build/libs/win32/Windows/System32/tradeplugin.dll differ diff --git a/build/libs/win64/Windows/System32/quoteplugin.dll b/build/libs/win64/Windows/System32/quoteplugin.dll index 70f36fe..f2388f0 100644 Binary files a/build/libs/win64/Windows/System32/quoteplugin.dll and b/build/libs/win64/Windows/System32/quoteplugin.dll differ diff --git a/build/libs/win64/Windows/System32/tradeplugin.dll b/build/libs/win64/Windows/System32/tradeplugin.dll index b71f0f3..c4ea8fe 100644 Binary files a/build/libs/win64/Windows/System32/tradeplugin.dll and b/build/libs/win64/Windows/System32/tradeplugin.dll differ diff --git a/build/libs/xtpapi-1.1.18.19.jar b/build/libs/xtpapi-1.1.18.19.jar index 1a54467..98de580 100644 Binary files a/build/libs/xtpapi-1.1.18.19.jar and b/build/libs/xtpapi-1.1.18.19.jar differ diff --git a/cpp/buildcpp/linux/libtradeplugin.so b/cpp/buildcpp/linux/libtradeplugin.so index c20d296..e626af9 100644 Binary files a/cpp/buildcpp/linux/libtradeplugin.so and b/cpp/buildcpp/linux/libtradeplugin.so differ diff --git a/cpp/buildcpp/macosx/libquoteplugin.dylib b/cpp/buildcpp/macosx/libquoteplugin.dylib index 7b0c6c5..bfd8e63 100644 Binary files a/cpp/buildcpp/macosx/libquoteplugin.dylib and b/cpp/buildcpp/macosx/libquoteplugin.dylib differ diff --git a/cpp/buildcpp/macosx/libtradeplugin.dylib b/cpp/buildcpp/macosx/libtradeplugin.dylib index 492a755..d1aacd8 100644 Binary files a/cpp/buildcpp/macosx/libtradeplugin.dylib and b/cpp/buildcpp/macosx/libtradeplugin.dylib differ diff --git a/cpp/buildcpp/win32/quoteplugin.dll b/cpp/buildcpp/win32/quoteplugin.dll index a431737..d141cb3 100644 Binary files a/cpp/buildcpp/win32/quoteplugin.dll and b/cpp/buildcpp/win32/quoteplugin.dll differ diff --git a/cpp/buildcpp/win32/tradeplugin.dll b/cpp/buildcpp/win32/tradeplugin.dll index 4a9e0eb..3b8c8d7 100644 Binary files a/cpp/buildcpp/win32/tradeplugin.dll and b/cpp/buildcpp/win32/tradeplugin.dll differ diff --git a/cpp/buildcpp/win64/quoteplugin.dll b/cpp/buildcpp/win64/quoteplugin.dll index 70f36fe..f2388f0 100644 Binary files a/cpp/buildcpp/win64/quoteplugin.dll and b/cpp/buildcpp/win64/quoteplugin.dll differ diff --git a/cpp/buildcpp/win64/tradeplugin.dll b/cpp/buildcpp/win64/tradeplugin.dll index b71f0f3..c4ea8fe 100644 Binary files a/cpp/buildcpp/win64/tradeplugin.dll and b/cpp/buildcpp/win64/tradeplugin.dll differ diff --git a/cpp/src/XtpTradeApi.cpp b/cpp/src/XtpTradeApi.cpp index 80c8e1f..d32bb30 100644 --- a/cpp/src/XtpTradeApi.cpp +++ b/cpp/src/XtpTradeApi.cpp @@ -1121,8 +1121,9 @@ void Trade::generateOrderInfoObj(JNIEnv* env, jobject& tradeOrderInfoObj,XTPOrde env->CallVoidMethod(tradeOrderInfoObj, jm_setOrderCancelClientId, order_info->order_cancel_client_id); //call setOrderCancelXtpId - jmethodID jm_setOrderCancelXtpId = env->GetMethodID(trade_order_info_class_, "setOrderCancelXtpId", "(I)V"); - env->CallVoidMethod(tradeOrderInfoObj, jm_setOrderCancelXtpId, order_info->order_cancel_xtp_id); + jmethodID jm_setOrderCancelXtpId = env->GetMethodID(trade_order_info_class_, "setOrderCancelXtpId", "(Ljava/lang/String;)V"); + jstring orderCancelXtpIdStr = env->NewStringUTF((std::to_string(order_info->order_cancel_xtp_id)).c_str()); + env->CallVoidMethod(tradeOrderInfoObj, jm_setOrderCancelXtpId, orderCancelXtpIdStr); //call setTicker jmethodID jm_setTicker = env->GetMethodID(trade_order_info_class_, "setTicker", "(Ljava/lang/String;)V"); @@ -1229,8 +1230,9 @@ void Trade::generateCancelInfoObj(JNIEnv* env, jobject& tradeCancelOrderInfoObj, jstring orderXtpIdStr = env->NewStringUTF((std::to_string(cancel_info->order_xtp_id)).c_str()); env->CallVoidMethod(tradeCancelOrderInfoObj, jm_setOrderXtpId, orderXtpIdStr); - jmethodID jm_setOrderCancelXtpId = env->GetMethodID(order_cancel_info_class_, "setOrderCancelXtpId", "(I)V"); - env->CallVoidMethod(tradeCancelOrderInfoObj, jm_setOrderCancelXtpId, cancel_info->order_cancel_xtp_id); + jmethodID jm_setOrderCancelXtpId = env->GetMethodID(order_cancel_info_class_, "setOrderCancelXtpId", "(Ljava/lang/String;)V"); + jstring orderCancelXtpIdStr = env->NewStringUTF((std::to_string(cancel_info->order_cancel_xtp_id)).c_str()); + env->CallVoidMethod(tradeCancelOrderInfoObj, jm_setOrderCancelXtpId, orderCancelXtpIdStr); //call setRequestId jmethodID jm_setRequestId = env->GetMethodID(order_cancel_info_class_, "setRequestId", "(I)V"); diff --git a/src/main/java/com/zts/xtp/common/enums/EtfReplaceType.java b/src/main/java/com/zts/xtp/common/enums/EtfReplaceType.java index a0b703c..308895e 100644 --- a/src/main/java/com/zts/xtp/common/enums/EtfReplaceType.java +++ b/src/main/java/com/zts/xtp/common/enums/EtfReplaceType.java @@ -11,7 +11,14 @@ public enum EtfReplaceType { ERT_CASH_OPTIONAL, /**必须现金替代*/ ERT_CASH_MUST, + /**深市退补现金替代*/ + ERT_CASH_RECOMPUTE_INTER_SZ, + /**深市必须现金替代*/ + ERT_CASH_MUST_INTER_SZ, + /**非沪深市场成分证券退补现金替代*/ + ERT_CASH_RECOMPUTE_INTER_OTHER, + /**表示非沪深市场成份证券必须现金替代*/ + ERT_CASH_MUST_INTER_OTHER, /**无效值*/ EPT_INVALID; - } diff --git a/src/main/java/com/zts/xtp/quote/model/response/TickerInfoResponse.java b/src/main/java/com/zts/xtp/quote/model/response/TickerInfoResponse.java index 5d74f33..8cd189d 100644 --- a/src/main/java/com/zts/xtp/quote/model/response/TickerInfoResponse.java +++ b/src/main/java/com/zts/xtp/quote/model/response/TickerInfoResponse.java @@ -59,7 +59,7 @@ public void setTickerType(int tickerType) { this.tickerType = TickerType.XTP_TICKER_TYPE_UNKNOWN; System.err.println("Error: TickerInfoResponse received TickerType value exceed TickerType enum size, receive="+tickerType); }else{ - this.tickerType = TickerType.values()[tickerType - 1]; + this.tickerType = TickerType.values()[tickerType]; } } } diff --git a/src/main/java/com/zts/xtp/trade/model/response/OrderCancelResponse.java b/src/main/java/com/zts/xtp/trade/model/response/OrderCancelResponse.java index f8b0b4f..bf6cf3e 100644 --- a/src/main/java/com/zts/xtp/trade/model/response/OrderCancelResponse.java +++ b/src/main/java/com/zts/xtp/trade/model/response/OrderCancelResponse.java @@ -14,7 +14,7 @@ public class OrderCancelResponse { /**撤单XTPID*/ - private int orderCancelXtpId; + private String orderCancelXtpId; /**原始订单XTPID*/ private String orderXtpId; /**此消息响应函数对应的请求ID*/ @@ -26,8 +26,8 @@ public class OrderCancelResponse { public String toString(){ return "OrderCancelResponse [ "+ "orderXtpId:"+orderXtpId+ - "orderCancelXtpId"+orderCancelXtpId+ - "requestId"+requestId+ - "lastResp"+lastResp; + " orderCancelXtpId:"+orderCancelXtpId+ + " requestId:"+requestId+ + " lastResp:"+lastResp+" ]"; } } diff --git a/src/main/java/com/zts/xtp/trade/model/response/OrderResponse.java b/src/main/java/com/zts/xtp/trade/model/response/OrderResponse.java index a5f707c..c71ed60 100644 --- a/src/main/java/com/zts/xtp/trade/model/response/OrderResponse.java +++ b/src/main/java/com/zts/xtp/trade/model/response/OrderResponse.java @@ -27,7 +27,7 @@ public class OrderResponse { /**报单操作引用，用户自定义*/ private int orderCancelClientId; /**撤单在XTP系统中的id，在XTP系统中唯一*/ - private int orderCancelXtpId; + private String orderCancelXtpId; /**合约代码*/ private String ticker; /**交易市场*/ pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy