Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cuichang/rest
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: zytbwu/rest
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
2 contributors

Commits on Sep 1, 2014

  1. no message

    OKCoin committed Sep 1, 2014
    Copy the full SHA
    c0ab712 View commit details

  2. 支持SNI

    OKCoin committed Sep 1, 2014
    Copy the full SHA
    860c162 View commit details

Commits on Oct 5, 2014

  1. 支持 期货 Python 用例

    OKCoin committed Oct 5, 2014
    Copy the full SHA
    91bea0f View commit details

  2. Merge branch 'master' of https://github.com/OKCoin/rest

    OKCoin committed Oct 5, 2014
    Copy the full SHA
    43837a0 View commit details

Commits on Oct 24, 2014

  1. Update and rename okcoin_com.py to okcoin.py

    @happiness123
    happiness123 committed Oct 24, 2014
    Copy the full SHA
    786d38a View commit details

  2. Update okcoin.py

    @happiness123
    happiness123 committed Oct 24, 2014
    Copy the full SHA
    b915eda View commit details

  3. Update OkTrade.php

    @happiness123
    happiness123 committed Oct 24, 2014
    Copy the full SHA
    68678a5 View commit details

  4. Update OkTrade.php

    @happiness123
    happiness123 committed Oct 24, 2014
    Copy the full SHA
    425f0ec View commit details

  5. 新版API Java示例 包括现货和期货

    OKCoin committed Oct 24, 2014
    Copy the full SHA
    ff5b954 View commit details

Commits on Oct 26, 2014

  1. Update OkTrade.php

    @happiness123
    happiness123 committed Oct 26, 2014
    Copy the full SHA
    72d59aa View commit details

Commits on Oct 27, 2014

  1. Update ReadMe

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    d05a67d View commit details

  2. Update ReadMe

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    b1f5176 View commit details

  3. Update OkTrade.php

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    07a8e05 View commit details

  4. Update OkTrade.php

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    040d834 View commit details

  5. Update FutureClient.java

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    41ee51d View commit details

  6. Update FutureClient.java

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    19e1b81 View commit details

  7. Update StockClient.java

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    1c5439a View commit details

  8. Update StockClient.java

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    cf9ea63 View commit details

  9. Update IFutureRestApi.java

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    8126ed2 View commit details

  10. Update IStockRestApi.java

    @happiness123
    happiness123 committed Oct 27, 2014
    Copy the full SHA
    95d68e0 View commit details

Commits on Nov 3, 2014

  1. Update okcoin.py

    @happiness123
    happiness123 committed Nov 3, 2014
    Copy the full SHA
    7fcdb26 View commit details

  2. Update okcoin.py

    @happiness123
    happiness123 committed Nov 3, 2014
    Copy the full SHA
    4ffb037 View commit details

Commits on Nov 6, 2014

  1. Update IFutureRestApi.java

    @happiness123
    happiness123 committed Nov 6, 2014
    Copy the full SHA
    4f648ab View commit details

  2. Update FutureRestApiV1.java

    @happiness123
    happiness123 committed Nov 6, 2014
    Copy the full SHA
    2d3959c View commit details

Commits on Nov 14, 2014

  1. Update OkTrade.php

    @happiness123
    happiness123 committed Nov 14, 2014
    Copy the full SHA
    2d52159 View commit details

  2. Update OkTrade.php

    @happiness123
    happiness123 committed Nov 14, 2014
    Copy the full SHA
    4b43d32 View commit details

Commits on Nov 19, 2014

  1. Update okcoin.py

    @happiness123
    happiness123 committed Nov 19, 2014
    Copy the full SHA
    2378e73 View commit details

Commits on Nov 27, 2014

  1. Update FutureClient.java

    @happiness123
    happiness123 committed Nov 27, 2014
    Copy the full SHA
    3a09955 View commit details

  2. Update StockClient.java

    @happiness123
    happiness123 committed Nov 27, 2014
    Copy the full SHA
    5e394e9 View commit details

  3. Update StockRestApi.java

    @happiness123
    happiness123 committed Nov 27, 2014
    Copy the full SHA
    9da721e View commit details

  4. Update FutureRestApiV1.java

    @happiness123
    happiness123 committed Nov 27, 2014
    Copy the full SHA
    6faa909 View commit details

  5. Update OkTrade.php

    @happiness123
    happiness123 committed Nov 27, 2014
    Copy the full SHA
    3024fb5 View commit details

Commits on Nov 28, 2014

  1. Update okcoin.py

    @happiness123
    happiness123 committed Nov 28, 2014
    Copy the full SHA
    9190212 View commit details

Commits on Dec 1, 2014

  1. Update HttpMD5Util.py

    @happiness123
    happiness123 committed Dec 1, 2014
    Copy the full SHA
    b628cd1 View commit details

  2. Update Client.py

    @happiness123
    happiness123 committed Dec 1, 2014
    Copy the full SHA
    45d1222 View commit details

  3. Update OkcoinFutureAPI.py

    @happiness123
    happiness123 committed Dec 1, 2014
    Copy the full SHA
    9032a7a View commit details

  4. Update OkcoinSpotAPI.py

    @happiness123
    happiness123 committed Dec 1, 2014
    Copy the full SHA
    b42814e View commit details

Commits on Dec 3, 2014

  1. Update Client.py

    @happiness123
    happiness123 committed Dec 3, 2014
    Copy the full SHA
    153cb28 View commit details

Commits on Dec 8, 2014

  1. Update StockClient.java

    @happiness123
    happiness123 committed Dec 8, 2014
    Copy the full SHA
    83aa7c9 View commit details

  2. Update StockClient.java

    @happiness123
    happiness123 committed Dec 8, 2014
    Copy the full SHA
    dc7e262 View commit details

  3. Update IFutureRestApi.java

    @happiness123
    happiness123 committed Dec 8, 2014
    Copy the full SHA
    46406f4 View commit details

  4. Delete okcoin.py

    @happiness123
    happiness123 committed Dec 8, 2014
    Copy the full SHA
    e4d3103 View commit details

  5. Update OkcoinSpotAPI.py

    @happiness123
    happiness123 committed Dec 8, 2014
    Copy the full SHA
    c7a748e View commit details

  6. Update Client.py

    @happiness123
    happiness123 committed Dec 8, 2014
    Copy the full SHA
    1cf2d2a View commit details

Commits on Dec 24, 2014

  1. Delete commons-httpclient-3.1.jar

    @happiness123
    happiness123 committed Dec 24, 2014
    Copy the full SHA
    6b3e2e8 View commit details

  2. Create ReadMe

    @happiness123
    happiness123 committed Dec 24, 2014
    Copy the full SHA
    16c6023 View commit details

  3. Delete ReadMe

    @happiness123
    happiness123 committed Dec 24, 2014
    Copy the full SHA
    a6ff0ea View commit details

  4. Create ReadMe

    @happiness123
    happiness123 committed Dec 24, 2014
    Copy the full SHA
    add3f39 View commit details

Commits on Dec 25, 2014

  1. Update OkTrade.php

    @happiness123
    happiness123 committed Dec 25, 2014
    Copy the full SHA
    9d4af11 View commit details

  2. Update OkTrade.php

    @happiness123
    happiness123 committed Dec 25, 2014
    Copy the full SHA
    8b95a90 View commit details
Showing with 23,938 additions and 359 deletions.
  1. +3 −0 .gitignore
  2. +22 −0 C#/rest.sln
  3. BIN C#/rest.v12.suo
  4. +6 −0 C#/rest/App.config
  5. +36 −0 C#/rest/Properties/AssemblyInfo.cs
  6. +905 −0 C#/rest/future/FutureRestApiV1.cs
  7. +173 −0 C#/rest/future/IFutureRestApi.cs
  8. BIN C#/rest/obj/Debug/DesignTimeResolveAssemblyReferences.cache
  9. BIN C#/rest/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  10. 0 C#/rest/obj/Debug/TemporaryGeneratedFile_036C0B5B-1481-4323-8D20-8F5ADCB23D92.cs
  11. 0 C#/rest/obj/Debug/TemporaryGeneratedFile_5937a670-0e60-4077-877b-f7221da3dda1.cs
  12. 0 C#/rest/obj/Debug/TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs
  13. +6 −0 C#/rest/obj/Debug/rest.csproj.FileListAbsolute.txt
  14. BIN C#/rest/obj/Debug/rest.csprojResolveAssemblyReference.cache
  15. BIN C#/rest/obj/Debug/rest.exe
  16. BIN C#/rest/obj/Debug/rest.pdb
  17. +98 −0 C#/rest/rest.csproj
  18. +13 −0 C#/rest/rest.csproj.user
  19. +114 −0 C#/rest/rest/Eample.cs
  20. +150 −0 C#/rest/rest/HttpUtilManager.cs
  21. +110 −0 C#/rest/rest/MD5Util.cs
  22. +29 −0 C#/rest/rest/StringUtil.cs
  23. +200 −0 C#/rest/stock/IStockRestApi.cs
  24. +1,052 −0 C#/rest/stock/StockRestApi.cs
  25. +20 −0 C++/API.sln
  26. BIN C++/API.suo
  27. +65 −0 C++/API/API.cpp
  28. +106 −0 C++/API/API.vcxproj
  29. +81 −0 C++/API/API.vcxproj.filters
  30. +3 −0 C++/API/API.vcxproj.user
  31. +36 −0 C++/API/ReadMe.txt
  32. +8 −0 C++/API/stdafx.cpp
  33. +15 −0 C++/API/stdafx.h
  34. +8 −0 C++/API/targetver.h
  35. BIN C++/Debug/libcurl.dll
  36. +3,866 −0 C++/Debug/root.pem
  37. BIN C++/Release/libcurl.dll
  38. +3,866 −0 C++/Release/root.pem
  39. +300 −0 C++/net/http/curl/curl.cpp
  40. +68 −0 C++/net/http/curl/curl.h
  41. +2,325 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/curl.h
  42. +585 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/curlbuild.h
  43. +262 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/curlrules.h
  44. +69 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/curlver.h
  45. +102 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/easy.h
  46. +81 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/mprintf.h
  47. +399 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/multi.h
  48. +33 −0 ...et/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/stdcheaders.h
  49. +610 −0 .../http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/include/curl/typecheck-gcc.h
  50. BIN C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/lib/libcurl.dll
  51. BIN C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/lib/libcurl.exp
  52. BIN C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/lib/libcurl.lib
  53. +3,866 −0 C++/net/http/curl/curl/libcurl-vc10-x86-release-dll-ipv6-sspi-spnego-winssl/lib/root.pem
  54. +123 −0 C++/net/http/curl/curlprotocol.cpp
  55. +170 −0 C++/net/http/curl/curlprotocol.h
  56. +264 −0 C++/net/http/curl/md5.cpp
  57. +70 −0 C++/net/http/curl/md5.h
  58. +529 −0 C++/net/http/curl/okcoinapi.cpp
  59. +116 −0 C++/net/http/curl/okcoinapi.h
  60. +146 −0 C++/net/http/curl/string.cpp
  61. +36 −0 C++/net/http/curl/string.h
  62. +239 −0 C++/net/http/curl/uri.cpp
  63. +107 −0 C++/net/http/curl/uri.h
  64. +0 −134 JAVA/src/OKCoinApiClient.java
  65. BIN JAVA/src/lib/commons-httpclient-3.1.jar
  66. +0 −126 PHP/OkTrade.php
  67. +0 −99 Python/okcoin_com.py
  68. +13 −0 java/ReadMe
  69. BIN {JAVA/src → java}/lib/commons-codec-1.7.jar
  70. BIN java/lib/commons-io-2.2.jar
  71. BIN {JAVA/src → java}/lib/commons-logging-1.0.4.jar
  72. BIN java/lib/fastjson-1.1.23.jar
  73. BIN java/lib/httpclient-4.3.6.jar
  74. BIN java/lib/httpcore-4.3.3.jar
  75. BIN java/lib/jackson-annotations-2.0.2.jar
  76. BIN java/lib/jackson-core-2.0.2.jar
  77. BIN java/lib/jackson-databind-2.0.2.jar
  78. +79 −0 java/src/com/okcoin/rest/FutureClient.java
  79. +169 −0 java/src/com/okcoin/rest/HttpUtilManager.java
  80. +102 −0 java/src/com/okcoin/rest/MD5Util.java
  81. +76 −0 java/src/com/okcoin/rest/StockClient.java
  82. +15 −0 java/src/com/okcoin/rest/StringUtil.java
  83. +140 −0 java/src/com/okcoin/rest/future/IFutureRestApi.java
  84. +381 −0 java/src/com/okcoin/rest/future/impl/FutureRestApiV1.java
  85. +125 −0 java/src/com/okcoin/rest/stock/IStockRestApi.java
  86. +332 −0 java/src/com/okcoin/rest/stock/impl/StockRestApi.java
  87. +131 −0 php/Example.php
  88. +21 −0 php/OKCoin/ApiKeyAuthentication.php
  89. +7 −0 php/OKCoin/Authentication.php
  90. +75 −0 php/OKCoin/Base.php
  91. +21 −0 php/OKCoin/Exception.php
  92. +152 −0 php/OKCoin/OKCoin.php
  93. +26 −0 php/OKCoin/Requestor.php
  94. +102 −0 php/OKCoin/Rpc.php
  95. +16 −0 php/OKCoin/SimpleApiKeyAuthentication.php
  96. +23 −0 php/ReadMe
  97. +94 −0 python/Client.py
  98. +40 −0 python/HttpMD5Util.py
  99. +167 −0 python/OkcoinFutureAPI.py
  100. +134 −0 python/OkcoinSpotAPI.py
  101. +6 −0 python/ReadMe
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*.class
JAVA/OkCoinRESTAPI/.settings/org.eclipse.jdt.core.prefs
JAVA/OkCoinRESTAPI/.classpath
22 changes: 22 additions & 0 deletions C#/rest.sln
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "rest", "rest\rest.csproj", "{C3A49FBC-7F63-4F56-AC4E-70506E21FC5B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C3A49FBC-7F63-4F56-AC4E-70506E21FC5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3A49FBC-7F63-4F56-AC4E-70506E21FC5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3A49FBC-7F63-4F56-AC4E-70506E21FC5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3A49FBC-7F63-4F56-AC4E-70506E21FC5B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Binary file added C#/rest.v12.suo
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions C#/rest/App.config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
</startup>
</configuration>
36 changes: 36 additions & 0 deletions C#/rest/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// 有关程序集的常规信息通过以下
// 特性集控制。更改这些特性值可修改
// 与程序集关联的信息。
[assembly: AssemblyTitle("rest")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("rest")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// 将 ComVisible 设置为 false 使此程序集中的类型
// 对 COM 组件不可见。 如果需要从 COM 访问此程序集中的类型，
// 则将该类型上的 ComVisible 特性设置为 true。
[assembly: ComVisible(false)]

// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
[assembly: Guid("d8bf0c36-ca7e-4181-a6f9-c0111112fbe4")]

// 程序集的版本信息由下面四个值组成:
//
// 主版本
// 次版本
// 生成号
// 修订号
//
// 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
Loading