Skip to content

T
token
Commit 339e6ff5 authored by shajiaiming's avatar shajiaiming
Browse files
Options

Merge branch 'master' into feature/ws_ticker

parents b35924a8 80f2bde6
Show whitespace changes
Inline Side-by-side
Showing with 704 additions and 46 deletions
api/controllers/CoinDogController.php 0 → 100644
View file @ 339e6ff5
<?php
namespace api\controllers;
use linslin\yii2\curl\Curl;
use Yii;
use api\base\BaseController;
class CoinDogController extends BaseController
{
public function actionArticle()
{
$coindog = Yii::$app->params['coindog'];
$accessKey = $coindog['accessKey'];
$secretKey = $coindog['secretKey'];
$httpParams = array(
'access_key' => $accessKey,
'date' => time()
);
$signParams = array_merge($httpParams, array('secret_key' => $secretKey));
ksort($signParams);
$signString = http_build_query($signParams);
$httpParams['sign'] = strtolower(md5($signString));
$url = $coindog['article'] . '?' . http_build_query($httpParams);
$curl = new Curl();
$resp = $curl->get($url, false);
return ['code' => 200, 'data' => $resp, 'msg' => 'ok'];
}
public function actionLive()
{
$limit = Yii::$app->request->get('limit', 20);
$id = Yii::$app->request->get('id', 0);
$flag = Yii::$app->request->get('flag', 'down');
$coindog = Yii::$app->params['coindog'];
$accessKey = $coindog['accessKey'];
$secretKey = $coindog['secretKey'];
$httpParams = array(
'access_key' => $accessKey,
'date' => time()
);
$signParams = array_merge($httpParams, array('secret_key' => $secretKey));
ksort($signParams);
$signString = http_build_query($signParams);
$httpParams = [
'sign' => strtolower(md5($signString)),
'limit' => $limit,
'id' => $id,
'flag' => $flag
];
$url = $coindog['live'] . '?' . http_build_query($httpParams);
$curl = new Curl();
$resp = $curl->get($url, false);
if (!isset($resp['list'])) {
$msg = '数据不存在';
$code = -1;
$data = null;
goto doEnd;
}
$list = $resp['list'][0]['lives'];
foreach ($list as &$item) {
preg_match_all("/\【(.+?)\】/", $item['content'], $match);
$item['title'] = $match[1][0];
}
$code = 0;
$msg = 'success';
doEnd :
return ['code' => $code, 'data' => $list, 'msg' => $msg];
}
}
\ No newline at end of file
api/controllers/CoinPlatformBannerController.php
View file @ 339e6ff5
...@@ -13,14 +13,15 @@ class CoinPlatformBannerController extends BaseController ...@@ -13,14 +13,15 @@ class CoinPlatformBannerController extends BaseController
$code = 0; $code = 0;
$msg = 'success'; $msg = 'success';
$platform_id = Yii::$app->request->get('platform_id', ''); $platform_id = Yii::$app->request->get('platform_id', '');
if(empty($platform_id)){ $type = Yii::$app->request->get('type', '');
$msg = '参数不能为空'; if (empty($platform_id) || empty($type)) {
$msg = '参数错误';
$code = -1; $code = -1;
$data = null; $data = null;
goto doEnd; goto doEnd;
} }
$data = CoinPlatformBanner::find()->where(['platform_id' => $platform_id])->asArray()->all(); $data = CoinPlatformBanner::find()->where(['platform_id' => $platform_id, 'type' => $type])->asArray()->all();
doEnd : doEnd :
return ['code' => $code, 'data' => $data, 'msg' => $msg]; return ['code' => $code, 'data' => $data, 'msg' => $msg];
......
api/controllers/CrossChainController.php 0 → 100644
View file @ 339e6ff5
<?php
namespace api\controllers;
use api\base\BaseController;
use common\models\psources\CoinAirDropTrade;
use common\models\psources\CoinCrossChain;
use common\service\chain33\Chain33Service;
use Yii;
use yii\db\Exception;
class CrossChainController extends BaseController
{
public function actionTransfer()
{
$code = -1;
$request = Yii::$app->request;
if (!$request->isPost) {
$msg = '请求错误!';
goto doEnd;
}
$post = $request->post();
if (3 != count($post['txs'])) {
$msg = '交易笔数错误!';
goto doEnd;
}
$data['is_with_draw'] = (false == $post['isWithdraw']) ? 0 : 1;
$data['address'] = $post['address'];
$data['transfer_number'] = date('YmdHis') . self::getrandnums();
$redis = Yii::$app->redis;
if ($redis->exists($post['address'] . '_' . $data['is_with_draw'])) {
$msg = '存在未完成的交易!';
goto doEnd;
}
$redis->set($post['address'] . '_' . $data['is_with_draw'], $post['address'] . '_' . $data['is_with_draw']);
// $isExist = CoinCrossChain::find()
// ->where(['address' => $post['address'], 'is_with_draw' => $data['is_with_draw']])
// ->andWhere(['<>', 'query_result', 'success'])
// ->asArray()->all();
//
// if ($isExist) {
// $msg = '存在未完成的交易!';
// goto doEnd;
// }
foreach ($post['txs'] as $key => $val) {
$model = new CoinCrossChain();
$data['txhex'] = $val['tx'];
$data['transfer_url'] = $val['url'];
$data['step'] = $val['step'];
$data['amount'] = isset($val['amount']) ? $val['amount'] : 0;
$model->load($data, '');
$model->save();
}
$code = 0;
$msg = 'success';
doEnd :
return ['code' => $code, 'msg' => $msg];
}
public function actionFixTransfer()
{
$code = -1;
$request = Yii::$app->request;
if (!$request->isPost) {
$msg = '请求错误!';
goto doEnd;
}
$post = $request->post();
$data['is_with_draw'] = (false == $post['isWithdraw']) ? 0 : 1;
$data['address'] = $post['address'];
foreach ($post['txs'] as $key => $val) {
$model = CoinCrossChain::find()->where(['is_with_draw' => $data['is_with_draw']])
->andWhere(['address' => $data['address']])
->andWhere(['step' => $val['step']])
->andWhere(['<>', 'msg', 'success'])
->one();
if(false == $model) continue;
$node_params = $model->transfer_url;
$node_params = explode(':', $node_params);
$node_params = [
'scheme' => $node_params[0],
'host' => str_replace('//', '', $node_params[1]),
'port' => isset($node_params[2]) ? $node_params[2] : ''
];
$service = new Chain33Service($node_params);
$send_result = $model->send_result;
$result = $service->QueryTransaction($send_result);
if (isset($result['result']['actionName']) && 'unknown' == $result['result']['actionName']) {
$model->query_result = 'success';
$model->msg = 'success';
$model->save();
continue;
} else if (isset($result['result']['receipt']['ty']) && 2 == $result['result']['receipt']['ty']) {
$model->query_result = 'success';
$model->msg = 'success';
$model->save();
continue;
} else {
$model->txhex = $val['tx'];
$model->transfer_url = $val['url'];
$model->send_result = 0;
$model->query_result = 0;
$model->msg = 0;
$model->save();
continue;
}
}
$code = 0;
$msg = 'success';
doEnd :
return ['code' => $code, 'msg' => $msg];
}
public function actionTransferStatus()
{
$code = -1;
$msg = 'fail';
$data = null;
$step = $amount = 0;
$request = Yii::$app->request;
if (!$request->isGet) {
$msg = '请求错误!';
goto doEnd;
}
$address = $request->get('address', '');
$is_with_draw = $request->get('isWithdraw', '');
if (empty($address)) {
$msg = '参数错误!';
goto doEnd;
}
$model = CoinCrossChain::find()->where(['address' => $address, 'is_with_draw' => $is_with_draw])->orderBy("id desc")->limit(3)->asArray()->all();
if (empty($model)) {
$msg = '数据不存在!';
$code = 0;
goto doEnd;
}
sort($model);
foreach ($model as $key => $val) {
$amount = $val['amount'];
//未交易
if ('0' == $val['send_result'] && '0' == $val['query_result'] && '0' == $val['msg']) {
$step = $key + 1;
$code = 0;
$msg = '第' . ($key + 1) . '笔交易尚未执行';
goto doEnd;
}
//交易报错
if ('0' == $val['send_result'] && '0' == $val['query_result'] && true == $val['msg']) {
$step = $key + 1;
$code = -1;
$msg = $val['msg'];
goto doEnd;
}
//交易成功
if (true == $val['send_result'] && '0' == $val['query_result'] && '0' == $val['msg']) {
$step = $key + 1;
$code = 0;
$msg = $val['send_result'];
goto doEnd;
}
//交易成功，查询失败
if (true == $val['send_result'] && 'success' != $val['query_result']) {
$step = $key + 1;
$code = -1;
$msg = $val['msg'];
goto doEnd;
}
//交易成功，查询成功
if (true == $val['send_result'] && 'success' == $val['query_result'] && 'success' == $val['msg']) {
if (2 == $key) {
$step = (2 == $key) ? 4 : ($key + 2);
$code = 0;
$msg = $val['send_result'];
goto doEnd;
}
continue;
}
}
doEnd :
$data = [
'step' => $step,
'amount' => (int)$amount
];
return ['code' => $code, 'msg' => $msg, 'data' => $data];
}
public static function getrandnums()
{
$arr = array();
while (count($arr) < 6) {
$arr[] = rand(0, 9);
$arr = array_unique($arr);
}
return implode("", $arr);
}
}
\ No newline at end of file
api/controllers/GameBetController.php
View file @ 339e6ff5
...@@ -23,10 +23,10 @@ class GameBetController extends BaseController ...@@ -23,10 +23,10 @@ class GameBetController extends BaseController
} }
$query = CoinGameBet::find() $query = CoinGameBet::find()
->select('round, player, amount, height, guess_num, guess_num, rand_num, player_win, platform') ->select('round, player, amount, height, guess_num, valid, rand_num, player_win, platform')
->where('player= :player',[':player' => $player]) ->where('player= :player',[':player' => $player])
->andWhere(['platform' => $platform]) ->andWhere(['platform' => $platform])
#->andWhere(['valid' => CoinGameBet::VAILD_TRUE]) //->andWhere(['valid' => CoinGameBet::VAILD_TRUE])
->orderBy('update_time desc'); ->orderBy('update_time desc');
$count = $query->count(); $count = $query->count();
......
backend/controllers/CoinPlatformBannerController.php
View file @ 339e6ff5
...@@ -14,14 +14,16 @@ class CoinPlatformBannerController extends BaseController ...@@ -14,14 +14,16 @@ class CoinPlatformBannerController extends BaseController
Yii::$app->response->format = 'json'; Yii::$app->response->format = 'json';
$request = Yii::$app->request; $request = Yii::$app->request;
$image_url = $request->post('image_url', ''); $image_url = $request->post('image_url', '');
if($image_url){ $type = $request->post('banner_type', 1);
if ($image_url) {
$banner_item = new CoinPlatformBanner(); $banner_item = new CoinPlatformBanner();
$banner_item->image_url = $image_url; $banner_item->image_url = $image_url;
$banner_item->platform_id = $user_platform_id; $banner_item->platform_id = $user_platform_id;
$banner_item->type = $type;
$banner_item->save(); $banner_item->save();
return ['code' => 0,'msg' => 'banner添加成功']; return ['code' => 0, 'msg' => 'banner添加成功'];
}else{ } else {
return ['code' => 1,'msg' => 'banner添加加失败']; return ['code' => 1, 'msg' => 'banner添加加失败'];
} }
} }
} }
...@@ -36,15 +38,15 @@ class CoinPlatformBannerController extends BaseController ...@@ -36,15 +38,15 @@ class CoinPlatformBannerController extends BaseController
Yii::$app->response->format = 'json'; Yii::$app->response->format = 'json';
$request = Yii::$app->request; $request = Yii::$app->request;
$id = $request->get('id', ''); $id = $request->get('id', '');
if($id){ if ($id) {
$banner = CoinPlatformBanner::getBanner($id); $banner = CoinPlatformBanner::getBanner($id);
if(!$banner){ if (!$banner) {
return ['code' => 1,'msg' =>'banner不存在,不能删除']; return ['code' => 1, 'msg' => 'banner不存在,不能删除'];
} }
$banner->delete(); $banner->delete();
return ['code' => 0,'msg' => 'banner删除成功']; return ['code' => 0, 'msg' => 'banner删除成功'];
}else{ } else {
return ['code' => 1 ,'msg' => 'banner删除失败']; return ['code' => 1, 'msg' => 'banner删除失败'];
} }
} }
} }
...@@ -55,17 +57,17 @@ class CoinPlatformBannerController extends BaseController ...@@ -55,17 +57,17 @@ class CoinPlatformBannerController extends BaseController
public function actionIndex() public function actionIndex()
{ {
$user_platform_id = Yii::$app->user->identity->platform_id; $user_platform_id = Yii::$app->user->identity->platform_id;
if(Yii::$app->request->isAjax){ if (Yii::$app->request->isAjax) {
Yii::$app->response->format = 'json'; Yii::$app->response->format = 'json';
$condition = []; $condition = [];
if(1 !== $user_platform_id){ if (1 !== $user_platform_id) {
$condition = ['platform_id' => $user_platform_id]; $condition = ['platform_id' => $user_platform_id];
} }
$data = CoinPlatformBanner::getItems($condition); $data = CoinPlatformBanner::getItems($condition);
foreach ($data as $key => &$val){ foreach ($data as $key => &$val) {
$val['coin_name'] = isset($val['platform']['name']) ? $val['platform']['name'] : ''; $val['coin_name'] = isset($val['platform']['name']) ? $val['platform']['name'] : '';
} }
return [ 'data' =>$data, 'code' => 0]; return ['data' => $data, 'code' => 0];
} }
return $this->render('index'); return $this->render('index');
} }
......
backend/views/coin-platform-banner/index.php
View file @ 339e6ff5
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<div class="layui-col-md9"> <div class="layui-col-md9">
<table class="layui-table" id="table1" lay-filter="table1"></table> <table class="layui-table" id="table1" lay-filter="table1"></table>
</div> </div>
<div class="layui-row add" style="display: none;padding: 5px;" id="_form"> <div class="layui-row add" style="display: none;padding: 50px;" id="_form">
<div class="layui-col-xs6 layui-col-sm6 layui-col-md11"> <div class="layui-col-xs6 layui-col-sm6 layui-col-md11">
<form class="layui-form" action="javascript:void(0)" id="form1" method="post" lay-filter="form1"> <form class="layui-form" action="javascript:void(0)" id="form1" method="post" lay-filter="form1">
<input type="hidden" name="_csrf" value="<?= Yii::$app->request->getCsrfToken() ?>"> <input type="hidden" name="_csrf" value="<?= Yii::$app->request->getCsrfToken() ?>">
...@@ -31,6 +31,15 @@ ...@@ -31,6 +31,15 @@
</button> </button>
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">图片类型</label>
<div class="layui-input-block">
<select name="banner_type">
<option value="1">banner</option>
<option value="2">海报</option>
</select>
</div>
</div>
</form> </form>
</div> </div>
</div> </div>
...@@ -54,7 +63,7 @@ ...@@ -54,7 +63,7 @@
}, },
{ {
field: 'image_url', field: 'image_url',
title: '图片跳转地址', title: '图片地址',
width: 600 width: 600
}, },
{ {
...@@ -87,7 +96,7 @@ ...@@ -87,7 +96,7 @@
$('#add').click(function () { $('#add').click(function () {
var index = layer.open({ var index = layer.open({
title: '添加banner', title: '添加banner',
area: '800px', area: '750px',
type: 1, type: 1,
content: $("#_form"), content: $("#_form"),
btn: ['保存', '取消'], btn: ['保存', '取消'],
......
common/business/ExchangeBusiness.php
View file @ 339e6ff5
...@@ -42,7 +42,8 @@ class ExchangeBusiness ...@@ -42,7 +42,8 @@ class ExchangeBusiness
13 => 'Ex', 13 => 'Ex',
14 => 'Zt', 14 => 'Zt',
15 => 'Tsc', 15 => 'Tsc',
16 => 'Binance' 16 => 'Binance',
17 => 'Ceohk'
]; ];
/** /**
...@@ -85,7 +86,7 @@ class ExchangeBusiness ...@@ -85,7 +86,7 @@ class ExchangeBusiness
goto doEnd; goto doEnd;
} }
if (strtoupper($tag) == 'RYH' || strtoupper($tag) == 'WL' || strtoupper($tag) == 'ETS' || strtoupper($tag) == 'LIMS' || strtoupper($tag) == 'AT' || strtoupper($tag) == 'BTJ') { if (strtoupper($tag) == 'RYH' || strtoupper($tag) == 'CNDT' || strtoupper($tag) == 'WL' || strtoupper($tag) == 'ETS' || strtoupper($tag) == 'LIMS' || strtoupper($tag) == 'AT' || strtoupper($tag) == 'BTJ') {
$quotation = [ $quotation = [
'low' => 0, 'low' => 0,
'high' => 0, 'high' => 0,
...@@ -173,6 +174,13 @@ class ExchangeBusiness ...@@ -173,6 +174,13 @@ class ExchangeBusiness
goto doEnd; goto doEnd;
} }
if (in_array(strtoupper($tag), ['TIX'])) {
$exchange = ExchangeFactory::createExchange("Ceohk");
$quotation = $exchange->getTicker('TIX', 'QC');
$quotation['rmb'] = $quotation['last'];
goto doEnd;
}
if (in_array(strtoupper($tag), ['SJPY'])) { if (in_array(strtoupper($tag), ['SJPY'])) {
$exchange = ExchangeFactory::createExchange("Boc"); $exchange = ExchangeFactory::createExchange("Boc");
$quotation = $exchange->getTicker('CNY', 'JPY'); $quotation = $exchange->getTicker('CNY', 'JPY');
......
common/helpers/Curl.php
View file @ 339e6ff5
...@@ -103,11 +103,24 @@ class Curl ...@@ -103,11 +103,24 @@ class Curl
* *
* @return mixed response * @return mixed response
*/ */
protected $connect_timeout_ms;
protected $timeout_ms;
public function __construct($config = [])
{
if (!empty($config)) {
$this->connect_timeout_ms = isset($config['connect_timeout']) ? $config['connect_timeout'] : 10;
$this->timeout_ms = isset($config['timeout_ms']) ? $config['timeout_ms'] : 100;
}
}
public function get($url, $raw = true) public function get($url, $raw = true)
{ {
$this->_baseUrl = $url; $this->_baseUrl = $url;
return $this->_httpRequest('GET', $raw); return $this->_httpRequest('GET', $raw);
} }
/** /**
* Start performing HEAD-HTTP-Request * Start performing HEAD-HTTP-Request
* *
...@@ -120,6 +133,7 @@ class Curl ...@@ -120,6 +133,7 @@ class Curl
$this->_baseUrl = $url; $this->_baseUrl = $url;
return $this->_httpRequest('HEAD'); return $this->_httpRequest('HEAD');
} }
/** /**
* Start performing POST-HTTP-Request * Start performing POST-HTTP-Request
* *
...@@ -133,6 +147,7 @@ class Curl ...@@ -133,6 +147,7 @@ class Curl
$this->_baseUrl = $url; $this->_baseUrl = $url;
return $this->_httpRequest('POST', $raw); return $this->_httpRequest('POST', $raw);
} }
/** /**
* Start performing PUT-HTTP-Request * Start performing PUT-HTTP-Request
* *
...@@ -146,6 +161,7 @@ class Curl ...@@ -146,6 +161,7 @@ class Curl
$this->_baseUrl = $url; $this->_baseUrl = $url;
return $this->_httpRequest('PUT', $raw); return $this->_httpRequest('PUT', $raw);
} }
/** /**
* Start performing PATCH-HTTP-Request * Start performing PATCH-HTTP-Request
* *
...@@ -160,8 +176,9 @@ class Curl ...@@ -160,8 +176,9 @@ class Curl
$this->setHeaders([ $this->setHeaders([
'X-HTTP-Method-Override' => 'PATCH' 'X-HTTP-Method-Override' => 'PATCH'
]); ]);
return $this->_httpRequest('POST',$raw); return $this->_httpRequest('POST', $raw);
} }
/** /**
* Start performing DELETE-HTTP-Request * Start performing DELETE-HTTP-Request
* *
...@@ -175,6 +192,7 @@ class Curl ...@@ -175,6 +192,7 @@ class Curl
$this->_baseUrl = $url; $this->_baseUrl = $url;
return $this->_httpRequest('DELETE', $raw); return $this->_httpRequest('DELETE', $raw);
} }
/** /**
* Set curl option * Set curl option
* *
...@@ -194,6 +212,7 @@ class Curl ...@@ -194,6 +212,7 @@ class Curl
//return self //return self
return $this; return $this;
} }
/** /**
* Set get params * Set get params
* *
...@@ -210,6 +229,7 @@ class Curl ...@@ -210,6 +229,7 @@ class Curl
//return self //return self
return $this; return $this;
} }
/** /**
* Set get params * Set get params
* *
...@@ -227,6 +247,7 @@ class Curl ...@@ -227,6 +247,7 @@ class Curl
//return self //return self
return $this; return $this;
} }
/** /**
* Set raw post data allows you to post any data format. * Set raw post data allows you to post any data format.
* *
...@@ -242,6 +263,7 @@ class Curl ...@@ -242,6 +263,7 @@ class Curl
//return self //return self
return $this; return $this;
} }
/** /**
* Set get params * Set get params
* *
...@@ -259,6 +281,7 @@ class Curl ...@@ -259,6 +281,7 @@ class Curl
//return self //return self
return $this; return $this;
} }
/** /**
* Get URL - return URL parsed with given params * Get URL - return URL parsed with given params
* *
...@@ -267,11 +290,12 @@ class Curl ...@@ -267,11 +290,12 @@ class Curl
public function getUrl() public function getUrl()
{ {
if (Count($this->_getParams) > 0) { if (Count($this->_getParams) > 0) {
return $this->_baseUrl.'?'.http_build_query($this->_getParams); return $this->_baseUrl . '?' . http_build_query($this->_getParams);
} else { } else {
return $this->_baseUrl; return $this->_baseUrl;
} }
} }
/** /**
* Set curl options * Set curl options
* *
...@@ -284,6 +308,7 @@ class Curl ...@@ -284,6 +308,7 @@ class Curl
$this->_options = $options + $this->_options; $this->_options = $options + $this->_options;
return $this; return $this;
} }
/** /**
* Set multiple headers for request. * Set multiple headers for request.
* *
...@@ -298,11 +323,11 @@ class Curl ...@@ -298,11 +323,11 @@ class Curl
$parsedHeader = []; $parsedHeader = [];
//collect currently set headers //collect currently set headers
foreach ($this->getRequestHeaders() as $header => $value) { foreach ($this->getRequestHeaders() as $header => $value) {
array_push($parsedHeader, $header.':'.$value); array_push($parsedHeader, $header . ':' . $value);
} }
//parse header into right format key:value //parse header into right format key:value
foreach ($headers as $header => $value) { foreach ($headers as $header => $value) {
array_push($parsedHeader, $header.':'.$value); array_push($parsedHeader, $header . ':' . $value);
} }
//set headers //set headers
$this->setOption( $this->setOption(
...@@ -312,6 +337,7 @@ class Curl ...@@ -312,6 +337,7 @@ class Curl
} }
return $this; return $this;
} }
/** /**
* Set a single header for request. * Set a single header for request.
* *
...@@ -326,11 +352,11 @@ class Curl ...@@ -326,11 +352,11 @@ class Curl
$parsedHeader = []; $parsedHeader = [];
//collect currently set headers //collect currently set headers
foreach ($this->getRequestHeaders() as $headerToSet => $valueToSet) { foreach ($this->getRequestHeaders() as $headerToSet => $valueToSet) {
array_push($parsedHeader, $headerToSet.':'.$valueToSet); array_push($parsedHeader, $headerToSet . ':' . $valueToSet);
} }
//add override new header //add override new header
if (strlen($header) > 0) { if (strlen($header) > 0) {
array_push($parsedHeader, $header.':'.$value); array_push($parsedHeader, $header . ':' . $value);
} }
//set headers //set headers
$this->setOption( $this->setOption(
...@@ -339,6 +365,7 @@ class Curl ...@@ -339,6 +365,7 @@ class Curl
); );
return $this; return $this;
} }
/** /**
* Unset a single header. * Unset a single header.
* *
...@@ -353,7 +380,7 @@ class Curl ...@@ -353,7 +380,7 @@ class Curl
//collect currently set headers and filter "unset" header param. //collect currently set headers and filter "unset" header param.
foreach ($this->getRequestHeaders() as $headerToSet => $valueToSet) { foreach ($this->getRequestHeaders() as $headerToSet => $valueToSet) {
if ($header !== $headerToSet) { if ($header !== $headerToSet) {
array_push($parsedHeader, $headerToSet.':'.$valueToSet); array_push($parsedHeader, $headerToSet . ':' . $valueToSet);
} }
} }
//set headers //set headers
...@@ -363,6 +390,7 @@ class Curl ...@@ -363,6 +390,7 @@ class Curl
); );
return $this; return $this;
} }
/** /**
* Get all request headers as key:value array * Get all request headers as key:value array
* *
...@@ -381,6 +409,7 @@ class Curl ...@@ -381,6 +409,7 @@ class Curl
} }
return $parsedRequestHeaders; return $parsedRequestHeaders;
} }
/** /**
* Get specific request header as key:value array * Get specific request header as key:value array
* *
...@@ -394,6 +423,7 @@ class Curl ...@@ -394,6 +423,7 @@ class Curl
$parsedRequestHeaders = $this->getRequestHeaders(); $parsedRequestHeaders = $this->getRequestHeaders();
return isset($parsedRequestHeaders[$headerKey]) ? $parsedRequestHeaders[$headerKey] : null; return isset($parsedRequestHeaders[$headerKey]) ? $parsedRequestHeaders[$headerKey] : null;
} }
/** /**
* Unset a single curl option * Unset a single curl option
* *
...@@ -409,6 +439,7 @@ class Curl ...@@ -409,6 +439,7 @@ class Curl
} }
return $this; return $this;
} }
/** /**
* Unset all curl option, excluding default options. * Unset all curl option, excluding default options.
* *
...@@ -422,6 +453,7 @@ class Curl ...@@ -422,6 +453,7 @@ class Curl
} }
return $this; return $this;
} }
/** /**
* Total reset of options, responses, etc. * Total reset of options, responses, etc.
* *
...@@ -449,6 +481,7 @@ class Curl ...@@ -449,6 +481,7 @@ class Curl
$this->_getParams = []; $this->_getParams = [];
return $this; return $this;
} }
/** /**
* Return a single option * Return a single option
* *
...@@ -462,6 +495,7 @@ class Curl ...@@ -462,6 +495,7 @@ class Curl
//return value or false if key is not set. //return value or false if key is not set.
return isset($mergesOptions[$key]) ? $mergesOptions[$key] : false; return isset($mergesOptions[$key]) ? $mergesOptions[$key] : false;
} }
/** /**
* Return merged curl options and keep keys! * Return merged curl options and keep keys!
* *
...@@ -471,6 +505,7 @@ class Curl ...@@ -471,6 +505,7 @@ class Curl
{ {
return $this->_options + $this->_defaultOptions; return $this->_options + $this->_defaultOptions;
} }
/** /**
* Get curl info according to http://php.net/manual/de/function.curl-getinfo.php * Get curl info according to http://php.net/manual/de/function.curl-getinfo.php
* *
...@@ -487,6 +522,7 @@ class Curl ...@@ -487,6 +522,7 @@ class Curl
return []; return [];
} }
} }
/** /**
* Performs HTTP request * Performs HTTP request
* *
...@@ -508,8 +544,8 @@ class Curl ...@@ -508,8 +544,8 @@ class Curl
} }
//setup error reporting and profiling //setup error reporting and profiling
if (YII_DEBUG) { if (YII_DEBUG) {
Yii::trace('Start sending cURL-Request: '.$this->getUrl().'\n', __METHOD__); Yii::trace('Start sending cURL-Request: ' . $this->getUrl() . '\n', __METHOD__);
Yii::beginProfile($method.' '.$this->_baseUrl.'#'.md5(serialize($this->getOption(CURLOPT_POSTFIELDS))), __METHOD__); Yii::beginProfile($method . ' ' . $this->_baseUrl . '#' . md5(serialize($this->getOption(CURLOPT_POSTFIELDS))), __METHOD__);
} }
/** /**
* proceed curl * proceed curl
...@@ -517,7 +553,12 @@ class Curl ...@@ -517,7 +553,12 @@ class Curl
$curlOptions = $this->getOptions(); $curlOptions = $this->getOptions();
$this->curl = curl_init($this->getUrl()); $this->curl = curl_init($this->getUrl());
curl_setopt_array($this->curl, $curlOptions); curl_setopt_array($this->curl, $curlOptions);
curl_setopt($this->curl, CURLOPT_TIMEOUT,40); if (true == $this->timeout_ms && true == $this->connect_timeout_ms) {
curl_setopt($this->curl, CURLOPT_TIMEOUT_MS, $this->timeout_ms);
curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT, $this->timeout_ms);
curl_setopt($this->curl, CURLOPT_CONNECTTIMEOUT_MS, $this->connect_timeout_ms);
}
//curl_setopt($this->curl, CURLOPT_TIMEOUT,40);
$response = curl_exec($this->curl); $response = curl_exec($this->curl);
//check if curl was successful //check if curl was successful
if ($response === false) { if ($response === false) {
...@@ -547,7 +588,7 @@ class Curl ...@@ -547,7 +588,7 @@ class Curl
$this->_extractAdditionalCurlParameter(); $this->_extractAdditionalCurlParameter();
//end yii debug profile //end yii debug profile
if (YII_DEBUG) { if (YII_DEBUG) {
Yii::endProfile($method.' '.$this->getUrl().'#'.md5(serialize($this->getOption(CURLOPT_POSTFIELDS))), __METHOD__); Yii::endProfile($method . ' ' . $this->getUrl() . '#' . md5(serialize($this->getOption(CURLOPT_POSTFIELDS))), __METHOD__);
} }
//check responseCode and return data/status //check responseCode and return data/status
if ($this->getOption(CURLOPT_CUSTOMREQUEST) === 'HEAD') { if ($this->getOption(CURLOPT_CUSTOMREQUEST) === 'HEAD') {
...@@ -557,10 +598,11 @@ class Curl ...@@ -557,10 +598,11 @@ class Curl
return $this->response; return $this->response;
} }
} }
/** /**
* Extract additional curl params protected class helper * Extract additional curl params protected class helper
*/ */
protected function _extractAdditionalCurlParameter () protected function _extractAdditionalCurlParameter()
{ {
/** /**
* retrieve response code * retrieve response code
...@@ -581,27 +623,29 @@ class Curl ...@@ -581,27 +623,29 @@ class Curl
* try extract response length * try extract response length
*/ */
$this->responseLength = curl_getinfo($this->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD); $this->responseLength = curl_getinfo($this->curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD);
if((int)$this->responseLength == -1) { if ((int)$this->responseLength == -1) {
$this->responseLength = strlen($this->response); $this->responseLength = strlen($this->response);
} }
} }
/** /**
* Extract body curl data from response * Extract body curl data from response
* *
* @param string $response * @param string $response
* @return string * @return string
*/ */
protected function _extractCurlBody ($response) protected function _extractCurlBody($response)
{ {
return substr($response, $this->getInfo(CURLINFO_HEADER_SIZE)); return substr($response, $this->getInfo(CURLINFO_HEADER_SIZE));
} }
/** /**
* Extract header curl data from response * Extract header curl data from response
* *
* @param string $response * @param string $response
* @return array * @return array
*/ */
protected function _extractCurlHeaders ($response) protected function _extractCurlHeaders($response)
{ {
//Init //Init
$headers = []; $headers = [];
......
common/models/psources/CoinCrossChain.php 0 → 100644
View file @ 339e6ff5
<?php
namespace common\models\psources;
use Yii;
use common\core\BaseActiveRecord;
class CoinCrossChain extends BaseActiveRecord
{
const WITHDRAW = 0;
const RECHARGE = 1;
const CROSS_CHAIN_TRANSFERING = 'cross_chain_transfering';
const CROSS_CHAIN_CACHE_FAIL = 'cross_chain_fail';
public static function getDb()
{
return Yii::$app->get('p_sources');
}
public static function tableName()
{
return '{{%coin_cross_chain_transfer}}';
}
//定义场景
const SCENARIOS_CREATE = 'create';
public function rules()
{
return [
[['is_with_draw', 'address', 'txhex', 'transfer_url'], 'required'],
[['transfer_number', 'amount', 'step', 'send_result', 'query_result', 'msg'], 'safe']
];
}
public function scenarios()
{
$scenarios = [
self:: SCENARIOS_CREATE => ['is_with_draw', 'address', 'txhex', 'transfer_url', 'transfer_number', 'amount', 'step', 'send_result', 'query_result', 'msg'],
];
return array_merge(parent:: scenarios(), $scenarios);
}
}
common/service/chain33/Chain33Service.php
View file @ 339e6ff5
...@@ -20,7 +20,7 @@ class Chain33Service ...@@ -20,7 +20,7 @@ class Chain33Service
public function __construct($parameter = []) public function __construct($parameter = [])
{ {
if(empty($parameter)){ if (empty($parameter)) {
$this->node_params = Yii::$app->params['chain33']; $this->node_params = Yii::$app->params['chain33'];
} else { } else {
$this->node_params = $parameter; $this->node_params = $parameter;
...@@ -56,7 +56,11 @@ class Chain33Service ...@@ -56,7 +56,11 @@ class Chain33Service
public function send($params = [], $method = 'Chain33.Query') public function send($params = [], $method = 'Chain33.Query')
{ {
$ch = new Curl(); $timeout = [
'connect_timeout' => 50000,
'timeout_ms' => 40000
];
$ch = new Curl($timeout);
$jsonrpc = self::jsonRpcBuild($params, $method); $jsonrpc = self::jsonRpcBuild($params, $method);
$ch->setHeader('Content-Type', 'application/json'); $ch->setHeader('Content-Type', 'application/json');
$ch->setRawPostData($jsonrpc); $ch->setRawPostData($jsonrpc);
...@@ -203,7 +207,7 @@ class Chain33Service ...@@ -203,7 +207,7 @@ class Chain33Service
return $this->send($params, 'Chain33.CreateRawTransaction'); return $this->send($params, 'Chain33.CreateRawTransaction');
} }
public function createRawTransaction($to, $amount, $fee, $note,$execer) public function createRawTransaction($to, $amount, $fee, $note, $execer)
{ {
$params = [ $params = [
"to" => $to, "to" => $to,
...@@ -234,6 +238,14 @@ class Chain33Service ...@@ -234,6 +238,14 @@ class Chain33Service
return $this->send($params, 'Chain33.SendTransaction'); return $this->send($params, 'Chain33.SendTransaction');
} }
public function QueryTransaction($data)
{
$params = [
'hash' => $data
];
return $this->send($params, 'Chain33.QueryTransaction');
}
public function getBalance($address, $execer) public function getBalance($address, $execer)
{ {
$params = [ $params = [
...@@ -294,6 +306,14 @@ class Chain33Service ...@@ -294,6 +306,14 @@ class Chain33Service
return $this->send($params, 'Chain33.SendTransaction'); return $this->send($params, 'Chain33.SendTransaction');
} }
public function getHeight($params = [])
{
$params = [
"data" => 'user.p.game.',
];
return $this->send($params, 'paracross.GetHeight');
}
/** /**
* 获取最新的区块 * 获取最新的区块
*/ */
......
common/service/exchange/Ceohk.php 0 → 100644
View file @ 339e6ff5
<?php
namespace common\service\exchange;
use linslin\yii2\curl\Curl;
class Ceohk extends Exchange implements ExchangeInterface
{
protected $supported_symbol = 'supported_symbol_ceohk';
protected $quotation_prefix = 'quotation_ceohk_';
protected $base_url = 'https://ceohk.bi/api/market/ticker?market=tix_qc';
public function symbolExists($tag = 'TIX', $aim = "QC")
{
$supported = $this->redis->smembers($this->supported_symbol);
if (is_array($supported) && in_array($this->formatSymbol($tag, $aim), $supported)) {
return true;
}
return false;
}
/**
* 转化交易对为请求变量
*
* @param string $tag
* @param string $aim
* @return mixed
*/
public function formatSymbol($tag = 'TIX', $aim = 'QC')
{
return strtoupper($tag .'_'. $aim);
}
/**
* 保存支持的交易对到redis数据库，使用crontab定时更新
*
* @return mixed|void
*/
public function setSupportedSymbol()
{
$this->redis->sadd($this->supported_symbol, 'TIX_QC');
}
/**
* 更新交易对行情保存到redis，使用crontab定时更新
*
* @return mixed|void
*/
public function setQuotation()
{
$curl = new Curl();
$content = $curl->get($this->base_url, false);
if (is_array($content) && isset($content['data'])) {
$data = $content['data'];
$key = $this->quotation_prefix . 'TIX_QC';
$this->redis->hmset($key, 'low', $data['low'], 'high', $data['high'], 'last', $data['last']);
$this->redis->sadd($this->supported_symbol, 'TIX_QC');
}
}
}
\ No newline at end of file
console/controllers/CrossChainController.php 0 → 100644
View file @ 339e6ff5
<?php
namespace console\controllers;
use common\models\psources\CoinCrossChain;
use Yii;
use yii\console\Controller;
use common\service\chain33\Chain33Service;
class CrossChainController extends Controller
{
/**
* 自动交易
*
* @return array
*/
public function actionAutoTransfer($step, $is_with_draw)
{
$redis = Yii::$app->redis;
$model = CoinCrossChain::find()->where(['send_result' => "0", 'step' => (int)$step, 'is_with_draw' => (int)$is_with_draw])->asArray()->all();
if (empty($model)) {
echo date('Y-m-d H:i:s') . ' STEP: ' . $step . '暂无跨链交易计划' . PHP_EOL;
return 0;
}
$current_time = time();
foreach ($model as $val) {
if ($step > 1) {
$isExist = CoinCrossChain::find()
->where(['transfer_number' => $val['transfer_number']])
->andWhere(['<', 'id', (int)$val['id']])
->orderBy('id desc')
->asArray()
->one();
//上一步发送成功，未查询
if ('success' != $isExist['query_result'] && !empty($isExist)) {
continue;
}
}
$cache_transfering_time = $redis->hget(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
if (true == $cache_transfering_time) {
continue;
}
$redis->hmset(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id'], $current_time);
go(function () use ($val, $redis) {
\Co::sleep(0.5);
$transfer_url = $val['transfer_url'];
$transfer_url = explode(':', $transfer_url);
$node_params = [
'scheme' => $transfer_url[0],
'host' => str_replace('//', '', $transfer_url[1]),
'port' => isset($transfer_url[2]) ? $transfer_url[2] : '',
];
$service = new Chain33Service($node_params);
$sign_str = $val['txhex'];
$result = $service->sendTransaction($sign_str);
if (0 == $result['code']) {
$send_result = $result['result'];
$currentModel = CoinCrossChain::findOne($val['id']);
$currentModel->send_result = $send_result;
$currentModel->msg = 0;
$currentModel->save();
$redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
}
if (0 != $result['code'] && (false == strstr($result['msg'], 'ErrDupTx'))) {
$redis->hdel(CoinCrossChain::CROSS_CHAIN_TRANSFERING, $val['address'] . ':' . $val['is_with_draw'] . ':' . $val['id']);
}
});
}
echo date('Y-m-d H:i:s') . ' STEP: ' . $step . '跨链交易成功' . PHP_EOL;
return 0;
}
public function actionQueryTransaction()
{
$redis = Yii::$app->redis;
$model = CoinCrossChain::find()->where(['<>', 'send_result', '0'])->andWhere(['msg' => '0'])->asArray()->all();
if (empty($model)) {
echo date('Y-m-d H:i:s') . '暂无跨链交易计划' . PHP_EOL;
return 0;
}
//查询共识高度
$node_params = [
'scheme' => 'https',
'host' => 'jiedian1.bityuan.com',
'port' => 8801
];
$service = new Chain33Service($node_params);
$result = $service->getHeight();
$consensHeight = $result['result']['consensHeight'];
$current_time = time();
foreach ($model as $val) {
$node_params = $val['transfer_url'];
$node_params = explode(':', $node_params);
$node_params = [
'scheme' => $node_params[0],
'host' => str_replace('//', '', $node_params[1]),
'port' => isset($node_params[2]) ? $node_params[2] : ''
];
$service = new Chain33Service($node_params);
$send_result = $val['send_result'];
$result = $service->QueryTransaction($send_result);
$switch = true;
if (isset($result['result']['actionName']) && 'unknown' == $result['result']['actionName']) {
$redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
$query_result = 'success';
$msg = 'success';
$height = isset($result['result']['height']) ? $result['result']['height'] : 0;
goto doEnd;
} else if (isset($result['result']['receipt']['ty']) && 2 == $result['result']['receipt']['ty']) {
$redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
$query_result = 'success';
$msg = 'success';
$height = isset($result['result']['height']) ? $result['result']['height'] : 0;
goto doEnd;
} else {
$cache_error_time = $redis->hget(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
if (false == $cache_error_time) {
$redis->hmset(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw'], $current_time);
continue;
}
if (($current_time - $cache_error_time) < 60) {
continue;
}
$redis->hdel(CoinCrossChain::CROSS_CHAIN_CACHE_FAIL, $val['address'] . ':' . $val['is_with_draw']);
if (-1 == $result['code']) {
$msg = $result['msg'];
$query_result = $result['code'];
$switch = false;
goto doEnd;
} else {
$query_result = 'fail';
foreach ($result['result']['receipt']['logs'] as $log) {
if (is_array($log['log'])) continue;
$msg = isset($log['log']) ? $log['log'] : '查询错误';
}
$switch = false;
goto doEnd;
}
}
doEnd :
if (CoinCrossChain::RECHARGE == $val['is_with_draw'] && $val['step'] == 2 && $switch && isset($height) && ($consensHeight < $height)) {
continue;
}
$currentModel = CoinCrossChain::findOne($val['id']);
$currentModel->query_result = $query_result;
$currentModel->msg = $msg;
$currentModel->save();
$count = CoinCrossChain::find()->where(['transfer_number' => $val['transfer_number']])->andWhere(['query_result' => 'success'])->count();
if (3 == $count) {
$key = $val['address'] . '_' . $val['is_with_draw'];
if ($redis->exists($key)) {
$redis->del($key);
}
}
}
echo date('Y-m-d H:i:s') . '查询完毕' . PHP_EOL;
return 0;
}
}
\ No newline at end of file
console/controllers/GameBetController.php
View file @ 339e6ff5
...@@ -37,6 +37,7 @@ class GameBetController extends Controller ...@@ -37,6 +37,7 @@ class GameBetController extends Controller
$resultJSON = json_decode($queryResultItems['queryResultItems'][0]['resultJSON'], true); $resultJSON = json_decode($queryResultItems['queryResultItems'][0]['resultJSON'], true);
$current_round = $resultJSON['current_round']; $current_round = $resultJSON['current_round'];
$current_height = $resultJSON['height'];
$cache_current_round = Yii::$app->redis->get('chain33_game_bet_status_'.$key); $cache_current_round = Yii::$app->redis->get('chain33_game_bet_status_'.$key);
if (empty($cache_current_round)) { if (empty($cache_current_round)) {
$cache_current_round = CoinGameBet::find()->where(['platform' => $key])->max('round'); $cache_current_round = CoinGameBet::find()->where(['platform' => $key])->max('round');
...@@ -48,7 +49,7 @@ class GameBetController extends Controller ...@@ -48,7 +49,7 @@ class GameBetController extends Controller
continue; continue;
} }
Yii::$app->redis->set('chain33_game_bet_status_'.$key, $current_round, 'EX', 300); Yii::$app->redis->set('chain33_game_bet_status_'.$key, $current_round, 'EX', 300);
Yii::$app->redis->set('chain33_game_bet_status_height_'.$key, $current_height, 'EX', 300);
$result = $service->getBetStatus($cache_current_round, $current_round, '', $node); $result = $service->getBetStatus($cache_current_round, $current_round, '', $node);
if (0 !== $result['code']) { if (0 !== $result['code']) {
echo $key.':'.date('Y-m-d H:i:s') . '数据错误' . PHP_EOL; echo $key.':'.date('Y-m-d H:i:s') . '数据错误' . PHP_EOL;
...@@ -132,4 +133,5 @@ class GameBetController extends Controller ...@@ -132,4 +133,5 @@ class GameBetController extends Controller
} }
return 0; return 0;
} }
} }
\ No newline at end of file
shell/GameBet.sh deleted 100644 → 0
View file @ b35924a8
#!/bin/bash
while true; do php /var/www/html/token_pwallet/yii game-bet/game-status >> /var/log/game-bet.log 2>&1; sleep 5; done &
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment