作者 karlet

feat:修复jiaoyin包名更换

... ... @@ -18,8 +18,8 @@ require_once __DIR__ . '/struct/WsDataAccount.php';
require_once __DIR__ . '/struct/Pos.php';
require_once __DIR__ . '/struct/Premium.php';
require_once __DIR__ . '/struct/IndexTicker.php';
require_once __DIR__ . '/../jytools/func.php';
require_once __DIR__ . '/../jytools/Websocket.php';
require_once __DIR__ . '/../jiaoyin/func.php';
require_once __DIR__ . '/../jiaoyin/Websocket.php';
use trader\struct\ApiInfo;
... ... @@ -39,9 +39,9 @@ use trader\struct\Pos;
use trader\struct\Premium;
use trader\struct\IndexTicker;
use \Exception;
use function jytools\timeFormat;
use function jytools\getMicrotime;
use function jytools\output;
use function Jiaoyin\timeFormat;
use function Jiaoyin\getMicrotime;
use function Jiaoyin\output;
class CmBroker
{
... ...
... ... @@ -3,11 +3,11 @@
namespace trader\exchange\binance;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use jytools\Curl;
use function jytools\getMicrotime;
use Jiaoyin\Curl;
use function Jiaoyin\getMicrotime;
class Api
{
... ...
... ... @@ -3,11 +3,11 @@
namespace trader\exchange\binance;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use jytools\Curl;
use function jytools\getMicrotime;
use Jiaoyin\Curl;
use function Jiaoyin\getMicrotime;
class ApiSpot
{
... ... @@ -104,7 +104,8 @@ class ApiSpot
}
//现货
public function account($param){
public function account($param)
{
$url = "/api/v3/account";
$method = "GET";
return $this->request($method, $url, $param, $this->apiInfo);
... ... @@ -146,5 +147,4 @@ class ApiSpot
}
return json_decode($data, true);
}
}
... ...
... ... @@ -5,17 +5,17 @@ namespace trader\exchange\binance;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/Api.php';
require_once __DIR__ . '/ApiSpot.php';
require_once __DIR__ . '/../../../jytools/Websocket.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use trader\exchange\binance\Api as BnApi;
use trader\exchange\binance\ApiSpot as BnSpotApi;
use jytools\Websocket;
use Jiaoyin\Websocket;
use Swoole\Coroutine;
use function jytools\getMicrotime;
use function jytools\output;
use function Jiaoyin\getMicrotime;
use function Jiaoyin\output;
class ExBroker
{
... ...
... ... @@ -3,12 +3,12 @@
namespace trader\exchange\bitget;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jytools/Curl.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
require_once __DIR__ . '/../../../jiaoyin/Curl.php';
use trader\struct\ApiInfo;
use jytools\Curl;
use function jytools\getMicrotime;
use Jiaoyin\Curl;
use function Jiaoyin\getMicrotime;
class Api
{
... ...
... ... @@ -4,14 +4,14 @@ namespace trader\exchange\bitget;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/Api.php';
require_once __DIR__ . '/../../../jytools/Websocket.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use trader\exchange\bitget\Api as BgApi;
use jytools\Websocket;
use function jytools\output;
use function jytools\getMicrotime;
use Jiaoyin\Websocket;
use function Jiaoyin\output;
use function Jiaoyin\getMicrotime;
class ExBroker
{
... ...
... ... @@ -3,12 +3,12 @@
namespace trader\exchange\bybit;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jytools/Curl.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
require_once __DIR__ . '/../../../jiaoyin/Curl.php';
use trader\struct\ApiInfo;
use jytools\Curl;
use function jytools\getMicrotime;
use Jiaoyin\Curl;
use function Jiaoyin\getMicrotime;
class Api
{
... ...
... ... @@ -4,14 +4,14 @@ namespace trader\exchange\bybit;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/Api.php';
require_once __DIR__ . '/../../../jytools/Websocket.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use trader\exchange\bybit\Api as BbApi;
use jytools\Websocket;
use function jytools\output;
use function jytools\getMicrotime;
use Jiaoyin\Websocket;
use function Jiaoyin\output;
use function Jiaoyin\getMicrotime;
class ExBroker
{
... ...
... ... @@ -3,15 +3,15 @@
namespace trader\exchange\gateio;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use jytools\Curl;
use function jytools\getMicrotime;
use Jiaoyin\Curl;
use function Jiaoyin\getMicrotime;
class Api
{
private $host = 'https://api.bybit.com';
private $host = 'https://api.gateio.ws';
private ?ApiInfo $apiInfo;
public function __construct(?ApiInfo $apiInfo)
{
... ...
... ... @@ -4,13 +4,13 @@ namespace trader\exchange\bybit;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/Api.php';
require_once __DIR__ . '/../../../jytools/Websocket.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
use trader\struct\ApiInfo;
use trader\exchange\bybit\Api as BbApi;
use jytools\Websocket;
use function jytools\output;
use Jiaoyin\Websocket;
use function Jiaoyin\output;
class ExBroker
{
... ...
... ... @@ -3,13 +3,13 @@
namespace trader\exchange\okx;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jytools/Curl.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
require_once __DIR__ . '/../../../jiaoyin/Curl.php';
use trader\struct\ApiInfo;
use jytools\Curl;
use function jytools\getMicrotime;
use function jytools\tsToISO;
use Jiaoyin\Curl;
use function Jiaoyin\getMicrotime;
use function Jiaoyin\tsToISO;
class Api
{
... ...
... ... @@ -4,14 +4,14 @@ namespace trader\exchange\okx;
require_once __DIR__ . '/../../struct/ApiInfo.php';
require_once __DIR__ . '/Api.php';
require_once __DIR__ . '/../../../jytools/func.php';
require_once __DIR__ . '/../../../jytools/Websocket.php';
require_once __DIR__ . '/../../../jiaoyin/func.php';
require_once __DIR__ . '/../../../jiaoyin/Websocket.php';
use trader\struct\ApiInfo;
use trader\exchange\okx\Api as OkxApi;
use jytools\Websocket;
use function jytools\output;
use function jytools\getMicrotime;
use Jiaoyin\Websocket;
use function Jiaoyin\output;
use function Jiaoyin\getMicrotime;
class ExBroker
... ...
... ... @@ -2,9 +2,9 @@
namespace trader\struct;
require_once __DIR__ . '/../../jytools/func.php';
require_once __DIR__ . '/../../jiaoyin/func.php';
use function jytools\getPrecision;
use function Jiaoyin\getPrecision;
class SymbolInfo
{
... ...