作者 karlet

feat:修复jiaoyin包名更换

@@ -18,8 +18,8 @@ require_once __DIR__ . '/struct/WsDataAccount.php'; @@ -18,8 +18,8 @@ require_once __DIR__ . '/struct/WsDataAccount.php';
18 require_once __DIR__ . '/struct/Pos.php'; 18 require_once __DIR__ . '/struct/Pos.php';
19 require_once __DIR__ . '/struct/Premium.php'; 19 require_once __DIR__ . '/struct/Premium.php';
20 require_once __DIR__ . '/struct/IndexTicker.php'; 20 require_once __DIR__ . '/struct/IndexTicker.php';
21 -require_once __DIR__ . '/../jytools/func.php';  
22 -require_once __DIR__ . '/../jytools/Websocket.php'; 21 +require_once __DIR__ . '/../jiaoyin/func.php';
  22 +require_once __DIR__ . '/../jiaoyin/Websocket.php';
23 23
24 24
25 use trader\struct\ApiInfo; 25 use trader\struct\ApiInfo;
@@ -39,9 +39,9 @@ use trader\struct\Pos; @@ -39,9 +39,9 @@ use trader\struct\Pos;
39 use trader\struct\Premium; 39 use trader\struct\Premium;
40 use trader\struct\IndexTicker; 40 use trader\struct\IndexTicker;
41 use \Exception; 41 use \Exception;
42 -use function jytools\timeFormat;  
43 -use function jytools\getMicrotime;  
44 -use function jytools\output; 42 +use function Jiaoyin\timeFormat;
  43 +use function Jiaoyin\getMicrotime;
  44 +use function Jiaoyin\output;
45 45
46 class CmBroker 46 class CmBroker
47 { 47 {
@@ -3,11 +3,11 @@ @@ -3,11 +3,11 @@
3 namespace trader\exchange\binance; 3 namespace trader\exchange\binance;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 -require_once __DIR__ . '/../../../jytools/func.php'; 6 +require_once __DIR__ . '/../../../jiaoyin/func.php';
7 7
8 use trader\struct\ApiInfo; 8 use trader\struct\ApiInfo;
9 -use jytools\Curl;  
10 -use function jytools\getMicrotime; 9 +use Jiaoyin\Curl;
  10 +use function Jiaoyin\getMicrotime;
11 11
12 class Api 12 class Api
13 { 13 {
@@ -3,11 +3,11 @@ @@ -3,11 +3,11 @@
3 namespace trader\exchange\binance; 3 namespace trader\exchange\binance;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 -require_once __DIR__ . '/../../../jytools/func.php'; 6 +require_once __DIR__ . '/../../../jiaoyin/func.php';
7 7
8 use trader\struct\ApiInfo; 8 use trader\struct\ApiInfo;
9 -use jytools\Curl;  
10 -use function jytools\getMicrotime; 9 +use Jiaoyin\Curl;
  10 +use function Jiaoyin\getMicrotime;
11 11
12 class ApiSpot 12 class ApiSpot
13 { 13 {
@@ -104,7 +104,8 @@ class ApiSpot @@ -104,7 +104,8 @@ class ApiSpot
104 } 104 }
105 105
106 //现货 106 //现货
107 - public function account($param){ 107 + public function account($param)
  108 + {
108 $url = "/api/v3/account"; 109 $url = "/api/v3/account";
109 $method = "GET"; 110 $method = "GET";
110 return $this->request($method, $url, $param, $this->apiInfo); 111 return $this->request($method, $url, $param, $this->apiInfo);
@@ -146,5 +147,4 @@ class ApiSpot @@ -146,5 +147,4 @@ class ApiSpot
146 } 147 }
147 return json_decode($data, true); 148 return json_decode($data, true);
148 } 149 }
149 -  
150 } 150 }
@@ -5,17 +5,17 @@ namespace trader\exchange\binance; @@ -5,17 +5,17 @@ namespace trader\exchange\binance;
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 require_once __DIR__ . '/Api.php'; 6 require_once __DIR__ . '/Api.php';
7 require_once __DIR__ . '/ApiSpot.php'; 7 require_once __DIR__ . '/ApiSpot.php';
8 -require_once __DIR__ . '/../../../jytools/Websocket.php';  
9 -require_once __DIR__ . '/../../../jytools/func.php'; 8 +require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
  9 +require_once __DIR__ . '/../../../jiaoyin/func.php';
10 10
11 use trader\struct\ApiInfo; 11 use trader\struct\ApiInfo;
12 use trader\exchange\binance\Api as BnApi; 12 use trader\exchange\binance\Api as BnApi;
13 use trader\exchange\binance\ApiSpot as BnSpotApi; 13 use trader\exchange\binance\ApiSpot as BnSpotApi;
14 -use jytools\Websocket; 14 +use Jiaoyin\Websocket;
15 use Swoole\Coroutine; 15 use Swoole\Coroutine;
16 16
17 -use function jytools\getMicrotime;  
18 -use function jytools\output; 17 +use function Jiaoyin\getMicrotime;
  18 +use function Jiaoyin\output;
19 19
20 class ExBroker 20 class ExBroker
21 { 21 {
@@ -3,12 +3,12 @@ @@ -3,12 +3,12 @@
3 namespace trader\exchange\bitget; 3 namespace trader\exchange\bitget;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 -require_once __DIR__ . '/../../../jytools/func.php';  
7 -require_once __DIR__ . '/../../../jytools/Curl.php'; 6 +require_once __DIR__ . '/../../../jiaoyin/func.php';
  7 +require_once __DIR__ . '/../../../jiaoyin/Curl.php';
8 8
9 use trader\struct\ApiInfo; 9 use trader\struct\ApiInfo;
10 -use jytools\Curl;  
11 -use function jytools\getMicrotime; 10 +use Jiaoyin\Curl;
  11 +use function Jiaoyin\getMicrotime;
12 12
13 class Api 13 class Api
14 { 14 {
@@ -4,14 +4,14 @@ namespace trader\exchange\bitget; @@ -4,14 +4,14 @@ namespace trader\exchange\bitget;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 require_once __DIR__ . '/Api.php'; 6 require_once __DIR__ . '/Api.php';
7 -require_once __DIR__ . '/../../../jytools/Websocket.php';  
8 -require_once __DIR__ . '/../../../jytools/func.php'; 7 +require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
  8 +require_once __DIR__ . '/../../../jiaoyin/func.php';
9 9
10 use trader\struct\ApiInfo; 10 use trader\struct\ApiInfo;
11 use trader\exchange\bitget\Api as BgApi; 11 use trader\exchange\bitget\Api as BgApi;
12 -use jytools\Websocket;  
13 -use function jytools\output;  
14 -use function jytools\getMicrotime; 12 +use Jiaoyin\Websocket;
  13 +use function Jiaoyin\output;
  14 +use function Jiaoyin\getMicrotime;
15 15
16 class ExBroker 16 class ExBroker
17 { 17 {
@@ -3,12 +3,12 @@ @@ -3,12 +3,12 @@
3 namespace trader\exchange\bybit; 3 namespace trader\exchange\bybit;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 -require_once __DIR__ . '/../../../jytools/func.php';  
7 -require_once __DIR__ . '/../../../jytools/Curl.php'; 6 +require_once __DIR__ . '/../../../jiaoyin/func.php';
  7 +require_once __DIR__ . '/../../../jiaoyin/Curl.php';
8 8
9 use trader\struct\ApiInfo; 9 use trader\struct\ApiInfo;
10 -use jytools\Curl;  
11 -use function jytools\getMicrotime; 10 +use Jiaoyin\Curl;
  11 +use function Jiaoyin\getMicrotime;
12 12
13 class Api 13 class Api
14 { 14 {
@@ -4,14 +4,14 @@ namespace trader\exchange\bybit; @@ -4,14 +4,14 @@ namespace trader\exchange\bybit;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 require_once __DIR__ . '/Api.php'; 6 require_once __DIR__ . '/Api.php';
7 -require_once __DIR__ . '/../../../jytools/Websocket.php';  
8 -require_once __DIR__ . '/../../../jytools/func.php'; 7 +require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
  8 +require_once __DIR__ . '/../../../jiaoyin/func.php';
9 9
10 use trader\struct\ApiInfo; 10 use trader\struct\ApiInfo;
11 use trader\exchange\bybit\Api as BbApi; 11 use trader\exchange\bybit\Api as BbApi;
12 -use jytools\Websocket;  
13 -use function jytools\output;  
14 -use function jytools\getMicrotime; 12 +use Jiaoyin\Websocket;
  13 +use function Jiaoyin\output;
  14 +use function Jiaoyin\getMicrotime;
15 15
16 class ExBroker 16 class ExBroker
17 { 17 {
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
3 namespace trader\exchange\gateio; 3 namespace trader\exchange\gateio;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 -require_once __DIR__ . '/../../../jytools/func.php'; 6 +require_once __DIR__ . '/../../../jiaoyin/func.php';
7 7
8 use trader\struct\ApiInfo; 8 use trader\struct\ApiInfo;
9 -use jytools\Curl;  
10 -use function jytools\getMicrotime; 9 +use Jiaoyin\Curl;
  10 +use function Jiaoyin\getMicrotime;
11 11
12 class Api 12 class Api
13 { 13 {
14 - private $host = 'https://api.bybit.com'; 14 + private $host = 'https://api.gateio.ws';
15 private ?ApiInfo $apiInfo; 15 private ?ApiInfo $apiInfo;
16 public function __construct(?ApiInfo $apiInfo) 16 public function __construct(?ApiInfo $apiInfo)
17 { 17 {
@@ -4,13 +4,13 @@ namespace trader\exchange\bybit; @@ -4,13 +4,13 @@ namespace trader\exchange\bybit;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 require_once __DIR__ . '/Api.php'; 6 require_once __DIR__ . '/Api.php';
7 -require_once __DIR__ . '/../../../jytools/Websocket.php';  
8 -require_once __DIR__ . '/../../../jytools/func.php'; 7 +require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
  8 +require_once __DIR__ . '/../../../jiaoyin/func.php';
9 9
10 use trader\struct\ApiInfo; 10 use trader\struct\ApiInfo;
11 use trader\exchange\bybit\Api as BbApi; 11 use trader\exchange\bybit\Api as BbApi;
12 -use jytools\Websocket;  
13 -use function jytools\output; 12 +use Jiaoyin\Websocket;
  13 +use function Jiaoyin\output;
14 14
15 class ExBroker 15 class ExBroker
16 { 16 {
@@ -3,13 +3,13 @@ @@ -3,13 +3,13 @@
3 namespace trader\exchange\okx; 3 namespace trader\exchange\okx;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 -require_once __DIR__ . '/../../../jytools/func.php';  
7 -require_once __DIR__ . '/../../../jytools/Curl.php'; 6 +require_once __DIR__ . '/../../../jiaoyin/func.php';
  7 +require_once __DIR__ . '/../../../jiaoyin/Curl.php';
8 8
9 use trader\struct\ApiInfo; 9 use trader\struct\ApiInfo;
10 -use jytools\Curl;  
11 -use function jytools\getMicrotime;  
12 -use function jytools\tsToISO; 10 +use Jiaoyin\Curl;
  11 +use function Jiaoyin\getMicrotime;
  12 +use function Jiaoyin\tsToISO;
13 13
14 class Api 14 class Api
15 { 15 {
@@ -4,14 +4,14 @@ namespace trader\exchange\okx; @@ -4,14 +4,14 @@ namespace trader\exchange\okx;
4 4
5 require_once __DIR__ . '/../../struct/ApiInfo.php'; 5 require_once __DIR__ . '/../../struct/ApiInfo.php';
6 require_once __DIR__ . '/Api.php'; 6 require_once __DIR__ . '/Api.php';
7 -require_once __DIR__ . '/../../../jytools/func.php';  
8 -require_once __DIR__ . '/../../../jytools/Websocket.php'; 7 +require_once __DIR__ . '/../../../jiaoyin/func.php';
  8 +require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
9 9
10 use trader\struct\ApiInfo; 10 use trader\struct\ApiInfo;
11 use trader\exchange\okx\Api as OkxApi; 11 use trader\exchange\okx\Api as OkxApi;
12 -use jytools\Websocket;  
13 -use function jytools\output;  
14 -use function jytools\getMicrotime; 12 +use Jiaoyin\Websocket;
  13 +use function Jiaoyin\output;
  14 +use function Jiaoyin\getMicrotime;
15 15
16 16
17 class ExBroker 17 class ExBroker
@@ -2,9 +2,9 @@ @@ -2,9 +2,9 @@
2 2
3 namespace trader\struct; 3 namespace trader\struct;
4 4
5 -require_once __DIR__ . '/../../jytools/func.php'; 5 +require_once __DIR__ . '/../../jiaoyin/func.php';
6 6
7 -use function jytools\getPrecision; 7 +use function Jiaoyin\getPrecision;
8 8
9 class SymbolInfo 9 class SymbolInfo
10 { 10 {