8000 update · coderhxt/bitmax-client-api@f940676 · GitHub
[go: up one dir, main page]
Skip to content

Commit f940676

Browse files
author
xiaotian.huang
committed
update
1 parent 4e8964f commit f940676

File tree

12 files changed

+87
-36
lines changed
  • test/java/com/bitmax/api/client

    • 12 files changed

    +87
    -36
    lines changed

    ‎src/main/java/com/bitmax/api/client/domain/BasicOrderData.java

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -11,5 +11,5 @@
    1111
    @Setter @Getter
    1212
    public class BasicOrderData extends BaseResp {
    1313
    @JsonProperty("data")
    14-
    private OrderDetail orderData;
    14+
    private HistoryOrder orderData;
    1515
    }

    ‎src/main/java/com/bitmax/api/client/DepositAddressResp.java renamed to ‎src/main/java/com/bitmax/api/client/domain/DepositAddressResp.java

    Lines changed: 1 addition & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,6 +1,5 @@
    1-
    package com.bitmax.api.client;
    1+
    package com.bitmax.api.client.domain;
    22

    3-
    import com.bitmax.api.client.domain.BaseResp;
    43
    import com.fasterxml.jackson.annotation.JsonProperty;
    54
    import lombok.Getter;
    65
    import lombok.Setter;

    ‎src/main/java/com/bitmax/api/client/domain/FillsOrderResp.java

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -14,5 +14,5 @@
    1414
    public class FillsOrderResp extends BaseResp {
    1515

    1616
    @JsonProperty("data")
    17-
    private List<OrderDetail> fillOrder;
    17+
    private List<OrderData> fillOrder;
    1818
    }

    ‎src/main/java/com/bitmax/api/client/NumericAddress.java renamed to ‎src/main/java/com/bitmax/api/client/domain/NumericAddress.java

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1,4 +1,4 @@
    1-
    package com.bitmax.api.client;
    1+
    package com.bitmax.api.client.domain;
    22

    33
    import lombok.Getter;
    44
    import lombok.Setter;

    ‎src/main/java/com/bitmax/api/client/domain/OrderData.java

    Lines changed: 54 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,54 @@
    1+
    package com.bitmax.api.client.domain;
    2+
    3+
    import com.fasterxml.jackson.annotation.JsonProperty;
    4+
    import lombok.Getter;
    5+
    import lombok.Setter;
    6+
    7+
    /**
    8+
    * @author xiaotian.huang
    9+
    * @date 2019-05-24
    10+
    */
    11+
    @Setter @Getter
    12+
    public class OrderData {
    13+
    @JsonProperty("m")
    14+
    private String messageType;
    15+
    private String execId;
    16+
    private String coid;
    17+
    private String origCoid;
    18+
    private String orderType;
    19+
    @JsonProperty("s")
    20+
    private String symbol;
    21+
    @JsonProperty("t")
    22+
    private long time;
    23+
    @JsonProperty("p")
    24< F438 code class="diff-text syntax-highlighted-line addition">+
    private String orderPrice;
    25+
    @JsonProperty("sp")
    26+
    private String stopPrice;
    27+
    @JsonProperty("q")
    28+
    private String orderQty;
    29+
    private String l;
    30+
    @JsonProperty("f")
    31+
    private String filledQty;
    32+
    @JsonProperty("ap")
    33+
    private String avgPrice;
    34+
    @JsonProperty("bb")
    35+
    private String baseAssetTotalBalance;
    36+
    @JsonProperty("bpb")
    37+
    private String baseAssetPendingBalance;
    38+
    @JsonProperty("qb")
    39+
    private String quoteAssetTotalBalance;
    40+
    @JsonProperty("qpb")
    41+
    private String quoteAssetPendingBalance;
    42+
    private String fee;
    43+
    @JsonProperty("fa")
    44+
    private String feeAssset;
    45+
    private String bc;
    46+
    private String btmxBal;
    47+
    private String side;
    48+
    private String status;
    49+
    private String errorCode;
    50+
    @JsonProperty("cat")
    51+
    private String accountCategory;
    52+
    @JsonProperty("ei")
    53+
    private String executionInstruction;
    54+
    }

    ‎src/main/java/com/bitmax/api/client/exception/BitmaxApiException.java

    Lines changed: 0 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -19,10 +19,6 @@ public BitmaxApiException(BitmaxApiError error) {
    1919
    this.error = error;
    2020
    }
    2121

    22-
    public BitmaxApiException() {
    23-
    super();
    24-
    }
    25-
    2622
    public BitmaxApiException(String message) {
    2723
    super(message);
    2824
    }

    ‎src/main/java/com/bitmax/api/client/impl/BitmaxApiRestClientImpl.java

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -2,7 +2,7 @@
    22

    33
    import com.bitmax.api.client.BitmaxApiRestClient;
    44
    import com.bitmax.api.client.BitmaxApiService;
    5-
    import com.bitmax.api.client.DepositAddressResp;
    5+
    import com.bitmax.api.client.domain.DepositAddressResp;
    66
    import com.bitmax.api.client.domain.*;
    77
    import org.apache.commons.lang3.StringUtils;
    88

    ‎src/main/java/com/bitmax/api/client/impl/BitmaxWebSocketBootStrap.java

    Lines changed: 3 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -75,19 +75,20 @@ private void checkPong() {
    7575
    scheduledThreadPoolExecutor.scheduleAtFixedRate(() -> {
    7676
    Long localValue = localCounter.get(buildKey());
    7777
    if (localValue.longValue() == pongCounter.get(buildKey()).getCount()) {
    78-
    logCallBack.printLog("一分钟没有收到pong, 服务端断开准备重连");
    78+
    logCallBack.printLog(buildKey() + "一分钟没有收到pong, 服务端断开准备重连");
    7979
    pongCounter.get(buildKey()).getWebSocket().close(1000, null);
    8080
    pongCounter.get(buildKey()).reset();
    8181
    //
    8282
    restart();
    83-
    logCallBack.printLog("重新订阅");
    83+
    logCallBack.printLog(buildKey() + "重新订阅");
    8484
    } else {
    8585
    localValue = pongCounter.get(buildKey()).getCount();
    8686
    localCounter.put(buildKey(), localValue);
    8787
    logCallBack.printLog(buildKey() + "收到服务端pong次数: " + localValue);
    8888
    }
    8989
    }, 20, 15, TimeUnit.SECONDS);
    9090
    }
    91+
    9192
    private String buildKey() {
    9293
    return webSocketType + ":" + symbol;
    9394
    }

    ‎src/test/java/com/bitmax/api/client/impl/BitmaxApiRestClientImplTest.java

    Lines changed: 18 additions & 18 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,7 +3,6 @@
    33
    import com.bitmax.api.client.BaseTest;
    44
    import com.bitmax.api.client.BitmaxApiClientFactory;
    55
    import com.bitmax.api.client.BitmaxApiRestClient;
    6-
    import com.bitmax.api.client.DepositAddressResp;
    76
    import com.bitmax.api.client.domain.*;
    87
    import com.bitmax.api.client.util.OrderIdWorker;
    98
    import org.junit.Before;
    @@ -19,7 +18,8 @@ public class BitmaxApiRestClientImplTest extends BaseTest {
    1918

    2019
    @Before
    2120
    public void setup() {
    22-
    bitmaxApiRestClient = BitmaxApiClientFactory.newInstance("api-key","secret")
    21+
    bitmaxApiRestClient = BitmaxApiClientFactory.newInstance("your-api-key",
    22+
    "your-secret")
    2323
    .newRestClient();
    2424
    }
    2525

    @@ -129,21 +129,21 @@ public void depositWithdrawHistory() {
    129129

    130130
    @Test
    131131
    public void placeNewOrder() {
    132-
    OrderReq orderReq = OrderReq.builder().coid("cash123456789")
    132+
    OrderReq orderReq = OrderReq.builder().coid("cash05001")
    133133
    .time(System.currentTimeMillis())
    134-
    .orderPrice("13.5")
    135-
    .stopPrice("15.7")
    136-
    .orderQty("3.5")
    134+
    .orderPrice("7001")
    135+
    // .stopPrice("15.7")
    136+
    .orderQty("0.002")
    137137
    .orderType("limit")
    138138
    .side("buy")
    139-
    .postOnly(true)
    140-
    .timeInForce("GTC")
    141-
    .symbol("ETH/BTC")
    139+
    // .postOnly(true)
    140+
    // .timeInForce("GTC")
    141+
    .symbol("BTC/USDT")
    142142
    .build();
    143143
    OrderResp orderResp = bitmaxApiRestClient.placeNewOrder(2, OrderType.CASH, orderReq);
    144144
    super.toPrettyShow(orderResp);
    145-
    OrderResp orderResp1 = bitmaxApiRestClient.placeNewOrder(2, OrderType.MARGIN, orderReq);
    146-
    super.toPrettyShow(orderResp1);
    145+
    // OrderResp orderResp1 = bitmaxApiRestClient.placeNewOrder(2, OrderType.MARGIN, orderReq);
    146+
    // super.toPrettyShow(orderResp1);
    147147
    }
    148148

    149149

    @@ -179,14 +179,14 @@ public void placingMultipleOrdersFromTheCashAccount() {
    179179
    @Test
    180180
    public void cancelOrder() {
    181181
    CancelOrderReq cancelOrderReq = CancelOrderReq.builder().coid("cash123123")
    182-
    .origCoid("cash123456789")
    182+
    .origCoid("cash05001")
    183183
    .symbol("ETH/BTC")
    184184
    .time(System.currentTimeMillis())
    185185
    .build();
    186186
    CancelOrderResp cancelOrderResp = bitmaxApiRestClient.cancelOrder(2, OrderType.CASH, cancelOrderReq);
    187187
    super.toPrettyShow(cancelOrderResp);
    188-
    CancelOrderResp cancelOrderResp1 = bitmaxApiRestClient.cancelOrder(2, OrderType.MARGIN, cancelOrderReq);
    189-
    super.toPrettyShow(cancelOrderResp1);
    188+
    // CancelOrderResp cancelOrderResp1 = bitmaxApiRestClient.cancelOrder(2, OrderType.MARGIN, cancelOrderReq);
    189+
    // super.toPrettyShow(cancelOrderResp1);
    190190
    }
    191191

    192192

    @@ -218,8 +218,8 @@ public void cancelAllOpenOrder() {
    218218
    public void listOfAllOpenOrders() {
    219219
    AllOpenOrder allOpenOrder = bitmaxApiRestClient.listOfAllOpenOrders(2, OrderType.CASH);
    220220
    super.toPrettyShow(allOpenOrder);
    221-
    AllOpenOrder allOpenOrder1 = bitmaxApiRestClient.listOfAllOpenOrders(2, OrderType.MARGIN);
    222-
    super.toPrettyShow(allOpenOrder1);
    221+
    // AllOpenOrder allOpenOrder1 = bitmaxApiRestClient.listOfAllOpenOrders(2, OrderType.MARGIN);
    222+
    // super.toPrettyShow(allOpenOrder1);
    223223
    }
    224224

    225225
    @Test
    @@ -232,14 +232,14 @@ public void listHistoricalOrders() {
    232232

    233233
    @Test
    234234
    public void basicOrderDataOfOneOrder() {
    235-
    BasicOrderData basicOrderData = bitmaxApiRestClient.basicOrderDataOfOneOrder(2, "cash123123");
    235+
    BasicOrderData basicOrderData = bitmaxApiRestClient.basicOrderDataOfOneOrder(2, "cash05001");
    236236
    super.toPrettyShow(basicOrderData);
    237237
    }
    238238

    239239

    240240
    @Test
    241241
    public void fillsOfOneOrder() {
    242-
    FillsOrderResp fillsOrderResp = bitmaxApiRestClient.fillsOfOneOrder(2, "cash123123");
    242+
    FillsOrderResp fillsOrderResp = bitmaxApiRestClient.fillsOfOneOrder(2, "cash05001");
    243243
    super.toPrettyShow(fillsOrderResp);
    244244
    }
    245245

    ‎src/test/java/com/bitmax/api/client/security/JavaAuthClientTest.java

    Lines changed: 3 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -7,8 +7,8 @@ public class JavaAuthClientTest {
    77
    @Test
    88
    public void testSign() throws Exception {
    99
    String baseUrl = "https://bitmax.io";
    10-
    String apiKey = "api-key";
    11-
    String secret = "secret";
    12-
    new JavaAuthClient(baseUrl, apiKey, secret).makeHeader("deposit", null);
    10+
    String apiKey = "your-api-key";
    11+
    String secret = "your-secret";
    12+
    new JavaAuthClient(baseUrl, apiKey, secret).makeHeader("order/fills", null);
    1313
    }
    1414
    }

    ‎src/test/java/com/bitmax/api/client/websocket/BitmaxOrderManageWebSocketExample.java

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -12,8 +12,8 @@
    1212
    public class BitmaxOrderManageWebSocketExample {
    1313

    1414
    public static void main(String[] args) {
    15-
    BitmaxApiWebSocketClient socketClient = BitmaxApiClientFactory.newInstance("api-key",
    16-
    "secret").newWebSocketClient();
    15+
    BitmaxApiWebSocketClient socketClient = BitmaxApiClientFactory.newInstance("your-api-key",
    16+
    "your-secret").newWebSocketClient();
    1717
    String symbol = "ETH-BTC";
    1818
    // 订阅order manage
    1919
    BitmaxWebSocketBootStrap bootStrap = new BitmaxWebSocketBootStrap(WebSocketType.ORDER, socketClient,

    ‎src/test/java/com/bitmax/api/client/websocket/BitmaxPublicWebSocketExample.java

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -13,7 +13,8 @@
    1313
    public class BitmaxPublicWebSocketExample {
    1414

    1515
    public static void main(String[] args) {
    16-
    BitmaxApiWebSocketClient bitmaxApiWebSocketClient = BitmaxApiClientFactory.newInstance().newWebSocketClient();
    16+
    BitmaxApiWebSocketClient bitmaxApiWebSocketClient = BitmaxApiClientFactory.newInstance()
    17+
    .newWebSocketClient();
    1718
    String symbol = "ETH-BTC";
    1819
    SubscribeConfig config = new SubscribeConfig(20, 20, false, false);
    1920
    // 订阅 public

    0 commit comments

    Comments
     (0)
    0